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

Fixed compilation of all the examples after merging pull requests...

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2013-01-06 18:32:18 -08:00
parent f83f8d55d7
commit 0eeca37e9f
15 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,7 +250,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); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
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++)

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

@ -250,7 +250,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); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5);
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,

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

@ -336,7 +336,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); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
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. */

4
examples/stm32/f1/lisa-m-2/can/can.c
View File

@ -135,7 +135,9 @@ void can_setup(void)
CAN_BTR_SJW_1TQ, CAN_BTR_SJW_1TQ,
CAN_BTR_TS1_3TQ, CAN_BTR_TS1_3TQ,
CAN_BTR_TS2_4TQ, CAN_BTR_TS2_4TQ,
12)) /* BRP+1: Baud rate prescaler */ 12,
false,
false)) /* BRP+1: Baud rate prescaler */
{ {
gpio_set(GPIOA, GPIO8); /* LED1 off */ gpio_set(GPIOA, GPIO8); /* LED1 off */
gpio_set(GPIOB, GPIO4); /* LED2 off */ gpio_set(GPIOB, GPIO4); /* LED2 off */

4
examples/stm32/f1/obldc-strip/can/can.c
View File

@ -124,7 +124,9 @@ void can_setup(void)
CAN_BTR_SJW_1TQ, CAN_BTR_SJW_1TQ,
CAN_BTR_TS1_9TQ, CAN_BTR_TS1_9TQ,
CAN_BTR_TS2_6TQ, CAN_BTR_TS2_6TQ,
2)) /* BRP+1: Baud rate prescaler */ 2,
false,
false)) /* BRP+1: Baud rate prescaler */
{ {
gpio_clear(GPIOB, GPIO4); /* LED green on */ gpio_clear(GPIOB, GPIO4); /* LED green on */
gpio_set(GPIOB, GPIO5); /* LED red off */ gpio_set(GPIOB, GPIO5); /* LED red off */

4
examples/stm32/f1/obldc/can/can.c
View File

@ -121,7 +121,9 @@ void can_setup(void)
CAN_BTR_SJW_1TQ, CAN_BTR_SJW_1TQ,
CAN_BTR_TS1_3TQ, CAN_BTR_TS1_3TQ,
CAN_BTR_TS2_4TQ, CAN_BTR_TS2_4TQ,
12)) /* BRP+1: Baud rate prescaler */ 12,
false,
false)) /* BRP+1: Baud rate prescaler */
{ {
gpio_set(GPIOA, GPIO6); /* LED0 off */ gpio_set(GPIOA, GPIO6); /* LED0 off */
gpio_set(GPIOA, GPIO7); /* LED1 off */ gpio_set(GPIOA, GPIO7); /* LED1 off */

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

@ -242,7 +242,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
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);

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

@ -251,7 +251,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); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5);
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,

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

@ -254,7 +254,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
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);

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

@ -244,7 +244,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
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++)

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

@ -249,7 +249,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5);
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,

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

@ -256,7 +256,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
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++)

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

@ -249,7 +249,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); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5);
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,

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

@ -108,7 +108,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); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,
USB_REQ_TYPE_VENDOR, USB_REQ_TYPE_VENDOR,

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

@ -233,7 +233,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); usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 4);
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
while (1) while (1)