andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add usbh_device_info_t to return device status

Browse Source 
add usbh_init and test code
replace usbh_device_is_plugged in hid_host and test_hid_host with usbh_device_info_t
This commit is contained in:
hathach
2013-01-27 17:57:35 +07:00
parent 36dbd52870
commit 06f923c7bb
6 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tinyusb/host/usbd_host.c
View File

@@ -35,11 +35,44 @@
* This file is part of the tiny usb stack.
*/
#include "usbd_host.h"
#include "tusb_option.h"
#ifdef TUSB_CFG_HOST
usbh_device_info_t usbh_device_pool[TUSB_CFG_HOST_DEVICE_MAX];
#define _TINY_USB_SOURCE_FILE_
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
#include "usbd_host.h"
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
//--------------------------------------------------------------------+
// PUBLIC API (Parameter Verification is required)
//--------------------------------------------------------------------+
tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl)
{
ASSERT(device_hdl < TUSB_CFG_HOST_DEVICE_MAX, 0);
return device_info_pool[device_hdl].status;
}
//--------------------------------------------------------------------+
// CLASS-USBD API (don't require to verify parameters)
//--------------------------------------------------------------------+
void usbh_init(void)
{
memset(device_info_pool, 0, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
}
#if 0
tusb_error_t tusbh_keyboard_open(tusb_handle_device_t device_hdl, uint8_t configure_num, tusb_handle_keyboard_t *keyboard_hdl)

16
tinyusb/host/usbd_host.h
View File

@@ -98,10 +98,21 @@ enum {
TUSB_FLAGS_CLASS_VENDOR_SPECIFIC = BIT_(31)
};
/// Device Status
enum {
TUSB_DEVICE_STATUS_UNPLUG = 0,
TUSB_DEVICE_STATUS_READY = BIT_(0),
TUSB_DEVICE_STATUS_REMOVING = BIT_(2),
TUSB_DEVICE_STATUS_SAFE_REMOVE = BIT_(3),
};
typedef uint8_t tusbh_device_status_t;
typedef uint32_t tusbh_flag_class_t;
typedef struct {
typedef struct { // TODO internal structure
uint8_t core_id;
tusbh_device_status_t status;
pipe_handle_t pipe_control;
#if 0 // TODO allow configure for vendor/product
@@ -134,6 +145,7 @@ typedef uint32_t tusb_handle_device_t;
void tusbh_device_mounting_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
void tusbh_device_mounted_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
tusb_error_t tusbh_configuration_set (tusb_handle_device_t const device_hdl, uint8_t const configure_number) ATTR_WARN_UNUSED_RESULT;
tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl) ATTR_WARN_UNUSED_RESULT;
//--------------------------------------------------------------------+
@@ -141,7 +153,7 @@ tusb_error_t tusbh_configuration_set (tusb_handle_device_t const device_hdl,
//--------------------------------------------------------------------+
#ifdef _TINY_USB_SOURCE_FILE_
bool usbh_device_is_plugged(tusb_handle_device_t const device_hdl) ATTR_WARN_UNUSED_RESULT;
void usbh_init(void);
pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) ATTR_WARN_UNUSED_RESULT;
#endif