kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

able to fully enumerated with keyboard

This commit is contained in:
hathach 2013-10-29 14:19:56 +07:00
parent 357813f171
commit db986b3107
7 changed files with 164 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/device/keyboard/.cproject
View File

@ -244,7 +244,7 @@
<tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="com.crt.advproject.link.exe.debug.2143352384" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug">
<option id="com.crt.advproject.link.arch.449102543" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm4" valueType="enumerated"/>
<option id="com.crt.advproject.link.thumb.1645494591" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/>
<option id="com.crt.advproject.link.script.1301365456" name="Linker script" superClass="com.crt.advproject.link.script" value="&quot;device_keyboard_Board_EmbeddedArtists4357.ld&quot;" valueType="string"/>
<option id="com.crt.advproject.link.script.1301365456" name="Linker script" superClass="com.crt.advproject.link.script" value="&quot;device_keyboard_Board_EA4357.ld&quot;" valueType="string"/>
<option id="com.crt.advproject.link.manage.679369872" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/>
<option id="gnu.c.link.option.nostdlibs.1169165709" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/>
<option id="gnu.c.link.option.other.1791196714" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList">
@ -253,7 +253,7 @@
</option>
<option id="gnu.c.link.option.paths.975811544" name="Library search path (-L)" superClass="gnu.c.link.option.paths"/>
<option id="gnu.c.link.option.libs.1195892209" name="Libraries (-l)" superClass="gnu.c.link.option.libs"/>
<option id="com.crt.advproject.link.gcc.hdrlib.2063456418" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.semihost" valueType="enumerated"/>
<option id="com.crt.advproject.link.gcc.hdrlib.2063456418" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/>
<option id="com.crt.advproject.link.fpu.764700776" name="Floating point" superClass="com.crt.advproject.link.fpu" value="com.crt.advproject.link.fpu.fpv4" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1656058909" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

27
demos/device/keyboard/main.c
View File

@ -82,23 +82,20 @@ void led_blinking_task(void * p_para)
}
#if TUSB_CFG_DEVICE_HID_KEYBOARD
hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM;
void keyboard_device_app_task(void * p_para)
{
#if 0
if (tusbd_is_configured())
{
static uint32_t count =0;
if (count < 4)
{
count++;
tusbd_hid_keyboard_send_report(
&(hid_keyboard_report_t) {
.keycode = { 0x04 } }
);
}
}
#endif
// if (tusbd_is_configured(0))
// {
// static uint32_t count =0;
// if (count < 10)
// {
// count++;
//
// keyboard_report.keycode[0] = 0x04;
// tusbd_hid_keyboard_send(0, &keyboard_report );
// }
// }
}
#endif

76
tinyusb/class/hid_device.c
View File

@ -55,14 +55,14 @@ typedef struct {
tusb_descriptor_interface_t const * p_interface_desc;
tusb_hid_descriptor_hid_t const * p_hid_desc;
uint8_t const * p_report_desc;
// volatile tusb_interface_status_t status;
endpoint_handle_t ept_handle;
uint8_t interface_number;
uint8_t idle_rate; // need to be in usb ram
}hidd_interface_t;
#if TUSB_CFG_DEVICE_HID_KEYBOARD
STATIC_ hidd_interface_t keyboard_intf =
STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t keyboardd_data =
{
.p_interface_desc = &app_tusb_desc_configuration.keyboard_interface,
.p_hid_desc = &app_tusb_desc_configuration.keyboard_hid,
@ -348,9 +348,27 @@ ErrorCode_t HID_EpOut_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
#elif 1 // not use the rom driver
//--------------------------------------------------------------------+
// APPLICATION API
//--------------------------------------------------------------------+
tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_kbd_report)
{
//------------- verify data -------------//
hidd_interface_t * p_kbd = &keyboardd_data; // TODO &keyboardd_data[coreid];
ASSERT_STATUS( dcd_pipe_xfer(p_kbd->ept_handle, p_kbd_report, sizeof(hid_keyboard_report_t), false) ) ;
return TUSB_ERROR_NONE;
}
//--------------------------------------------------------------------+
// USBD-CLASS API
//--------------------------------------------------------------------+
tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const * p_request)
{
#if TUSB_CFG_DEVICE_HID_KEYBOARD
hidd_interface_t* p_kbd = &keyboardd_data;
if (p_request->bmRequestType_bit.type == TUSB_REQUEST_TYPE_STANDARD) // standard request to hid
{
uint8_t const desc_type = u16_high_u8(p_request->wValue);
@ -360,36 +378,42 @@ tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const *
desc_type == HID_DESC_TYPE_REPORT)
{
dcd_pipe_control_xfer(coreid, TUSB_DIR_DEV_TO_HOST,
keyboard_intf.p_report_desc, keyboard_intf.p_hid_desc->wReportLength);
p_kbd->p_report_desc, p_kbd->p_hid_desc->wReportLength);
}else
{
ASSERT_STATUS(TUSB_ERROR_FAILED);
}
}else if ( p_request->wIndex == keyboard_intf.p_interface_desc->bInterfaceNumber) // class request
}
else if (p_request->bmRequestType_bit.type == TUSB_REQUEST_TYPE_CLASS)
{
switch(p_request->bRequest)
if ( p_request->wIndex == p_kbd->p_interface_desc->bInterfaceNumber) // class request
{
case HID_REQUEST_CONTROL_SET_IDLE:
// TODO hidd idle rate, no data phase
break;
switch(p_request->bRequest)
{
case HID_REQUEST_CONTROL_SET_IDLE:
p_kbd->idle_rate = u16_high_u8(p_request->wValue);
dcd_pipe_control_xfer(coreid, TUSB_DIR_HOST_TO_DEV, NULL, 0);
break;
case HID_REQUEST_CONTROL_SET_REPORT:
// TODO hidd set report, has data phase
// TODO verify data read from control pipe
// ; uint8_t hehe[10]= { 0 };
// dcd_pipe_control_read(coreid, hehe, p_request->wLength);
break;
case HID_REQUEST_CONTROL_GET_IDLE:
dcd_pipe_control_xfer(coreid, TUSB_DIR_DEV_TO_HOST, &p_kbd->idle_rate, 1); // idle_rate need to be in usb ram
break;
case HID_REQUEST_CONTROL_GET_REPORT:
case HID_REQUEST_CONTROL_GET_IDLE:
case HID_REQUEST_CONTROL_GET_PROTOCOL:
case HID_REQUEST_CONTROL_SET_PROTOCOL:
default:
ASSERT_STATUS(TUSB_ERROR_NOT_SUPPORTED_YET);
return TUSB_ERROR_NOT_SUPPORTED_YET;
case HID_REQUEST_CONTROL_SET_REPORT:
// TODO hidd set report, has data phase
// TODO verify data read from control pipe
// ; uint8_t hehe[10]= { 0 };
// dcd_pipe_control_read(coreid, hehe, p_request->wLength);
break;
case HID_REQUEST_CONTROL_GET_REPORT:
case HID_REQUEST_CONTROL_GET_PROTOCOL:
case HID_REQUEST_CONTROL_SET_PROTOCOL:
default:
ASSERT_STATUS(TUSB_ERROR_NOT_SUPPORTED_YET);
return TUSB_ERROR_NOT_SUPPORTED_YET;
}
}
dcd_pipe_control_xfer(coreid, TUSB_DIR_HOST_TO_DEV, NULL, 0); // treat all class request as non-data control
}else
{
ASSERT_STATUS(TUSB_ERROR_FAILED);
@ -419,8 +443,8 @@ tusb_error_t hidd_init(uint8_t coreid, tusb_descriptor_interface_t const * p_int
{
#if TUSB_CFG_DEVICE_HID_KEYBOARD
case HID_PROTOCOL_KEYBOARD:
keyboard_intf.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint);
ASSERT( endpointhandle_is_valid(keyboard_intf.ept_handle), TUSB_ERROR_DCD_FAILED);
keyboardd_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint);
ASSERT( endpointhandle_is_valid(keyboardd_data.ept_handle), TUSB_ERROR_DCD_FAILED);
break;
#endif
@ -442,8 +466,6 @@ tusb_error_t hidd_init(uint8_t coreid, tusb_descriptor_interface_t const * p_int
*p_length = 0;
return TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE;
}
return TUSB_ERROR_NONE;
}
#endif

23
tinyusb/class/hid_device.h
View File

@ -36,13 +36,6 @@
*/
/**************************************************************************/
/** \ingroup TBD
* \defgroup TBD
* \brief TBD
*
* @{
*/
#ifndef _TUSB_HID_DEVICE_H_
#define _TUSB_HID_DEVICE_H_
@ -57,8 +50,18 @@
//--------------------------------------------------------------------+
// KEYBOARD Application API
//--------------------------------------------------------------------+
tusb_error_t tusbd_hid_keyboard_send_report(hid_keyboard_report_t *p_kbd_report);
tusb_error_t tusbd_hid_mouse_send_report(hid_mouse_report_t *p_mouse_report);
/** \addtogroup ClassDriver_HID_Keyboard Keyboard
* @{ */
/** \defgroup Keyboard_Device Device
* The interface API includes status checking function, data transferring function and callback functions
* @{ */
tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_kbd_report);
tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_mouse_report);
/** @} */
/** @} */
//--------------------------------------------------------------------+
// USBD-CLASS DRIVER API
@ -77,4 +80,4 @@ tusb_error_t hidd_configured(void);
#endif /* _TUSB_HID_DEVICE_H_ */
/** @} */

1
tinyusb/device/dcd.h
View File

@ -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
}

95
tinyusb/device/dcd_lpc43xx.c
View File

@ -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;
while (LPC_USB0->ENDPTPRIME);
LPC_USB0->ENDPTFLUSH = 0xFFFFFFFF;
while (LPC_USB0->ENDPTFLUSH);
// 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;
dcd_data.qhd[0].int_on_setup = 1; // OUT only
}
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) );
/* 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;
// while (LPC_USB0->ENDPTPRIME); /* Wait until all bits are 0 */
LPC_USB0->ENDPTFLUSH = 0xFFFFFFFF;
while (LPC_USB0->ENDPTFLUSH); /* Wait until all bits are 0 */
/* 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

37
tinyusb/device/usbd.c
View File

@ -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;