EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated all affected examples to the usb API change.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2013-04-25 17:44:11 -07:00
parent 402a7c47df
commit f395592764
13 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,6 +163,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -249,7 +252,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, 3); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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

@@ -257,8 +257,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, 4); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, 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,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,

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

@@ -175,6 +175,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer used for control requests. */
u8 usbd_control_buffer[128];
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, u8 **buf, u16 *len, static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, u8 **buf, u16 *len,
void (**complete)(usbd_device *dev, struct usb_setup_data *req)) void (**complete)(usbd_device *dev, struct usb_setup_data *req))
{ {
@@ -337,7 +340,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_descr, &config, usb_strings, 3); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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. */

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

@@ -163,6 +163,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -241,7 +244,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, 3); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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

@@ -258,8 +258,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, 4); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, 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,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,

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

@@ -171,6 +171,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, u8 **buf, u16 *len, static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, u8 **buf, u16 *len,
void (**complete)(usbd_device *, struct usb_setup_data *)) void (**complete)(usbd_device *, struct usb_setup_data *))
{ {
@@ -255,7 +258,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_descr, &config, usb_strings, 3); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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);

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

@@ -163,6 +163,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -243,7 +246,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, 3); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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

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

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

@@ -168,6 +168,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int hid_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, u16 *len, static int hid_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, u16 *len,
void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -256,7 +259,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, 3); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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

@@ -256,8 +256,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, 4, usbd_control_buffer, 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,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,

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

@@ -74,6 +74,9 @@ const char *usb_strings[] = {
"1001", "1001",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int simple_control_callback(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int simple_control_callback(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -107,7 +110,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, 3); usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_control_callback( usbd_register_control_callback(
usbd_dev, usbd_dev,
USB_REQ_TYPE_VENDOR, USB_REQ_TYPE_VENDOR,

5
examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
View File

@@ -164,6 +164,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -254,7 +257,7 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO5); GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3); usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
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++)

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

@@ -164,6 +164,9 @@ static const char *usb_strings[] = {
"DEMO", "DEMO",
}; };
/* Buffer to be used for control requests. */
u8 usbd_control_buffer[128];
static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf, static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) u16 *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{ {
@@ -232,7 +235,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, 3); usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config); usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
while (1) while (1)