update to current library

Minor api changes required.
This commit is contained in:
Karl Palsson
2018-03-03 21:42:52 +00:00
parent bcf608fa54
commit 85be1e5e7b
13 changed files with 17 additions and 15 deletions

View File

@@ -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 */

View File

@@ -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;

View File

@@ -24,7 +24,7 @@
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/spi.h>
#include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/dwc/otg_fs.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h>
#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;

View File

@@ -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 */

View File

@@ -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 */

View File

@@ -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 */

View File

@@ -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,