kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change signature usbh_isr to add tusb_bus_event_t parameter 

change singature of call_isr as well
This commit is contained in:
hathach 2013-03-23 15:00:56 +07:00
parent e6b8166a58
commit 4adfc6a6d8
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test/host/ehci/test_pipe_bulk_xfer.c
View File

@ -202,7 +202,7 @@ void test_bulk_xfer_double(void)
TEST_ASSERT_TRUE(p_tail->int_on_complete);
}
void test_bulk_xfer_isr(void)
void test_bulk_xfer_complete_isr(void)
{
hcd_pipe_xfer(pipe_hdl_bulk, xfer_data, sizeof(xfer_data), false);
hcd_pipe_xfer(pipe_hdl_bulk, data2, sizeof(data2), true);
@ -212,7 +212,7 @@ void test_bulk_xfer_isr(void)
ehci_controller_run(hostid);
usbh_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC);
usbh_isr_Expect(pipe_hdl_bulk, TUSB_CLASS_MSC, BUS_EVENT_XFER_COMPLETE);
//------------- Code Under Test -------------//
hcd_isr(hostid);

2
tests/test/host/ehci/test_pipe_control_xfer.c
View File

@ -235,7 +235,7 @@ void test_control_xfer_complete_isr(void)
TEST_ASSERT_EQUAL_HEX(async_head, get_operational_register(hostid)->async_list_base);
TEST_ASSERT_EQUAL_HEX((uint32_t) p_control_qhd, align32(async_head->next.address));
usbh_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0);
usbh_isr_Expect(((pipe_handle_t){.dev_addr = dev_addr}), 0, BUS_EVENT_XFER_COMPLETE);
//------------- Code Under TEST -------------//
hcd_isr(hostid);

2
tinyusb/class/hid_host.h
View File

@ -89,7 +89,7 @@ tusb_error_t hidh_keyboard_install(uint8_t dev_addr, uint8_t const *descriptor)
//--------------------------------------------------------------------+
void hidh_init(void) ATTR_WEAK;
tusb_error_t hidh_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) ATTR_WEAK ATTR_WARN_UNUSED_RESULT;
void hidh_isr(pipe_handle_t pipe_hdl) ATTR_WEAK;
void hidh_isr(pipe_handle_t pipe_hdl, tusb_bus_event_t event) ATTR_WEAK;
void hidh_close(uint8_t dev_addr) ATTR_WEAK;
#endif

2
tinyusb/class/msc_host.h
View File

@ -70,7 +70,7 @@
void msch_init(void) ATTR_WEAK;
tusb_error_t msch_open_subtask(uint8_t dev_addr, uint8_t const *descriptor, uint16_t *p_length) ATTR_WEAK ATTR_WARN_UNUSED_RESULT;
void msch_isr(pipe_handle_t pipe_hdl) ATTR_WEAK;
void msch_isr(pipe_handle_t pipe_hdl, tusb_bus_event_t event) ATTR_WEAK;
void msch_close(uint8_t dev_addr) ATTR_WEAK;
#endif

5
tinyusb/core/tusb_types.h
View File

@ -164,6 +164,11 @@ enum tusb_device_state_{
TUSB_DEVICE_STATE_SAFE_REMOVE ,
};
typedef enum {
BUS_EVENT_XFER_COMPLETE,
BUS_EVENT_XFER_ERROR
}tusb_bus_event_t;
#ifdef __cplusplus
}
#endif

2
tinyusb/host/ehci/ehci.c
View File

@ -224,7 +224,7 @@ void async_list_process_isr(ehci_qhd_t * const async_head, ehci_registers_t * co
pipe_hdl.xfer_type = TUSB_XFER_BULK;
pipe_hdl.index = qhd_get_index(p_qhd);
}
usbh_isr( pipe_hdl, p_qhd->class_code); // call USBH call back
usbh_isr( pipe_hdl, p_qhd->class_code, BUS_EVENT_XFER_COMPLETE); // call USBH callback
}
p_qhd->p_qtd_list_head->used = 0; // free QTD

5
tinyusb/host/hcd.h
View File

@ -66,11 +66,6 @@ typedef struct {
uint8_t index;
} pipe_handle_t;
typedef enum {
BUS_XFER_COMPLETE,
BUS_XFER_ERROR
}usb_bus_event_t;
//--------------------------------------------------------------------+
// USBH-HCD API
//--------------------------------------------------------------------+

6
tinyusb/host/usbh.c
View File

@ -61,7 +61,7 @@ void tusb_tick_tock(void)
#define ENUM_QUEUE_DEPTH 5
// TODO fix number of class driver
static class_driver_t const usbh_class_drivers[TUSB_CLASS_MAX_CONSEC_NUMBER] =
static host_class_driver_t const usbh_class_drivers[TUSB_CLASS_MAX_CONSEC_NUMBER] =
{
[TUSB_CLASS_HID] = {
.init = hidh_init,
@ -179,14 +179,14 @@ pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl)
// USBH-HCD ISR/Callback API
//--------------------------------------------------------------------+
// interrupt caused by a TD (with IOC=1) in pipe of class class_code
void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code)
void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event)
{
if (class_code == 0) // Control transfer
{
osal_semaphore_post( usbh_device_info_pool[ pipe_hdl.dev_addr ].sem_hdl );
}else if (usbh_class_drivers[class_code].isr)
{
usbh_class_drivers[class_code].isr(pipe_hdl);
usbh_class_drivers[class_code].isr(pipe_hdl, event);
}else
{
ASSERT(false, (void) 0); // something wrong, no one claims the isr's source

4
tinyusb/host/usbh.h
View File

@ -106,9 +106,9 @@ typedef uint8_t tusbh_device_status_t;
typedef struct {
void (* const init) (void);
tusb_error_t (* const open_subtask)(uint8_t, uint8_t const *, uint16_t*);
void (* const isr) (pipe_handle_t);
void (* const isr) (pipe_handle_t, tusb_bus_event_t);
void (* const close) (uint8_t);
} class_driver_t;
} host_class_driver_t;
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+

2
tinyusb/host/usbh_hcd.h
View File

@ -101,7 +101,7 @@ typedef struct { // TODO internal structure, re-order members
extern usbh_device_info_t usbh_device_info_pool[TUSB_CFG_HOST_DEVICE_MAX+1]; // including zero-address
void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code);
void usbh_isr(pipe_handle_t pipe_hdl, uint8_t class_code, tusb_bus_event_t event);
void usbh_device_plugged_isr(uint8_t hostid, tusb_speed_t speed);
void usbh_device_unplugged_isr(uint8_t hostid);