From 6c67bc77bc0c42ae8a67d6bbe6abce8de235de56 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Tue, 23 Jun 2015 08:00:16 -0700 Subject: [PATCH] Revert "Merge pull request #27 from smasher816/wakeup-devel" This reverts commit 622ea5d85f94be4b1694fdf08e30fa76eeb18fe4, reversing changes made to c21439cb48daec7514da4250c41962205fa96624. --- Output/pjrcUSB/arm/usb_dev.c | 19 +------------------ Output/pjrcUSB/arm/usb_dev.h | 2 -- Output/pjrcUSB/arm/usb_keyboard.c | 7 ------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/Output/pjrcUSB/arm/usb_dev.c b/Output/pjrcUSB/arm/usb_dev.c index 5c12a41..f09540c 100644 --- a/Output/pjrcUSB/arm/usb_dev.c +++ b/Output/pjrcUSB/arm/usb_dev.c @@ -167,7 +167,6 @@ volatile uint8_t usb_reboot_timer = 0; static uint8_t reply_buffer[8]; -volatile uint8_t remote_wakeup_enabled = 0; // ----- Functions ----- @@ -295,8 +294,7 @@ static void usb_setup() 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 @@ static void usb_setup() 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 @@ static void usb_setup() 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 @@ restart: //serial_print("sleep\n"); USB0_ISTAT = USB_ISTAT_SLEEP; } - - if ( (status & USB_ISTAT_RESUME /* 20 */ ) ) { - //serial_print("resume\n"); - USB0_ISTAT = USB_ISTAT_RESUME; - } } diff --git a/Output/pjrcUSB/arm/usb_dev.h b/Output/pjrcUSB/arm/usb_dev.h index e4f8add..0f445de 100644 --- a/Output/pjrcUSB/arm/usb_dev.h +++ b/Output/pjrcUSB/arm/usb_dev.h @@ -55,8 +55,6 @@ extern volatile uint8_t usb_cdc_line_coding[7]; extern volatile uint8_t usb_cdc_line_rtsdtr; extern volatile uint8_t usb_cdc_transmit_flush_timer; -extern volatile uint8_t remote_wakeup_enabled; - // ----- Functions ----- diff --git a/Output/pjrcUSB/arm/usb_keyboard.c b/Output/pjrcUSB/arm/usb_keyboard.c index 8453534..d3c9632 100644 --- a/Output/pjrcUSB/arm/usb_keyboard.c +++ b/Output/pjrcUSB/arm/usb_keyboard.c @@ -78,13 +78,6 @@ void usb_keyboard_send() uint32_t wait_count = 0; usb_packet_t *tx_packet; - if (remote_wakeup_enabled) { - USB0_CTL |= USB_CTL_RESUME; - _delay_ms(5); //wait 1 to 15ms - USB0_CTL &= ~USB_CTL_RESUME; - _delay_ms(5); - } - // Wait till ready while ( 1 ) { -- 2.39.2