Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 17:33:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cosmetic changes after PR 94

Browse Source
This commit is contained in:
Sebastien Lorquet
2016-07-12 00:57:18 +02:00
parent 749b54fbda
commit 5e12d6203e
6 changed files with 279 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+103 -86
View File
@@ -468,7 +468,7 @@ struct stm32l4_ctrlreq_s
struct stm32l4_req_s
{
struct usbdev_req_s req; /* Standard USB request */
struct stm32l4_req_s *flink; /* Supports a singly linked list */
FAR struct stm32l4_req_s *flink; /* Supports a singly linked list */
};
/* This is the internal representation of an endpoint */
@@ -484,9 +484,9 @@ struct stm32l4_ep_s
/* STM32-specific fields */
struct stm32l4_usbdev_s *dev; /* Reference to private driver data */
struct stm32l4_req_s *head; /* Request list for this endpoint */
struct stm32l4_req_s *tail;
FAR struct stm32l4_usbdev_s *dev; /* Reference to private driver data */
FAR struct stm32l4_req_s *head; /* Request list for this endpoint */
FAR struct stm32l4_req_s *tail;
uint8_t epphy; /* Physical EP address */
uint8_t eptype:2; /* Endpoint type */
uint8_t active:1; /* 1: A request is being processed */
@@ -509,7 +509,7 @@ struct stm32l4_usbdev_s
/* The bound device class driver */
struct usbdevclass_driver_s *driver;
FAR struct usbdevclass_driver_s *driver;
/* STM32-specific fields */
@@ -573,13 +573,14 @@ static void stm32l4_putreg(uint32_t val, uint32_t addr);
static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *privep);
static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
FAR struct stm32l4_req_s *req);
FAR struct stm32l4_req_s *req);
/* Low level data transfers and request operations *****************************/
/* Special endpoint 0 data transfer logic */
static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
FAR uint8_t *data, uint32_t nbytes);
FAR uint8_t *data,
uint32_t nbytes);
static inline void stm32l4_ep0in_transmitzlp(FAR struct stm32l4_usbdev_s *priv);
static void stm32l4_ep0in_activate(void);
@@ -588,56 +589,61 @@ static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv);
/* IN request and TxFIFO handling */
static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *buf, int nbytes);
FAR uint8_t *buf, int nbytes);
static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *buf, int nbytes);
FAR uint8_t *buf, int nbytes);
static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep);
FAR struct stm32l4_ep_s *privep);
/* OUT request and RxFIFO handling */
static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *dest, uint16_t len);
static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len);
FAR uint8_t *dest, uint16_t len);
static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep,
int len);
static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep);
static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
FAR struct stm32l4_ep_s *privep);
static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
int bcnt);
static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
int bcnt);
static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep);
FAR struct stm32l4_ep_s *privep);
/* General request handling */
static void stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep);
static void stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
int16_t result);
int16_t result);
static void stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep,
int16_t status);
int16_t status);
/* Interrupt handling **********************************************************/
static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
uint16_t eplog);
uint16_t eplog);
static int stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
FAR const struct usb_ctrlreq_s *ctrl);
FAR const struct usb_ctrlreq_s *ctrl);
static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv);
/* Second level OUT endpoint interrupt processing */
static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
uint16_t index);
static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ctrlreq_s *ctrlreq);
uint16_t index);
static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ctrlreq_s *ctrlreq);
static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv);
static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv,
uint8_t epno);
uint8_t epno);
static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv);
/* Second level IN endpoint interrupt processing */
static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv);
static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno);
static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno);
static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv,
uint8_t epno);
static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv,
int epno);
static inline void stm32l4_epin_interrupt(FAR struct stm32l4_usbdev_s *priv);
/* Other second level interrupt processing */
@@ -668,11 +674,12 @@ static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep);
/* Endpoint configuration */
static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
uint8_t eptype, uint16_t maxpacket);
uint8_t eptype, uint16_t maxpacket);
static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
uint8_t eptype, uint16_t maxpacket);
uint8_t eptype, uint16_t maxpacket);
static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
FAR const struct usb_epdesc_s *desc, bool last);
FAR const struct usb_epdesc_s *desc,
bool last);
static void stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv);
/* Endpoint disable */
@@ -685,24 +692,26 @@ static int stm32l4_ep_disable(FAR struct usbdev_ep_s *ep);
static FAR struct usbdev_req_s *stm32l4_ep_allocreq(FAR struct usbdev_ep_s *ep);
static void stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *);
FAR struct usbdev_req_s *);
/* Endpoint buffer management */
#ifdef CONFIG_USBDEV_DMA
static void *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
static void *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep,
unsigned bytes);
static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep,
FAR void *buf);
#endif
/* Endpoint request submission */
static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
struct usbdev_req_s *req);
FAR struct usbdev_req_s *req);
/* Endpoint request cancellation */
static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
struct usbdev_req_s *req);
FAR struct usbdev_req_s *req);
/* Stall handling */
@@ -716,18 +725,19 @@ static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv);
/* Endpoint allocation */
static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
uint8_t epno, bool in, uint8_t eptype);
uint8_t epno, bool in,
uint8_t eptype);
static void stm32l4_ep_free(FAR struct usbdev_s *dev,
FAR struct usbdev_ep_s *ep);
FAR struct usbdev_ep_s *ep);
/* USB device controller operations ********************************************/
static int stm32l4_getframe(struct usbdev_s *dev);
static int stm32l4_wakeup(struct usbdev_s *dev);
static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered);
static int stm32l4_pullup(struct usbdev_s *dev, bool enable);
static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv,
uint16_t address);
static int stm32l4_getframe(FAR struct usbdev_s *dev);
static int stm32l4_wakeup(FAR struct usbdev_s *dev);
static int stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered);
static int stm32l4_pullup(FAR struct usbdev_s *dev, bool enable);
static void stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
uint16_t address);
static int stm32l4_txfifo_flush(uint32_t txfnum);
static int stm32l4_rxfifo_flush(void);
@@ -992,7 +1002,7 @@ static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *p
****************************************************************************/
static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
FAR struct stm32l4_req_s *req)
FAR struct stm32l4_req_s *req)
{
bool is_empty = !privep->head;
@@ -1019,7 +1029,7 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
****************************************************************************/
static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
FAR uint8_t *buf, uint32_t nbytes)
FAR uint8_t *buf, uint32_t nbytes)
{
stm32l4_epin_transfer(&priv->epin[EP0], buf, nbytes);
priv->ep0state = EP0STATE_SETUPRESPONSE;
@@ -1112,7 +1122,7 @@ static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv)
****************************************************************************/
static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *buf, int nbytes)
FAR uint8_t *buf, int nbytes)
{
uint32_t regaddr;
uint32_t regval;
@@ -1157,7 +1167,7 @@ static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
****************************************************************************/
static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *buf, int nbytes)
FAR uint8_t *buf, int nbytes)
{
uint32_t pktcnt;
uint32_t regval;
@@ -1257,7 +1267,7 @@ static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
****************************************************************************/
static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep)
FAR struct stm32l4_ep_s *privep)
{
struct stm32l4_req_s *privreq;
uint32_t regaddr;
@@ -1477,7 +1487,7 @@ static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
****************************************************************************/
static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
FAR uint8_t *dest, uint16_t len)
FAR uint8_t *dest, uint16_t len)
{
uint32_t regaddr;
int i;
@@ -1557,9 +1567,9 @@ static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len)
****************************************************************************/
static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep)
FAR struct stm32l4_ep_s *privep)
{
struct stm32l4_req_s *privreq;
FAR struct stm32l4_req_s *privreq;
/* Since a transfer just completed, there must be a read request at the head of
* the endpoint request queue.
@@ -1605,7 +1615,8 @@ static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
int bcnt)
{
FAR struct stm32l4_usbdev_s *priv;
@@ -1663,10 +1674,11 @@ static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int b
*
****************************************************************************/
static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
int bcnt)
{
struct stm32l4_req_s *privreq;
uint8_t *dest;
FAR struct stm32l4_req_s *privreq;
FAR uint8_t *dest;
int buflen;
int readlen;
@@ -1746,9 +1758,9 @@ static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bc
****************************************************************************/
static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ep_s *privep)
FAR struct stm32l4_ep_s *privep)
{
struct stm32l4_req_s *privreq;
FAR struct stm32l4_req_s *privreq;
uint32_t regaddr;
uint32_t regval;
uint32_t xfrsize;
@@ -1882,7 +1894,7 @@ static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
static void stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep)
{
if (privep->isin)
{
@@ -1902,7 +1914,8 @@ static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
*
****************************************************************************/
static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
static void stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
int16_t result)
{
FAR struct stm32l4_req_s *privreq;
@@ -1942,7 +1955,7 @@ static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
*
****************************************************************************/
static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
static void stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep, int16_t status)
{
if (!stm32l4_rqempty(privep))
{
@@ -1966,8 +1979,8 @@ static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
*
****************************************************************************/
static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
uint16_t eplog)
static FAR struct stm32l4_ep_s *stm32l4_ep_findbyaddr(FAR struct stm32l4_usbdev_s *priv,
uint16_t eplog)
{
struct stm32l4_ep_s *privep;
uint8_t epphy = USB_EPNO(eplog);
@@ -2003,8 +2016,8 @@ static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
const struct usb_ctrlreq_s *ctrl)
static int stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
FAR const struct usb_ctrlreq_s *ctrl)
{
int ret = -EIO;
@@ -2036,7 +2049,7 @@ static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv)
{
FAR struct stm32l4_ep_s *privep;
uint32_t regval;
@@ -2135,7 +2148,7 @@ static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
****************************************************************************/
static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
uint16_t index)
uint16_t index)
{
uint8_t testmode;
@@ -2182,8 +2195,8 @@ static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ctrlreq_s *ctrlreq)
static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
FAR struct stm32l4_ctrlreq_s *ctrlreq)
{
FAR struct stm32l4_ep_s *privep;
@@ -2552,7 +2565,7 @@ static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
*
****************************************************************************/
static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv)
static inline void stm32l4_ep0out_setup(FAR struct stm32l4_usbdev_s *priv)
{
struct stm32l4_ctrlreq_s ctrlreq;
@@ -3862,8 +3875,8 @@ static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep)
*
****************************************************************************/
static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
uint16_t maxpacket)
static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
uint8_t eptype, uint16_t maxpacket)
{
uint32_t mpsiz;
uint32_t regaddr;
@@ -3957,8 +3970,8 @@ static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t epty
*
****************************************************************************/
static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
uint16_t maxpacket)
static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
uint8_t eptype, uint16_t maxpacket)
{
uint32_t mpsiz;
uint32_t regaddr;
@@ -4058,8 +4071,8 @@ static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptyp
****************************************************************************/
static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
FAR const struct usb_epdesc_s *desc,
bool last)
FAR const struct usb_epdesc_s *desc,
bool last)
{
FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
uint16_t maxpacket;
@@ -4417,7 +4430,8 @@ static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
*
****************************************************************************/
static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req)
{
FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4511,7 +4525,8 @@ static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
*
****************************************************************************/
static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
FAR struct usbdev_req_s *req)
{
FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
irqstate_t flags;
@@ -4790,8 +4805,8 @@ static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv)
****************************************************************************/
static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
uint8_t eplog, bool in,
uint8_t eptype)
uint8_t eplog, bool in,
uint8_t eptype)
{
FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
uint8_t epavail;
@@ -4874,7 +4889,8 @@ static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
*
****************************************************************************/
static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
static void stm32l4_ep_free(FAR struct usbdev_s *dev,
FAR struct usbdev_ep_s *ep)
{
FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4900,7 +4916,7 @@ static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep
*
****************************************************************************/
static int stm32l4_getframe(struct usbdev_s *dev)
static int stm32l4_getframe(FAR struct usbdev_s *dev)
{
uint32_t regval;
@@ -4920,7 +4936,7 @@ static int stm32l4_getframe(struct usbdev_s *dev)
*
****************************************************************************/
static int stm32l4_wakeup(struct usbdev_s *dev)
static int stm32l4_wakeup(FAR struct usbdev_s *dev)
{
FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
uint32_t regval;
@@ -4968,7 +4984,7 @@ static int stm32l4_wakeup(struct usbdev_s *dev)
*
****************************************************************************/
static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
static int stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered)
{
FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
@@ -4994,7 +5010,7 @@ static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
*
****************************************************************************/
static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
static int stm32l4_pullup(FAR struct usbdev_s *dev, bool enable)
{
uint32_t regval;
@@ -5032,7 +5048,8 @@ static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
*
****************************************************************************/
static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv, uint16_t address)
static void stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
uint16_t address)
{
uint32_t regval;
@@ -5655,7 +5672,7 @@ void up_usbuninitialize(void)
*
****************************************************************************/
int usbdev_register(struct usbdevclass_driver_s *driver)
int usbdev_register(FAR struct usbdevclass_driver_s *driver)
{
/* At present, there is only a single OTG FS device support. Hence it is
* pre-allocated as g_otgfsdev. However, in most code, the private data
@@ -5726,7 +5743,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
*
****************************************************************************/
int usbdev_unregister(struct usbdevclass_driver_s *driver)
int usbdev_unregister(FAR struct usbdevclass_driver_s *driver)
{
/* At present, there is only a single OTG FS device support. Hence it is
* pre-allocated as g_otgfsdev. However, in most code, the private data
arch/arm/src/stm32l4/stm32l4_otgfshost.c
+116 -112
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/stm32l4/stm32l4_rtcc.c
+1 -1
View File
@@ -535,7 +535,7 @@ static void rtc_resume(void)
************************************************************************************/
#ifdef CONFIG_RTC_ALARM
static int stm32l4_rtc_alarm_handler(int irq, void *context)
static int stm32l4_rtc_alarm_handler(int irq, FAR void *context)
{
FAR struct alm_cbinfo_s *cbinfo;
alm_callback_t cb;
arch/arm/src/stm32l4/stm32l4_tickless.c
+1 -1
View File
@@ -152,7 +152,7 @@ static struct stm32l4_tickless_s g_tickless;
*
****************************************************************************/
static void stm32l4_oneshot_handler(void *arg)
static void stm32l4_oneshot_handler(FAR void *arg)
{
tmrinfo("Expired...\n");
sched_timer_expiration();
arch/arm/src/stm32l4/stm32l4_tim.c
+51 -41
View File
@@ -217,7 +217,7 @@
struct stm32l4_tim_priv_s
{
const struct stm32l4_tim_ops_s *ops;
FAR const struct stm32l4_tim_ops_s *ops;
stm32l4_tim_mode_t mode;
uint32_t base; /* TIMn base address */
};
@@ -229,16 +229,16 @@ struct stm32l4_tim_priv_s
/* Register helpers */
static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset);
static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
uint16_t value);
uint8_t offset);
static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint16_t value);
static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint16_t clearbits,
uint16_t setbits);
uint8_t offset, uint16_t clearbits,
uint16_t setbits);
static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset);
static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
uint32_t value);
uint8_t offset);
static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint32_t value);
/* Timer helpers */
@@ -254,21 +254,26 @@ static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode);
/* Timer methods */
static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev,
stm32l4_tim_mode_t mode);
static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev,
uint32_t freq);
static void stm32l4_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
uint32_t period);
uint32_t period);
static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev);
static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
stm32l4_tim_channel_t mode);
static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
uint32_t compare);
static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel, stm32l4_tim_channel_t mode);
static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel, uint32_t compare);
static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel);
static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
int (*handler)(int irq, void *context),
int source);
static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source);
static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source);
int (*handler)(int irq, FAR void *context),
int source);
static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev,
int source);
static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev,
int source);
static void stm32l4_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source);
static int stm32l4_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source);
@@ -403,7 +408,7 @@ struct stm32l4_tim_priv_s stm32l4_tim17_priv =
************************************************************************************/
static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset)
uint8_t offset)
{
return getreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset);
}
@@ -416,8 +421,8 @@ static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
*
************************************************************************************/
static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
uint16_t value)
static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint16_t value)
{
putreg16(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
}
@@ -431,10 +436,11 @@ static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t o
************************************************************************************/
static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint16_t clearbits,
uint16_t setbits)
uint8_t offset, uint16_t clearbits,
uint16_t setbits)
{
modifyreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset, clearbits, setbits);
modifyreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset, clearbits,
setbits);
}
/************************************************************************************
@@ -447,7 +453,7 @@ static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
************************************************************************************/
static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset)
uint8_t offset)
{
return getreg32(((struct stm32l4_tim_priv_s *)dev)->base + offset);
}
@@ -461,8 +467,8 @@ static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
*
************************************************************************************/
static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
uint32_t value)
static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev,
uint8_t offset, uint32_t value)
{
putreg32(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
}
@@ -541,7 +547,8 @@ static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode)
* Name: stm32l4_tim_setmode
************************************************************************************/
static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode)
static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev,
stm32l4_tim_mode_t mode)
{
uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
@@ -611,7 +618,8 @@ static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mo
* Name: stm32l4_tim_setclock
************************************************************************************/
static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev,
uint32_t freq)
{
uint32_t freqin;
int prescaler;
@@ -747,8 +755,8 @@ static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev)
* Name: stm32l4_tim_setchannel
************************************************************************************/
static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
stm32l4_tim_channel_t mode)
static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel, stm32l4_tim_channel_t mode)
{
uint16_t ccmr_orig = 0;
uint16_t ccmr_val = 0;
@@ -1096,8 +1104,8 @@ static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
* Name: stm32l4_tim_setcompare
************************************************************************************/
static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
uint32_t compare)
static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel, uint32_t compare)
{
DEBUGASSERT(dev != NULL);
@@ -1125,7 +1133,8 @@ static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
* Name: stm32l4_tim_getcapture
************************************************************************************/
static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel)
static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev,
uint8_t channel)
{
DEBUGASSERT(dev != NULL);
@@ -1149,8 +1158,8 @@ static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
************************************************************************************/
static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
int (*handler)(int irq, void *context),
int source)
int (*handler)(int irq, FAR void *context),
int source)
{
int vectorno;
@@ -1256,7 +1265,8 @@ static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source)
* Name: stm32l4_tim_disableint
************************************************************************************/
static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source)
static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev,
int source)
{
DEBUGASSERT(dev != NULL);
stm32l4_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
@@ -1386,7 +1396,7 @@ FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
*
************************************************************************************/
int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev)
int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s *dev)
{
DEBUGASSERT(dev != NULL);
arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
+7 -6
View File
@@ -144,9 +144,9 @@ static int stm32l4_timer_handler(FAR struct stm32l4_lowerhalf_s *lower);
static int stm32l4_start(FAR struct timer_lowerhalf_s *lower);
static int stm32l4_stop(FAR struct timer_lowerhalf_s *lower);
static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower,
uint32_t timeout);
uint32_t timeout);
static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
tccb_t handler);
tccb_t handler);
/****************************************************************************
* Private Data
@@ -437,9 +437,9 @@ static int stm32l4_start(FAR struct timer_lowerhalf_s *lower)
*
****************************************************************************/
static int stm32l4_stop(struct timer_lowerhalf_s *lower)
static int stm32l4_stop(FAR struct timer_lowerhalf_s *lower)
{
struct stm32l4_lowerhalf_s *priv = (struct stm32l4_lowerhalf_s *)lower;
FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
if (priv->started)
{
@@ -471,7 +471,8 @@ static int stm32l4_stop(struct timer_lowerhalf_s *lower)
*
****************************************************************************/
static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeout)
static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower,
uint32_t timeout)
{
FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
uint64_t maxtimeout;
@@ -517,7 +518,7 @@ static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t time
****************************************************************************/
static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
tccb_t newhandler)
tccb_t newhandler)
{
FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;