projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 tools: fix error code propagation
[carl9170fw.git]
/
carlfw
/
usb
/
main.c
diff --git
a/carlfw/usb/main.c
b/carlfw/usb/main.c
index c2ad6c3d71fcc79fc4b1bc082430f796931745cd..5c09476b29a5592b63906c21067d70ce25969a41 100644
(file)
--- a/
carlfw/usb/main.c
+++ b/
carlfw/usb/main.c
@@
-4,7
+4,7
@@
* Copyright (c) 2000-2005 ZyDAS Technology Corporation
* Copyright (c) 2007-2009 Atheros Communications, Inc.
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
* Copyright (c) 2000-2005 ZyDAS Technology Corporation
* Copyright (c) 2007-2009 Atheros Communications, Inc.
* Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
- * Copyright
2009
Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright
2009-2011
Christian Lamparter <chunkeey@googlemail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-395,10
+395,11
@@
static void usb_handler(uint8_t usb_interrupt_level1)
}
if (usb_interrupt_level2 & AR9170_USB_INTR_SRC7_USB_RESUME) {
}
if (usb_interrupt_level2 & AR9170_USB_INTR_SRC7_USB_RESUME) {
+ usb_resume_ack();
+
fw.suspend_mode = CARL9170_HOST_AWAKE;
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();
}
}
reboot();
}
}
@@
-419,9
+420,4
@@
void handle_usb(void)
void usb_timer(void)
{
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);
- }
-#endif /* CONFIG_CARL9170FW_WOL */
}
}