summaryrefslogtreecommitdiff
path: root/tinyusb
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-10-30 14:16:45 +0700
committerhathach <[email protected]>2013-10-30 14:16:45 +0700
commitc760c69d51e44c98f9a15feb3f93bee599026332 (patch)
tree44513093beb360ba4cfbd0095a14ccea50474a06 /tinyusb
parent3a37dd66cc06df4c326dd43257095c0069fff22e (diff)
clean up
Diffstat (limited to 'tinyusb')
-rw-r--r--tinyusb/device/usbd.c3
-rw-r--r--tinyusb/device/usbd_dcd.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 2a65b5037..e9fe26b90 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -168,8 +168,7 @@ void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request)
break;
case TUSB_REQUEST_SET_ADDRESS:
- p_device->address = (uint8_t) p_request->wValue;
- dcd_controller_set_address(coreid, p_device->address);
+ dcd_controller_set_address(coreid, (uint8_t) p_request->wValue);
usbd_devices[coreid].state = TUSB_DEVICE_STATE_ADDRESSED;
dcd_pipe_control_xfer(coreid, TUSB_DIR_HOST_TO_DEV, NULL, 0); // zero length
diff --git a/tinyusb/device/usbd_dcd.h b/tinyusb/device/usbd_dcd.h
index c58d852f2..27e4d737f 100644
--- a/tinyusb/device/usbd_dcd.h
+++ b/tinyusb/device/usbd_dcd.h
@@ -55,13 +55,11 @@
extern "C" {
#endif
-#define USBD_MAX_INTERFACE 10 // TODO refractor later
+#define USBD_MAX_INTERFACE 16 // TODO refractor later
#define USBD_MAX_ENDPOINT 32 // TODO refractor later
typedef struct {
volatile uint8_t state;
- uint8_t address;
uint8_t interface2class[USBD_MAX_INTERFACE]; // determine interface number belongs to which class
- uint8_t endpoint_idx2class[USBD_MAX_ENDPOINT]; // determine endpoint index belongs to which class
}usbd_device_info_t;
extern usbd_device_info_t usbd_devices[CONTROLLER_DEVICE_NUMBER];