aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/f1/lisa-m-1
diff options
context:
space:
mode:
Diffstat (limited to 'examples/stm32/f1/lisa-m-1')
-rw-r--r--examples/stm32/f1/lisa-m-1/can/can.c6
-rw-r--r--examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c8
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c16
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c29
5 files changed, 36 insertions, 27 deletions
diff --git a/examples/stm32/f1/lisa-m-1/can/can.c b/examples/stm32/f1/lisa-m-1/can/can.c
index c5a1f12..18162c0 100644
--- a/examples/stm32/f1/lisa-m-1/can/can.c
+++ b/examples/stm32/f1/lisa-m-1/can/can.c
@@ -47,7 +47,7 @@ struct can_rx_msg {
struct can_tx_msg can_tx_msg;
struct can_rx_msg can_rx_msg;
-void gpio_setup(void)
+static void gpio_setup(void)
{
/* Enable Alternate Function clock. */
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
@@ -85,7 +85,7 @@ void gpio_setup(void)
}
-void systick_setup(void)
+static void systick_setup(void)
{
/* 72MHz / 8 => 9000000 counts per second */
systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8);
@@ -100,7 +100,7 @@ void systick_setup(void)
systick_counter_enable();
}
-void can_setup(void)
+static void can_setup(void)
{
/* Enable peripheral clocks. */
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
diff --git a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
index 3e2577d..442709a 100644
--- a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
@@ -22,7 +22,7 @@
#include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */
-void clock_setup(void)
+static void clock_setup(void)
{
rcc_clock_setup_in_hse_12mhz_out_72mhz();
@@ -32,7 +32,7 @@ void clock_setup(void)
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
}
-void gpio_setup(void)
+static void gpio_setup(void)
{
/* Set GPIO13 (in GPIO port C) to 'output push-pull'. */
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
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 1f98e70..d12d3d8 100644
--- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
@@ -177,8 +177,8 @@ static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *
* even though it's optional in the CDC spec, and we don't
* advertise it in the ACM functional descriptor.
*/
- char buf[10];
- struct usb_cdc_notification *notif = (void*)buf;
+ char local_buf[10];
+ struct usb_cdc_notification *notif = (void*)local_buf;
/* We echo signals back to host as notification. */
notif->bmRequestType = 0xA1;
@@ -186,8 +186,8 @@ static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *
notif->wValue = 0;
notif->wIndex = 0;
notif->wLength = 2;
- buf[8] = req->wValue & 3;
- buf[9] = 0;
+ local_buf[8] = req->wValue & 3;
+ local_buf[9] = 0;
// usbd_ep_write_packet(0x83, buf, 10);
return 1;
}
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 018306a..5db6542 100644
--- a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
@@ -141,16 +141,24 @@ static void usbdfu_getstatus_complete(usbd_device *usbd_dev, struct usb_setup_da
if (prog.blocknum == 0) {
switch (prog.buf[0]) {
case CMD_ERASE:
- flash_erase_page(*(u32 *)(prog.buf + 1));
+ {
+ u32 *dat = (u32 *)(prog.buf + 1);
+ flash_erase_page(*dat);
+ }
case CMD_SETADDR:
- prog.addr = *(u32 *)(prog.buf + 1);
+ {
+ u32 *dat = (u32 *)(prog.buf + 1);
+ prog.addr = *dat;
+ }
}
} else {
u32 baseaddr = prog.addr + ((prog.blocknum - 2) *
dfu_function.wTransferSize);
- for (i = 0; i < prog.len; i += 2)
+ for (i = 0; i < prog.len; i += 2) {
+ u16 *dat = (u16 *)(prog.buf + i);
flash_program_half_word(baseaddr + i,
- *(u16 *)(prog.buf + i));
+ *dat);
+ }
}
flash_lock();
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 266b0da..859a3de 100644
--- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
+++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
@@ -24,6 +24,7 @@
#include <libopencm3/cm3/systick.h>
#include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/otg_fs.h>
+#include <libopencm3/stm32/f1/nvic.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h>
#include "adxl345.h"
@@ -38,7 +39,7 @@
static usbd_device *usbd_dev;
-const struct usb_device_descriptor dev = {
+const struct usb_device_descriptor dev_descr = {
.bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE,
.bcdUSB = 0x0200,
@@ -174,11 +175,11 @@ static const char *usb_strings[] = {
"DEMO",
};
-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))
+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;
- (void)usbd_dev;
+ (void)dev;
if((req->bmRequestType != 0x81) ||
(req->bRequest != USB_REQ_GET_DESCRIPTOR) ||
@@ -193,10 +194,10 @@ static int hid_control_request(usbd_device *usbd_dev, struct usb_setup_data *req
}
#ifdef INCLUDE_DFU_INTERFACE
-static void dfu_detach_complete(usbd_device *usbd_dev, struct usb_setup_data *req)
+static void dfu_detach_complete(usbd_device *dev, struct usb_setup_data *req)
{
(void)req;
- (void)usbd_dev;
+ (void)dev;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -205,12 +206,12 @@ static void dfu_detach_complete(usbd_device *usbd_dev, struct usb_setup_data *re
scb_reset_core();
}
-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))
+static int dfu_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)buf;
(void)len;
- (void)usbd_dev;
+ (void)dev;
if ((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH))
return 0; /* Only accept class request. */
@@ -221,20 +222,20 @@ static int dfu_control_request(usbd_device *usbd_dev, struct usb_setup_data *req
}
#endif
-static void hid_set_config(usbd_device *usbd_dev, u16 wValue)
+static void hid_set_config(usbd_device *dev, u16 wValue)
{
(void)wValue;
- usbd_ep_setup(usbd_dev, 0x81, USB_ENDPOINT_ATTR_INTERRUPT, 4, NULL);
+ usbd_ep_setup(dev, 0x81, USB_ENDPOINT_ATTR_INTERRUPT, 4, NULL);
usbd_register_control_callback(
- usbd_dev,
+ 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,
+ dev,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
dfu_control_request);
@@ -336,7 +337,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, 3);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev_descr, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, hid_set_config);
/* Delay some seconds to show that pull-up switch works. */