diff options
author | Christian Pointner <equinox@spreadspace.org> | 2012-05-29 19:59:20 +0000 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2012-05-29 19:59:20 +0000 |
commit | b54ed86f6f1095b351d90e51a98d639934b09b3a (patch) | |
tree | 9ae0236b9649aeecab7a34139f937b253b2d1a4a | |
parent | improved external lib (diff) |
small refactoring
git-svn-id: https://svn.spreadspace.org/avr/trunk@40 aa12f405-d877-488e-9caf-2d797e2a1cc7
-rw-r--r-- | lib/lufa-descriptor-usbserial.c (renamed from usb-serial/Descriptors.c) | 2 | ||||
-rw-r--r-- | lib/lufa-descriptor-usbserial.h (renamed from usb-serial/Descriptors.h) | 0 | ||||
-rw-r--r-- | usb-serial/Makefile | 4 | ||||
-rw-r--r-- | usb-serial/usb-serial.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/usb-serial/Descriptors.c b/lib/lufa-descriptor-usbserial.c index 4f62cd5..0199f49 100644 --- a/usb-serial/Descriptors.c +++ b/lib/lufa-descriptor-usbserial.c @@ -35,7 +35,7 @@ * the device's capabilities and functions.
*/
-#include "Descriptors.h"
+#include "lufa-descriptor-usbserial.h"
/* On some devices, there is a factory set internal serial number which can be automatically sent to the host as
* the device's serial number when the Device Descriptor's .SerialNumStrIndex entry is set to USE_INTERNAL_SERIAL.
diff --git a/usb-serial/Descriptors.h b/lib/lufa-descriptor-usbserial.h index 0146524..0146524 100644 --- a/usb-serial/Descriptors.h +++ b/lib/lufa-descriptor-usbserial.h diff --git a/usb-serial/Makefile b/usb-serial/Makefile index bdd5fec..73a91b7 100644 --- a/usb-serial/Makefile +++ b/usb-serial/Makefile @@ -22,8 +22,8 @@ NAME := usb-serial
BOARD_TYPE := teensy2
-OBJ := $(NAME).o Descriptors.o
-LIBS := util led
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial
EXTERNAL_LIBS := lufa
LUFA_PATH := ../contrib/LUFA-120219
diff --git a/usb-serial/usb-serial.c b/usb-serial/usb-serial.c index 700d8eb..9c5a89a 100644 --- a/usb-serial/usb-serial.c +++ b/usb-serial/usb-serial.c @@ -66,7 +66,7 @@ #include <avr/interrupt.h>
#include <avr/power.h>
-#include "Descriptors.h"
+#include "lufa-descriptor-usbserial.h"
#include "util.h"
#include "led.h"
|