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

add TUSB_CFG_PROUDCT_ID check

Browse Source 
move USB_MAX_EP_NUM to device dependency
- lpc43 --> 6
- lpc11/13 --> 5
This commit is contained in:
hathach
2013-06-03 15:56:14 +07:00
parent 52f18f3784
commit 9f9adca03b
8 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demos/device/keyboard/tusb_descriptors.c
View File

@@ -132,14 +132,14 @@ tusb_descriptor_device_t app_tusb_desc_device =
.bMaxPacketSize0 = USB_MAX_PACKET0,
.idVendor = TUSB_CFG_DEVICE_VENDORID,
.idProduct = USB_PRODUCT_ID,
.idProduct = TUSB_CFG_PRODUCT_ID,
.bcdDevice = 0x0100,
.iManufacturer = 0x01,
.iProduct = 0x02,
.iSerialNumber = 0x03,
.bNumConfigurations = 0x01 // TODO configuration number
.bNumConfigurations = 0x01 // TODO multiple configurations
};

7
demos/device/keyboard/tusb_descriptors.h
View File

@@ -98,10 +98,15 @@ typedef ATTR_PACKED_STRUCT(struct)
#define TOTAL_INTEFACES (INTERFACES_OF_CDC + INTERFACES_OF_HID_KEYBOARD + INTERFACES_OF_HID_MOUSE + INTERFACES_OF_HID_GENERIC + INTERFACES_OF_MASS_STORAGE)
// each combination of interfaces need to have different productid, as windows will bind & remember device driver after the
// first plug.
#ifndef TUSB_CFG_PRODUCT_ID
// Bitmap: MassStorage | Generic | Mouse | Key | CDC
#define PRODUCTID_BITMAP(interface, n) ( (INTERFACES_OF_##interface ? 1 : 0) << (n) )
#define USB_PRODUCT_ID (0x2000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | PRODUCTID_BITMAP(HID_MOUSE, 2) | \
#define TUSB_CFG_PRODUCT_ID (0x2000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | PRODUCTID_BITMAP(HID_MOUSE, 2) | \
PRODUCTID_BITMAP(HID_GENERIC, 3) | PRODUCTID_BITMAP(MASS_STORAGE, 4) ) )
#endif
///////////////////////////////////////////////////////////////////////
typedef ATTR_PACKED_STRUCT(struct)