diff options
| author | hathach <[email protected]> | 2013-01-22 18:19:05 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-01-22 18:25:26 +0700 |
| commit | b5207ff146c1a71b2cfe65e34292496c42de34f2 (patch) | |
| tree | 267391a825944dc6926d628445ba7aaa4ccb5c63 /tinyusb | |
| parent | 3ffda2033a55093a1b1667ed22f523a9a8a6a3d4 (diff) | |
use unsigned char instead of char for error string
use #if 0 instead of // for remove code
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/cdc.c | 10 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.c | 6 | ||||
| -rw-r--r-- | tinyusb/common/errors.c | 2 | ||||
| -rw-r--r-- | tinyusb/common/errors.h | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/tinyusb/class/cdc.c b/tinyusb/class/cdc.c index d6b0ec518..138666f45 100644 --- a/tinyusb/class/cdc.c +++ b/tinyusb/class/cdc.c @@ -188,12 +188,14 @@ uint16_t tusb_cdc_recv(uint8_t* buffer, uint16_t max) return fifo_read_n(&ffRX, buffer, max); } +#if 0 // ROM driver bug: cannot hook this to CIC_GetRequest // Need this to implement GetLineCode & detect -//ErrorCode_t CDC_Control_GetRequest(USBD_HANDLE_T hUsb, USB_SETUP_PACKET *pSetup, uint8_t **pBuffer, uint16_t *length) -//{ -// return LPC_OK; -//} +ErrorCode_t CDC_Control_GetRequest(USBD_HANDLE_T hUsb, USB_SETUP_PACKET *pSetup, uint8_t **pBuffer, uint16_t *length) +{ + return LPC_OK; +} +#endif /**************************************************************************/ /*! diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index dbf19b9f9..c4ae20008 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -35,9 +35,11 @@ * This file is part of the tiny usb stack. */ -#include "hid_host.h" +#include "common/common.h" + +#if defined TUSB_CFG_HOST && defined DEVICE_CLASS_HID -#if defined DEVICE_CLASS_HID && defined TUSB_CFG_HOST +#include "hid_host.h" tusb_error_t tusbh_keyboard_get(tusb_handle_configure_t const config_hdl, tusb_keyboard_report_t * const report) { diff --git a/tinyusb/common/errors.c b/tinyusb/common/errors.c index 58b9e6b8d..0b36a6c8b 100644 --- a/tinyusb/common/errors.c +++ b/tinyusb/common/errors.c @@ -39,7 +39,7 @@ #if TUSB_CFG_DEBUG == 3 -char const* const TUSB_ErrorStr[] = +unsigned char const* const TUSB_ErrorStr[] = { ERROR_TABLE(ERROR_STRING) 0 diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h index e771794c1..bf1998365 100644 --- a/tinyusb/common/errors.h +++ b/tinyusb/common/errors.h @@ -76,7 +76,7 @@ typedef enum { #if TUSB_CFG_DEBUG == 3 /// Enum to String for debugging purposes. Only available if \ref TUSB_CFG_DEBUG > 0 -extern char const* const TUSB_ErrorStr[]; +extern unsigned char const* const TUSB_ErrorStr[]; #endif #ifdef __cplusplus |