summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-06-21 13:11:16 +0700
committerhathach <[email protected]>2013-06-21 13:11:45 +0700
commit3924764dff9d90ccff09e1d657c6f40ed8def8d9 (patch)
treec3b124a2f9a76be89cbb34d36a38678d0fb3e8b2 /tinyusb/device
parent743e5a7a930b7e22d85ed1ae9714d42e75ef43c6 (diff)
[host lpc43xx] adding support for host custom class
refractor usbh class driver indexing opt out periodic list code in EHCI (need to refractor/group later) [device lpc176x] rename dcd_endpoint_configure to dcd_pipe_open add usbd_pipe_open to manage pipe
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd.h2
-rw-r--r--tinyusb/device/dcd_lpc175x_6x.c2
-rw-r--r--tinyusb/device/usbd.c19
-rw-r--r--tinyusb/device/usbd.h1
4 files changed, 17 insertions, 7 deletions
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 0ae804d08..b6415a1b5 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -66,7 +66,7 @@ tusb_error_t dcd_pipe_control_write(uint8_t coreid, void const * buffer, uint16_
tusb_error_t dcd_pipe_control_read(uint8_t coreid, void * buffer, uint16_t length);
void dcd_pipe_control_write_zero_length(uint8_t coreid);
-tusb_error_t dcd_endpoint_configure(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc) ATTR_WARN_UNUSED_RESULT;
void dcd_device_set_address(uint8_t coreid, uint8_t dev_addr);
void dcd_device_set_configuration(uint8_t coreid, uint8_t config_num);
diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c
index bbae9d314..c6ab3990c 100644
--- a/tinyusb/device/dcd_lpc175x_6x.c
+++ b/tinyusb/device/dcd_lpc175x_6x.c
@@ -297,7 +297,7 @@ static inline uint8_t endpoint_address_to_physical_index(uint8_t ep_address)
return (ep_address << 1) + (ep_address & 0x80 ? 1 : 0 );
}
-tusb_error_t dcd_endpoint_configure(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc)
+tusb_error_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc)
{
uint8_t phy_ep = endpoint_address_to_physical_index( p_endpoint_desc->bEndpointAddress );
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 02a8b5f28..3fb8fa542 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -55,7 +55,7 @@
usbd_device_info_t usbd_devices[CONTROLLER_DEVICE_NUMBER];
// TODO fix/compress number of class driver
-static device_class_driver_t const usbd_class_drivers[TUSB_CLASS_MAX_CONSEC_NUMBER] =
+static device_class_driver_t const usbd_class_drivers[TUSB_CLASS_MAPPED_INDEX_START] =
{
#if DEVICE_CLASS_HID
[TUSB_CLASS_HID] = {
@@ -78,6 +78,9 @@ bool tusbd_is_configured(uint8_t coreid)
return usbd_devices[coreid].state == TUSB_DEVICE_STATE_CONFIGURED;
}
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
void usbd_bus_reset(uint32_t coreid)
{
memclr_(usbd_devices, sizeof(usbd_device_info_t)*CONTROLLER_DEVICE_NUMBER);
@@ -166,9 +169,6 @@ void usbd_setup_received(uint8_t coreid)
}
}
-//--------------------------------------------------------------------+
-// IMPLEMENTATION
-//--------------------------------------------------------------------+
tusb_error_t usbd_init (void)
{
ASSERT_STATUS ( usbd_string_descriptor_init() );
@@ -197,10 +197,17 @@ tusb_error_t usbd_init (void)
return TUSB_ERROR_NONE;
}
-#endif
//--------------------------------------------------------------------+
+// USBD-CLASS API
+//--------------------------------------------------------------------+
+tusb_error_t usbd_pipe_open(uint8_t coreid, tusb_descriptor_interface_t const * p_interfacae, tusb_descriptor_endpoint_t const * p_endpoint_desc)
+{
+ return TUSB_ERROR_NONE;
+}
+
+//--------------------------------------------------------------------+
// callback from DCD ISR
//--------------------------------------------------------------------+
void usbd_isr(uint8_t coreid, tusb_event_t event)
@@ -252,3 +259,5 @@ static tusb_error_t usbd_string_descriptor_init(void)
return TUSB_ERROR_NONE;
}
+
+#endif
diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h
index 929900ffc..2f362f6fd 100644
--- a/tinyusb/device/usbd.h
+++ b/tinyusb/device/usbd.h
@@ -86,6 +86,7 @@ bool tusbd_is_configured(uint8_t coreid) ATTR_WARN_UNUSED_RESULT;
#ifdef _TINY_USB_SOURCE_FILE_
tusb_error_t usbd_init(void);
+tusb_error_t usbd_pipe_open(uint8_t coreid, tusb_descriptor_interface_t const * p_interfacae, tusb_descriptor_endpoint_t const * p_endpoint_desc);
#endif