diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-11-16 13:26:34 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-04-11 16:56:51 -0400 |
| commit | 844665608fbeeab270e3d1a4bd797afd24302a10 (patch) | |
| tree | 30a292680106fd81e9e8b41344b27ec8306c31f6 /wirish | |
| parent | 62e4ce256e1f2ea18cf2d576ed8110d6553c7fc1 (diff) | |
| download | librambutan-844665608fbeeab270e3d1a4bd797afd24302a10.tar.gz librambutan-844665608fbeeab270e3d1a4bd797afd24302a10.zip | |
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')
| -rw-r--r-- | wirish/boards.cpp | 2 | ||||
| -rw-r--r-- | wirish/usb_serial.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wirish/boards.cpp b/wirish/boards.cpp index dbdcf1c..1f97119 100644 --- a/wirish/boards.cpp +++ b/wirish/boards.cpp @@ -41,7 +41,7 @@ #include <libmaple/gpio.h> #include <libmaple/adc.h> #include <libmaple/timer.h> -#include "usb_cdcacm.h" +#include <libmaple/usb_cdcacm.h> static void setupFlash(void); static void setupClocks(void); 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> |