X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=usb.c;h=3011ecb2a90b909497140fb2f24c242f7c01fd52;hb=a31b31e717a2fa67642be33b321cde4b9b3b496a;hp=5c3240a47d9ce4974cab1ce0a12ed8644a9fedfc;hpb=45d4a7a89883c3433604d4e011b665796a583008;p=max%2Ftmk_keyboard.git

diff --git a/usb.c b/usb.c
index 5c3240a4..3011ecb2 100644
--- a/usb.c
+++ b/usb.c
@@ -478,16 +478,16 @@ ISR(USB_GEN_vect)
 				UEINTX = 0x3A;
 			}
 		}
-		if (keyboard_idle_config && (++div4 & 3) == 0) {
+		if (usb_keyboard_idle_config && (++div4 & 3) == 0) {
 			UENUM = KEYBOARD_ENDPOINT;
 			if (UEINTX & (1<<RWAL)) {
-				keyboard_idle_count++;
-				if (keyboard_idle_count == keyboard_idle_config) {
-					keyboard_idle_count = 0;
-					UEDATX = keyboard_modifier_keys;
+				usb_keyboard_idle_count++;
+				if (usb_keyboard_idle_count == usb_keyboard_idle_config) {
+					usb_keyboard_idle_count = 0;
+					UEDATX = usb_keyboard_mods;
 					UEDATX = 0;
 					for (i=0; i<6; i++) {
-						UEDATX = keyboard_keys[i];
+						UEDATX = usb_keyboard_keys[i];
 					}
 					UEINTX = 0x3A;
 				}
@@ -658,23 +658,23 @@ ISR(USB_COM_vect)
 			if (bmRequestType == 0xA1) {
 				if (bRequest == HID_GET_REPORT) {
 					usb_wait_in_ready();
-					UEDATX = keyboard_modifier_keys;
+					UEDATX = usb_keyboard_mods;
 					UEDATX = 0;
 					for (i=0; i<6; i++) {
-						UEDATX = keyboard_keys[i];
+						UEDATX = usb_keyboard_keys[i];
 					}
 					usb_send_in();
 					return;
 				}
 				if (bRequest == HID_GET_IDLE) {
 					usb_wait_in_ready();
-					UEDATX = keyboard_idle_config;
+					UEDATX = usb_keyboard_idle_config;
 					usb_send_in();
 					return;
 				}
 				if (bRequest == HID_GET_PROTOCOL) {
 					usb_wait_in_ready();
-					UEDATX = keyboard_protocol;
+					UEDATX = usb_keyboard_protocol;
 					usb_send_in();
 					return;
 				}
@@ -682,20 +682,20 @@ ISR(USB_COM_vect)
 			if (bmRequestType == 0x21) {
 				if (bRequest == HID_SET_REPORT) {
 					usb_wait_receive_out();
-					keyboard_leds = UEDATX;
+					usb_keyboard_leds = UEDATX;
 					usb_ack_out();
 					usb_send_in();
 					return;
 				}
 				if (bRequest == HID_SET_IDLE) {
-					keyboard_idle_config = (wValue >> 8);
-					keyboard_idle_count = 0;
+					usb_keyboard_idle_config = (wValue >> 8);
+					usb_keyboard_idle_count = 0;
 					//usb_wait_in_ready();
 					usb_send_in();
 					return;
 				}
 				if (bRequest == HID_SET_PROTOCOL) {
-					keyboard_protocol = wValue;
+					usb_keyboard_protocol = wValue;
 					//usb_wait_in_ready();
 					usb_send_in();
 					return;