diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-27 02:08:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-27 02:08:26 +0000 |
| commit | cfefd4b07238e523428e1547435628494e234183 (patch) | |
| tree | fc705392458fcc4490c394383617d478336e9f2e | |
| parent | efc8d580b339a7c741e8f134c9fbb8a834ee3179 (diff) | |
| download | px4-nuttx-cfefd4b07238e523428e1547435628494e234183.tar.gz px4-nuttx-cfefd4b07238e523428e1547435628494e234183.tar.bz2 px4-nuttx-cfefd4b07238e523428e1547435628494e234183.zip | |
More USB macros; fix warnings
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2178 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/drivers/usbdev/usbdev_serial.c | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/usb.h | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_serial.c b/nuttx/drivers/usbdev/usbdev_serial.c index 569b0e118..4faee3f5d 100644 --- a/nuttx/drivers/usbdev/usbdev_serial.c +++ b/nuttx/drivers/usbdev/usbdev_serial.c @@ -300,10 +300,10 @@ struct usbser_alloc_s /* Transfer helpers *********************************************************/ static uint16 usbclass_fillrequest(FAR struct usbser_dev_s *priv, - char *reqbuf, uint16 reqlen); + ubyte *reqbuf, uint16 reqlen); static int usbclass_sndpacket(FAR struct usbser_dev_s *priv); static inline int usbclass_recvpacket(FAR struct usbser_dev_s *priv, - char *reqbuf, uint16 reqlen); + ubyte *reqbuf, uint16 reqlen); /* Request helpers *********************************************************/ @@ -502,7 +502,7 @@ static const struct usb_qualdesc_s g_qualdesc = * ************************************************************************************/ -static uint16 usbclass_fillrequest(FAR struct usbser_dev_s *priv, char *reqbuf, uint16 reqlen) +static uint16 usbclass_fillrequest(FAR struct usbser_dev_s *priv, ubyte *reqbuf, uint16 reqlen) { FAR uart_dev_t *serdev = &priv->serdev; FAR struct uart_buffer_s *xmit = &serdev->xmit; @@ -646,7 +646,7 @@ static int usbclass_sndpacket(FAR struct usbser_dev_s *priv) ************************************************************************************/ static inline int usbclass_recvpacket(FAR struct usbser_dev_s *priv, - char *reqbuf, uint16 reqlen) + ubyte *reqbuf, uint16 reqlen) { FAR uart_dev_t *serdev = &priv->serdev; FAR struct uart_buffer_s *recv = &serdev->recv; diff --git a/nuttx/include/nuttx/usb.h b/nuttx/include/nuttx/usb.h index 4b5835d93..7a2724fa2 100644 --- a/nuttx/include/nuttx/usb.h +++ b/nuttx/include/nuttx/usb.h @@ -58,12 +58,16 @@ /* USB directions (in endpoint addresses) */ +#define USB_DIR_MASK (0x80) +#define USB_EPNO_MASK (0x7f) #define USB_DIR_OUT (0x00) /* host-to-device */ #define USB_DIR_IN (0x80) /* device-to-host */ -#define USB_EPNO(addr) ((addr)&0x7f) -#define USB_EPOUT(addr) ((addr)|USB_DIR_OUT) -#define USB_EPIN(addr) ((addr)|USB_DIR_IN) +#define USB_EPNO(addr) ((addr) & USB_EPNO_MASK) +#define USB_EPOUT(addr) ((addr) | USB_DIR_OUT) +#define USB_EPIN(addr) ((addr) | USB_DIR_IN) +#define USB_ISEPIN(addr) (((addr) & USB_DIR_MASK) == USB_DIR_IN) +#define USB_ISEPOUT(addr) (((addr) & USB_DIR_MASK) == USB_DIR_OUT) /* Control Setup Packet. Byte 0=Request */ |