From 3c2467196070eeedd4171e183db04fb815677246 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 10 Apr 2018 14:31:11 +0700 Subject: mass rename TUSB_CFG to CFG_TUSB --- tinyusb/class/hid/hid_device.c | 10 +++++----- tinyusb/class/hid/hid_device.h | 8 ++++---- tinyusb/class/hid/hid_host.c | 40 ++++++++++++++++++++-------------------- tinyusb/class/hid/hid_host.h | 4 ++-- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'tinyusb/class/hid') diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index 6790ef739..da296260e 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -78,7 +78,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = { // [HID_PROTOCOL_NONE] = for HID Generic -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD [HID_PROTOCOL_KEYBOARD] = { .p_interface = &keyboardd_data, @@ -88,7 +88,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = }, #endif -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE [HID_PROTOCOL_MOUSE] = { .p_interface = &moused_data, @@ -100,12 +100,12 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] = }; // internal buffer for transferring data -TUSB_CFG_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ]; +CFG_TUSB_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ]; //--------------------------------------------------------------------+ // KEYBOARD APPLICATION API //--------------------------------------------------------------------+ -#if TUSB_CFG_DEVICE_HID_KEYBOARD +#if CFG_TUSB_DEVICE_HID_KEYBOARD STATIC_VAR hidd_interface_t keyboardd_data; bool tud_hid_keyboard_busy(uint8_t rhport) @@ -128,7 +128,7 @@ tusb_error_t tud_hid_keyboard_send(uint8_t rhport, hid_keyboard_report_t const * //--------------------------------------------------------------------+ // MOUSE APPLICATION API //--------------------------------------------------------------------+ -#if TUSB_CFG_DEVICE_HID_MOUSE +#if CFG_TUSB_DEVICE_HID_MOUSE STATIC_VAR hidd_interface_t moused_data; bool tud_hid_mouse_is_busy(uint8_t rhport) diff --git a/tinyusb/class/hid/hid_device.h b/tinyusb/class/hid/hid_device.h index a816a29ac..b211731e0 100644 --- a/tinyusb/class/hid/hid_device.h +++ b/tinyusb/class/hid/hid_device.h @@ -66,7 +66,7 @@ bool tud_hid_keyboard_busy(uint8_t rhport); /** \brief Submit USB transfer * \param[in] rhport USB Controller ID - * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM) * \returns \ref tusb_error_t type to indicate success or error condition. * \retval TUSB_ERROR_NONE on success * \retval TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device @@ -96,7 +96,7 @@ void tud_hid_keyboard_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_by * via control endpoint. * \param[in] rhport USB Controller ID * \param[in] report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests - * \param[out] pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[out] pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM) * \param[in] requested_length number of bytes that host requested * \retval non-zero Actual number of bytes in the response's buffer. * \retval zero indicates the current request is not supported. Tinyusb device stack will reject the request by @@ -139,7 +139,7 @@ bool tud_hid_mouse_is_busy(uint8_t rhport); /** \brief Perform transfer queuing * \param[in] rhport USB Controller ID - * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM) * \returns \ref tusb_error_t type to indicate success or error condition. * \retval TUSB_ERROR_NONE on success * \retval TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device @@ -169,7 +169,7 @@ void tud_hid_mouse_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes * via control endpoint. * \param[in] rhport USB Controller ID * \param[in] report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests - * \param[out] pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[out] pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM) * \param[in] requested_length number of bytes that host requested * \retval non-zero Actual number of bytes in the response's buffer. * \retval zero indicates the current request is not supported. Tinyusb device stack will reject the request by diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c index 06e87210b..65bb36b15 100644 --- a/tinyusb/class/hid/hid_host.c +++ b/tinyusb/class/hid/hid_host.c @@ -88,7 +88,7 @@ tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_int //--------------------------------------------------------------------+ // KEYBOARD //--------------------------------------------------------------------+ -#if TUSB_CFG_HOST_HID_KEYBOARD +#if CFG_TUSB_HOST_HID_KEYBOARD #define EXPAND_KEYCODE_TO_ASCII(keycode, ascii, shift_modified) \ [0][keycode] = ascii,\ @@ -100,7 +100,7 @@ uint8_t const hid_keycode_to_ascii_tbl[2][128] = HID_KEYCODE_TABLE(EXPAND_KEYCODE_TO_ASCII) }; -STATIC_VAR hidh_interface_info_t keyboardh_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 +STATIC_VAR hidh_interface_info_t keyboardh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 //------------- KEYBOARD PUBLIC API (parameter validation required) -------------// bool tuh_hid_keyboard_is_mounted(uint8_t dev_addr) @@ -124,9 +124,9 @@ bool tuh_hid_keyboard_is_busy(uint8_t dev_addr) //--------------------------------------------------------------------+ // MOUSE //--------------------------------------------------------------------+ -#if TUSB_CFG_HOST_HID_MOUSE +#if CFG_TUSB_HOST_HID_MOUSE -STATIC_VAR hidh_interface_info_t mouseh_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 +STATIC_VAR hidh_interface_info_t mouseh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1 //------------- Public API -------------// bool tuh_hid_mouse_is_mounted(uint8_t dev_addr) @@ -150,11 +150,11 @@ tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report) //--------------------------------------------------------------------+ // GENERIC //--------------------------------------------------------------------+ -#if TUSB_CFG_HOST_HID_GENERIC +#if CFG_TUSB_HOST_HID_GENERIC //STATIC_ struct { // hidh_interface_info_t -//} generic_data[TUSB_CFG_HOST_DEVICE_MAX]; +//} generic_data[CFG_TUSB_HOST_DEVICE_MAX]; #endif @@ -163,21 +163,21 @@ tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report) //--------------------------------------------------------------------+ void hidh_init(void) { -#if TUSB_CFG_HOST_HID_KEYBOARD - memclr_(&keyboardh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX); +#if CFG_TUSB_HOST_HID_KEYBOARD + memclr_(&keyboardh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX); #endif -#if TUSB_CFG_HOST_HID_MOUSE - memclr_(&mouseh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX); +#if CFG_TUSB_HOST_HID_MOUSE + memclr_(&mouseh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX); #endif -#if TUSB_CFG_HOST_HID_GENERIC +#if CFG_TUSB_HOST_HID_GENERIC hidh_generic_init(); #endif } #if 0 -TUSB_CFG_ATTR_USBRAM uint8_t report_descriptor[256]; +CFG_TUSB_ATTR_USBRAM uint8_t report_descriptor[256]; #endif tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) @@ -222,7 +222,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_ if ( HID_SUBCLASS_BOOT == p_interface_desc->bInterfaceSubClass ) { - #if TUSB_CFG_HOST_HID_KEYBOARD + #if CFG_TUSB_HOST_HID_KEYBOARD if ( HID_PROTOCOL_KEYBOARD == p_interface_desc->bInterfaceProtocol) { STASK_ASSERT_ERR ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &keyboardh_data[dev_addr-1]) ); @@ -230,7 +230,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_ } else #endif - #if TUSB_CFG_HOST_HID_MOUSE + #if CFG_TUSB_HOST_HID_MOUSE if ( HID_PROTOCOL_MOUSE == p_interface_desc->bInterfaceProtocol) { STASK_ASSERT_ERR ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &mouseh_data[dev_addr-1]) ); @@ -255,7 +255,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes { (void) xferred_bytes; // TODO may need to use this para later -#if TUSB_CFG_HOST_HID_KEYBOARD +#if CFG_TUSB_HOST_HID_KEYBOARD if ( pipehandle_is_equal(pipe_hdl, keyboardh_data[pipe_hdl.dev_addr-1].pipe_hdl) ) { tuh_hid_keyboard_isr(pipe_hdl.dev_addr, event); @@ -263,7 +263,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes } #endif -#if TUSB_CFG_HOST_HID_MOUSE +#if CFG_TUSB_HOST_HID_MOUSE if ( pipehandle_is_equal(pipe_hdl, mouseh_data[pipe_hdl.dev_addr-1].pipe_hdl) ) { tuh_hid_mouse_isr(pipe_hdl.dev_addr, event); @@ -271,14 +271,14 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes } #endif -#if TUSB_CFG_HOST_HID_GENERIC +#if CFG_TUSB_HOST_HID_GENERIC #endif } void hidh_close(uint8_t dev_addr) { -#if TUSB_CFG_HOST_HID_KEYBOARD +#if CFG_TUSB_HOST_HID_KEYBOARD if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) ) { hidh_interface_close(&keyboardh_data[dev_addr-1]); @@ -286,7 +286,7 @@ void hidh_close(uint8_t dev_addr) } #endif -#if TUSB_CFG_HOST_HID_MOUSE +#if CFG_TUSB_HOST_HID_MOUSE if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) ) { hidh_interface_close(&mouseh_data[dev_addr-1]); @@ -294,7 +294,7 @@ void hidh_close(uint8_t dev_addr) } #endif -#if TUSB_CFG_HOST_HID_GENERIC +#if CFG_TUSB_HOST_HID_GENERIC hidh_generic_close(dev_addr); #endif } diff --git a/tinyusb/class/hid/hid_host.h b/tinyusb/class/hid/hid_host.h index c52f4b6de..b93bcdccb 100644 --- a/tinyusb/class/hid/hid_host.h +++ b/tinyusb/class/hid/hid_host.h @@ -80,7 +80,7 @@ bool tuh_hid_keyboard_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNU /** \brief Perform a get report from Keyboard interface * \param[in] dev_addr device address - * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM) * \returns \ref tusb_error_t type to indicate success or error condition. * \retval TUSB_ERROR_NONE on success * \retval TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device @@ -145,7 +145,7 @@ bool tuh_hid_mouse_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED /** \brief Perform a get report from Mouse interface * \param[in] dev_addr device address - * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM) + * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM) * \returns \ref tusb_error_t type to indicate success or error condition. * \retval TUSB_ERROR_NONE on success * \retval TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device -- cgit v1.3.1