mirror of
https://github.com/hathach/tinyusb.git
synced 2025-03-19 19:21:05 +00:00
fix #449 remove obsolete pipehandle from hid host
This commit is contained in:
parent
1d83ad0ebb
commit
ef651e0734
@ -13,12 +13,13 @@ CFLAGS += -Wno-error=cast-align
|
|||||||
|
|
||||||
# TinyUSB Host Stack source
|
# TinyUSB Host Stack source
|
||||||
SRC_C += \
|
SRC_C += \
|
||||||
|
src/class/cdc/cdc_host.c \
|
||||||
|
src/class/hid/hid_host.c \
|
||||||
|
src/class/msc/msc_host.c \
|
||||||
src/host/usbh.c \
|
src/host/usbh.c \
|
||||||
src/host/hub.c \
|
src/host/hub.c \
|
||||||
src/host/ehci/ehci.c \
|
src/host/ehci/ehci.c \
|
||||||
src/host/ohci/ohci.c \
|
src/host/ohci/ohci.c \
|
||||||
src/class/cdc/cdc_host.c \
|
|
||||||
src/class/msc/msc_host.c \
|
|
||||||
src/portable/nxp/lpc18_43/hcd_lpc18_43.c \
|
src/portable/nxp/lpc18_43/hcd_lpc18_43.c \
|
||||||
src/portable/nxp/lpc17_40/hcd_lpc17_40.c
|
src/portable/nxp/lpc17_40/hcd_lpc17_40.c
|
||||||
|
|
||||||
|
@ -35,35 +35,43 @@
|
|||||||
// MACRO CONSTANT TYPEDEF
|
// MACRO CONSTANT TYPEDEF
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t itf_numr;
|
||||||
|
uint8_t ep_in;
|
||||||
|
uint8_t ep_out;
|
||||||
|
|
||||||
|
uint16_t report_size;
|
||||||
|
}hidh_interface_t;
|
||||||
|
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// HID Interface common functions
|
// HID Interface common functions
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
static inline bool hidh_interface_open(uint8_t dev_addr, uint8_t interface_number, tusb_desc_endpoint_t const *p_endpoint_desc, hidh_interface_info_t *p_hid)
|
static inline bool hidh_interface_open(uint8_t rhport, uint8_t dev_addr, uint8_t interface_number, tusb_desc_endpoint_t const *p_endpoint_desc, hidh_interface_t *p_hid)
|
||||||
{
|
{
|
||||||
p_hid->pipe_hdl = usbh_edpt_open(dev_addr, p_endpoint_desc, TUSB_CLASS_HID);
|
TU_ASSERT( usbh_edpt_open(rhport, dev_addr, p_endpoint_desc) );
|
||||||
p_hid->report_size = p_endpoint_desc->wMaxPacketSize.size; // TODO get size from report descriptor
|
|
||||||
p_hid->interface_number = interface_number;
|
|
||||||
|
|
||||||
TU_ASSERT (pipehandle_is_valid(p_hid->pipe_hdl));
|
p_hid->ep_in = p_endpoint_desc->bEndpointAddress;
|
||||||
|
p_hid->report_size = p_endpoint_desc->wMaxPacketSize.size; // TODO get size from report descriptor
|
||||||
|
p_hid->itf_numr = interface_number;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void hidh_interface_close(hidh_interface_info_t *p_hid)
|
static inline void hidh_interface_close(hidh_interface_t *p_hid)
|
||||||
{
|
{
|
||||||
tu_memclr(p_hid, sizeof(hidh_interface_info_t));
|
tu_memclr(p_hid, sizeof(hidh_interface_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
// called from public API need to validate parameters
|
// called from public API need to validate parameters
|
||||||
tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_interface_info_t *p_hid)
|
tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_interface_t *p_hid)
|
||||||
{
|
{
|
||||||
//------------- parameters validation -------------//
|
//------------- parameters validation -------------//
|
||||||
// TODO change to use is configured function
|
// TODO change to use is configured function
|
||||||
TU_ASSERT (TUSB_DEVICE_STATE_CONFIGURED == tuh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
|
TU_ASSERT (TUSB_DEVICE_STATE_CONFIGURED == tuh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
|
||||||
TU_VERIFY (report, TUSB_ERROR_INVALID_PARA);
|
TU_VERIFY (report, TUSB_ERROR_INVALID_PARA);
|
||||||
TU_ASSERT (!hcd_edpt_busy(p_hid->pipe_hdl), TUSB_ERROR_INTERFACE_IS_BUSY);
|
TU_ASSERT (!hcd_edpt_busy(dev_addr, p_hid->ep_in), TUSB_ERROR_INTERFACE_IS_BUSY);
|
||||||
|
|
||||||
TU_ASSERT_ERR( hcd_pipe_xfer(p_hid->pipe_hdl, report, p_hid->report_size, true) ) ;
|
TU_ASSERT_ERR( hcd_pipe_xfer(dev_addr, p_hid->ep_in, report, p_hid->report_size, true) ) ;
|
||||||
|
|
||||||
return TUSB_ERROR_NONE;
|
return TUSB_ERROR_NONE;
|
||||||
}
|
}
|
||||||
@ -85,12 +93,12 @@ uint8_t const hid_keycode_to_ascii_tbl[2][128] =
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static hidh_interface_info_t keyboardh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
|
static hidh_interface_t keyboardh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
|
||||||
|
|
||||||
//------------- KEYBOARD PUBLIC API (parameter validation required) -------------//
|
//------------- KEYBOARD PUBLIC API (parameter validation required) -------------//
|
||||||
bool tuh_hid_keyboard_is_mounted(uint8_t dev_addr)
|
bool tuh_hid_keyboard_is_mounted(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
return tuh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboardh_data[dev_addr-1].pipe_hdl);
|
return tuh_device_is_configured(dev_addr) && (keyboardh_data[dev_addr-1].ep_in != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
tusb_error_t tuh_hid_keyboard_get_report(uint8_t dev_addr, void* p_report)
|
tusb_error_t tuh_hid_keyboard_get_report(uint8_t dev_addr, void* p_report)
|
||||||
@ -100,8 +108,7 @@ tusb_error_t tuh_hid_keyboard_get_report(uint8_t dev_addr, void* p_report)
|
|||||||
|
|
||||||
bool tuh_hid_keyboard_is_busy(uint8_t dev_addr)
|
bool tuh_hid_keyboard_is_busy(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
return tuh_hid_keyboard_is_mounted(dev_addr) &&
|
return tuh_hid_keyboard_is_mounted(dev_addr) && hcd_edpt_busy(dev_addr, keyboardh_data[dev_addr-1].ep_in);
|
||||||
hcd_edpt_busy( keyboardh_data[dev_addr-1].pipe_hdl );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -111,18 +118,17 @@ bool tuh_hid_keyboard_is_busy(uint8_t dev_addr)
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
|
|
||||||
static hidh_interface_info_t mouseh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
|
static hidh_interface_t mouseh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1
|
||||||
|
|
||||||
//------------- Public API -------------//
|
//------------- Public API -------------//
|
||||||
bool tuh_hid_mouse_is_mounted(uint8_t dev_addr)
|
bool tuh_hid_mouse_is_mounted(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
return tuh_device_is_configured(dev_addr) && pipehandle_is_valid(mouseh_data[dev_addr-1].pipe_hdl);
|
return tuh_device_is_configured(dev_addr) && (mouseh_data[dev_addr-1].ep_in != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool tuh_hid_mouse_is_busy(uint8_t dev_addr)
|
bool tuh_hid_mouse_is_busy(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
return tuh_hid_mouse_is_mounted(dev_addr) &&
|
return tuh_hid_mouse_is_mounted(dev_addr) && hcd_edpt_busy(dev_addr, mouseh_data[dev_addr-1].ep_in);
|
||||||
hcd_edpt_busy( mouseh_data[dev_addr-1].pipe_hdl );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report)
|
tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report)
|
||||||
@ -149,11 +155,11 @@ tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report)
|
|||||||
void hidh_init(void)
|
void hidh_init(void)
|
||||||
{
|
{
|
||||||
#if CFG_TUH_HID_KEYBOARD
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
tu_memclr(&keyboardh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX);
|
tu_memclr(&keyboardh_data, sizeof(hidh_interface_t)*CFG_TUSB_HOST_DEVICE_MAX);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
tu_memclr(&mouseh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX);
|
tu_memclr(&mouseh_data, sizeof(hidh_interface_t)*CFG_TUSB_HOST_DEVICE_MAX);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUSB_HOST_HID_GENERIC
|
#if CFG_TUSB_HOST_HID_GENERIC
|
||||||
@ -165,7 +171,7 @@ void hidh_init(void)
|
|||||||
CFG_TUSB_MEM_SECTION uint8_t report_descriptor[256];
|
CFG_TUSB_MEM_SECTION uint8_t report_descriptor[256];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)
|
bool hidh_open_subtask(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)
|
||||||
{
|
{
|
||||||
uint8_t const *p_desc = (uint8_t const *) p_interface_desc;
|
uint8_t const *p_desc = (uint8_t const *) p_interface_desc;
|
||||||
|
|
||||||
@ -208,7 +214,7 @@ bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
|
|||||||
#if CFG_TUH_HID_KEYBOARD
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
if ( HID_PROTOCOL_KEYBOARD == p_interface_desc->bInterfaceProtocol)
|
if ( HID_PROTOCOL_KEYBOARD == p_interface_desc->bInterfaceProtocol)
|
||||||
{
|
{
|
||||||
TU_ASSERT( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &keyboardh_data[dev_addr-1]) );
|
TU_ASSERT( hidh_interface_open(rhport, dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &keyboardh_data[dev_addr-1]) );
|
||||||
tuh_hid_keyboard_mounted_cb(dev_addr);
|
tuh_hid_keyboard_mounted_cb(dev_addr);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
@ -216,7 +222,7 @@ bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
|
|||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
if ( HID_PROTOCOL_MOUSE == p_interface_desc->bInterfaceProtocol)
|
if ( HID_PROTOCOL_MOUSE == p_interface_desc->bInterfaceProtocol)
|
||||||
{
|
{
|
||||||
TU_ASSERT ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &mouseh_data[dev_addr-1]) );
|
TU_ASSERT ( hidh_interface_open(rhport, dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &mouseh_data[dev_addr-1]) );
|
||||||
tuh_hid_mouse_mounted_cb(dev_addr);
|
tuh_hid_mouse_mounted_cb(dev_addr);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
@ -236,22 +242,22 @@ bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void hidh_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes)
|
void hidh_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes)
|
||||||
{
|
{
|
||||||
(void) xferred_bytes; // TODO may need to use this para later
|
(void) xferred_bytes; // TODO may need to use this para later
|
||||||
|
|
||||||
#if CFG_TUH_HID_KEYBOARD
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
if ( pipehandle_is_equal(pipe_hdl, keyboardh_data[pipe_hdl.dev_addr-1].pipe_hdl) )
|
if ( ep_addr == keyboardh_data[dev_addr-1].ep_in )
|
||||||
{
|
{
|
||||||
tuh_hid_keyboard_isr(pipe_hdl.dev_addr, event);
|
tuh_hid_keyboard_isr(dev_addr, event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
if ( pipehandle_is_equal(pipe_hdl, mouseh_data[pipe_hdl.dev_addr-1].pipe_hdl) )
|
if ( ep_addr == mouseh_data[dev_addr-1].ep_in )
|
||||||
{
|
{
|
||||||
tuh_hid_mouse_isr(pipe_hdl.dev_addr, event);
|
tuh_hid_mouse_isr(dev_addr, event);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -264,7 +270,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_byte
|
|||||||
void hidh_close(uint8_t dev_addr)
|
void hidh_close(uint8_t dev_addr)
|
||||||
{
|
{
|
||||||
#if CFG_TUH_HID_KEYBOARD
|
#if CFG_TUH_HID_KEYBOARD
|
||||||
if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) )
|
if ( keyboardh_data[dev_addr-1].ep_in != 0 )
|
||||||
{
|
{
|
||||||
hidh_interface_close(&keyboardh_data[dev_addr-1]);
|
hidh_interface_close(&keyboardh_data[dev_addr-1]);
|
||||||
tuh_hid_keyboard_unmounted_cb(dev_addr);
|
tuh_hid_keyboard_unmounted_cb(dev_addr);
|
||||||
@ -272,7 +278,7 @@ void hidh_close(uint8_t dev_addr)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CFG_TUH_HID_MOUSE
|
#if CFG_TUH_HID_MOUSE
|
||||||
if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) )
|
if( mouseh_data[dev_addr-1].ep_in != 0 )
|
||||||
{
|
{
|
||||||
hidh_interface_close(&mouseh_data[dev_addr-1]);
|
hidh_interface_close(&mouseh_data[dev_addr-1]);
|
||||||
tuh_hid_mouse_unmounted_cb( dev_addr );
|
tuh_hid_mouse_unmounted_cb( dev_addr );
|
||||||
|
@ -195,15 +195,9 @@ void tuh_hid_generic_isr(uint8_t dev_addr, xfer_result_t event);
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// Internal Class Driver API
|
// Internal Class Driver API
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
typedef struct {
|
|
||||||
pipe_handle_t pipe_hdl;
|
|
||||||
uint16_t report_size;
|
|
||||||
uint8_t interface_number;
|
|
||||||
}hidh_interface_info_t;
|
|
||||||
|
|
||||||
void hidh_init(void);
|
void hidh_init(void);
|
||||||
bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);
|
bool hidh_open_subtask(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);
|
||||||
void hidh_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);
|
void hidh_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
|
||||||
void hidh_close(uint8_t dev_addr);
|
void hidh_close(uint8_t dev_addr);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -306,7 +306,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
|
|||||||
ep_desc = (tusb_desc_endpoint_t const *) tu_desc_next(ep_desc);
|
ep_desc = (tusb_desc_endpoint_t const *) tu_desc_next(ep_desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
p_msc->itf_numr = itf_desc->bInterfaceNumber;
|
p_msc->itf_num = itf_desc->bInterfaceNumber;
|
||||||
(*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
|
(*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);
|
||||||
|
|
||||||
//------------- Get Max Lun -------------//
|
//------------- Get Max Lun -------------//
|
||||||
@ -315,7 +315,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
|
|||||||
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
|
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_IN },
|
||||||
.bRequest = MSC_REQ_GET_MAX_LUN,
|
.bRequest = MSC_REQ_GET_MAX_LUN,
|
||||||
.wValue = 0,
|
.wValue = 0,
|
||||||
.wIndex = p_msc->itf_numr,
|
.wIndex = p_msc->itf_num,
|
||||||
.wLength = 1
|
.wLength = 1
|
||||||
};
|
};
|
||||||
// TODO STALL means zero
|
// TODO STALL means zero
|
||||||
@ -328,7 +328,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
|
|||||||
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
|
.bmRequestType_bit = { .recipient = TUSB_REQ_RCPT_INTERFACE, .type = TUSB_REQ_TYPE_CLASS, .direction = TUSB_DIR_OUT },
|
||||||
.bRequest = MSC_REQ_RESET,
|
.bRequest = MSC_REQ_RESET,
|
||||||
.wValue = 0,
|
.wValue = 0,
|
||||||
.wIndex = p_msc->itf_numr,
|
.wIndex = p_msc->itf_num,
|
||||||
.wLength = 0
|
.wLength = 0
|
||||||
};
|
};
|
||||||
TU_ASSERT( usbh_control_xfer( dev_addr, &request, NULL ) );
|
TU_ASSERT( usbh_control_xfer( dev_addr, &request, NULL ) );
|
||||||
|
@ -175,7 +175,7 @@ void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);
|
|||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
uint8_t itf_numr;
|
uint8_t itf_num;
|
||||||
uint8_t ep_in;
|
uint8_t ep_in;
|
||||||
uint8_t ep_out;
|
uint8_t ep_out;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user