OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
patacongo 2010-08-18 23:27:36 +00:00
parent 8541920c2e
commit 9df7fba149
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1209,3 +1209,5 @@
* 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.

4
Documentation/NuttX.html
View File

@ -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 &lt;spudmonkey@racsa.co.cr&gt;
* 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 &lt;spudmonkey@racsa.co.cr&gt;

6
drivers/usbdev/usbdev_serial.c
View File

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