fix lpcxpresso1347 board_leds
temp change USBD_API to ROM_API add lpc13xx device support fix romdriver pointer able to init rom driver
This commit is contained in:
@@ -233,7 +233,7 @@ ErrorCode_t CDC_BulkIn_Hdlr(USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
uint16_t count;
|
||||
|
||||
count = fifo_read_n(&ffTX, buffer, CDC_DATA_EP_MAXPACKET_SIZE);
|
||||
USBD_API->hw->WriteEP(hUsb, CDC_DATA_EP_IN, buffer, count); // write data to EP
|
||||
ROM_API->hw->WriteEP(hUsb, CDC_DATA_EP_IN, buffer, count); // write data to EP
|
||||
}
|
||||
|
||||
return LPC_OK;
|
||||
@@ -251,7 +251,7 @@ ErrorCode_t CDC_BulkOut_Hdlr(USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
uint16_t count, i;
|
||||
uint8_t buffer[CDC_DATA_EP_MAXPACKET_SIZE];
|
||||
|
||||
count = USBD_API->hw->ReadEP(hUsb, CDC_DATA_EP_OUT, buffer);
|
||||
count = ROM_API->hw->ReadEP(hUsb, CDC_DATA_EP_OUT, buffer);
|
||||
for (i=0; i<count; i++)
|
||||
{
|
||||
fifo_write(&ffRX, buffer[i]);
|
||||
@@ -290,10 +290,10 @@ tusb_error_t tusb_cdc_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *c
|
||||
ASSERT (pControlIntfDesc && pDataIntfDesc, ERR_FAILED);
|
||||
|
||||
/* register Bulk IN & OUT endpoint interrupt handler */
|
||||
ASSERT ( LPC_OK == USBD_API->core->RegisterEpHandler (hUsb , ((CDC_DATA_EP_IN & 0x0F) << 1) +1 , CDC_BulkIn_Hdlr , NULL), TUSB_ERROR_FAILED );
|
||||
ASSERT ( LPC_OK == USBD_API->core->RegisterEpHandler (hUsb , (CDC_DATA_EP_OUT & 0x0F) << 1 , CDC_BulkOut_Hdlr , NULL), TUSB_ERROR_FAILED );
|
||||
ASSERT ( LPC_OK == ROM_API->core->RegisterEpHandler (hUsb , ((CDC_DATA_EP_IN & 0x0F) << 1) +1 , CDC_BulkIn_Hdlr , NULL), TUSB_ERROR_FAILED );
|
||||
ASSERT ( LPC_OK == ROM_API->core->RegisterEpHandler (hUsb , (CDC_DATA_EP_OUT & 0x0F) << 1 , CDC_BulkOut_Hdlr , NULL), TUSB_ERROR_FAILED );
|
||||
|
||||
ASSERT ( LPC_OK == USBD_API->cdc->init(hUsb, &cdc_param, &g_hCdc), TUSB_ERROR_FAILED);
|
||||
ASSERT ( LPC_OK == ROM_API->cdc->init(hUsb, &cdc_param, &g_hCdc), TUSB_ERROR_FAILED);
|
||||
|
||||
/* update memory variables */
|
||||
*mem_base = cdc_param.mem_base;
|
||||
@@ -310,7 +310,7 @@ tusb_error_t tusb_cdc_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *c
|
||||
tusb_error_t tusb_cdc_configured(USBD_HANDLE_T hUsb)
|
||||
{
|
||||
uint8_t dummy=0;
|
||||
USBD_API->hw->WriteEP(hUsb, CDC_DATA_EP_IN, &dummy, 1); // initial packet for IN endpoint, will not work if omitted
|
||||
ROM_API->hw->WriteEP(hUsb, CDC_DATA_EP_IN, &dummy, 1); // initial packet for IN endpoint, will not work if omitted
|
||||
|
||||
// FIXME abstract to hal
|
||||
#if MCU == MCU_LPC11UXX
|
||||
|
@@ -134,7 +134,7 @@ ErrorCode_t HID_EpIn_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
{
|
||||
memset(&hid_keyboard_report, 0, sizeof(tusb_keyboard_report_t));
|
||||
}
|
||||
USBD_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_keyboard_report, sizeof(tusb_keyboard_report_t));
|
||||
ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_keyboard_report, sizeof(tusb_keyboard_report_t));
|
||||
bKeyChanged = false;
|
||||
break;
|
||||
#endif
|
||||
@@ -145,7 +145,7 @@ ErrorCode_t HID_EpIn_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
{
|
||||
memset(&hid_mouse_report, 0, sizeof(tusb_mouse_report_t));
|
||||
}
|
||||
USBD_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_mouse_report, sizeof(tusb_mouse_report_t));
|
||||
ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_mouse_report, sizeof(tusb_mouse_report_t));
|
||||
bMouseChanged = false;
|
||||
break;
|
||||
#endif
|
||||
@@ -170,7 +170,7 @@ ErrorCode_t HID_EpOut_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
// not used yet
|
||||
// uint8_t outreport[8];
|
||||
// USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*)data;
|
||||
// USBD_API->hw->ReadEP(hUsb, pHidCtrl->epout_adr, outreport);
|
||||
// ROM_API->hw->ReadEP(hUsb, pHidCtrl->epout_adr, outreport);
|
||||
}
|
||||
return LPC_OK;
|
||||
}
|
||||
@@ -207,7 +207,7 @@ tusb_error_t tusb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *c
|
||||
|
||||
ASSERT( (pIntfDesc != NULL) && (pIntfDesc->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE), ERR_FAILED);
|
||||
|
||||
ASSERT( LPC_OK == USBD_API->hid->init(hUsb, &hid_param), TUSB_ERROR_FAILED );
|
||||
ASSERT( LPC_OK == ROM_API->hid->init(hUsb, &hid_param), TUSB_ERROR_FAILED );
|
||||
|
||||
/* update memory variables */
|
||||
*mem_base += (*mem_size - hid_param.mem_size);
|
||||
@@ -224,11 +224,11 @@ tusb_error_t tusb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *c
|
||||
tusb_error_t tusb_hid_configured(USBD_HANDLE_T hUsb)
|
||||
{
|
||||
#ifdef TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
USBD_API->hw->WriteEP(hUsb , HID_KEYBOARD_EP_IN , (uint8_t* ) &hid_keyboard_report , sizeof(tusb_keyboard_report_t) ); // initial packet for IN endpoint , will not work if omitted
|
||||
ROM_API->hw->WriteEP(hUsb , HID_KEYBOARD_EP_IN , (uint8_t* ) &hid_keyboard_report , sizeof(tusb_keyboard_report_t) ); // initial packet for IN endpoint , will not work if omitted
|
||||
#endif
|
||||
|
||||
#ifdef TUSB_CFG_DEVICE_HID_MOUSE
|
||||
USBD_API->hw->WriteEP(hUsb , HID_MOUSE_EP_IN , (uint8_t* ) &hid_mouse_report , sizeof(tusb_mouse_report_t) ); // initial packet for IN endpoint, will not work if omitted
|
||||
ROM_API->hw->WriteEP(hUsb , HID_MOUSE_EP_IN , (uint8_t* ) &hid_mouse_report , sizeof(tusb_mouse_report_t) ); // initial packet for IN endpoint, will not work if omitted
|
||||
#endif
|
||||
|
||||
return TUSB_ERROR_NONE;
|
||||
|
@@ -69,6 +69,12 @@ enum {
|
||||
HID_DESC_TYPE_PHYSICAL = 0x23
|
||||
};
|
||||
|
||||
enum {
|
||||
HID_REQUEST_REPORT_INPUT = 1,
|
||||
HID_REQUEST_REPORT_OUTPUT,
|
||||
HID_REQUEST_REPORT_FEATURE
|
||||
};
|
||||
|
||||
typedef ATTR_PREPACKED struct ATTR_PACKED {
|
||||
uint8_t bLength; /**< Numeric expression that is the total size of the HID descriptor */
|
||||
uint8_t bDescriptorType; /**< Constant name specifying type of HID descriptor. */
|
||||
|
@@ -38,7 +38,7 @@
|
||||
|
||||
#include "tusb_option.h"
|
||||
|
||||
#if (MODE_DEVICE_SUPPORTED && defined HOST_CLASS_HID)
|
||||
#if (MODE_DEVICE_SUPPORTED && DEVICE_CLASS_HID)
|
||||
|
||||
#define _TINY_USB_SOURCE_FILE_
|
||||
//--------------------------------------------------------------------+
|
||||
@@ -58,5 +58,221 @@
|
||||
//--------------------------------------------------------------------+
|
||||
// IMPLEMENTATION
|
||||
//--------------------------------------------------------------------+
|
||||
#if TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
tusb_keyboard_report_t hid_keyboard_report;
|
||||
static volatile bool bKeyChanged = false;
|
||||
#endif
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_MOUSE
|
||||
tusb_mouse_report_t hid_mouse_report;
|
||||
static volatile bool bMouseChanged = false;
|
||||
#endif
|
||||
|
||||
ErrorCode_t HID_GetReport( USBD_HANDLE_T hHid, USB_SETUP_PACKET* pSetup, uint8_t** pBuffer, uint16_t* plength)
|
||||
{
|
||||
USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*) hHid;
|
||||
|
||||
/* ReportID = SetupPacket.wValue.WB.L; */
|
||||
if (pSetup->wValue.WB.H == HID_REQUEST_REPORT_INPUT)
|
||||
return (ERR_USBD_STALL); /* Not Supported */
|
||||
|
||||
switch (pHidCtrl->protocol)
|
||||
{
|
||||
#if TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
case HID_PROTOCOL_KEYBOARD:
|
||||
*pBuffer = (uint8_t*) &hid_keyboard_report;
|
||||
*plength = sizeof(tusb_keyboard_report_t);
|
||||
|
||||
if (!bKeyChanged)
|
||||
{
|
||||
memset(pBuffer, 0, *plength);
|
||||
}
|
||||
bKeyChanged = false;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_MOUSE
|
||||
case HID_PROTOCOL_MOUSE:
|
||||
*pBuffer = (uint8_t*) &hid_mouse_report;
|
||||
*plength = sizeof(tusb_mouse_report_t);
|
||||
|
||||
if (!bMouseChanged)
|
||||
{
|
||||
memset(pBuffer, 0, *plength);
|
||||
}
|
||||
bMouseChanged = false;
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return (LPC_OK);
|
||||
}
|
||||
|
||||
ErrorCode_t HID_SetReport( USBD_HANDLE_T hHid, USB_SETUP_PACKET* pSetup, uint8_t** pBuffer, uint16_t length)
|
||||
{
|
||||
/* we will reuse standard EP0Buf */
|
||||
if (length == 0)
|
||||
return LPC_OK;
|
||||
|
||||
/* ReportID = SetupPacket.wValue.WB.L; */
|
||||
if (pSetup->wValue.WB.H != HID_REQUEST_REPORT_OUTPUT)
|
||||
return (ERR_USBD_STALL); /* Not Supported */
|
||||
|
||||
return (LPC_OK);
|
||||
}
|
||||
|
||||
ErrorCode_t HID_EpIn_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
{
|
||||
if (USB_EVT_IN == event)
|
||||
{
|
||||
USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*)data;
|
||||
switch(pHidCtrl->protocol)
|
||||
{
|
||||
#if TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
case HID_PROTOCOL_KEYBOARD:
|
||||
if (!bKeyChanged)
|
||||
{
|
||||
memset(&hid_keyboard_report, 0, sizeof(tusb_keyboard_report_t));
|
||||
}
|
||||
ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_keyboard_report, sizeof(tusb_keyboard_report_t));
|
||||
bKeyChanged = false;
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_MOUSE
|
||||
case HID_PROTOCOL_MOUSE:
|
||||
if (!bMouseChanged)
|
||||
{
|
||||
memset(&hid_mouse_report, 0, sizeof(tusb_mouse_report_t));
|
||||
}
|
||||
ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_mouse_report, sizeof(tusb_mouse_report_t));
|
||||
bMouseChanged = false;
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return LPC_OK;
|
||||
}
|
||||
|
||||
ErrorCode_t HID_EpOut_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
|
||||
{
|
||||
if (USB_EVT_OUT == event)
|
||||
{
|
||||
// not used yet
|
||||
// uint8_t outreport[8];
|
||||
// USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*)data;
|
||||
// ROM_API->hw->ReadEP(hUsb, pHidCtrl->epout_adr, outreport);
|
||||
}
|
||||
return LPC_OK;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------+
|
||||
// CLASS-USBH API (don't require to verify parameters)
|
||||
//--------------------------------------------------------------------+
|
||||
tusb_error_t hidd_init(USBD_HANDLE_T hUsb, tusb_descriptor_interface_t const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size)
|
||||
{
|
||||
USB_HID_REPORT_T reports_data =
|
||||
{
|
||||
.desc = (uint8_t*) pHIDReportDesc,
|
||||
.len = ReportDescLength,
|
||||
.idle_time = 0,
|
||||
};
|
||||
|
||||
USBD_HID_INIT_PARAM_T hid_param =
|
||||
{
|
||||
.mem_base = *mem_base,
|
||||
.mem_size = *mem_size,
|
||||
|
||||
.intf_desc = (uint8_t*)pIntfDesc,
|
||||
.report_data = &reports_data,
|
||||
.max_reports = 1,
|
||||
|
||||
/* user defined functions */
|
||||
.HID_GetReport = HID_GetReport,
|
||||
.HID_SetReport = HID_SetReport,
|
||||
.HID_EpIn_Hdlr = HID_EpIn_Hdlr,
|
||||
.HID_EpOut_Hdlr = HID_EpOut_Hdlr
|
||||
};
|
||||
|
||||
ASSERT( (pIntfDesc != NULL) && (pIntfDesc->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE), ERR_FAILED);
|
||||
|
||||
ASSERT( LPC_OK == ROM_API->hid->init(hUsb, &hid_param), TUSB_ERROR_FAILED );
|
||||
|
||||
/* update memory variables */
|
||||
*mem_base += (*mem_size - hid_param.mem_size);
|
||||
*mem_size = hid_param.mem_size;
|
||||
|
||||
return TUSB_ERROR_NONE;
|
||||
}
|
||||
|
||||
tusb_error_t hidd_configured(USBD_HANDLE_T hUsb)
|
||||
{
|
||||
#if TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
ROM_API->hw->WriteEP(hUsb , HID_KEYBOARD_EP_IN , (uint8_t* ) &hid_keyboard_report , sizeof(tusb_keyboard_report_t) ); // initial packet for IN endpoint , will not work if omitted
|
||||
#endif
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_MOUSE
|
||||
ROM_API->hw->WriteEP(hUsb , HID_MOUSE_EP_IN , (uint8_t* ) &hid_mouse_report , sizeof(tusb_mouse_report_t) ); // initial packet for IN endpoint, will not work if omitted
|
||||
#endif
|
||||
|
||||
return TUSB_ERROR_NONE;
|
||||
}
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_KEYBOARD
|
||||
tusb_error_t tusbd_hid_keyboard_send_report(uint8_t modifier, uint8_t keycodes[], uint8_t numkey)
|
||||
{
|
||||
// uint32_t start_time = systickGetSecondsActive();
|
||||
// while (bKeyChanged) // TODO blocking while previous key has yet sent - can use fifo to improve this
|
||||
// {
|
||||
// ASSERT_MESSAGE(systickGetSecondsActive() - start_time < 5, ERR_FAILED, "HID Keyboard Timeout");
|
||||
// }
|
||||
|
||||
if (bKeyChanged)
|
||||
{
|
||||
return TUSB_ERROR_FAILED;
|
||||
}
|
||||
|
||||
ASSERT(keycodes && numkey && numkey <=6, ERR_FAILED);
|
||||
|
||||
hid_keyboard_report.modifier = modifier;
|
||||
memset(hid_keyboard_report.keycode, 0, 6);
|
||||
memcpy(hid_keyboard_report.keycode, keycodes, numkey);
|
||||
|
||||
bKeyChanged = true;
|
||||
|
||||
return TUSB_ERROR_NONE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if TUSB_CFG_DEVICE_HID_MOUSE
|
||||
tusb_error_t tusb_hid_mouse_send(uint8_t buttons, int8_t x, int8_t y)
|
||||
{
|
||||
// uint32_t start_time = systickGetSecondsActive();
|
||||
// while (bMouseChanged) // TODO Block while previous key hasn't been sent - can use fifo to improve this
|
||||
// {
|
||||
// ASSERT_MESSAGE(systickGetSecondsActive() - start_time < 5, ERR_FAILED, "HID Mouse Timeout");
|
||||
// }
|
||||
|
||||
if (bMouseChanged)
|
||||
{
|
||||
return TUSB_ERROR_FAILED;
|
||||
}
|
||||
|
||||
hid_mouse_report.buttons = buttons;
|
||||
hid_mouse_report.x = x;
|
||||
hid_mouse_report.y = y;
|
||||
|
||||
bMouseChanged = true;
|
||||
|
||||
return TUSB_ERROR_NONE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@@ -53,50 +53,29 @@
|
||||
#define _TUSB_HID_DEVICE_H_
|
||||
|
||||
#include "common/common.h"
|
||||
#include "device/usbd.h"
|
||||
#include "hid.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef DEVICE_ROMDRIVER
|
||||
/** \brief Initialize HID driver
|
||||
*
|
||||
* \param[in] para1
|
||||
* \param[out] para2
|
||||
* \return Error Code of the \ref TUSB_ERROR enum
|
||||
* \note
|
||||
*/
|
||||
tusb_error_t tusb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size);
|
||||
|
||||
/** \brief Notify HID class that usb is configured
|
||||
*
|
||||
* \param[in] para1
|
||||
* \param[out] para2
|
||||
* \return Error Code of the \ref TUSB_ERROR enum
|
||||
* \note
|
||||
*/
|
||||
tusb_error_t tusb_hid_configured(USBD_HANDLE_T hUsb);
|
||||
|
||||
/** \brief Used by Application to send Keycode to Host
|
||||
*
|
||||
* \param[in] para1
|
||||
* \param[out] para2
|
||||
* \return Error Code of the \ref TUSB_ERROR enum
|
||||
* \note
|
||||
*/
|
||||
tusb_error_t tusb_hid_keyboard_sendKeys(uint8_t modifier, uint8_t keycodes[], uint8_t numkey);
|
||||
|
||||
/** \brief
|
||||
*
|
||||
* \param[in] para1
|
||||
* \param[out] para2
|
||||
* \return Error Code of the \ref TUSB_ERROR enum
|
||||
* \note
|
||||
*/
|
||||
//--------------------------------------------------------------------+
|
||||
// KEYBOARD Application API
|
||||
//--------------------------------------------------------------------+
|
||||
tusb_error_t tusbd_hid_keyboard_send_report(uint8_t modifier, uint8_t keycodes[], uint8_t numkey);
|
||||
tusb_error_t tusb_hid_mouse_send(uint8_t buttons, int8_t x, int8_t y);
|
||||
|
||||
#endif /* ROM DRIVRER */
|
||||
//--------------------------------------------------------------------+
|
||||
// USBD-CLASS DRIVER API
|
||||
//--------------------------------------------------------------------+
|
||||
#ifdef _TINY_USB_SOURCE_FILE_
|
||||
#include "device/romdriver/mw_usbd_rom_api.h" // TODO remove rom driver dependency
|
||||
|
||||
tusb_error_t hidd_init(USBD_HANDLE_T hUsb, tusb_descriptor_interface_t const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size);
|
||||
tusb_error_t hidd_configured(USBD_HANDLE_T hUsb);
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@@ -181,7 +181,7 @@ tusb_interface_status_t tusbh_hid_mouse_status(uint8_t dev_addr, uint8_t instanc
|
||||
#endif
|
||||
|
||||
//--------------------------------------------------------------------+
|
||||
// CLASS-USBD API (don't require to verify parameters)
|
||||
// CLASS-USBH API (don't require to verify parameters)
|
||||
//--------------------------------------------------------------------+
|
||||
void hidh_init(void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user