more cleanup and reorganization

Author: carlossless

src/usb.c

@@ -16,14 +16,6 @@
     #define USB_PID             0xbeef
 #endif
 
-// TODO: replace usage / rename
-#define REPORT_TYPE_OUTPUT      2
-#define REPORT_TYPE_FEATURE     3
-
-#define DEVICE_TYPE             0
-#define INTERFACE_TYPE          1
-#define ENDPOINT_TYPE           2
-
 // EP0 States
 #define NEW_SETUP_PHASE         0x00
 #define IN0_DATA_PHASE          0x01
@@ -34,7 +26,7 @@
 #define OUT0_KeyMode_PHASE      0x0a
 #define OUT0_ISP_PHASE          0x05
 
-/* interface */
+// interface
 #define interface0_PHASE        0x00
 #define interface1_PHASE        0x01
 
@@ -75,13 +67,6 @@
 #define IEP0CNT_SET(COUNT) \
     do { IEP0CNT_CLR; IEP0CNT |= COUNT; } while (0)
 
-enum {
-    REPORT_ID_ACPI = 0x01,
-    REPORT_ID_CONSUMER = 0x02,
-    REPORT_ID_ISP = 0x05,
-    REPORT_ID_NKRO = 0x06
-};
-
 const uint8_t hid_report_desc_keyboard[] = {
 // *INDENT-OFF*
     HID_RI_USAGE_PAGE(8, 0x01),     // Generic Desktop Controls
@@ -303,10 +288,17 @@ static usb_desc_langid_c usb_langid = {
     .wLANGID          = { /* English (United States) */ 0x0409 },
 };
 
+enum usb_string_index {
+    USB_STRING_LANGUAGE_ID    = 0,
+    USB_STRING_MANUFACTURER   = 1,
+    USB_STRING_PRODUCT        = 2,
+    USB_STRING_SERIAL_NUMBER  = 3,
+};
+
 usb_ascii_string_c usb_strings[] = {
     [USB_STRING_MANUFACTURER - 1] = "[email protected]",
     [USB_STRING_PRODUCT - 1] = "SMK Keyboard",
-    [USB_STRING_SERIAL_NUMBER - 1] = "0001" // TODO: include this
+    [USB_STRING_SERIAL_NUMBER - 1] = "0001"
 };
 
 usb_descriptor_set_c usb_descriptor_set = {
@@ -317,6 +309,13 @@ usb_descriptor_set_c usb_descriptor_set = {
     .strings          = usb_strings,
 };
 
+enum report_id {
+    REPORT_ID_ACPI = 1,
+    REPORT_ID_CONSUMER = 2,
+    REPORT_ID_ISP = 5,
+    REPORT_ID_NKRO = 6,
+};
+
 // interrupt handlers
 static void usb_setup_irq();
 static void usb_ep0_out_irq();
@@ -370,7 +369,6 @@ volatile __bit device_remote_wakeup_f;
 volatile uint8_t __xdata configution_value;
 
 uint8_t __xdata EP1_IDLE_TIME;
-uint8_t __xdata EP1_IDLE_COUNT;
 
 uint8_t __xdata ep0_xfer_state;
 
@@ -990,8 +988,8 @@ static void usb_hid_set_report_handler(__xdata struct usb_req_setup *req)
 
 static void usb_hid_set_idle_handler(__xdata struct usb_req_setup *req)
 {
-    // TODO: is this used?
-    EP1_IDLE_TIME = EP1_IDLE_COUNT = req->wValue >> 8;
+    // TODO: finish implementaiton to use the set idle time
+    EP1_IDLE_TIME = req->wValue >> 8;
 
     IEP0CNT_CLR;
     IN0_SET_READY;

src/usbdef.h

@@ -3,12 +3,6 @@
 
 #include <stdint.h>
 
-// USB string type
-#define USB_STRING_LANGUAGE_ID      0x00
-#define USB_STRING_MANUFACTURER     0x01
-#define USB_STRING_PRODUCT          0x02
-#define USB_STRING_SERIAL_NUMBER    0x03
-
 typedef struct {
     uint8_t request_type;
     uint8_t request;
@@ -316,4 +310,10 @@ struct usb_descriptor_set {
 typedef __code const struct usb_descriptor_set
     usb_descriptor_set_c;
 
+enum report_type {
+    REPORT_TYPE_INPUT   = 1,
+    REPORT_TYPE_OUTPUT  = 2,
+    REPORT_TYPE_FEATURE = 3,
+};
+
 #endif