Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove some unnecessary tests

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3235 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-01-09 02:42:02 +00:00
parent d04467620b
commit 08508f1a27
2 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lpc17xx/lpc17_usbhost.c
+1 -1
View File
@@ -802,7 +802,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
else if (priv->connected) else if (priv->connected)
{ {
/* Yes.. disable interrupts and disconnect the device */ /* Yes.. disconnect the device */
ullvdbg("Disconnected\n"); ullvdbg("Disconnected\n");
priv->connected = false; priv->connected = false;
drivers/usbhost/usbhost_storage.c
+10 -50
View File
@@ -660,25 +660,17 @@ static inline int usbhost_maxlunreq(FAR struct usbhost_state_s *priv)
FAR struct usb_ctrlreq_s *req = (FAR struct usb_ctrlreq_s *)priv->tdbuffer; FAR struct usb_ctrlreq_s *req = (FAR struct usb_ctrlreq_s *)priv->tdbuffer;
DEBUGASSERT(priv && priv->tdbuffer); DEBUGASSERT(priv && priv->tdbuffer);
/* Make sure that the device is still connected. */ /* Request maximum logical unit number. NOTE: On an IN transaction, The
* req and buffer pointers passed to DRVR_CTRLIN may refer to the same
* allocated memory.
*/
if (!priv->disconnected) uvdbg("Request maximum logical unit number\n");
{ memset(req, 0, sizeof(struct usb_ctrlreq_s));
/* Request maximum logical unit number. NOTE: On an IN transaction, The req->type = USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE;
* req and buffer pointers passed to DRVR_CTRLIN may refer to the same req->req = USBSTRG_REQ_GETMAXLUN;
* allocated memory. usbhost_putle16(req->len, 1);
*/ return DRVR_CTRLIN(priv->drvr, req, priv->tdbuffer);
uvdbg("Request maximum logical unit number\n");
memset(req, 0, sizeof(struct usb_ctrlreq_s));
req->type = USB_DIR_IN|USB_REQ_TYPE_CLASS|USB_REQ_RECIPIENT_INTERFACE;
req->req = USBSTRG_REQ_GETMAXLUN;
usbhost_putle16(req->len, 1);
return DRVR_CTRLIN(priv->drvr, req, priv->tdbuffer);
}
udbg("ERROR: No longer connected\n");
return -ENODEV;
} }
static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv) static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv)
@@ -686,14 +678,6 @@ static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv)
FAR struct usbstrg_cbw_s *cbw; FAR struct usbstrg_cbw_s *cbw;
int result; int result;
/* Make sure that the device is still connected */
if (priv->disconnected)
{
udbg("ERROR: No longer connected\n");
return -ENODEV;
}
/* Initialize a CBW (re-using the allocated transfer buffer) */ /* Initialize a CBW (re-using the allocated transfer buffer) */
cbw = usbhost_cbwalloc(priv); cbw = usbhost_cbwalloc(priv);
@@ -727,14 +711,6 @@ static inline int usbhost_requestsense(FAR struct usbhost_state_s *priv)
FAR struct usbstrg_cbw_s *cbw; FAR struct usbstrg_cbw_s *cbw;
int result; int result;
/* Make sure that the device is still connected */
if (priv->disconnected)
{
udbg("ERROR: No longer connected\n");
return -ENODEV;
}
/* Initialize a CBW (re-using the allocated transfer buffer) */ /* Initialize a CBW (re-using the allocated transfer buffer) */
cbw = usbhost_cbwalloc(priv); cbw = usbhost_cbwalloc(priv);
@@ -777,14 +753,6 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv)
FAR struct scsiresp_readcapacity10_s *resp; FAR struct scsiresp_readcapacity10_s *resp;
int result; int result;
/* Make sure that the device is still connected */
if (priv->disconnected)
{
udbg("ERROR: No longer connected\n");
return -ENODEV;
}
/* Initialize a CBW (re-using the allocated transfer buffer) */ /* Initialize a CBW (re-using the allocated transfer buffer) */
cbw = usbhost_cbwalloc(priv); cbw = usbhost_cbwalloc(priv);
@@ -833,14 +801,6 @@ static inline int usbhost_inquiry(FAR struct usbhost_state_s *priv)
FAR struct scsiresp_inquiry_s *resp; FAR struct scsiresp_inquiry_s *resp;
int result; int result;
/* Make sure that the device is still connected */
if (priv->disconnected)
{
udbg("ERROR: No longer connected\n");
return -ENODEV;
}
/* Initialize a CBW (re-using the allocated transfer buffer) */ /* Initialize a CBW (re-using the allocated transfer buffer) */
cbw = usbhost_cbwalloc(priv); cbw = usbhost_cbwalloc(priv);