From cb2fd43666315888df3babcc758e406d93abc53b Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Wed, 9 Jan 2013 00:39:42 -0800 Subject: Removed dummy character string from examples due to api change in: 7a5da60 --- examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c | 3 +-- examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c | 3 +-- examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c | 3 +-- examples/stm32/f1/other/usb_cdcacm/cdcacm.c | 3 +-- examples/stm32/f1/other/usb_dfu/usbdfu.c | 3 +-- examples/stm32/f1/other/usb_hid/usbhid.c | 3 +-- examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c | 3 +-- examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c | 3 +-- examples/stm32/f1/stm32-h103/usb_hid/usbhid.c | 3 +-- examples/stm32/f1/stm32-h103/usb_iap/usbiap.c | 3 +-- examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c | 3 +-- examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c | 3 +-- 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c index c72b715..1f98e70 100644 --- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c @@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "CDC-ACM Demo", "DEMO", @@ -250,7 +249,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO5); - usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); for (i = 0; i < 0x800000; i++) diff --git a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c index 8607191..018306a 100644 --- a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c +++ b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c @@ -106,7 +106,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "DFU Demo", "DEMO", @@ -250,7 +249,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO2); - usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5); + usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4); usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer)); usbd_register_control_callback( usbd_dev, diff --git a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c index bb0baba..e77ade0 100644 --- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c +++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c @@ -169,7 +169,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "HID Demo", "DEMO", @@ -336,7 +335,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO2); - usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, hid_set_config); /* Delay some seconds to show that pull-up switch works. */ diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c index 3aa7289..e841ef7 100644 --- a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c @@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "CDC-ACM Demo", "DEMO", @@ -242,7 +241,7 @@ int main(void) gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); gpio_set(GPIOA, GPIO15); diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c index 8c7493f..d1efe4a 100644 --- a/examples/stm32/f1/other/usb_dfu/usbdfu.c +++ b/examples/stm32/f1/other/usb_dfu/usbdfu.c @@ -106,7 +106,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "DFU Demo", "DEMO", @@ -251,7 +250,7 @@ int main(void) rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN); - usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5); + usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4); usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer)); usbd_register_control_callback( usbd_dev, diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c index 0231610..a3b78d5 100644 --- a/examples/stm32/f1/other/usb_hid/usbhid.c +++ b/examples/stm32/f1/other/usb_hid/usbhid.c @@ -165,7 +165,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "HID Demo", "DEMO", @@ -254,7 +253,7 @@ int main(void) AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, hid_set_config); gpio_set(GPIOA, GPIO15); diff --git a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c index 485f3ee..1dd47c0 100644 --- a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c @@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "CDC-ACM Demo", "DEMO", @@ -244,7 +243,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); for (i = 0; i < 0x800000; i++) diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c index 33a8983..95c51cb 100644 --- a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c +++ b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c @@ -106,7 +106,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "DFU Demo", "DEMO", @@ -249,7 +248,7 @@ int main(void) GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); gpio_set(GPIOC, GPIO11); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer)); usbd_register_control_callback( usbd_dev, diff --git a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c index 360a3cd..2073096 100644 --- a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c +++ b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c @@ -163,7 +163,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "HID Demo", "DEMO", @@ -256,7 +255,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, hid_set_config); for (i = 0; i < 0x80000; i++) diff --git a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c index 2a122af..4db224c 100644 --- a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c +++ b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c @@ -106,7 +106,6 @@ const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "DFU Demo", "DEMO", @@ -249,7 +248,7 @@ int main(void) AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); - usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5); + usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4); usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer)); usbd_register_control_callback( usbd_dev, diff --git a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c index aa0c282..4b930dd 100644 --- a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c +++ b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c @@ -69,7 +69,6 @@ const struct usb_config_descriptor config = { }; const char *usb_strings[] = { - "x", "Black Sphere Technologies", "Simple Device", "1001", @@ -108,7 +107,7 @@ int main(void) gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO6); - usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3); usbd_register_control_callback( usbd_dev, USB_REQ_TYPE_VENDOR, diff --git a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c index 0e19dbb..80c700b 100644 --- a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c @@ -159,7 +159,6 @@ static const struct usb_config_descriptor config = { }; static const char *usb_strings[] = { - "x", "Black Sphere Technologies", "CDC-ACM Demo", "DEMO", @@ -233,7 +232,7 @@ int main(void) GPIO9 | GPIO11 | GPIO12); gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12); - usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 4); + usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 3); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); while (1) -- cgit v1.2.3