From: Christian Lamparter Date: Sun, 16 Jan 2011 14:17:48 +0000 (+0100) Subject: carl9170 firmware: reorder SUSPEND/RESUME/WOL paths X-Git-Tag: 1.9.3~15 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=9e6041aee729b65a5a8bd386eb8a7fb13887fec9;p=carl9170fw.git carl9170 firmware: reorder SUSPEND/RESUME/WOL paths Signed-off-by: Christian Lamparter --- diff --git a/carlfw/usb/main.c b/carlfw/usb/main.c index c2ad6c3..bd8428a 100644 --- a/carlfw/usb/main.c +++ b/carlfw/usb/main.c @@ -395,10 +395,11 @@ static void usb_handler(uint8_t usb_interrupt_level1) } if (usb_interrupt_level2 & AR9170_USB_INTR_SRC7_USB_RESUME) { + usb_resume_ack(); + fw.suspend_mode = CARL9170_HOST_AWAKE; - andl(AR9170_USB_REG_WAKE_UP, AR9170_USB_WAKE_UP_WAKE); + set(AR9170_USB_REG_WAKE_UP, 0); - usb_resume_ack(); reboot(); } } @@ -421,7 +422,7 @@ void usb_timer(void) { #ifdef CONFIG_CARL9170FW_WOL if (fw.suspend_mode == CARL9170_AWAKE_HOST) { - orl(AR9170_USB_REG_WAKE_UP, AR9170_USB_WAKE_UP_WAKE); + set(AR9170_USB_REG_WAKE_UP, AR9170_USB_WAKE_UP_WAKE); } #endif /* CONFIG_CARL9170FW_WOL */ }