diff options
| author | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
|---|---|---|
| committer | Rachel Dowdall <rjdowdall@gmail.com> | 2014-03-22 12:17:36 +0000 |
| commit | 17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5 (patch) | |
| tree | 36077e73d30aa91f94ed74b707facc86b7ed7937 /stmhal/usb.h | |
| parent | 300c8bd4c2c0c6d626a6aaeb873c22a8f8b9fc3f (diff) | |
| parent | da8d21e0dd236ae5e31bfac4ff8d5b73ddd49282 (diff) | |
| download | micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.tar.gz micropython-17f45d41fefdb75fb76fca00ce4d7d5e158b6ea5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'stmhal/usb.h')
| -rw-r--r-- | stmhal/usb.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/stmhal/usb.h b/stmhal/usb.h index 3e6bdccec2..bb6283c89a 100644 --- a/stmhal/usb.h +++ b/stmhal/usb.h @@ -4,10 +4,18 @@ #define VCP_CHAR_CTRL_C (3) #define VCP_CHAR_CTRL_D (4) -#define PYB_USB_DEV_VCP_MSC (0) -#define PYB_USB_DEV_HID (1) +typedef enum { + USBD_DEVICE_CDC, + USBD_DEVICE_MSC, + USBD_DEVICE_HID, +} usbd_device_kind_t; -void pyb_usb_dev_init(int usb_dev_type); +typedef enum { + USBD_STORAGE_MEDIUM_FLASH, + USBD_STORAGE_MEDIUM_SDCARD, +} usbd_storage_medium_kind_t; + +void pyb_usb_dev_init(usbd_device_kind_t device_kind, usbd_storage_medium_kind_t medium_kind); bool usb_vcp_is_enabled(void); bool usb_vcp_is_connected(void); void usb_vcp_set_interrupt_char(int c); |