aboutsummaryrefslogtreecommitdiff
path: root/lib/usb
diff options
context:
space:
mode:
authorUwe Hermann2010-12-31 18:18:39 +0100
committerUwe Hermann2010-12-31 18:18:39 +0100
commit8f251e8a9d46634be4741f7f1aef3d52fb1b7dba (patch)
treefb3c17756e0b18fe19ca28f0f67b2ae636cac807 /lib/usb
parent95793aa6cedeef06db9592602ecf3dc00edec610 (diff)
Some more file/path restructuring.
All #includes now explicitly use the "<libopencm3/stm32/rcc.h>" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld
Diffstat (limited to 'lib/usb')
-rw-r--r--lib/usb/usb.c2
-rw-r--r--lib/usb/usb_control.c2
-rw-r--r--lib/usb/usb_f103.c8
-rw-r--r--lib/usb/usb_standard.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/usb/usb.c b/lib/usb/usb.c
index 1e8ad44..c88de55 100644
--- a/lib/usb/usb.c
+++ b/lib/usb/usb.c
@@ -18,7 +18,7 @@
*/
#include <string.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
struct _usbd_device _usbd_device;
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c
index ff46732..cd3fe0f 100644
--- a/lib/usb/usb_control.c
+++ b/lib/usb/usb_control.c
@@ -18,7 +18,7 @@
*/
#include <stdlib.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
static struct usb_control_state {
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index dab046d..1f82def 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cm3/common.h>
-#include <stm32/tools.h>
-#include <stm32/usb.h>
-#include <usb/usbd.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/tools.h>
+#include <libopencm3/stm32/usb.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
/** Initialize the USB device controller hardware of the STM32. */
diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c
index 81616e5..efaea27 100644
--- a/lib/usb/usb_standard.c
+++ b/lib/usb/usb_standard.c
@@ -18,7 +18,7 @@
*/
#include <string.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
void usbd_register_set_config_callback(void (*callback)(u16 wValue))