summaryrefslogtreecommitdiff
path: root/tinyusb/class
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-03-27 11:51:44 +0700
committerhathach <[email protected]>2013-03-27 11:51:44 +0700
commit7b5d9edc5af88422b26116a56032091e96714495 (patch)
tree3062a01b7636ea43beb05a15ae9c736dd11edb04 /tinyusb/class
parentb0ff7a7e235b1901def71305e6c35e6c3cda222c (diff)
add test for pipe_interrupt_xfer
implement keyboard app code - forcefully place keyboard_report in RAM section 3 change used bit in qtd from reserved in buffer[1] to alternate link add code for fake ehci controller runs on period interrupt change signature of tusbh_hid_keyboard_get_report - tusb_keyboard_report_t* to uint8_t* implement period (interrupt) complete isr processing
Diffstat (limited to 'tinyusb/class')
-rw-r--r--tinyusb/class/hid.h4
-rw-r--r--tinyusb/class/hid_host.c4
-rw-r--r--tinyusb/class/hid_host.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index cec54d1b7..11018b422 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -102,12 +102,12 @@ typedef ATTR_PREPACKED struct
*
* Type define for a standard Boot Protocol Keyboard report
*/
-typedef ATTR_PREPACKED struct
+typedef ATTR_PACKED_STRUCT(struct)
{
uint8_t modifier; /**< Keyboard modifier byte, indicating pressed modifier keys (a combination of HID_KEYBOARD_MODIFER_* masks). */
uint8_t reserved; /**< Reserved for OEM use, always set to 0. */
uint8_t keycode[6]; /**< Key codes of the currently pressed keys. */
-} ATTR_PACKED tusb_keyboard_report_t;
+} tusb_keyboard_report_t;
/**
* \brief buttons codes for HID mouse
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index e30d0d901..8efc5ec9e 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -72,7 +72,7 @@ bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr)
return tusbh_device_is_configured(dev_addr) && pipehandle_is_valid(keyboard_data[dev_addr-1].pipe_hdl);
}
-tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report)
+tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, uint8_t * const report)
{
//------------- parameters validation -------------//
ASSERT_INT(TUSB_DEVICE_STATE_CONFIGURED, tusbh_device_get_state(dev_addr), TUSB_ERROR_DEVICE_NOT_READY);
@@ -85,7 +85,7 @@ tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_nu
ASSERT(TUSB_INTERFACE_STATUS_BUSY != p_keyboard->status, TUSB_ERROR_INTERFACE_IS_BUSY);
// TODO abstract to use hidh service
- ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, (uint8_t*) report, p_keyboard->report_size, true) ) ;
+ ASSERT_STATUS( hcd_pipe_xfer(p_keyboard->pipe_hdl, report, p_keyboard->report_size, true) ) ;
p_keyboard->status = TUSB_INTERFACE_STATUS_BUSY;
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index 1846bf674..5d5fa1fc9 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -69,7 +69,7 @@ typedef struct {
}hidh_keyboard_info_t;
bool tusbh_hid_keyboard_is_supported(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED_RESULT;
-tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, tusb_keyboard_report_t * const report) ATTR_WARN_UNUSED_RESULT;
+tusb_error_t tusbh_hid_keyboard_get_report(uint8_t dev_addr, uint8_t instance_num, uint8_t * const report) ATTR_WARN_UNUSED_RESULT;
tusb_interface_status_t tusbh_hid_keyboard_status(uint8_t dev_addr, uint8_t instance_num) ATTR_WARN_UNUSED_RESULT;
//--------------------------------------------------------------------+