able to fully enumerated with keyboard

3 files changed, 88 insertions, 45 deletions

diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 0c648347e..6e10557ac 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -89,6 +89,7 @@ tusb_error_t dcd_pipe_control_xfer(uint8_t coreid, tusb_direction_t dir, void *
 //void dcd_pipe_control_write_zero_length(uint8_t coreid);
 
 endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const * p_endpoint_desc) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t  dcd_pipe_xfer(endpoint_handle_t pipe_hdl, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete)  ATTR_WARN_UNUSED_RESULT;
 
 #ifdef __cplusplus
  }
diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c
index 659bc7fff..cd2e79c92 100644
--- a/tinyusb/device/dcd_lpc43xx.c
+++ b/tinyusb/device/dcd_lpc43xx.c
@@ -195,32 +195,37 @@ void dcd_controller_set_configuration(uint8_t coreid, uint8_t config_num)
 

 }

 

+/// follows LPC43xx User Manual 23.10.3

 void bus_reset(uint8_t coreid)

 {

+  // TODO mutliple core id support

 

-}

+  //------------- Clear All Registers -------------//

+  LPC_USB0->ENDPTNAK       = LPC_USB0->ENDPTNAK;

+  LPC_USB0->ENDPTNAKEN     = 0;

+  LPC_USB0->USBSTS_D       = LPC_USB0->USBSTS_D;

+  LPC_USB0->ENDPTSETUPSTAT = LPC_USB0->ENDPTSETUPSTAT;

+  LPC_USB0->ENDPTCOMPLETE  = LPC_USB0->ENDPTCOMPLETE;

 

-tusb_error_t dcd_init(void)

-{

-  // TODO mutliple core id support

-	/* disable all EPs */

-	LPC_USB0->ENDPTCTRL1 &= ~(ENDPTCTRL_MASK_ENABLE | (ENDPTCTRL_MASK_ENABLE << 16) );

-	LPC_USB0->ENDPTCTRL2 &= ~(ENDPTCTRL_MASK_ENABLE | (ENDPTCTRL_MASK_ENABLE << 16) );

-	LPC_USB0->ENDPTCTRL3 &= ~(ENDPTCTRL_MASK_ENABLE | (ENDPTCTRL_MASK_ENABLE << 16) );

-	LPC_USB0->ENDPTCTRL4 &= ~(ENDPTCTRL_MASK_ENABLE | (ENDPTCTRL_MASK_ENABLE << 16) );

-	LPC_USB0->ENDPTCTRL5 &= ~(ENDPTCTRL_MASK_ENABLE | (ENDPTCTRL_MASK_ENABLE << 16) );

+  while (LPC_USB0->ENDPTPRIME);

+  LPC_USB0->ENDPTFLUSH = 0xFFFFFFFF;

+  while (LPC_USB0->ENDPTFLUSH);

 

-	/* Clear all pending interrupts */

-	LPC_USB0->ENDPTNAK       = LPC_USB0->ENDPTNAK;

-	LPC_USB0->ENDPTNAKEN     = 0;

-	LPC_USB0->USBSTS_D       = LPC_USB0->USBSTS_D;

-	LPC_USB0->ENDPTSETUPSTAT = LPC_USB0->ENDPTSETUPSTAT;

-	LPC_USB0->ENDPTCOMPLETE  = LPC_USB0->ENDPTCOMPLETE;

+  // read reset bit in portsc

+

+  //------------- Queue Head & Queue TD -------------//

+  memclr_(&dcd_data, sizeof(dcd_data_t));

+

+  //------------- Set up Control Endpoints (0 OUT, 1 IN) -------------//

+	dcd_data.qhd[0].zero_length_termination = dcd_data.qhd[1].zero_length_termination = 1;

+	dcd_data.qhd[0].max_package_size = dcd_data.qhd[1].max_package_size = CONTROL_ENDOINT_SIZE;

+	dcd_data.qhd[0].qtd_overlay.next = dcd_data.qhd[1].qtd_overlay.next = QTD_INVALID;

 

-//	while (LPC_USB0->ENDPTPRIME);                  /* Wait until all bits are 0 */

-	LPC_USB0->ENDPTFLUSH = 0xFFFFFFFF;

-	while (LPC_USB0->ENDPTFLUSH); /* Wait until all bits are 0 */

+	dcd_data.qhd[0].int_on_setup = 1; // OUT only

+}

 

+tusb_error_t dcd_init(void)

+{

 	/* Set the interrupt Threshold control interval to 0 */

 	LPC_USB0->USBCMD_D &= ~0x00FF0000;

 

@@ -230,13 +235,6 @@ tusb_error_t dcd_init(void)
 	/* Enable interrupts: USB interrupt, error, port change, reset, suspend, NAK interrupt */

 	LPC_USB0->USBINTR_D =  INT_MASK_USB | INT_MASK_ERROR | INT_MASK_PORT_CHANGE | INT_MASK_RESET | INT_MASK_SUSPEND; // | INT_MASK_SOF| INT_MASK_NAK;

 

-	//------------- Set up Control Endpoints (0 OUT, 1 IN)-------------//

-	dcd_data.qhd[0].zero_length_termination = dcd_data.qhd[1].zero_length_termination = 1;

-	dcd_data.qhd[0].max_package_size = dcd_data.qhd[1].max_package_size = CONTROL_ENDOINT_SIZE;

-	dcd_data.qhd[0].qtd_overlay.next = dcd_data.qhd[1].qtd_overlay.next = QTD_INVALID;

-

-	dcd_data.qhd[0].int_on_setup = 1; // OUT only

-

   return TUSB_ERROR_NONE;

 }

 

@@ -328,7 +326,39 @@ endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const
   return (endpoint_handle_t) { .coreid = coreid, .xfer_type = p_endpoint_desc->bmAttributes.xfer, .index = ep_idx };

 }

 

+STATIC_ INLINE_ dcd_qhd_t*  qhd_get_from_endpoint_handle(endpoint_handle_t edpt_hdl) ATTR_PURE ATTR_ALWAYS_INLINE;

+STATIC_ INLINE_ dcd_qhd_t*  qhd_get_from_endpoint_handle(endpoint_handle_t edpt_hdl)

+{

+  return &dcd_data.qhd[edpt_hdl.index];

+}

+

+tusb_error_t  dcd_pipe_xfer(endpoint_handle_t edpt_hdl, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete)

+{

+  dcd_qhd_t* p_qhd = qhd_get_from_endpoint_handle(edpt_hdl);

+  dcd_qtd_t* p_qtd = &dcd_data.qtd[edpt_hdl.index]; // TODO allocate qtd

+

+  ASSERT(edpt_hdl.xfer_type != TUSB_XFER_ISOCHRONOUS, TUSB_ERROR_NOT_SUPPORTED_YET);

+

+  // TODO pipe is busy

+//	DeviceTransferDescriptor*  pDTD = (DeviceTransferDescriptor*) &dTransferDescriptor[PhyEP];

+//	while ( lpc_usb->ENDPTSTAT & _BIT( EP_Physical2BitPosition(PhyEP) ) )	/* Endpoint is already primed */

+//	{

+//	}

+

+  //------------- Prepare qtd -------------//

+  qtd_init(p_qtd, buffer, total_bytes);

+  p_qtd->int_on_complete = int_on_complete;

 

+  p_qhd->qtd_overlay.next = (uint32_t) p_qtd;

+

+#define EP_Physical2Pos(n) ( (n)/2 + ((n)%2 ? 16 : 0 ) )

+

+	LPC_USB0->ENDPTPRIME |= BIT_( EP_Physical2Pos(edpt_hdl.index) ) ;

+

+	return TUSB_ERROR_NONE;

+}

+

+//------------- Device Controller Driver's Interrupt Handler -------------//

 void dcd_isr(uint8_t coreid)

 {

 	uint32_t int_status = LPC_USB0->USBSTS_D;

@@ -340,15 +370,18 @@ void dcd_isr(uint8_t coreid)
 

 	if (int_status & INT_MASK_RESET)

 	{

-//	  dcd_init()

+	  bus_reset(coreid);

+	  usbd_bus_reset(coreid);

 	}

 

 	if (int_status & INT_MASK_USB)

 	{

 		if (LPC_USB0->ENDPTSETUPSTAT)

 		{

-		  LPC_USB0->ENDPTSETUPSTAT = 1;

-		  usbd_setup_received_isr(coreid, &dcd_data.qhd[0].setup_request);

+		  tusb_control_request_t control_request = dcd_data.qhd[0].setup_request;

+

+		  LPC_USB0->ENDPTSETUPSTAT = LPC_USB0->ENDPTSETUPSTAT;

+		  usbd_setup_received_isr(coreid, &control_request);

 		}

 

 		if (LPC_USB0->ENDPTCOMPLETE)

@@ -363,4 +396,8 @@ void dcd_isr(uint8_t coreid)
 	if (int_status & INT_MASK_NAK) { }

 	if (int_status & INT_MASK_ERROR) ASSERT(false, VOID_RETURN);

 }

+

+//--------------------------------------------------------------------+

+// HELPER

+//--------------------------------------------------------------------+

 #endif

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 1092f4ce1..d6e3bd671 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -83,7 +83,7 @@ bool tusbd_is_configured(uint8_t coreid)
 //--------------------------------------------------------------------+
 void usbd_bus_reset(uint32_t coreid)
 {
-  memclr_(usbd_devices, sizeof(usbd_device_info_t)*CONTROLLER_DEVICE_NUMBER);
+  memclr_(&usbd_devices[coreid], sizeof(usbd_device_info_t));
 }
 
 void std_get_descriptor(uint8_t coreid, tusb_control_request_t * p_request)
@@ -119,6 +119,25 @@ void std_get_descriptor(uint8_t coreid, tusb_control_request_t * p_request)
   }
 }
 
+tusb_error_t usbh_set_configure_received(uint8_t coreid, uint8_t config_number)
+{
+  dcd_controller_set_configuration(coreid, config_number);
+  usbd_devices[coreid].state = TUSB_DEVICE_STATE_CONFIGURED;
+
+  uint16_t length = 0;
+
+  #if TUSB_CFG_DEVICE_HID_KEYBOARD
+  tusb_descriptor_interface_t const * p_interface = &app_tusb_desc_configuration.keyboard_interface;
+  ASSERT_STATUS( hidd_init(0, p_interface, &length) );
+  usbd_devices[0].interface2class[p_interface->bInterfaceNumber] = p_interface->bInterfaceClass;
+  #endif
+
+  #if TUSB_CFG_DEVICE_HID_MOUSE
+  ASSERT_STATUS( hidd_init(0, &app_tusb_desc_configuration.mouse_interface, &length) );
+  #endif
+
+}
+
 void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request)
 {
   usbd_device_info_t *p_device = &usbd_devices[coreid];
@@ -141,9 +160,7 @@ void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request)
         break;
 
         case TUSB_REQUEST_SET_CONFIGURATION:
-          dcd_controller_set_configuration(coreid, (uint8_t) p_request->wValue);
-          usbd_devices[coreid].state = TUSB_DEVICE_STATE_CONFIGURED;
-
+          usbh_set_configure_received(coreid, (uint8_t) p_request->wValue);
           dcd_pipe_control_xfer(coreid, TUSB_DIR_HOST_TO_DEV, NULL, 0); // zero length
         break;
 
@@ -166,18 +183,6 @@ tusb_error_t usbd_init (void)
 
   ASSERT_STATUS ( dcd_init() );
 
-  uint16_t length = 0;
-
-  #if TUSB_CFG_DEVICE_HID_KEYBOARD
-  tusb_descriptor_interface_t const * p_interface = &app_tusb_desc_configuration.keyboard_interface;
-  ASSERT_STATUS( hidd_init(0, p_interface, &length) );
-  usbd_devices[0].interface2class[p_interface->bInterfaceNumber] = p_interface->bInterfaceClass;
-  #endif
-
-  #if TUSB_CFG_DEVICE_HID_MOUSE
-  ASSERT_STATUS( hidd_init(0, &app_tusb_desc_configuration.mouse_interface, &length) );
-  #endif
-
   dcd_controller_connect(0);  // TODO USB1
 
   return TUSB_ERROR_NONE;