diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-21 15:57:40 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-21 15:57:40 +0000 |
commit | 3995bad80fedbebd70dc3864d99e93823a744b2e (patch) | |
tree | 3ce1709919fc0183fbc5caa9ae4969fdcdcaee18 /nuttx/arch/arm | |
parent | 3372fb6c418281542c00acc69d3a28fbcb135cd1 (diff) | |
download | px4-nuttx-3995bad80fedbebd70dc3864d99e93823a744b2e.tar.gz px4-nuttx-3995bad80fedbebd70dc3864d99e93823a744b2e.tar.bz2 px4-nuttx-3995bad80fedbebd70dc3864d99e93823a744b2e.zip |
misc resource utilization fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3212 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
-rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h | 3 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c | 41 |
2 files changed, 34 insertions, 10 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h index 477a57a2b..d2fc11248 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ohciram.h @@ -171,9 +171,8 @@ *
* Configuration:
* CONFIG_USBHOST_OHCIRAM_SIZE 1280
- * CONFIG_USBHOST_NTDS 2
* CONFIG_USBHOST_NEDS 2
- * CONFIG_USBHOST_TDBUFFERS 1
+ * CONFIG_USBHOST_TDBUFFERS 2
* CONFIG_USBHOST_TDBUFSIZE 128
* CONFIG_USBHOST_IOBUFSIZE 512
*
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c index d1d64ea12..810952342 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c @@ -552,8 +552,16 @@ static uint8_t *lpc17_tdalloc(struct lpc17_usbhost_s *priv) static void lpc17_tdfree(struct lpc17_usbhost_s *priv, uint8_t *buffer) { struct lpc17_buflist_s *tdfree = (struct lpc17_buflist_s *)buffer; - tdfree->flink = g_tdfree; - g_tdfree = tdfree; + + /* This may get called with a NULL buffer pointer on certain error handling + * paths. + */ + + if (tdfree) + { + tdfree->flink = g_tdfree; + g_tdfree = tdfree; + } } /******************************************************************************* @@ -581,7 +589,7 @@ static uint8_t *lpc17_ioalloc(struct lpc17_usbhost_s *priv) #endif /******************************************************************************* - * Name: lpc17_tdfree + * Name: lpc17_iofree * * Description: * Return an TD buffer to the free list @@ -1045,7 +1053,7 @@ static int lpc17_enumerate(FAR struct usbhost_driver_s *drvr) if (!buffer) { ret = -ENOMEM; - goto errout_nobuffer; + goto errout; } /* USB 2.0 spec says at least 50ms delay before port reset */ @@ -1088,6 +1096,14 @@ static int lpc17_enumerate(FAR struct usbhost_driver_s *drvr) EDCTRL->ctrl = (uint32_t)(((struct usb_devdesc_s *)buffer)->mxpacketsize) << ED_CONTROL_MPS_SHIFT; + /* NOTE: Additional logic is needed here. The device descriptor contains + * the class, subclass, protocol, and VID/PID. However, here we have assumed + * for the time being that class == USB_CLASS_PER_INTERFACE. This is not + * generally a good assumption and will need to get fixed someday. + */ + + DEBUGASSERT(((struct usb_devdesc_s *)buffer)->class == USB_CLASS_PER_INTERFACE); + /* Set the device address to 1 */ ctrlreq->type = USB_REQ_DIR_OUT|USB_REQ_RECIPIENT_DEVICE; @@ -1157,6 +1173,14 @@ static int lpc17_enumerate(FAR struct usbhost_driver_s *drvr) goto errout; } + /* Free the TD that we were using for the request buffer. It is not needed + * further here but it may be needed by the class driver during its connection + * operations. NOTE: lpc17_tdfree() can be called with a NULL pointer later. + */ + + lpc17_tdfree(priv, (uint8_t*)ctrlreq); + ctrlreq = NULL; + /* Some devices may require this delay before initialization */ up_mdelay(100); @@ -1174,7 +1198,6 @@ static int lpc17_enumerate(FAR struct usbhost_driver_s *drvr) errout: lpc17_tdfree(priv, buffer); -errout_nobuffer: lpc17_tdfree(priv, (uint8_t*)ctrlreq); return ret; } @@ -1268,13 +1291,15 @@ static int lpc17_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * Input Parameters: * drvr - The USB host driver instance obtained as a parameter from the call to * the class create() method. - * req - Describes the request to be sent. This data will be copied from the - * user provided memory. Therefore, the req buffer may be declared on the - * stack. + * req - Describes the request to be sent. This request must lie in memory + * created by DRVR_ALLOC. * buffer - A buffer used for sending the request and for returning any * responses. This buffer must be large enough to hold the length value * in the request description. buffer must have been allocated using DRVR_ALLOC * + * NOTE: On an IN transaction, req and buffer may refer to the same allocated + * memory. + * * Returned Values: * On success, zero (OK) is returned. On a failure, a negated errno value is * returned indicating the nature of the failure |