git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
pxa2xx_udc.h
diff --git
a/drivers/usb/gadget/pxa2xx_udc.h
b/drivers/usb/gadget/pxa2xx_udc.h
index
1f3a7d9
..
19a883f
100644
(file)
--- a/
drivers/usb/gadget/pxa2xx_udc.h
+++ b/
drivers/usb/gadget/pxa2xx_udc.h
@@
-73,7
+73,7
@@
struct pxa2xx_ep {
volatile u32 *reg_ubcr;
volatile u32 *reg_uddr;
#ifdef USE_DMA
volatile u32 *reg_ubcr;
volatile u32 *reg_uddr;
#ifdef USE_DMA
- volatile u32
*reg_drcmr;
+ volatile u32 *reg_drcmr;
#define drcmr(n) .reg_drcmr = & DRCMR ## n ,
#else
#define drcmr(n)
#define drcmr(n) .reg_drcmr = & DRCMR ## n ,
#else
#define drcmr(n)
@@
-177,23
+177,23
@@
struct pxa2xx_udc {
static struct pxa2xx_udc *the_controller;
static struct pxa2xx_udc *the_controller;
-/* one GPIO should be used to detect
host disconnec
t */
-static inline int is_
usb_connected
(void)
+/* one GPIO should be used to detect
VBUS from the hos
t */
+static inline int is_
vbus_present
(void)
{
if (!the_controller->mach->udc_is_connected)
return 1;
return the_controller->mach->udc_is_connected();
}
{
if (!the_controller->mach->udc_is_connected)
return 1;
return the_controller->mach->udc_is_connected();
}
-/* one GPIO should
force the host to see
this device (or not) */
-static inline void
make_usb_disappear
(void)
+/* one GPIO should
control a D+ pullup, so host sees
this device (or not) */
+static inline void
pullup_off
(void)
{
if (!the_controller->mach->udc_command)
return;
the_controller->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
}
{
if (!the_controller->mach->udc_command)
return;
the_controller->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
}
-static inline void
let_usb_appear
(void)
+static inline void
pullup_on
(void)
{
if (!the_controller->mach->udc_command)
return;
{
if (!the_controller->mach->udc_command)
return;