diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-06-15 16:29:19 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-10-18 13:30:17 -0400 |
commit | 9e3c80a3ae38c111c138aa9e7c70f1abb5d1424f (patch) | |
tree | 9accce7b55bb9b680f4dee2010087eb3b566b248 /libmaple/usb/usb.c | |
parent | c023d179fa613f979d50a0d105f08b9b58c7ce6b (diff) | |
download | librambutan-9e3c80a3ae38c111c138aa9e7c70f1abb5d1424f.tar.gz librambutan-9e3c80a3ae38c111c138aa9e7c70f1abb5d1424f.zip |
usb: Move some board-specific configuration to Wirish.
Create new BOARD_USB_DISC_DEV and BOARD_USB_DISC_BIT board-specific
values. Use these as arguments to setupUSB() and disableUSB(). This
helps make the USB stack more generic, and goes towards the resolution
of an important FIXME.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/usb/usb.c')
-rw-r--r-- | libmaple/usb/usb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmaple/usb/usb.c b/libmaple/usb/usb.c index 651b36e..9b70b6b 100644 --- a/libmaple/usb/usb.c +++ b/libmaple/usb/usb.c @@ -99,22 +99,22 @@ struct { volatile uint8 bESOFcnt; } ResumeS; -void setupUSB (void) { - gpio_set_mode(USB_DISC_DEV, USB_DISC_PIN, GPIO_OUTPUT_PP); +void setupUSB (gpio_dev *disc_dev, uint8 disc_bit) { + gpio_set_mode(disc_dev, disc_bit, GPIO_OUTPUT_PP); /* setup the apb1 clock for USB */ pRCC->APB1ENR |= 0x00800000; /* initialize the usb application */ - gpio_write_bit(USB_DISC_DEV, USB_DISC_PIN, 0); // presents us to the host + gpio_write_bit(disc_dev, disc_bit, 0); // presents us to the host USB_Init(); // low level init routine provided by the ST library } -void disableUSB (void) { +void disableUSB (gpio_dev *disc_dev, uint8 disc_bit) { // These are just guesses about how to do this // TODO: real disable function usbDsbISR(); - gpio_write_bit(USB_DISC_DEV, USB_DISC_PIN, 1); + gpio_write_bit(disc_dev, disc_bit, 1); } void usbSuspend(void) { |