Less power consumption on suspend.

diff --git a/ChangeLog b/ChangeLog
index 271e70f..10a1d83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@
        * src/main.c (main): Call chopstx_conf_idle.
 
        * src/usb-ccid.c (usb_event_handle): Use 2 for call of
-       chopstx_conf_idle on suspend.
+       chopstx_conf_idle on suspend.  Call random_fini on suspend
+       to stop ADC module.  Call random_init on wakeup.
 
 2017-11-16  NIIBE Yutaka  <gniibe@fsij.org>
 

diff --git a/chopstx b/chopstx
index e684e85..3071929 160000 (submodule)
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit e684e853c8770d8e4273926be1fbfd3315cb13a2
+Subproject commit 3071929c621f468938129bc2ba26a7663b04edbd

diff --git a/src/main.c b/src/main.c
index b9968d4..2461ef4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,7 @@
 #define main emulated_main
 #else
 #include "mcu/cortex-m.h"
+#include "mcu/stm32.h"
 #include "mcu/stm32f103.h"
 #endif
 

diff --git a/src/mcu-stm32f103.c b/src/mcu-stm32f103.c
index 8dbc9ad..8a16108 100644 (file)
--- a/src/mcu-stm32f103.c
+++ b/src/mcu-stm32f103.c
@@ -23,6 +23,7 @@
  */
 
 #include <stdint.h>
+#include "mcu/stm32.h"
 #include "mcu/stm32f103.h"
 
 uint8_t *

diff --git a/src/usb-ccid.c b/src/usb-ccid.c
index 3816dbc..afaf277 100644 (file)
--- a/src/usb-ccid.c
+++ b/src/usb-ccid.c
@@ -1558,6 +1558,10 @@ extern int usb_get_status_interface (struct usb_dev *dev);
 
 extern int usb_get_descriptor (struct usb_dev *dev);
 
+extern void random_init (void);
+extern void random_fini (void);
+
+
 /*
  * Return 0 for normal USB event
  *       -1 for USB reset
@@ -1649,12 +1653,14 @@ usb_event_handle (struct usb_dev *dev)
 
     case USB_EVENT_DEVICE_SUSPEND:
       led_blink (LED_OFF);
+      random_fini ();
       chopstx_conf_idle (2);
       bDeviceState |= USB_DEVICE_STATE_SUSPEND;
       break;
 
     case USB_EVENT_DEVICE_WAKEUP:
       chopstx_conf_idle (1);
+      random_init ();
       bDeviceState &= ~USB_DEVICE_STATE_SUSPEND;
       break;