Mercurial > louis > kiibohd-controller
diff Output/pjrcUSB/arm/usb_dev.c @ 346:1beec5f17e64
Revert "Merge pull request #27 from smasher816/wakeup-devel"
This reverts commit 622ea5d85f94be4b1694fdf08e30fa76eeb18fe4, reversing
changes made to c21439cb48daec7514da4250c41962205fa96624.
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Tue, 23 Jun 2015 08:00:16 -0700 |
| parents | f7b14e25ca5b |
| children | 136e47478441 |
line wrap: on
line diff
--- a/Output/pjrcUSB/arm/usb_dev.c Tue Jun 23 07:58:31 2015 -0700 +++ b/Output/pjrcUSB/arm/usb_dev.c Tue Jun 23 08:00:16 2015 -0700 @@ -167,7 +167,6 @@ static uint8_t reply_buffer[8]; -volatile uint8_t remote_wakeup_enabled = 0; // ----- Functions ----- @@ -295,8 +294,7 @@ data = reply_buffer; break; case 0x0080: // GET_STATUS (device) - //I think this is the corrent endianess - reply_buffer[0] = (remote_wakeup_enabled)<<1; + reply_buffer[0] = 0; reply_buffer[1] = 0; datalen = 2; data = reply_buffer; @@ -316,11 +314,6 @@ datalen = 2; break; case 0x0100: // CLEAR_FEATURE (device) - //Disable DEVICE_REMOTE_WAKEUP feature - if (setup.wValue == 0x01) { - remote_wakeup_enabled = 0; - } - break; case 0x0101: // CLEAR_FEATURE (interface) // TODO: Currently ignoring, perhaps useful? -HaaTa endpoint0_stall(); @@ -341,11 +334,6 @@ endpoint0_stall(); return; case 0x0300: // SET_FEATURE (device) - //Enable DEVICE_REMOTE_WAKEUP feature - if (setup.wValue == 0x01) { - remote_wakeup_enabled = 1; - } - break; case 0x0301: // SET_FEATURE (interface) // TODO: Currently ignoring, perhaps useful? -HaaTa endpoint0_stall(); @@ -1120,11 +1108,6 @@ //serial_print("sleep\n"); USB0_ISTAT = USB_ISTAT_SLEEP; } - - if ( (status & USB_ISTAT_RESUME /* 20 */ ) ) { - //serial_print("resume\n"); - USB0_ISTAT = USB_ISTAT_RESUME; - } }