From 844665608fbeeab270e3d1a4bd797afd24302a10 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed, 16 Nov 2011 13:26:34 -0500
Subject: 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>
---
 wirish/boards.cpp     | 2 +-
 wirish/usb_serial.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'wirish')

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>
-- 
cgit v1.2.3