update chopstx
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 9 Sep 2015 10:18:26 +0000 (19:18 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 9 Sep 2015 10:18:26 +0000 (19:18 +0900)
NEWS
chopstx
src/adc_stm32f103.c
src/aes-constant-ft.c
src/main.c

diff --git a/NEWS b/NEWS
index 41b0994..f0a6106 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 NeuG NEWS - User visible changes
 
+* Major changes in NeuG 1.0.4
+
+  Released 2015-09-??, by NIIBE Yutaka
+
+** Upgrade of Chopstx
+We use Chopstx 0.09, which supports Nitrokey-Start.
+
+** USB reset handling
+Now, USB reset lets NeuG device restart correctly.
+
+
 * Major changes in NeuG 1.0.3
 
   Released 2015-08-03, by NIIBE Yutaka
diff --git a/chopstx b/chopstx
index baef99b..acd4460 160000 (submodule)
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit baef99bf11db42df18e2155e14fe774260747c91
+Subproject commit acd4460a6ee0f7caa1d7871acd51cdcf6bb4264c
index 2577a1e..839b958 100644 (file)
@@ -90,7 +90,7 @@
 #define NEUG_ADC_SETTING1_SQR3  ADC_SQR3_SQ1_N(ADC_CHANNEL_VREFINT)     \
                               | ADC_SQR3_SQ2_N(ADC_CHANNEL_SENSOR)      \
                               | ADC_SQR3_SQ3_N(ADC_CHANNEL_SENSOR)      \
-                              | ADC_SQR3_SQ4_N(ADC_CHANNEL_VREFINT)     
+                              | ADC_SQR3_SQ4_N(ADC_CHANNEL_VREFINT)
 #define NEUG_ADC_SETTING1_NUM_CHANNELS 4
 
 
@@ -149,7 +149,7 @@ get_adc_config (uint32_t config[4])
 
     case BOARD_ID_OLIMEX_STM32_H103:
     case BOARD_ID_STBEE:
-      config[0] = ADC_SMPR1_SMP_AN10(ADC_SAMPLE_1P5) 
+      config[0] = ADC_SMPR1_SMP_AN10(ADC_SAMPLE_1P5)
                | ADC_SMPR1_SMP_AN11(ADC_SAMPLE_1P5);
       config[1] = 0;
       config[3] = ADC_SQR3_SQ1_N(ADC_CHANNEL_IN10)
index 21d1ba7..c724726 100644 (file)
@@ -138,7 +138,7 @@ const uint32_t FT1[256] __attribute__((section(".sys.1"))) = { FT };
 const uint32_t FT2[256] __attribute__((section(".sys.2"))) = { FT };
 #undef V
 
-#ifdef ORIGINAL_IMPLEMENTATION 
+#ifdef ORIGINAL_IMPLEMENTATION
 #define V(a,b,c,d) 0x##d##a##b##c
 const uint32_t FT3[256] = { FT };
 #undef V
index 1bba0b5..cc2b698 100644 (file)
@@ -43,7 +43,7 @@ enum {
   /**/
   FSIJ_DEVICE_NEUG_FRAUCHEKY_REQUESTED = 254,
   FSIJ_DEVICE_NEUG_EXIT_REQUESTED = 255
-}; 
+};
 
 #ifdef FRAUCHEKY_SUPPORT
 static uint8_t running_neug;
@@ -745,7 +745,7 @@ static void fill_serial_no_by_unique_id (void)
   for (i = 0; i < 4; i++)
     {
       uint8_t b = u[3-i];
-      uint8_t nibble; 
+      uint8_t nibble;
 
       nibble = (b >> 4);
       nibble += (nibble >= 10 ? ('A' - 10) : '0');
@@ -914,7 +914,7 @@ main (int argc, char **argv)
   adc_init ();
 
   event_flag_init (&led_event);
-  
+
   chopstx_mutex_init (&usb_mtx);
   chopstx_cond_init (&cnd_usb);