aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/usb/usb.c
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-06-15 17:28:05 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-18 13:30:17 -0400
commit4c73571eac60dd16103157d484ce4d0f53f91ae5 (patch)
tree50f8e1b96a9de18e559ae560f3a00849d44b5b52 /libmaple/usb/usb.c
parentd85462d0517baac39f3c316924162cca3d9c785a (diff)
downloadlibrambutan-4c73571eac60dd16103157d484ce4d0f53f91ae5.tar.gz
librambutan-4c73571eac60dd16103157d484ce4d0f53f91ae5.zip
Remove usb_hardware.c and usb_hardware.h.
These files contain a lot of duplicated and unused code. Move the relevant pieces that need to survive into usb.c and usb_callbacks.c. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/usb/usb.c')
-rw-r--r--libmaple/usb/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmaple/usb/usb.c b/libmaple/usb/usb.c
index 173673e..1754360 100644
--- a/libmaple/usb/usb.c
+++ b/libmaple/usb/usb.c
@@ -34,9 +34,9 @@
#include "libmaple.h"
#include "usb_lib.h"
#include "gpio.h"
-#include "usb_hardware.h"
#include "delay.h"
#include "nvic.h"
+#include "rcc.h"
#include "usb_config.h"
#include "usb_callbacks.h"
@@ -104,7 +104,7 @@ void usb_cdcacm_enable(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;
+ RCC_BASE->APB1ENR |= 0x00800000;
/* initialize the usb application */
gpio_write_bit(disc_dev, disc_bit, 0); // presents us to the host