diff options
author | tmk <nobody@nowhere> | 2013-03-27 15:23:57 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2013-03-27 15:23:57 +0900 |
commit | 969cc4f812e3f86213f97adf340e3c7160fc639e (patch) | |
tree | ad3719c0dd8cce043c235fd2d7e30c8bcd65f7af /protocol/lufa | |
parent | 1f19176867b1b1f760c0ec41cd78fbb6832d29ad (diff) | |
parent | ac509aa079bb090017886b5d7e32240ef16a1196 (diff) |
Merge branch 'suspend_fix'
Diffstat (limited to 'protocol/lufa')
-rw-r--r-- | protocol/lufa/lufa.c | 87 |
1 files changed, 4 insertions, 83 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index 127dece547..7c70720901 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -36,20 +36,18 @@ this software. */ -#include <avr/sleep.h> -#include <avr/wdt.h> #include "report.h" #include "host.h" #include "host_driver.h" #include "keyboard.h" #include "action.h" -#include "matrix.h" #include "led.h" #include "sendchar.h" #include "debug.h" #ifdef SLEEP_LED_ENABLE #include "sleep_led.h" #endif +#include "suspend.h" #include "descriptor.h" #include "lufa.h" @@ -170,9 +168,7 @@ void EVENT_USB_Device_Suspend() void EVENT_USB_Device_WakeUp() { - // initialize - matrix_init(); - clear_keyboard(); + suspend_wakeup_init(); #ifdef SLEEP_LED_ENABLE sleep_led_disable(); @@ -503,32 +499,6 @@ static void SetupHardware(void) USB_Device_EnableSOFEvents(); } - -static bool wakeup_condition(void) -{ - matrix_scan(); - for (uint8_t r = 0; r < MATRIX_ROWS; r++) { - if (matrix_get_row(r)) return true; - } - return false; -} - -#define wdt_intr_enable(value) \ -__asm__ __volatile__ ( \ - "in __tmp_reg__,__SREG__" "\n\t" \ - "cli" "\n\t" \ - "wdr" "\n\t" \ - "sts %0,%1" "\n\t" \ - "out __SREG__,__tmp_reg__" "\n\t" \ - "sts %0,%2" "\n\t" \ - : /* no outputs */ \ - : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \ - "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \ - "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \ - _BV(WDIE) | (value & 0x07)) ) \ - : "r0" \ -) - int main(void) __attribute__ ((weak)); int main(void) { @@ -541,42 +511,10 @@ int main(void) sei(); while (1) { - // while suspend while (USB_DeviceState == DEVICE_STATE_Suspended) { -#ifndef NO_SUSPEND_POWER_DOWN - // Enable watchdog to wake from MCU sleep - cli(); - wdt_reset(); - - // Watchdog Interrupt and System Reset Mode - //wdt_enable(WDTO_1S); - //WDTCSR |= _BV(WDIE); - - // Watchdog Interrupt Mode - wdt_intr_enable(WDTO_120MS); - - // TODO: more power saving - // See PicoPower application note - // - I/O port input with pullup - // - prescale clock - // - BOD disable - // - Power Reduction Register PRR - // sleep in power down mode - set_sleep_mode(SLEEP_MODE_PWR_DOWN); - sleep_enable(); - sei(); - sleep_cpu(); - sleep_disable(); - - // Disable watchdog after sleep - wdt_disable(); -#endif - - // Send request of USB Wakeup from Suspend to host - if (USB_Device_RemoteWakeupEnabled) { - if (wakeup_condition()) { + suspend_power_down(); + if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { USB_Device_SendRemoteWakeup(); - } } } @@ -587,20 +525,3 @@ int main(void) #endif } } - -#ifndef NO_SUSPEND_POWER_DOWN -/* watchdog timeout */ -ISR(WDT_vect) -{ - /* wakeup from MCU sleep mode */ -/* - // blink LED - static uint8_t led_state = 0; - static uint8_t led_count = 0; - led_count++; - if ((led_count & 0x07) == 0) { - led_set((led_state ^= (1<<USB_LED_CAPS_LOCK))); - } -*/ -} -#endif |