diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-18 23:27:36 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-08-18 23:27:36 +0000 |
| commit | 34c17facf49b0cb3fba681dd25a3a2e2b406a7ee (patch) | |
| tree | 6ec9fba02bcf6e9e430c685e67526f29d3af1779 /nuttx | |
| parent | 41fa63425f1613574c883b4bafd95147c008539f (diff) | |
| download | px4-nuttx-34c17facf49b0cb3fba681dd25a3a2e2b406a7ee.tar.gz px4-nuttx-34c17facf49b0cb3fba681dd25a3a2e2b406a7ee.tar.bz2 px4-nuttx-34c17facf49b0cb3fba681dd25a3a2e2b406a7ee.zip | |
Fix compile error in usbdev_serial.c
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2867 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 4 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/usbdev_serial.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c2ddcaeb4..19191e2a4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1208,4 +1208,6 @@ of GPIO port number that limited support for GPIO ports to 8 * sched/pg_*.c and *.c and include/nuttx/page.h - Implemented the common, core logic for on-demand paging. See - http://www.nuttx.org/NuttXDemandPaging.html for details.
\ No newline at end of file + http://www.nuttx.org/NuttXDemandPaging.html for details. + * drivers/usbdev/usbdev_serial.c - Correct compilation errors that + occur if CONFIG_USBDEV_DUALSPEED is selected. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 203651a67..7f3f8a3fa 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: August 14, 2010</p> + <p>Last Updated: August 18, 2010</p> </td> </tr> </table> @@ -1890,6 +1890,8 @@ nuttx-5.9 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * sched/pg_*.c and *.c and include/nuttx/page.h - Implemented the common, core logic for on-demand paging. See http://www.nuttx.org/NuttXDemandPaging.html for details. + * drivers/usbdev/usbdev_serial.c - Correct compilation errors that + occur if CONFIG_USBDEV_DUALSPEED is selected. pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/drivers/usbdev/usbdev_serial.c b/nuttx/drivers/usbdev/usbdev_serial.c index 78afd3279..4e7b38908 100644 --- a/nuttx/drivers/usbdev/usbdev_serial.c +++ b/nuttx/drivers/usbdev/usbdev_serial.c @@ -318,7 +318,7 @@ static void usbclass_freereq(FAR struct usbdev_ep_s *ep, static int usbclass_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc); #ifdef CONFIG_USBDEV_DUALSPEED -static void usbclass_mkepbulkdesc(const struct usb_epdesc *indesc, +static void usbclass_mkepbulkdesc(const struct usb_epdesc_s *indesc, uint16_t mxpacket, struct usb_epdesc_s *outdesc); static int16_t usbclass_mkcfgdesc(uint8_t *buf, uint8_t speed, uint8_t type); #else @@ -864,7 +864,7 @@ static int usbclass_mkstrdesc(uint8_t id, struct usb_strdesc_s *strdesc) ****************************************************************************/ #ifdef CONFIG_USBDEV_DUALSPEED -static inline void usbclass_mkepbulkdesc(const FAR struct usb_epdesc *indesc, +static inline void usbclass_mkepbulkdesc(const FAR struct usb_epdesc_s *indesc, uint16_t mxpacket, FAR struct usb_epdesc_s *outdesc) { @@ -1054,7 +1054,7 @@ static int usbclass_setconfig(FAR struct usbser_dev_s *priv, uint8_t config) /* Configure the IN bulk endpoint */ #ifdef CONFIG_USBDEV_DUALSPEED - if ((priv->usbdev->speed == USB_SPEED_HIGH) + if (priv->usbdev->speed == USB_SPEED_HIGH) { bulkmxpacket = 512; } |