From c6c959682084c8493a0c39754374e7dbe6cf1708 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Wed, 15 Jun 2011 16:43:48 -0400 Subject: 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 --- wirish/boards.cpp | 2 +- wirish/usb_serial.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'wirish') 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) { -- cgit v1.2.3