summaryrefslogtreecommitdiff
path: root/tinyusb/host
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-03-24 21:40:49 +0700
committerhathach <[email protected]>2013-03-24 21:40:49 +0700
commitc7c993d6cc497ff6baaa1e02d1c1da0dfa88017d (patch)
tree62db72be4d544b89e46f90e71e3766c34178355c /tinyusb/host
parenta1b17be6818320986328e4ac39abd82e2a894104 (diff)
refractor hidh keyboard
changing class hidh behavior
Diffstat (limited to 'tinyusb/host')
-rw-r--r--tinyusb/host/hcd.h1
-rw-r--r--tinyusb/host/usbh.c2
-rw-r--r--tinyusb/host/usbh.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 98b5e5c5c..e18cf3cc4 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -75,6 +75,7 @@ void hcd_isr(uint8_t hostid);
//--------------------------------------------------------------------+
// PIPE API
//--------------------------------------------------------------------+
+// TODO control xfer should be used via usbh layer
tusb_error_t hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size) ATTR_WARN_UNUSED_RESULT;
tusb_error_t hcd_pipe_control_xfer(uint8_t dev_addr, tusb_std_request_t const * p_request, uint8_t data[]) ATTR_WARN_UNUSED_RESULT;
tusb_error_t hcd_pipe_control_close(uint8_t dev_addr) ATTR_WARN_UNUSED_RESULT;
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index e78789264..2a5102967 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -100,7 +100,7 @@ static inline uint8_t get_configure_number_for_device(tusb_descriptor_device_t*
//--------------------------------------------------------------------+
tusb_device_state_t tusbh_device_get_state (uint8_t const dev_addr)
{
- ASSERT(dev_addr <= TUSB_CFG_HOST_DEVICE_MAX, TUSB_DEVICE_STATE_INVALID_PARAMETER);
+ ASSERT_INT_WITHIN(1, TUSB_CFG_HOST_DEVICE_MAX, dev_addr, TUSB_DEVICE_STATE_INVALID_PARAMETER);
return usbh_devices[dev_addr].state;
}
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
index 2ecd85067..3ed2a2ea9 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -113,7 +113,6 @@ void tusbh_device_mount_failed_cb(tusb_error_t error, tusb_descriptor_de
#ifdef _TINY_USB_SOURCE_FILE_
tusb_error_t usbh_init(void);
-pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) ATTR_WARN_UNUSED_RESULT;
#endif