aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-11-15 16:05:12 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2012-04-11 16:56:50 -0400
commitcb2f3071fcd49590499888c27c8f325699eafda9 (patch)
treebb00f1e8363df6d461953a0ad9c2cd643d37bf2f /wirish
parentf36fae273ec84ee2c53a33caa2dddea2d79db0da (diff)
downloadlibrambutan-cb2f3071fcd49590499888c27c8f325699eafda9.tar.gz
librambutan-cb2f3071fcd49590499888c27c8f325699eafda9.zip
Move wirish/comm/*.cpp into wirish.
The wirish/comm/ directory is stupid. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish')
-rw-r--r--wirish/HardwareSPI.cpp (renamed from wirish/comm/HardwareSPI.cpp)0
-rw-r--r--wirish/HardwareSerial.cpp (renamed from wirish/comm/HardwareSerial.cpp)0
-rw-r--r--wirish/rules.mk5
3 files changed, 2 insertions, 3 deletions
diff --git a/wirish/comm/HardwareSPI.cpp b/wirish/HardwareSPI.cpp
index e1f186e..e1f186e 100644
--- a/wirish/comm/HardwareSPI.cpp
+++ b/wirish/HardwareSPI.cpp
diff --git a/wirish/comm/HardwareSerial.cpp b/wirish/HardwareSerial.cpp
index a9eb763..a9eb763 100644
--- a/wirish/comm/HardwareSerial.cpp
+++ b/wirish/HardwareSerial.cpp
diff --git a/wirish/rules.mk b/wirish/rules.mk
index 923c17b..6fa3a28 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -3,7 +3,6 @@ sp := $(sp).x
dirstack_$(sp) := $(d)
d := $(dir)
BUILDDIRS += $(BUILD_PATH)/$(d)
-BUILDDIRS += $(BUILD_PATH)/$(d)/comm
# Board config -- TODO allow user override
WIRISH_BOARD_PATH := boards/$(BOARD)
@@ -21,8 +20,8 @@ cSRCS_$(d) := start_c.c
cppSRCS_$(d) := wirish_math.cpp \
Print.cpp \
boards.cpp \
- comm/HardwareSerial.cpp \
- comm/HardwareSPI.cpp \
+ HardwareSerial.cpp \
+ HardwareSPI.cpp \
HardwareTimer.cpp \
usb_serial.cpp \
cxxabi-compat.cpp \