projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
lpc
/
ao_usb_lpc.c
diff --git
a/src/lpc/ao_usb_lpc.c
b/src/lpc/ao_usb_lpc.c
index 5cd7aa59fca66a9f3effcf4cd84d5158b35013b2..594114b62ed856a8b4babc8f9ccf47f3597d9624 100644
(file)
--- a/
src/lpc/ao_usb_lpc.c
+++ b/
src/lpc/ao_usb_lpc.c
@@
-857,7
+857,7
@@
ao_usb_disable(void)
ao_arch_block_interrupts();
#if HAS_USB_PULLUP
ao_arch_block_interrupts();
#if HAS_USB_PULLUP
- ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN,
AO_USB_PULLUP,
0);
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 0);
#endif
/* Disable interrupts */
lpc_usb.inten = 0;
#endif
/* Disable interrupts */
lpc_usb.inten = 0;
@@
-975,7
+975,7
@@
ao_usb_enable(void)
ao_usb_set_ep0();
#if HAS_USB_PULLUP
ao_usb_set_ep0();
#if HAS_USB_PULLUP
- ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN,
AO_USB_PULLUP,
1);
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 1);
#endif
}
#endif
}
@@
-1014,7
+1014,7
@@
ao_usb_init(void)
{
#if HAS_USB_PULLUP
int i;
{
#if HAS_USB_PULLUP
int i;
- ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN,
AO_USB_PULLUP,
0);
+ ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 0);
for (i = 0; i < 40000; i++)
ao_arch_nop();
for (i = 0; i < 40000; i++)
ao_arch_nop();