jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed dummy character string from examples due to api change in: 7a5da60

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2013-01-09 00:39:42 -08:00
parent 61f2cb3f99
commit cb2fd43666
12 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
View File

@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"CDC-ACM Demo", "CDC-ACM Demo",
"DEMO", "DEMO",
@ -250,7 +249,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO5); 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); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++) for (i = 0; i < 0x800000; i++)

3
examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
View File

@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"DFU Demo", "DFU Demo",
"DEMO", "DEMO",
@ -250,7 +249,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2); 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_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,

3
examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
View File

@ -169,7 +169,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"HID Demo", "HID Demo",
"DEMO", "DEMO",
@ -336,7 +335,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2); 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); usbd_register_set_config_callback(usbd_dev, hid_set_config);
/* Delay some seconds to show that pull-up switch works. */ /* Delay some seconds to show that pull-up switch works. */

3
examples/stm32/f1/other/usb_cdcacm/cdcacm.c
View File

@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"CDC-ACM Demo", "CDC-ACM Demo",
"DEMO", "DEMO",
@ -242,7 +241,7 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); 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); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
gpio_set(GPIOA, GPIO15); gpio_set(GPIOA, GPIO15);

3
examples/stm32/f1/other/usb_dfu/usbdfu.c
View File

@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"DFU Demo", "DFU Demo",
"DEMO", "DEMO",
@ -251,7 +250,7 @@ int main(void)
rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN); 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_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,

3
examples/stm32/f1/other/usb_hid/usbhid.c
View File

@ -165,7 +165,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"HID Demo", "HID Demo",
"DEMO", "DEMO",
@ -254,7 +253,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); 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); usbd_register_set_config_callback(usbd_dev, hid_set_config);
gpio_set(GPIOA, GPIO15); gpio_set(GPIOA, GPIO15);

3
examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
View File

@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"CDC-ACM Demo", "CDC-ACM Demo",
"DEMO", "DEMO",
@ -244,7 +243,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); 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); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++) for (i = 0; i < 0x800000; i++)

3
examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
View File

@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"DFU Demo", "DFU Demo",
"DEMO", "DEMO",
@ -249,7 +248,7 @@ int main(void)
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
gpio_set(GPIOC, 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_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,

3
examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
View File

@ -163,7 +163,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"HID Demo", "HID Demo",
"DEMO", "DEMO",
@ -256,7 +255,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); 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); usbd_register_set_config_callback(usbd_dev, hid_set_config);
for (i = 0; i < 0x80000; i++) for (i = 0; i < 0x80000; i++)

3
examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
View File

@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"DFU Demo", "DFU Demo",
"DEMO", "DEMO",
@ -249,7 +248,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); 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_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,

3
examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
View File

@ -69,7 +69,6 @@ const struct usb_config_descriptor config = {
}; };
const char *usb_strings[] = { const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"Simple Device", "Simple Device",
"1001", "1001",
@ -108,7 +107,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO6); 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_register_control_callback(
usbd_dev, usbd_dev,
USB_REQ_TYPE_VENDOR, USB_REQ_TYPE_VENDOR,

3
examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
View File

@ -159,7 +159,6 @@ static const struct usb_config_descriptor config = {
}; };
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x",
"Black Sphere Technologies", "Black Sphere Technologies",
"CDC-ACM Demo", "CDC-ACM Demo",
"DEMO", "DEMO",
@ -233,7 +232,7 @@ int main(void)
GPIO9 | GPIO11 | GPIO12); GPIO9 | GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, 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); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
while (1) while (1)