aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-06-15 16:43:48 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-18 13:30:17 -0400
commitc6c959682084c8493a0c39754374e7dbe6cf1708 (patch)
treefa07c52c4527a2d1f11dbd1630aae1da25d54655 /wirish
parent9e3c80a3ae38c111c138aa9e7c70f1abb5d1424f (diff)
downloadlibrambutan-c6c959682084c8493a0c39754374e7dbe6cf1708.tar.gz
librambutan-c6c959682084c8493a0c39754374e7dbe6cf1708.zip
usb: Cleanups and renames.
Rename setupUSB() and disableUSB() to usb_cdcacm_enable() and usb_cdcacm_disable(), respectively. Remove usbSendHello(). This shouldn't exist. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish')
-rw-r--r--wirish/boards.cpp2
-rw-r--r--wirish/usb_serial.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/wirish/boards.cpp b/wirish/boards.cpp
index 1b921ac..3c09390 100644
--- a/wirish/boards.cpp
+++ b/wirish/boards.cpp
@@ -58,7 +58,7 @@ void init(void) {
afio_init();
setupADC();
setupTimers();
- setupUSB(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
+ usb_cdcacm_enable(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
boardInit();
}
diff --git a/wirish/usb_serial.cpp b/wirish/usb_serial.cpp
index 927f7fc..9d9cd59 100644
--- a/wirish/usb_serial.cpp
+++ b/wirish/usb_serial.cpp
@@ -39,11 +39,11 @@ USBSerial::USBSerial(void) {
}
void USBSerial::begin(void) {
- setupUSB(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
+ usb_cdcacm_enable(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
}
void USBSerial::end(void) {
- disableUSB(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
+ usb_cdcacm_disable(BOARD_USB_DISC_DEV, BOARD_USB_DISC_BIT);
}
void USBSerial::write(uint8 ch) {