updated init code

Author: carlossless

src/usb.c

@@ -358,22 +358,29 @@ __xdata uint8_t scratch[512];
 uint16_t ep0_xfer_bytes_left;
 uint8_t *ep0_xfer_src;
 
-uint8_t received_usb_addr;
-
+// usb state
+uint8_t __xdata received_usb_addr;
 uint8_t __xdata interface0_protocol;
 uint8_t __xdata interface1_protocol;
+uint8_t __xdata idle_time;
+uint8_t __xdata active_configution;
+uint8_t __xdata ep0_xfer_state;
 
 // TODO: remove
 volatile __bit device_remote_wakeup_f;
-volatile uint8_t __xdata configution_value;
 
-uint8_t __xdata EP1_IDLE_TIME;
-
-uint8_t __xdata ep0_xfer_state;
 
 void usb_init()
 {
     received_usb_addr = 0;
+    idle_time = 0;
+    interface0_protocol = 0;
+    interface1_protocol = 0;
+    active_configution = 0;
+    ep0_xfer_state = 0;
+    ep0_xfer_bytes_left = 0;
+    ep0_xfer_src = 0;
+
     USBADDR = 0;
     USBIE1 = (_OVERIE | _SETUPIE | _SOFIA | _RESMIE | _SUSPIE | _PBRSTIE);
     USBIE2 = (_OEP0IE | _IEP0IE);
@@ -710,7 +717,7 @@ static void usb_set_configuration_handler(__xdata struct usb_req_setup *req)
     if (USBADDR) {
         // TODO: can this actually support 2 configs?
         if ((req->wValue == 0) || (req->wValue == 1)) {
-            configution_value = req->wValue;
+            active_configution = req->wValue;
             // TODO: save config set state
             IEP0CNT_CLR;
             IN0_SET_READY;
@@ -934,7 +941,7 @@ static void usb_get_configuration_handler()
 {
     ep0_xfer_state = OUT0_STATUS_PHASE;
 
-    EP0_IN_BUF[0] = configution_value;
+    EP0_IN_BUF[0] = active_configution;
 
     IEP0CNT_SET(1);
     IN0_SET_READY;
@@ -979,7 +986,7 @@ 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: finish implementaiton to use the set idle time
-    EP1_IDLE_TIME = req->wValue >> 8;
+    idle_time = req->wValue >> 8;
 
     IEP0CNT_CLR;
     IN0_SET_READY;
@@ -988,7 +995,7 @@ static void usb_hid_set_idle_handler(__xdata struct usb_req_setup *req)
 static void usb_hid_get_idle_handler()
 {
     // TODO: finish implementaiton to use the set idle time
-    EP0_IN_BUF[0] = EP1_IDLE_TIME;
+    EP0_IN_BUF[0] = idle_time;
 
     IEP0CNT_SET(1);
     IN0_SET_READY;