summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-05-13 11:52:42 +0700
committerGitHub <[email protected]>2019-05-13 11:52:42 +0700
commit449a631a4a888146e8f68b6960f7fdb579fc5edf (patch)
treeabca694476ea8db0752d4c6416978e85365c20c4 /examples
parentaaf5848ce15c5d6ccf4c51c3ef7b04fb787639ee (diff)
parentfdc12db431c568ff4f3ff309f84f72c5d8475b2a (diff)
Merge pull request #65 from hathach/develop
clean up
Diffstat (limited to 'examples')
-rw-r--r--examples/device/cdc_msc_hid/src/usb_descriptors.c4
-rw-r--r--examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c3
-rw-r--r--examples/device/hid_generic_inout/src/usb_descriptors.c3
-rw-r--r--examples/device/msc_dual_lun/src/usb_descriptors.c3
4 files changed, 8 insertions, 5 deletions
diff --git a/examples/device/cdc_msc_hid/src/usb_descriptors.c b/examples/device/cdc_msc_hid/src/usb_descriptors.c
index 73c8e7ce1..f887571e5 100644
--- a/examples/device/cdc_msc_hid/src/usb_descriptors.c
+++ b/examples/device/cdc_msc_hid/src/usb_descriptors.c
@@ -155,11 +155,11 @@ uint8_t const * tud_descriptor_device_cb(void)
// Invoked when received GET CONFIGURATION DESCRIPTOR
// Application return pointer to descriptor
// Descriptor contents must exist long enough for transfer to complete
-uint8_t const * tud_descriptor_configuration_cb(void)
+uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
{
+ (void) index; // for multiple configurations
return desc_configuration;
}
-
//------------- String Descriptors -------------//
// array of pointer to string descriptors
diff --git a/examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c b/examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c
index 92ce8c6ec..333d07ba4 100644
--- a/examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c
+++ b/examples/device/cdc_msc_hid_freertos/src/usb_descriptors.c
@@ -155,8 +155,9 @@ uint8_t const * tud_descriptor_device_cb(void)
// Invoked when received GET CONFIGURATION DESCRIPTOR
// Application return pointer to descriptor
// Descriptor contents must exist long enough for transfer to complete
-uint8_t const * tud_descriptor_configuration_cb(void)
+uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
{
+ (void) index; // for multiple configurations
return desc_configuration;
}
diff --git a/examples/device/hid_generic_inout/src/usb_descriptors.c b/examples/device/hid_generic_inout/src/usb_descriptors.c
index fb4dd378c..a9f84b988 100644
--- a/examples/device/hid_generic_inout/src/usb_descriptors.c
+++ b/examples/device/hid_generic_inout/src/usb_descriptors.c
@@ -99,8 +99,9 @@ uint8_t const * tud_descriptor_device_cb(void)
// Invoked when received GET CONFIGURATION DESCRIPTOR
// Application return pointer to descriptor
// Descriptor contents must exist long enough for transfer to complete
-uint8_t const * tud_descriptor_configuration_cb(void)
+uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
{
+ (void) index; // for multiple configurations
return desc_configuration;
}
diff --git a/examples/device/msc_dual_lun/src/usb_descriptors.c b/examples/device/msc_dual_lun/src/usb_descriptors.c
index 1ae000fd9..8cc63da64 100644
--- a/examples/device/msc_dual_lun/src/usb_descriptors.c
+++ b/examples/device/msc_dual_lun/src/usb_descriptors.c
@@ -92,8 +92,9 @@ uint8_t const * tud_descriptor_device_cb(void)
// Invoked when received GET CONFIGURATION DESCRIPTOR
// Application return pointer to descriptor
// Descriptor contents must exist long enough for transfer to complete
-uint8_t const * tud_descriptor_configuration_cb(void)
+uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
{
+ (void) index; // for multiple configurations
return desc_configuration;
}