X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_keyboard.c;h=d3c9632c749dc139c20f4d5fe18b105f135e8c05;hb=55d03f448e42ea581810bef3d55eb9c017572665;hp=84f3af748d5f6b58cd4292404e2d93d65d392a1f;hpb=622ea5d85f94be4b1694fdf08e30fa76eeb18fe4;p=kiibohd-controller.git

diff --git a/Output/pjrcUSB/arm/usb_keyboard.c b/Output/pjrcUSB/arm/usb_keyboard.c
index 84f3af7..d3c9632 100644
--- a/Output/pjrcUSB/arm/usb_keyboard.c
+++ b/Output/pjrcUSB/arm/usb_keyboard.c
@@ -53,11 +53,13 @@
 #define TX_TIMEOUT_MSEC 50
 
 #if F_CPU == 96000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 596)
+#elif F_CPU == 72000000
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 512) // XXX Correct?
 #elif F_CPU == 48000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 428)
 #elif F_CPU == 24000000
-  #define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
+	#define TX_TIMEOUT (TX_TIMEOUT_MSEC * 262)
 #endif
 
 
@@ -76,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 )
 	{