diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-14 18:38:46 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-14 18:38:46 +0000 |
commit | e9a92fa715e5c58295066b6a9e8d8033cabaadd8 (patch) | |
tree | 4903017feb37114c999cd228ed2a6da500b4f2c5 /nuttx/drivers | |
parent | dba61e642d8471a75bb3b23dd74d127cb7a51ad0 (diff) | |
download | px4-nuttx-e9a92fa715e5c58295066b6a9e8d8033cabaadd8.tar.gz px4-nuttx-e9a92fa715e5c58295066b6a9e8d8033cabaadd8.tar.bz2 px4-nuttx-e9a92fa715e5c58295066b6a9e8d8033cabaadd8.zip |
Extend the ED and get the transfer type into the ED
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3251 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_hidkbd.c | 4 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_skeleton.c | 4 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_storage.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c index c8e5b32ac..782069c9f 100644 --- a/nuttx/drivers/usbhost/usbhost_hidkbd.c +++ b/nuttx/drivers/usbhost/usbhost_hidkbd.c @@ -653,6 +653,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, epoutdesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; epoutdesc.in = false; epoutdesc.funcaddr = funcaddr; + epoutdesc.xfrtype = USB_EP_ATTR_XFER_INT; epoutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Interrupt OUT EP addr:%d mxpacketsize:%d\n", epoutdesc.addr, epoutdesc.mxpacketsize); @@ -675,9 +676,10 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Save the interrupt IN endpoint information */ - epindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; + epindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; epindesc.in = 1; epindesc.funcaddr = funcaddr; + epindesc.xfrtype = USB_EP_ATTR_XFER_INT; epindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n", epindesc.addr, epindesc.mxpacketsize); diff --git a/nuttx/drivers/usbhost/usbhost_skeleton.c b/nuttx/drivers/usbhost/usbhost_skeleton.c index 28cf4b996..d04954f02 100644 --- a/nuttx/drivers/usbhost/usbhost_skeleton.c +++ b/nuttx/drivers/usbhost/usbhost_skeleton.c @@ -502,6 +502,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, boutdesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; boutdesc.in = false; boutdesc.funcaddr = funcaddr; + boutdesc.xfrtype = USB_EP_ATTR_XFER_BULK; boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); @@ -524,9 +525,10 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Save the bulk IN endpoint information */ - bindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; + bindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; bindesc.in = 1; bindesc.funcaddr = funcaddr; + bindesc.xfrtype = USB_EP_ATTR_XFER_BULK; bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n", bindesc.addr, bindesc.mxpacketsize); diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 2cfc61500..286a26885 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/drivers/usbhost/usbhost_storage.c @@ -1038,6 +1038,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, boutdesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; boutdesc.in = false; boutdesc.funcaddr = funcaddr; + boutdesc.xfrtype = USB_EP_ATTR_XFER_BULK; boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n", boutdesc.addr, boutdesc.mxpacketsize); @@ -1060,9 +1061,10 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv, /* Save the bulk IN endpoint information */ - bindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; + bindesc.addr = epdesc->addr & USB_EP_ADDR_NUMBER_MASK; bindesc.in = 1; bindesc.funcaddr = funcaddr; + bindesc.xfrtype = USB_EP_ATTR_XFER_BULK; bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize); uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n", bindesc.addr, bindesc.mxpacketsize); |