andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix dcd_data declared with TUSB_CFG_ATTR_USBRAM

Browse Source 
fix lpc43xx UM: non-control unused endpoint type should be set to different than control in ENDPTCTRL
add hid mouse device
fix mouse descriptor with vertical wheel support
This commit is contained in:
hathach
2013-10-30 12:20:00 +07:00
parent d9ce879df8
commit d67a7b7959
8 changed files with 163 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tinyusb/class/hid_device.c
View File

@@ -59,42 +59,64 @@ typedef struct {
uint8_t interface_number;
uint8_t idle_rate; // need to be in usb ram
hid_keyboard_report_t report;
hid_keyboard_report_t report; // need to be in usb ram
}hidd_interface_t;
//--------------------------------------------------------------------+
// KEYBOARD APPLICATION API
//--------------------------------------------------------------------+
#if TUSB_CFG_DEVICE_HID_KEYBOARD
STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t keyboardd_data =
{
.p_report_desc = app_tusb_keyboard_desc_report
};
#endif
#if TUSB_CFG_DEVICE_HID_MOUSE
STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t moused_data =
{
.p_report_desc = app_tusb_mouse_desc_report
};
#endif
//--------------------------------------------------------------------+
// APPLICATION API
//--------------------------------------------------------------------+
bool tusbd_hid_keyboard_is_busy(uint8_t coreid)
{
return dcd_pipe_is_busy(keyboardd_data.ept_handle);
}
tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_kbd_report)
tusb_error_t tusbd_hid_keyboard_send(uint8_t coreid, hid_keyboard_report_t const *p_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) ) ;
ASSERT_STATUS( dcd_pipe_xfer(p_kbd->ept_handle, p_report, sizeof(hid_keyboard_report_t), false) ) ;
return TUSB_ERROR_NONE;
}
#endif
//--------------------------------------------------------------------+
// MOUSE APPLICATION API
//--------------------------------------------------------------------+
#if TUSB_CFG_DEVICE_HID_MOUSE
STATIC_VAR TUSB_CFG_ATTR_USBRAM hidd_interface_t moused_data =
{
.p_report_desc = app_tusb_mouse_desc_report
};
bool tusbd_hid_mouse_is_busy(uint8_t coreid)
{
return dcd_pipe_is_busy(moused_data.ept_handle);
}
tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_report)
{
//------------- verify data -------------//
hidd_interface_t * p_mouse = &moused_data; // TODO &keyboardd_data[coreid];
ASSERT_STATUS( dcd_pipe_xfer(p_mouse->ept_handle, p_report, sizeof(hid_mouse_report_t), false) ) ;
return TUSB_ERROR_NONE;
}
#endif
//--------------------------------------------------------------------+
// USBD-CLASS API
@@ -105,7 +127,7 @@ tusb_error_t hidd_control_request(uint8_t coreid, tusb_control_request_t const *
#if TUSB_CFG_DEVICE_HID_KEYBOARD
(p_request->wIndex == keyboardd_data.interface_number) ? &keyboardd_data :
#endif
#if TUSB_CFG_DEVICE_HID_KEYBOARD
#if TUSB_CFG_DEVICE_HID_MOUSE
(p_request->wIndex == moused_data.interface_number) ? &moused_data :
#endif
NULL;
@@ -183,8 +205,8 @@ tusb_error_t hidd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int
// memclr_(&keyboardd_data, sizeof(hidd_interface_t));
keyboardd_data.interface_number = p_interface_desc->bInterfaceNumber;
keyboardd_data.report_length = p_desc_hid->wReportLength;
keyboardd_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint);
keyboardd_data.report_length = p_desc_hid->wReportLength;
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
@@ -192,8 +214,8 @@ tusb_error_t hidd_open(uint8_t coreid, tusb_descriptor_interface_t const * p_int
#if TUSB_CFG_DEVICE_HID_MOUSE
case HID_PROTOCOL_MOUSE:
moused_data.interface_number = p_interface_desc->bInterfaceNumber;
moused_data.report_length = p_desc_hid->wReportLength;
moused_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint);
moused_data.report_length = p_desc_hid->wReportLength;
moused_data.ept_handle = dcd_pipe_open(coreid, p_desc_endpoint);
ASSERT( endpointhandle_is_valid(moused_data.ept_handle), TUSB_ERROR_DCD_FAILED);
break;
#endif

4
tinyusb/class/hid_device.h
View File

@@ -100,7 +100,9 @@ void tusbd_hid_keyboard_isr(uint8_t coreid, tusb_event_t event);
/** \defgroup Mouse_Device Device
* @{ */
tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_mouse_report);
bool tusbd_hid_mouse_is_busy(uint8_t coreid);
tusb_error_t tusbd_hid_mouse_send(uint8_t coreid, hid_mouse_report_t const *p_report);
/** @} */
/** @} */

17
tinyusb/device/dcd_lpc43xx.c
View File

@@ -122,7 +122,7 @@ typedef struct {
}dcd_data_t;
ATTR_ALIGNED(2048) dcd_data_t dcd_data;
ATTR_ALIGNED(2048) dcd_data_t dcd_data TUSB_CFG_ATTR_USBRAM;
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
@@ -200,6 +200,14 @@ void bus_reset(uint8_t coreid)
{
// TODO mutliple core id support
// The reset value for all endpoint types is the control endpoint. If one endpoint
//direction is enabled and the paired endpoint of opposite direction is disabled, then the
//endpoint type of the unused direction must bechanged from the control type to any other
//type (e.g. bulk). Leaving an unconfigured endpoint control will cause undefined behavior
//for the data PID tracking on the active endpoint.
LPC_USB0->ENDPTCTRL1 = LPC_USB0->ENDPTCTRL2 = LPC_USB0->ENDPTCTRL3 = LPC_USB0->ENDPTCTRL4 = LPC_USB0->ENDPTCTRL5 =
(TUSB_XFER_BULK << 2) | (TUSB_XFER_BULK << 18);
//------------- Clear All Registers -------------//
LPC_USB0->ENDPTNAK = LPC_USB0->ENDPTNAK;
LPC_USB0->ENDPTNAKEN = 0;
@@ -327,7 +335,7 @@ endpoint_handle_t dcd_pipe_open(uint8_t coreid, tusb_descriptor_endpoint_t const
//------------- Endpoint Control Register -------------//
volatile uint32_t * reg_control = (&LPC_USB0->ENDPTCTRL0) + (p_endpoint_desc->bEndpointAddress & 0x0f);
(*reg_control) = ((p_endpoint_desc->bmAttributes.xfer << 2) | ENDPTCTRL_MASK_ENABLE | ENDPTCTRL_MASK_TOGGLE_RESET) << ((p_endpoint_desc->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK) ? 16 : 0);
(*reg_control) |= ((p_endpoint_desc->bmAttributes.xfer << 2) | ENDPTCTRL_MASK_ENABLE | ENDPTCTRL_MASK_TOGGLE_RESET) << ((p_endpoint_desc->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK) ? 16 : 0);
return (endpoint_handle_t) { .coreid = coreid, .xfer_type = p_endpoint_desc->bmAttributes.xfer, .index = ep_idx };
}
@@ -383,7 +391,7 @@ void dcd_isr(uint8_t coreid)
if (int_status & INT_MASK_USB)
{
if (LPC_USB0->ENDPTSETUPSTAT)
{
{ // 23.10.10.2 Operational model for setup transfers
tusb_control_request_t control_request = dcd_data.qhd[0].setup_request;
LPC_USB0->ENDPTSETUPSTAT = LPC_USB0->ENDPTSETUPSTAT;
@@ -392,7 +400,8 @@ void dcd_isr(uint8_t coreid)
if (LPC_USB0->ENDPTCOMPLETE)
{
// TransferCompleteISR(DeviceID);
// hal_debugger_breakpoint();
LPC_USB0->ENDPTCOMPLETE = LPC_USB0->ENDPTCOMPLETE;
}
}

1
tinyusb/device/usbd.c
View File

@@ -146,6 +146,7 @@ tusb_error_t usbh_set_configure_received(uint8_t coreid, uint8_t config_number)
}
#endif
return TUSB_ERROR_NONE;
}
void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request)

6
tinyusb/device/usbd.h
View File

@@ -50,11 +50,9 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
#include "osal/osal.h" // TODO refractor move to common.h ?
#include "osal/osal.h"
#include "dcd.h"
#ifdef _TINY_USB_SOURCE_FILE_
#include "dcd.h" // TODO hide from application include
#endif
//#include "tusb_descriptors.h"
#ifdef __cplusplus