Cosmetic changes after PR 94
This commit is contained in:
Sebastien Lorquet
parent
749b54fbda
commit
5e12d6203e
@ -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 */
|
||||
|
||||
@ -579,7 +579,8 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
|
||||
/* 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);
|
||||
|
||||
@ -598,11 +599,14 @@ 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);
|
||||
static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int 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);
|
||||
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);
|
||||
|
||||
@ -626,7 +630,7 @@ static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv);
|
||||
|
||||
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,
|
||||
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,
|
||||
@ -636,8 +640,10 @@ 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 */
|
||||
@ -672,7 +678,8 @@ static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
|
||||
static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
|
||||
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 */
|
||||
@ -690,19 +697,21 @@ static void stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep,
|
||||
/* 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,17 +725,18 @@ 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);
|
||||
|
||||
/* 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,
|
||||
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);
|
||||
@ -1559,7 +1569,7 @@ 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)
|
||||
{
|
||||
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;
|
||||
|
||||
@ -1748,7 +1760,7 @@ 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)
|
||||
{
|
||||
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,7 +1979,7 @@ 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,
|
||||
static FAR struct stm32l4_ep_s *stm32l4_ep_findbyaddr(FAR struct stm32l4_usbdev_s *priv,
|
||||
uint16_t eplog)
|
||||
{
|
||||
struct stm32l4_ep_s *privep;
|
||||
@ -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;
|
||||
@ -2182,7 +2195,7 @@ static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
|
||||
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;
|
||||
@ -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;
|
||||
@ -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
|
||||
|
||||
@ -305,12 +305,12 @@ static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
|
||||
|
||||
/* Semaphores ******************************************************************/
|
||||
|
||||
static void stm32l4_takesem(sem_t *sem);
|
||||
static void stm32l4_takesem(FAR sem_t *sem);
|
||||
#define stm32l4_givesem(s) sem_post(s);
|
||||
|
||||
/* Byte stream access helper functions *****************************************/
|
||||
|
||||
static inline uint16_t stm32l4_getle16(const uint8_t *val);
|
||||
static inline uint16_t stm32l4_getle16(FAR const uint8_t *val);
|
||||
|
||||
/* Channel management **********************************************************/
|
||||
|
||||
@ -437,7 +437,7 @@ static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
|
||||
FAR uint8_t **buffer, size_t buflen);
|
||||
static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
|
||||
static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
|
||||
const struct usb_ctrlreq_s *req,
|
||||
FAR const struct usb_ctrlreq_s *req,
|
||||
FAR uint8_t *buffer);
|
||||
static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
|
||||
FAR const struct usb_ctrlreq_s *req,
|
||||
@ -626,7 +626,8 @@ static void stm32l4_putreg(uint32_t addr, uint32_t val)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
|
||||
static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
|
||||
uint32_t setbits)
|
||||
{
|
||||
stm32l4_putreg(addr, (((stm32l4_getreg(addr)) & ~clrbits) | setbits));
|
||||
}
|
||||
@ -640,7 +641,7 @@ static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t s
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static void stm32l4_takesem(sem_t *sem)
|
||||
static void stm32l4_takesem(FAR sem_t *sem)
|
||||
{
|
||||
/* Take the semaphore (perhaps waiting) */
|
||||
|
||||
@ -662,7 +663,7 @@ static void stm32l4_takesem(sem_t *sem)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static inline uint16_t stm32l4_getle16(const uint8_t *val)
|
||||
static inline uint16_t stm32l4_getle16(FAR const uint8_t *val)
|
||||
{
|
||||
return (uint16_t)val[1] << 8 | (uint16_t)val[0];
|
||||
}
|
||||
@ -1385,7 +1386,8 @@ static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv, int chidx)
|
||||
static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv,
|
||||
int chidx)
|
||||
{
|
||||
FAR struct stm32l4_chan_s *chan;
|
||||
uint32_t regval;
|
||||
@ -1823,8 +1825,9 @@ static int stm32l4_in_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
|
||||
FAR uint8_t *buffer, size_t buflen)
|
||||
static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv,
|
||||
int chidx, FAR uint8_t *buffer,
|
||||
size_t buflen)
|
||||
{
|
||||
FAR struct stm32l4_chan_s *chan;
|
||||
systime_t start;
|
||||
@ -2082,8 +2085,9 @@ static int stm32l4_out_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
|
||||
FAR uint8_t *buffer, size_t buflen)
|
||||
static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv,
|
||||
int chidx, FAR uint8_t *buffer,
|
||||
size_t buflen)
|
||||
{
|
||||
FAR struct stm32l4_chan_s *chan;
|
||||
systime_t start;
|
||||
@ -3946,9 +3950,9 @@ static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
|
||||
uint8_t funcaddr, uint8_t speed,
|
||||
uint16_t maxpacketsize)
|
||||
static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr,
|
||||
usbhost_ep_t ep0, uint8_t funcaddr,
|
||||
uint8_t speed, uint16_t maxpacketsize)
|
||||
{
|
||||
FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
|
||||
FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
|
||||
@ -4129,7 +4133,7 @@ static int stm32l4_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
|
||||
* - Never called from an interrupt handler.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#warning this function name is too generic
|
||||
static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
|
||||
FAR uint8_t **buffer, FAR size_t *maxlen)
|
||||
{
|
||||
@ -4174,7 +4178,7 @@ static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
|
||||
* - Never called from an interrupt handler.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#warning this function name is too generic
|
||||
static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
|
||||
{
|
||||
/* There is no special memory requirement */
|
||||
@ -4210,7 +4214,7 @@ static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#warning this function name is too generic
|
||||
static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
|
||||
FAR uint8_t **buffer, size_t buflen)
|
||||
{
|
||||
@ -4254,7 +4258,7 @@ static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
|
||||
* This function will *not* be called from an interrupt handler.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#warning this function name is too generic
|
||||
static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
|
||||
{
|
||||
/* There is no special memory requirement */
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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 */
|
||||
};
|
||||
@ -230,15 +230,15 @@ struct stm32l4_tim_priv_s
|
||||
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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 (*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_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);
|
||||
|
||||
@ -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);
|
||||
}
|
||||
@ -434,7 +439,8 @@ static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
|
||||
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);
|
||||
}
|
||||
|
||||
/************************************************************************************
|
||||
@ -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,7 +1158,7 @@ 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 (*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);
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user