From 85be1e5e7bfb342e960ca1416f1c2f0233fc977e Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sat, 3 Mar 2018 21:42:52 +0000 Subject: [PATCH] update to current library Minor api changes required. --- examples/stm32/f0/stm32f0-discovery/adc/adc.c | 2 +- examples/stm32/f0/stm32f0-discovery/usart/usart.c | 2 +- .../stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c | 2 +- examples/stm32/f1/lisa-m-1/can/can.c | 2 +- examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c | 2 +- examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c | 6 +++--- examples/stm32/f1/lisa-m-2/can/can.c | 2 +- examples/stm32/f1/obldc-strip/can/can.c | 2 +- examples/stm32/f1/obldc/can/can.c | 2 +- examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c | 2 +- examples/stm32/f3/stm32f3-discovery/i2c/i2c.c | 4 +++- examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c | 2 +- libopencm3 | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/examples/stm32/f0/stm32f0-discovery/adc/adc.c b/examples/stm32/f0/stm32f0-discovery/adc/adc.c index f0a46fe..7a1d1aa 100644 --- a/examples/stm32/f0/stm32f0-discovery/adc/adc.c +++ b/examples/stm32/f0/stm32f0-discovery/adc/adc.c @@ -70,7 +70,7 @@ static void usart_setup(void) /* Setup UART parameters. */ usart_set_baudrate(USART1, 38400); usart_set_databits(USART1, 8); - usart_set_stopbits(USART1, USART_CR2_STOP_1_0BIT); + usart_set_stopbits(USART1, USART_CR2_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX); usart_set_parity(USART1, USART_PARITY_NONE); usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE); diff --git a/examples/stm32/f0/stm32f0-discovery/usart/usart.c b/examples/stm32/f0/stm32f0-discovery/usart/usart.c index e6b76d4..135ea24 100644 --- a/examples/stm32/f0/stm32f0-discovery/usart/usart.c +++ b/examples/stm32/f0/stm32f0-discovery/usart/usart.c @@ -38,7 +38,7 @@ static void usart_setup(void) usart_set_baudrate(USART1, 38400); usart_set_databits(USART1, 8); usart_set_parity(USART1, USART_PARITY_NONE); - usart_set_stopbits(USART1, USART_CR2_STOP_1_0BIT); + usart_set_stopbits(USART1, USART_CR2_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX); usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE); diff --git a/examples/stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c b/examples/stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c index 012786d..bfd120d 100644 --- a/examples/stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c +++ b/examples/stm32/f0/stm32f0-discovery/usart_stdio/usart_stdio.c @@ -58,7 +58,7 @@ static FILE *usart_setup(uint32_t dev) usart_set_baudrate(dev, 38400); usart_set_databits(dev, 8); usart_set_parity(dev, USART_PARITY_NONE); - usart_set_stopbits(dev, USART_CR2_STOP_1_0BIT); + usart_set_stopbits(dev, USART_CR2_STOPBITS_1); usart_set_mode(dev, USART_MODE_TX_RX); usart_set_flow_control(dev, USART_FLOWCONTROL_NONE); diff --git a/examples/stm32/f1/lisa-m-1/can/can.c b/examples/stm32/f1/lisa-m-1/can/can.c index 9f132c3..96643a4 100644 --- a/examples/stm32/f1/lisa-m-1/can/can.c +++ b/examples/stm32/f1/lisa-m-1/can/can.c @@ -153,7 +153,7 @@ static void can_setup(void) } /* CAN filter 0 init. */ - can_filter_id_mask_32bit_init(CAN1, + can_filter_id_mask_32bit_init( 0, /* Filter ID */ 0, /* CAN ID */ 0, /* CAN ID mask */ 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 e9bf0a1..66a703f 100644 --- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c @@ -166,7 +166,7 @@ static const char *usb_strings[] = { /* Buffer to be used for control requests. */ uint8_t usbd_control_buffer[128]; -static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, +static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) { (void)complete; 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 dd84f80..16dc8ed 100644 --- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c +++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include "adxl345.h" @@ -205,7 +205,7 @@ static const char *usb_strings[] = { /* Buffer used for control requests. */ uint8_t usbd_control_buffer[128]; -static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, +static enum usbd_request_return_codes hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, void (**complete)(usbd_device *dev, struct usb_setup_data *req)) { (void)complete; @@ -236,7 +236,7 @@ static void dfu_detach_complete(usbd_device *dev, struct usb_setup_data *req) scb_reset_core(); } -static int dfu_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, +static enum usbd_request_return_codes dfu_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, void (**complete)(usbd_device *dev, struct usb_setup_data *req)) { (void)buf; diff --git a/examples/stm32/f1/lisa-m-2/can/can.c b/examples/stm32/f1/lisa-m-2/can/can.c index 2a54492..2614ecb 100644 --- a/examples/stm32/f1/lisa-m-2/can/can.c +++ b/examples/stm32/f1/lisa-m-2/can/can.c @@ -153,7 +153,7 @@ static void can_setup(void) } /* CAN filter 0 init. */ - can_filter_id_mask_32bit_init(CAN1, + can_filter_id_mask_32bit_init( 0, /* Filter ID */ 0, /* CAN ID */ 0, /* CAN ID mask */ diff --git a/examples/stm32/f1/obldc-strip/can/can.c b/examples/stm32/f1/obldc-strip/can/can.c index 5e7ae2a..19e3e4c 100644 --- a/examples/stm32/f1/obldc-strip/can/can.c +++ b/examples/stm32/f1/obldc-strip/can/can.c @@ -139,7 +139,7 @@ static void can_setup(void) } /* CAN filter 0 init. */ - can_filter_id_mask_32bit_init(CAN1, + can_filter_id_mask_32bit_init( 0, /* Filter ID */ 0, /* CAN ID */ 0, /* CAN ID mask */ diff --git a/examples/stm32/f1/obldc/can/can.c b/examples/stm32/f1/obldc/can/can.c index 5d987ba..83c573e 100644 --- a/examples/stm32/f1/obldc/can/can.c +++ b/examples/stm32/f1/obldc/can/can.c @@ -138,7 +138,7 @@ static void can_setup(void) } /* CAN filter 0 init. */ - can_filter_id_mask_32bit_init(CAN1, + can_filter_id_mask_32bit_init( 0, /* Filter ID */ 0, /* CAN ID */ 0, /* CAN ID mask */ diff --git a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c index 1a5dc56..b26de16 100644 --- a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c +++ b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c @@ -175,7 +175,7 @@ static const char *usb_strings[] = { /* Buffer to be used for control requests. */ uint8_t usbd_control_buffer[128]; -static int cdcacm_control_request(usbd_device *usbd_dev, +static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, diff --git a/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c b/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c index 32307d3..e8b60ff 100644 --- a/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c +++ b/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c @@ -45,6 +45,8 @@ #define LD8 GPIOE, GPIO14 #define LD6 GPIOE, GPIO15 +int _write(int file, char *ptr, int len); + static void i2c_setup(void) { rcc_periph_clock_enable(RCC_I2C1); @@ -58,7 +60,7 @@ static void i2c_setup(void) i2c_peripheral_disable(I2C1); //configure ANFOFF DNF[3:0] in CR1 i2c_enable_analog_filter(I2C1); - i2c_set_digital_filter(I2C1, I2C_CR1_DNF_DISABLED); + i2c_set_digital_filter(I2C1, 0); /* HSI is at 8Mhz */ i2c_set_speed(I2C1, i2c_speed_sm_100k, 8); //configure No-Stretch CR1 (only relevant in slave mode) diff --git a/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c index c6419b7..6df6803 100644 --- a/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c +++ b/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c @@ -166,7 +166,7 @@ static const char *usb_strings[] = { /* Buffer to be used for control requests. */ uint8_t usbd_control_buffer[128]; -static int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, +static enum usbd_request_return_codes cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req)) { (void)complete; diff --git a/libopencm3 b/libopencm3 index e3c78b8..8feb711 160000 --- a/libopencm3 +++ b/libopencm3 @@ -1 +1 @@ -Subproject commit e3c78b88251c68b6b87240e6ed86f825a16a18ac +Subproject commit 8feb711ca0975808b8604903e44eefe48926ca46