aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/f1/other/usb_hid/usbhid.c
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-10-31 13:34:18 -0700
committerPiotr Esden-Tempski2012-10-31 13:34:18 -0700
commit6b2ca89f48bef80dd37fa4245a7138b7e5c36c91 (patch)
treef3d85ab83a90a8285faf677befc2a386141d165a /examples/stm32/f1/other/usb_hid/usbhid.c
parentfd3ee124f838aedc90e591f94201b75171219b56 (diff)
parente8ec29e636ec78da27efd2a077125144039a73c5 (diff)
Merge pull request #22 fixing usb and f4 alignment issues
Merge remote-tracking branch 'jdk/master' Conflicts: lib/stm32/f1/Makefile lib/stm32/f4/Makefile
Diffstat (limited to 'examples/stm32/f1/other/usb_hid/usbhid.c')
-rw-r--r--examples/stm32/f1/other/usb_hid/usbhid.c30
1 files changed, 19 insertions, 11 deletions
diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
index a61d9ea..7db0d8f 100644
--- a/examples/stm32/f1/other/usb_hid/usbhid.c
+++ b/examples/stm32/f1/other/usb_hid/usbhid.c
@@ -32,6 +32,8 @@
#include <libopencm3/usb/dfu.h>
#endif
+static usbd_device *usbd_dev;
+
const struct usb_device_descriptor dev = {
.bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE,
@@ -169,10 +171,11 @@ static const char *usb_strings[] = {
"DEMO",
};
-static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
- void (**complete)(struct usb_setup_data *req))
+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;
+ (void)usbd_dev;
if((req->bmRequestType != 0x81) ||
(req->bRequest != USB_REQ_GET_DESCRIPTOR) ||
@@ -187,9 +190,10 @@ static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
}
#ifdef INCLUDE_DFU_INTERFACE
-static void dfu_detach_complete(struct usb_setup_data *req)
+static void dfu_detach_complete(usbd_device *usbd_dev, struct usb_setup_data *req)
{
(void)req;
+ (void)usbd_dev;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -198,11 +202,12 @@ static void dfu_detach_complete(struct usb_setup_data *req)
scb_reset_core();
}
-static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
- void (**complete)(struct usb_setup_data *req))
+static int dfu_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)buf;
(void)len;
+ (void)usbd_dev;
if ((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH))
return 0; /* Only accept class request. */
@@ -213,18 +218,21 @@ static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
}
#endif
-static void hid_set_config(u16 wValue)
+static void hid_set_config(usbd_device *usbd_dev, u16 wValue)
{
(void)wValue;
+ (void)usbd_dev;
- usbd_ep_setup(0x81, USB_ENDPOINT_ATTR_INTERRUPT, 4, NULL);
+ usbd_ep_setup(usbd_dev, 0x81, USB_ENDPOINT_ATTR_INTERRUPT, 4, NULL);
usbd_register_control_callback(
+ usbd_dev,
USB_REQ_TYPE_STANDARD | USB_REQ_TYPE_INTERFACE,
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
hid_control_request);
#ifdef INCLUDE_DFU_INTERFACE
usbd_register_control_callback(
+ usbd_dev,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
dfu_control_request);
@@ -246,15 +254,15 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings);
- usbd_register_set_config_callback(hid_set_config);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings);
+ usbd_register_set_config_callback(usbd_dev, hid_set_config);
gpio_set(GPIOA, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
while (1)
- usbd_poll();
+ usbd_poll(usbd_dev);
}
void sys_tick_handler(void)
@@ -270,5 +278,5 @@ void sys_tick_handler(void)
if (x < -30)
dir = -dir;
- usbd_ep_write_packet(0x81, buf, 4);
+ usbd_ep_write_packet(usbd_dev, 0x81, buf, 4);
}