aboutsummaryrefslogtreecommitdiff
path: root/wirish/usb_serial.cpp
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-11-16 13:26:34 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2012-04-11 16:56:51 -0400
commit04760fa17b1d816f0cfd47cd75003400c93e037e (patch)
tree30a292680106fd81e9e8b41344b27ec8306c31f6 /wirish/usb_serial.cpp
parent578c3977eb7434b6da7486ed2f168686cb00ca58 (diff)
Make USB its own submodule.
Add libmaple/usb/rules.mk, which compiles the USB FS device firmware submodule. Move the logic for compiling the USB stack from libmaple/rules.mk into libmaple/usb/rules.mk. Move libmaple/usb/usb_cdacm.h to libmaple/include/libmaple/. Its API is sufficiently general that we'll be able to port it over to USB OTG (either FS or HS) eventually, and that lets us include it from Wirish using the new style for libmaple headers. Fix the includes for public libmaple headers within libmaple/usb. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish/usb_serial.cpp')
-rw-r--r--wirish/usb_serial.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/wirish/usb_serial.cpp b/wirish/usb_serial.cpp
index 1fd6e65..388c739 100644
--- a/wirish/usb_serial.cpp
+++ b/wirish/usb_serial.cpp
@@ -32,7 +32,7 @@
#include <string.h>
-#include "usb_cdcacm.h"
+#include <libmaple/usb_cdcacm.h>
#include <libmaple/usb.h>
#include <wirish/wirish.h>