aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2023-03-06 17:36:31 +0100
committerNicolas Schodet2023-03-06 17:36:31 +0100
commitd383f2bcdb6ff13cc562fce1ff55d826035debad (patch)
treef5cd0440869b8ba823fd254b361cdefe95e153b4
parent8fce63fda48a6593870ffd3c584c9dd0808bc2c2 (diff)
Simplify source tree
Now just use make in the root directory to build.
-rw-r--r--.gitignore3
-rw-r--r--AT91SAM7S256/SAM7S256/gcc/.gitignore3
-rw-r--r--Makefile (renamed from AT91SAM7S256/SAM7S256/gcc/Makefile)20
-rw-r--r--README6
-rw-r--r--armdebug/.gitignore (renamed from AT91SAM7S256/armdebug/.gitignore)0
-rw-r--r--armdebug/.project (renamed from AT91SAM7S256/armdebug/.project)0
-rw-r--r--armdebug/AUTHORS (renamed from AT91SAM7S256/armdebug/AUTHORS)0
-rw-r--r--armdebug/COPYING (renamed from AT91SAM7S256/armdebug/COPYING)0
-rw-r--r--armdebug/Debugger/_c_arm_macros.h (renamed from AT91SAM7S256/armdebug/Debugger/_c_arm_macros.h)0
-rw-r--r--armdebug/Debugger/abort_handler.S (renamed from AT91SAM7S256/armdebug/Debugger/abort_handler.S)0
-rw-r--r--armdebug/Debugger/debug_comm.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_comm.S)0
-rw-r--r--armdebug/Debugger/debug_hexutils.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_hexutils.S)0
-rw-r--r--armdebug/Debugger/debug_internals.h (renamed from AT91SAM7S256/armdebug/Debugger/debug_internals.h)0
-rw-r--r--armdebug/Debugger/debug_macros.h (renamed from AT91SAM7S256/armdebug/Debugger/debug_macros.h)0
-rw-r--r--armdebug/Debugger/debug_opcodes.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_opcodes.S)0
-rw-r--r--armdebug/Debugger/debug_runlooptasks.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.S)0
-rw-r--r--armdebug/Debugger/debug_runlooptasks.h (renamed from AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.h)0
-rw-r--r--armdebug/Debugger/debug_stack.ld (renamed from AT91SAM7S256/armdebug/Debugger/debug_stack.ld)0
-rw-r--r--armdebug/Debugger/debug_stub.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_stub.S)0
-rw-r--r--armdebug/Debugger/debug_stub.h (renamed from AT91SAM7S256/armdebug/Debugger/debug_stub.h)0
-rw-r--r--armdebug/Debugger/debug_test.S (renamed from AT91SAM7S256/armdebug/Debugger/debug_test.S)0
-rw-r--r--armdebug/Debugger/debug_test.h (renamed from AT91SAM7S256/armdebug/Debugger/debug_test.h)0
-rw-r--r--armdebug/Debugger/undef_handler.S (renamed from AT91SAM7S256/armdebug/Debugger/undef_handler.S)0
-rw-r--r--armdebug/Doxyfile (renamed from AT91SAM7S256/armdebug/Doxyfile)0
-rw-r--r--armdebug/GNU-GPLv2.txt (renamed from AT91SAM7S256/armdebug/GNU-GPLv2.txt)0
-rw-r--r--armdebug/Host/README (renamed from AT91SAM7S256/armdebug/Host/README)0
-rw-r--r--armdebug/Host/gdb-commands.txt (renamed from AT91SAM7S256/armdebug/Host/gdb-commands.txt)0
-rwxr-xr-xarmdebug/Host/nxt-gdb-server.py (renamed from AT91SAM7S256/armdebug/Host/nxt-gdb-server.py)0
-rw-r--r--armdebug/LEGO_Open_Source_License.doc (renamed from AT91SAM7S256/armdebug/LEGO_Open_Source_License.doc)bin40960 -> 40960 bytes
-rw-r--r--armdebug/README (renamed from AT91SAM7S256/armdebug/README)0
-rw-r--r--armdebug/SConscript (renamed from AT91SAM7S256/armdebug/SConscript)0
-rw-r--r--armdebug/SConstruct (renamed from AT91SAM7S256/armdebug/SConstruct)0
-rw-r--r--include/AT91SAM7S256.h (renamed from AT91SAM7S256/SAM7S256/Include/AT91SAM7S256.h)0
-rw-r--r--lib/abort.c (renamed from AT91SAM7S256/SAM7S256/gcc/lib/abort.c)0
-rw-r--r--lib/errno.c (renamed from AT91SAM7S256/SAM7S256/gcc/lib/errno.c)0
-rw-r--r--lib/nxt.ld (renamed from AT91SAM7S256/SAM7S256/gcc/nxt.ld)0
-rw-r--r--lib/sbrk.c (renamed from AT91SAM7S256/SAM7S256/gcc/lib/sbrk.c)0
-rw-r--r--lib/sscanf.c (renamed from AT91SAM7S256/SAM7S256/gcc/lib/sscanf.c)0
-rw-r--r--lib/strtod.c (renamed from AT91SAM7S256/SAM7S256/gcc/lib/strtod.c)0
-rw-r--r--src/BtTest.inc (renamed from AT91SAM7S256/Source/BtTest.inc)0
-rw-r--r--src/Connections.txt (renamed from AT91SAM7S256/Source/Connections.txt)0
-rw-r--r--src/Cursor.txt (renamed from AT91SAM7S256/Source/Cursor.txt)0
-rw-r--r--src/Devices.txt (renamed from AT91SAM7S256/Source/Devices.txt)0
-rw-r--r--src/Display.txt (renamed from AT91SAM7S256/Source/Display.txt)0
-rw-r--r--src/Fail.txt (renamed from AT91SAM7S256/Source/Fail.txt)0
-rw-r--r--src/Font.txt (renamed from AT91SAM7S256/Source/Font.txt)0
-rw-r--r--src/Functions.inl (renamed from AT91SAM7S256/Source/Functions.inl)0
-rw-r--r--src/Icons.txt (renamed from AT91SAM7S256/Source/Icons.txt)0
-rw-r--r--src/Info.txt (renamed from AT91SAM7S256/Source/Info.txt)0
-rw-r--r--src/LowBattery.txt (renamed from AT91SAM7S256/Source/LowBattery.txt)0
-rw-r--r--src/Mainmenu.rms (renamed from AT91SAM7S256/Source/Mainmenu.rms)0
-rw-r--r--src/Ok.txt (renamed from AT91SAM7S256/Source/Ok.txt)0
-rw-r--r--src/Port.txt (renamed from AT91SAM7S256/Source/Port.txt)0
-rw-r--r--src/RCXintro_1.txt (renamed from AT91SAM7S256/Source/RCXintro_1.txt)0
-rw-r--r--src/RCXintro_10.txt (renamed from AT91SAM7S256/Source/RCXintro_10.txt)0
-rw-r--r--src/RCXintro_11.txt (renamed from AT91SAM7S256/Source/RCXintro_11.txt)0
-rw-r--r--src/RCXintro_12.txt (renamed from AT91SAM7S256/Source/RCXintro_12.txt)0
-rw-r--r--src/RCXintro_13.txt (renamed from AT91SAM7S256/Source/RCXintro_13.txt)0
-rw-r--r--src/RCXintro_14.txt (renamed from AT91SAM7S256/Source/RCXintro_14.txt)0
-rw-r--r--src/RCXintro_15.txt (renamed from AT91SAM7S256/Source/RCXintro_15.txt)0
-rw-r--r--src/RCXintro_16.txt (renamed from AT91SAM7S256/Source/RCXintro_16.txt)0
-rw-r--r--src/RCXintro_2.txt (renamed from AT91SAM7S256/Source/RCXintro_2.txt)0
-rw-r--r--src/RCXintro_3.txt (renamed from AT91SAM7S256/Source/RCXintro_3.txt)0
-rw-r--r--src/RCXintro_4.txt (renamed from AT91SAM7S256/Source/RCXintro_4.txt)0
-rw-r--r--src/RCXintro_5.txt (renamed from AT91SAM7S256/Source/RCXintro_5.txt)0
-rw-r--r--src/RCXintro_6.txt (renamed from AT91SAM7S256/Source/RCXintro_6.txt)0
-rw-r--r--src/RCXintro_7.txt (renamed from AT91SAM7S256/Source/RCXintro_7.txt)0
-rw-r--r--src/RCXintro_8.txt (renamed from AT91SAM7S256/Source/RCXintro_8.txt)0
-rw-r--r--src/RCXintro_9.txt (renamed from AT91SAM7S256/Source/RCXintro_9.txt)0
-rw-r--r--src/Running.txt (renamed from AT91SAM7S256/Source/Running.txt)0
-rw-r--r--src/Status.txt (renamed from AT91SAM7S256/Source/Status.txt)0
-rw-r--r--src/Step.txt (renamed from AT91SAM7S256/Source/Step.txt)0
-rw-r--r--src/Submenu01.rms (renamed from AT91SAM7S256/Source/Submenu01.rms)0
-rw-r--r--src/Submenu02.rms (renamed from AT91SAM7S256/Source/Submenu02.rms)0
-rw-r--r--src/Submenu03.rms (renamed from AT91SAM7S256/Source/Submenu03.rms)0
-rw-r--r--src/Submenu04.rms (renamed from AT91SAM7S256/Source/Submenu04.rms)0
-rw-r--r--src/Submenu05.rms (renamed from AT91SAM7S256/Source/Submenu05.rms)0
-rw-r--r--src/Submenu06.rms (renamed from AT91SAM7S256/Source/Submenu06.rms)0
-rw-r--r--src/Submenu07.rms (renamed from AT91SAM7S256/Source/Submenu07.rms)0
-rw-r--r--src/Test1.txt (renamed from AT91SAM7S256/Source/Test1.txt)0
-rw-r--r--src/Test2.txt (renamed from AT91SAM7S256/Source/Test2.txt)0
-rw-r--r--src/Ui.txt (renamed from AT91SAM7S256/Source/Ui.txt)0
-rw-r--r--src/Wait.txt (renamed from AT91SAM7S256/Source/Wait.txt)0
-rw-r--r--src/c_button.c (renamed from AT91SAM7S256/Source/c_button.c)0
-rw-r--r--src/c_button.h (renamed from AT91SAM7S256/Source/c_button.h)0
-rw-r--r--src/c_button.iom (renamed from AT91SAM7S256/Source/c_button.iom)0
-rw-r--r--src/c_cmd.c (renamed from AT91SAM7S256/Source/c_cmd.c)0
-rw-r--r--src/c_cmd.h (renamed from AT91SAM7S256/Source/c_cmd.h)0
-rw-r--r--src/c_cmd.iom (renamed from AT91SAM7S256/Source/c_cmd.iom)0
-rw-r--r--src/c_cmd_bytecodes.h (renamed from AT91SAM7S256/Source/c_cmd_bytecodes.h)0
-rw-r--r--src/c_cmd_drawing.inc (renamed from AT91SAM7S256/Source/c_cmd_drawing.inc)0
-rw-r--r--src/c_comm.c (renamed from AT91SAM7S256/Source/c_comm.c)0
-rw-r--r--src/c_comm.h (renamed from AT91SAM7S256/Source/c_comm.h)0
-rw-r--r--src/c_comm.iom (renamed from AT91SAM7S256/Source/c_comm.iom)0
-rw-r--r--src/c_display.c (renamed from AT91SAM7S256/Source/c_display.c)0
-rw-r--r--src/c_display.h (renamed from AT91SAM7S256/Source/c_display.h)0
-rw-r--r--src/c_display.iom (renamed from AT91SAM7S256/Source/c_display.iom)0
-rw-r--r--src/c_input.c (renamed from AT91SAM7S256/Source/c_input.c)0
-rw-r--r--src/c_input.h (renamed from AT91SAM7S256/Source/c_input.h)0
-rw-r--r--src/c_input.iom (renamed from AT91SAM7S256/Source/c_input.iom)0
-rw-r--r--src/c_ioctrl.c (renamed from AT91SAM7S256/Source/c_ioctrl.c)0
-rw-r--r--src/c_ioctrl.h (renamed from AT91SAM7S256/Source/c_ioctrl.h)0
-rw-r--r--src/c_ioctrl.iom (renamed from AT91SAM7S256/Source/c_ioctrl.iom)0
-rw-r--r--src/c_loader.c (renamed from AT91SAM7S256/Source/c_loader.c)0
-rw-r--r--src/c_loader.h (renamed from AT91SAM7S256/Source/c_loader.h)0
-rw-r--r--src/c_loader.iom (renamed from AT91SAM7S256/Source/c_loader.iom)0
-rw-r--r--src/c_lowspeed.c (renamed from AT91SAM7S256/Source/c_lowspeed.c)0
-rw-r--r--src/c_lowspeed.h (renamed from AT91SAM7S256/Source/c_lowspeed.h)0
-rw-r--r--src/c_lowspeed.iom (renamed from AT91SAM7S256/Source/c_lowspeed.iom)0
-rw-r--r--src/c_output.c (renamed from AT91SAM7S256/Source/c_output.c)0
-rw-r--r--src/c_output.h (renamed from AT91SAM7S256/Source/c_output.h)0
-rw-r--r--src/c_output.iom (renamed from AT91SAM7S256/Source/c_output.iom)0
-rw-r--r--src/c_sound.c (renamed from AT91SAM7S256/Source/c_sound.c)0
-rw-r--r--src/c_sound.h (renamed from AT91SAM7S256/Source/c_sound.h)0
-rw-r--r--src/c_sound.iom (renamed from AT91SAM7S256/Source/c_sound.iom)0
-rw-r--r--src/c_ui.c (renamed from AT91SAM7S256/Source/c_ui.c)0
-rw-r--r--src/c_ui.h (renamed from AT91SAM7S256/Source/c_ui.h)0
-rw-r--r--src/c_ui.iom (renamed from AT91SAM7S256/Source/c_ui.iom)0
-rw-r--r--src/config.h (renamed from AT91SAM7S256/Source/config.h)0
-rw-r--r--src/d_bt.c (renamed from AT91SAM7S256/Source/d_bt.c)0
-rw-r--r--src/d_bt.h (renamed from AT91SAM7S256/Source/d_bt.h)0
-rw-r--r--src/d_bt.r (renamed from AT91SAM7S256/Source/d_bt.r)0
-rw-r--r--src/d_button.c (renamed from AT91SAM7S256/Source/d_button.c)0
-rw-r--r--src/d_button.h (renamed from AT91SAM7S256/Source/d_button.h)0
-rw-r--r--src/d_button.r (renamed from AT91SAM7S256/Source/d_button.r)0
-rw-r--r--src/d_display.c (renamed from AT91SAM7S256/Source/d_display.c)0
-rw-r--r--src/d_display.h (renamed from AT91SAM7S256/Source/d_display.h)0
-rw-r--r--src/d_display.r (renamed from AT91SAM7S256/Source/d_display.r)0
-rw-r--r--src/d_hispeed.c (renamed from AT91SAM7S256/Source/d_hispeed.c)0
-rw-r--r--src/d_hispeed.h (renamed from AT91SAM7S256/Source/d_hispeed.h)0
-rw-r--r--src/d_hispeed.r (renamed from AT91SAM7S256/Source/d_hispeed.r)0
-rw-r--r--src/d_input.c (renamed from AT91SAM7S256/Source/d_input.c)0
-rw-r--r--src/d_input.h (renamed from AT91SAM7S256/Source/d_input.h)0
-rw-r--r--src/d_input.r (renamed from AT91SAM7S256/Source/d_input.r)0
-rw-r--r--src/d_ioctrl.c (renamed from AT91SAM7S256/Source/d_ioctrl.c)0
-rw-r--r--src/d_ioctrl.h (renamed from AT91SAM7S256/Source/d_ioctrl.h)0
-rw-r--r--src/d_ioctrl.r (renamed from AT91SAM7S256/Source/d_ioctrl.r)0
-rw-r--r--src/d_loader.c (renamed from AT91SAM7S256/Source/d_loader.c)0
-rw-r--r--src/d_loader.h (renamed from AT91SAM7S256/Source/d_loader.h)0
-rw-r--r--src/d_loader.r (renamed from AT91SAM7S256/Source/d_loader.r)0
-rw-r--r--src/d_lowspeed.c (renamed from AT91SAM7S256/Source/d_lowspeed.c)0
-rw-r--r--src/d_lowspeed.h (renamed from AT91SAM7S256/Source/d_lowspeed.h)0
-rw-r--r--src/d_lowspeed.r (renamed from AT91SAM7S256/Source/d_lowspeed.r)0
-rw-r--r--src/d_output.c (renamed from AT91SAM7S256/Source/d_output.c)0
-rw-r--r--src/d_output.h (renamed from AT91SAM7S256/Source/d_output.h)0
-rw-r--r--src/d_output.r (renamed from AT91SAM7S256/Source/d_output.r)0
-rw-r--r--src/d_sound.c (renamed from AT91SAM7S256/Source/d_sound.c)0
-rw-r--r--src/d_sound.h (renamed from AT91SAM7S256/Source/d_sound.h)0
-rw-r--r--src/d_sound.r (renamed from AT91SAM7S256/Source/d_sound.r)0
-rw-r--r--src/d_sound_adpcm.r (renamed from AT91SAM7S256/Source/d_sound_adpcm.r)0
-rw-r--r--src/d_timer.c (renamed from AT91SAM7S256/Source/d_timer.c)0
-rw-r--r--src/d_timer.h (renamed from AT91SAM7S256/Source/d_timer.h)0
-rw-r--r--src/d_timer.r (renamed from AT91SAM7S256/Source/d_timer.r)0
-rw-r--r--src/d_usb.c (renamed from AT91SAM7S256/Source/d_usb.c)0
-rw-r--r--src/d_usb.h (renamed from AT91SAM7S256/Source/d_usb.h)0
-rw-r--r--src/d_usb.r (renamed from AT91SAM7S256/Source/d_usb.r)0
-rw-r--r--src/m_sched.c (renamed from AT91SAM7S256/Source/m_sched.c)0
-rw-r--r--src/m_sched.h (renamed from AT91SAM7S256/Source/m_sched.h)4
-rw-r--r--src/modules.h (renamed from AT91SAM7S256/Source/modules.h)0
-rw-r--r--src/sam7s256.c (renamed from AT91SAM7S256/SAM7S256/Include/sam7s256.c)0
-rw-r--r--src/sam7s256.h (renamed from AT91SAM7S256/SAM7S256/Include/sam7s256.h)0
-rw-r--r--src/stdconst.h (renamed from AT91SAM7S256/Source/stdconst.h)0
-rw-r--r--startup/Cstartup.S (renamed from AT91SAM7S256/SAM7S256/Include/Cstartup.S)0
-rw-r--r--startup/Cstartup_SAM7.c (renamed from AT91SAM7S256/SAM7S256/Include/Cstartup_SAM7.c)0
164 files changed, 19 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 06741cc..d801ece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
*.sym
*.elf
tags
+version.mak
+nxt_firmware.bin
+nxt_firmware.rfw
diff --git a/AT91SAM7S256/SAM7S256/gcc/.gitignore b/AT91SAM7S256/SAM7S256/gcc/.gitignore
deleted file mode 100644
index 83a204c..0000000
--- a/AT91SAM7S256/SAM7S256/gcc/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-version.mak
-nxt_firmware.bin
-nxt_firmware.rfw
diff --git a/AT91SAM7S256/SAM7S256/gcc/Makefile b/Makefile
index 2562b54..3d6e4d2 100644
--- a/AT91SAM7S256/SAM7S256/gcc/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
-BASE = ../..
-SRCDIR = $(BASE)/Source
+BASE = .
+SRCDIR = $(BASE)/src
+LIBDIR = $(BASE)/lib
DBGDIR = $(BASE)/armdebug/Debugger
-CPUINCDIR = $(BASE)/SAM7S256/Include
+CPUINCDIR = $(BASE)/include
+STARTUPDIR = $(BASE)/startup
DATE_FMT = +%Y-%m-%dT%H:%M
ifndef SOURCE_DATE_EPOCH
@@ -30,11 +32,11 @@ ASM_ARM_SOURCE = Cstartup.S
ASM_THUMB_SOURCE =
vpath %.c $(SRCDIR)
-vpath %.c $(CPUINCDIR)
-vpath %.c lib
-vpath %.S $(CPUINCDIR)
+vpath %.c $(LIBDIR)
+vpath %.c $(STARTUPDIR)
+vpath %.S $(STARTUPDIR)
-INCLUDES =
+INCLUDES = -I$(CPUINCDIR)
MCU = arm7tdmi
STARTOFUSERFLASH_DEFINES = -DSTARTOFUSERFLASH_FROM_LINKER=1
@@ -48,7 +50,7 @@ THUMB_INTERWORK = -mthumb-interwork
CFLAGS = -g -mcpu=$(MCU) $(THUMB) $(THUMB_INTERWORK) $(WARNINGS) $(OPTIMIZE)
ASFLAGS = -g -mcpu=$(MCU) $(THUMB) $(THUMB_INTERWORK)
CPPFLAGS = $(INCLUDES) $(DEFINES) -MMD
-LDSCRIPT = nxt.ld
+LDSCRIPT = $(LIBDIR)/nxt.ld
LDFLAGS = -nostdlib -T $(LDSCRIPT) -Wl,--gc-sections
LDLIBS = -lc -lm -lgcc -lnosys
@@ -58,7 +60,7 @@ ASM_ARM_SOURCE += abort_handler.S undef_handler.S debug_hexutils.S \
debug_runlooptasks.S
vpath %.S $(DBGDIR)
DEFINES += -DARMDEBUG
-INCLUDES += -I../../armdebug/Debugger
+INCLUDES += -I$(DBGDIR)
endif
CROSS_COMPILE = arm-none-eabi-
diff --git a/README b/README
index 4da7744..bcdcdab 100644
--- a/README
+++ b/README
@@ -10,9 +10,9 @@ including documentation, building guides, and more:
Quick start
-----------
-To build the firmware, run make in the AT91SAM7S256/SAM7S256/gcc directory. It
-will produce a nxt_firmware.bin file that you can flash with your tool of
-choice. For example, you can use fwflash from libnxt.
+To build the firmware, run make in this directory. It will produce a
+nxt_firmware.bin file that you can flash with your tool of choice. For
+example, you can use fwflash from libnxt.
License
diff --git a/AT91SAM7S256/armdebug/.gitignore b/armdebug/.gitignore
index 46f8223..46f8223 100644
--- a/AT91SAM7S256/armdebug/.gitignore
+++ b/armdebug/.gitignore
diff --git a/AT91SAM7S256/armdebug/.project b/armdebug/.project
index 15b12fc..15b12fc 100644
--- a/AT91SAM7S256/armdebug/.project
+++ b/armdebug/.project
diff --git a/AT91SAM7S256/armdebug/AUTHORS b/armdebug/AUTHORS
index 169c2b6..169c2b6 100644
--- a/AT91SAM7S256/armdebug/AUTHORS
+++ b/armdebug/AUTHORS
diff --git a/AT91SAM7S256/armdebug/COPYING b/armdebug/COPYING
index 86fae60..86fae60 100644
--- a/AT91SAM7S256/armdebug/COPYING
+++ b/armdebug/COPYING
diff --git a/AT91SAM7S256/armdebug/Debugger/_c_arm_macros.h b/armdebug/Debugger/_c_arm_macros.h
index 025542e..025542e 100644
--- a/AT91SAM7S256/armdebug/Debugger/_c_arm_macros.h
+++ b/armdebug/Debugger/_c_arm_macros.h
diff --git a/AT91SAM7S256/armdebug/Debugger/abort_handler.S b/armdebug/Debugger/abort_handler.S
index dab25d1..dab25d1 100644
--- a/AT91SAM7S256/armdebug/Debugger/abort_handler.S
+++ b/armdebug/Debugger/abort_handler.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_comm.S b/armdebug/Debugger/debug_comm.S
index b4590eb..b4590eb 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_comm.S
+++ b/armdebug/Debugger/debug_comm.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_hexutils.S b/armdebug/Debugger/debug_hexutils.S
index 267406f..267406f 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_hexutils.S
+++ b/armdebug/Debugger/debug_hexutils.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_internals.h b/armdebug/Debugger/debug_internals.h
index bdab463..bdab463 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_internals.h
+++ b/armdebug/Debugger/debug_internals.h
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_macros.h b/armdebug/Debugger/debug_macros.h
index d852f38..d852f38 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_macros.h
+++ b/armdebug/Debugger/debug_macros.h
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_opcodes.S b/armdebug/Debugger/debug_opcodes.S
index c264338..c264338 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_opcodes.S
+++ b/armdebug/Debugger/debug_opcodes.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.S b/armdebug/Debugger/debug_runlooptasks.S
index a9eb50a..a9eb50a 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.S
+++ b/armdebug/Debugger/debug_runlooptasks.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.h b/armdebug/Debugger/debug_runlooptasks.h
index a2ae956..a2ae956 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_runlooptasks.h
+++ b/armdebug/Debugger/debug_runlooptasks.h
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stack.ld b/armdebug/Debugger/debug_stack.ld
index 8fc4cb7..8fc4cb7 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stack.ld
+++ b/armdebug/Debugger/debug_stack.ld
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stub.S b/armdebug/Debugger/debug_stub.S
index a7b2d56..a7b2d56 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.S
+++ b/armdebug/Debugger/debug_stub.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_stub.h b/armdebug/Debugger/debug_stub.h
index 2430e77..2430e77 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_stub.h
+++ b/armdebug/Debugger/debug_stub.h
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_test.S b/armdebug/Debugger/debug_test.S
index 2cb87a0..2cb87a0 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_test.S
+++ b/armdebug/Debugger/debug_test.S
diff --git a/AT91SAM7S256/armdebug/Debugger/debug_test.h b/armdebug/Debugger/debug_test.h
index b8e6634..b8e6634 100644
--- a/AT91SAM7S256/armdebug/Debugger/debug_test.h
+++ b/armdebug/Debugger/debug_test.h
diff --git a/AT91SAM7S256/armdebug/Debugger/undef_handler.S b/armdebug/Debugger/undef_handler.S
index cfbaae3..cfbaae3 100644
--- a/AT91SAM7S256/armdebug/Debugger/undef_handler.S
+++ b/armdebug/Debugger/undef_handler.S
diff --git a/AT91SAM7S256/armdebug/Doxyfile b/armdebug/Doxyfile
index 6266354..6266354 100644
--- a/AT91SAM7S256/armdebug/Doxyfile
+++ b/armdebug/Doxyfile
diff --git a/AT91SAM7S256/armdebug/GNU-GPLv2.txt b/armdebug/GNU-GPLv2.txt
index 5b6e7c6..5b6e7c6 100644
--- a/AT91SAM7S256/armdebug/GNU-GPLv2.txt
+++ b/armdebug/GNU-GPLv2.txt
diff --git a/AT91SAM7S256/armdebug/Host/README b/armdebug/Host/README
index 1b6537e..1b6537e 100644
--- a/AT91SAM7S256/armdebug/Host/README
+++ b/armdebug/Host/README
diff --git a/AT91SAM7S256/armdebug/Host/gdb-commands.txt b/armdebug/Host/gdb-commands.txt
index 3135a1e..3135a1e 100644
--- a/AT91SAM7S256/armdebug/Host/gdb-commands.txt
+++ b/armdebug/Host/gdb-commands.txt
diff --git a/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py b/armdebug/Host/nxt-gdb-server.py
index 03a95d3..03a95d3 100755
--- a/AT91SAM7S256/armdebug/Host/nxt-gdb-server.py
+++ b/armdebug/Host/nxt-gdb-server.py
diff --git a/AT91SAM7S256/armdebug/LEGO_Open_Source_License.doc b/armdebug/LEGO_Open_Source_License.doc
index 94b65e6..94b65e6 100644
--- a/AT91SAM7S256/armdebug/LEGO_Open_Source_License.doc
+++ b/armdebug/LEGO_Open_Source_License.doc
Binary files differ
diff --git a/AT91SAM7S256/armdebug/README b/armdebug/README
index 4660b1e..4660b1e 100644
--- a/AT91SAM7S256/armdebug/README
+++ b/armdebug/README
diff --git a/AT91SAM7S256/armdebug/SConscript b/armdebug/SConscript
index c495847..c495847 100644
--- a/AT91SAM7S256/armdebug/SConscript
+++ b/armdebug/SConscript
diff --git a/AT91SAM7S256/armdebug/SConstruct b/armdebug/SConstruct
index fa88d7a..fa88d7a 100644
--- a/AT91SAM7S256/armdebug/SConstruct
+++ b/armdebug/SConstruct
diff --git a/AT91SAM7S256/SAM7S256/Include/AT91SAM7S256.h b/include/AT91SAM7S256.h
index 168e5ac..168e5ac 100644
--- a/AT91SAM7S256/SAM7S256/Include/AT91SAM7S256.h
+++ b/include/AT91SAM7S256.h
diff --git a/AT91SAM7S256/SAM7S256/gcc/lib/abort.c b/lib/abort.c
index 26d47e7..26d47e7 100644
--- a/AT91SAM7S256/SAM7S256/gcc/lib/abort.c
+++ b/lib/abort.c
diff --git a/AT91SAM7S256/SAM7S256/gcc/lib/errno.c b/lib/errno.c
index 3eb52ac..3eb52ac 100644
--- a/AT91SAM7S256/SAM7S256/gcc/lib/errno.c
+++ b/lib/errno.c
diff --git a/AT91SAM7S256/SAM7S256/gcc/nxt.ld b/lib/nxt.ld
index e54bc5d..e54bc5d 100644
--- a/AT91SAM7S256/SAM7S256/gcc/nxt.ld
+++ b/lib/nxt.ld
diff --git a/AT91SAM7S256/SAM7S256/gcc/lib/sbrk.c b/lib/sbrk.c
index 317a94b..317a94b 100644
--- a/AT91SAM7S256/SAM7S256/gcc/lib/sbrk.c
+++ b/lib/sbrk.c
diff --git a/AT91SAM7S256/SAM7S256/gcc/lib/sscanf.c b/lib/sscanf.c
index a4f5e64..a4f5e64 100644
--- a/AT91SAM7S256/SAM7S256/gcc/lib/sscanf.c
+++ b/lib/sscanf.c
diff --git a/AT91SAM7S256/SAM7S256/gcc/lib/strtod.c b/lib/strtod.c
index 49d02a2..49d02a2 100644
--- a/AT91SAM7S256/SAM7S256/gcc/lib/strtod.c
+++ b/lib/strtod.c
diff --git a/AT91SAM7S256/Source/BtTest.inc b/src/BtTest.inc
index 65575af..65575af 100644
--- a/AT91SAM7S256/Source/BtTest.inc
+++ b/src/BtTest.inc
diff --git a/AT91SAM7S256/Source/Connections.txt b/src/Connections.txt
index 3c20ed0..3c20ed0 100644
--- a/AT91SAM7S256/Source/Connections.txt
+++ b/src/Connections.txt
diff --git a/AT91SAM7S256/Source/Cursor.txt b/src/Cursor.txt
index 69037cd..69037cd 100644
--- a/AT91SAM7S256/Source/Cursor.txt
+++ b/src/Cursor.txt
diff --git a/AT91SAM7S256/Source/Devices.txt b/src/Devices.txt
index cbfd564..cbfd564 100644
--- a/AT91SAM7S256/Source/Devices.txt
+++ b/src/Devices.txt
diff --git a/AT91SAM7S256/Source/Display.txt b/src/Display.txt
index d1c2136..d1c2136 100644
--- a/AT91SAM7S256/Source/Display.txt
+++ b/src/Display.txt
diff --git a/AT91SAM7S256/Source/Fail.txt b/src/Fail.txt
index a213ec5..a213ec5 100644
--- a/AT91SAM7S256/Source/Fail.txt
+++ b/src/Fail.txt
diff --git a/AT91SAM7S256/Source/Font.txt b/src/Font.txt
index 0aa4303..0aa4303 100644
--- a/AT91SAM7S256/Source/Font.txt
+++ b/src/Font.txt
diff --git a/AT91SAM7S256/Source/Functions.inl b/src/Functions.inl
index 1424721..1424721 100644
--- a/AT91SAM7S256/Source/Functions.inl
+++ b/src/Functions.inl
diff --git a/AT91SAM7S256/Source/Icons.txt b/src/Icons.txt
index 459b078..459b078 100644
--- a/AT91SAM7S256/Source/Icons.txt
+++ b/src/Icons.txt
diff --git a/AT91SAM7S256/Source/Info.txt b/src/Info.txt
index 7e2b639..7e2b639 100644
--- a/AT91SAM7S256/Source/Info.txt
+++ b/src/Info.txt
diff --git a/AT91SAM7S256/Source/LowBattery.txt b/src/LowBattery.txt
index 51b8ddb..51b8ddb 100644
--- a/AT91SAM7S256/Source/LowBattery.txt
+++ b/src/LowBattery.txt
diff --git a/AT91SAM7S256/Source/Mainmenu.rms b/src/Mainmenu.rms
index 2e014fb..2e014fb 100644
--- a/AT91SAM7S256/Source/Mainmenu.rms
+++ b/src/Mainmenu.rms
diff --git a/AT91SAM7S256/Source/Ok.txt b/src/Ok.txt
index 32bad41..32bad41 100644
--- a/AT91SAM7S256/Source/Ok.txt
+++ b/src/Ok.txt
diff --git a/AT91SAM7S256/Source/Port.txt b/src/Port.txt
index 292fccc..292fccc 100644
--- a/AT91SAM7S256/Source/Port.txt
+++ b/src/Port.txt
diff --git a/AT91SAM7S256/Source/RCXintro_1.txt b/src/RCXintro_1.txt
index 456a63d..456a63d 100644
--- a/AT91SAM7S256/Source/RCXintro_1.txt
+++ b/src/RCXintro_1.txt
diff --git a/AT91SAM7S256/Source/RCXintro_10.txt b/src/RCXintro_10.txt
index 5f98538..5f98538 100644
--- a/AT91SAM7S256/Source/RCXintro_10.txt
+++ b/src/RCXintro_10.txt
diff --git a/AT91SAM7S256/Source/RCXintro_11.txt b/src/RCXintro_11.txt
index 6afaabd..6afaabd 100644
--- a/AT91SAM7S256/Source/RCXintro_11.txt
+++ b/src/RCXintro_11.txt
diff --git a/AT91SAM7S256/Source/RCXintro_12.txt b/src/RCXintro_12.txt
index b89f65c..b89f65c 100644
--- a/AT91SAM7S256/Source/RCXintro_12.txt
+++ b/src/RCXintro_12.txt
diff --git a/AT91SAM7S256/Source/RCXintro_13.txt b/src/RCXintro_13.txt
index ee512ea..ee512ea 100644
--- a/AT91SAM7S256/Source/RCXintro_13.txt
+++ b/src/RCXintro_13.txt
diff --git a/AT91SAM7S256/Source/RCXintro_14.txt b/src/RCXintro_14.txt
index feb4cd7..feb4cd7 100644
--- a/AT91SAM7S256/Source/RCXintro_14.txt
+++ b/src/RCXintro_14.txt
diff --git a/AT91SAM7S256/Source/RCXintro_15.txt b/src/RCXintro_15.txt
index 71f51e0..71f51e0 100644
--- a/AT91SAM7S256/Source/RCXintro_15.txt
+++ b/src/RCXintro_15.txt
diff --git a/AT91SAM7S256/Source/RCXintro_16.txt b/src/RCXintro_16.txt
index 9cf470c..9cf470c 100644
--- a/AT91SAM7S256/Source/RCXintro_16.txt
+++ b/src/RCXintro_16.txt
diff --git a/AT91SAM7S256/Source/RCXintro_2.txt b/src/RCXintro_2.txt
index addecb2..addecb2 100644
--- a/AT91SAM7S256/Source/RCXintro_2.txt
+++ b/src/RCXintro_2.txt
diff --git a/AT91SAM7S256/Source/RCXintro_3.txt b/src/RCXintro_3.txt
index eba6710..eba6710 100644
--- a/AT91SAM7S256/Source/RCXintro_3.txt
+++ b/src/RCXintro_3.txt
diff --git a/AT91SAM7S256/Source/RCXintro_4.txt b/src/RCXintro_4.txt
index dc15847..dc15847 100644
--- a/AT91SAM7S256/Source/RCXintro_4.txt
+++ b/src/RCXintro_4.txt
diff --git a/AT91SAM7S256/Source/RCXintro_5.txt b/src/RCXintro_5.txt
index efd3cb9..efd3cb9 100644
--- a/AT91SAM7S256/Source/RCXintro_5.txt
+++ b/src/RCXintro_5.txt
diff --git a/AT91SAM7S256/Source/RCXintro_6.txt b/src/RCXintro_6.txt
index 4ab152a..4ab152a 100644
--- a/AT91SAM7S256/Source/RCXintro_6.txt
+++ b/src/RCXintro_6.txt
diff --git a/AT91SAM7S256/Source/RCXintro_7.txt b/src/RCXintro_7.txt
index cabcc7b..cabcc7b 100644
--- a/AT91SAM7S256/Source/RCXintro_7.txt
+++ b/src/RCXintro_7.txt
diff --git a/AT91SAM7S256/Source/RCXintro_8.txt b/src/RCXintro_8.txt
index d062714..d062714 100644
--- a/AT91SAM7S256/Source/RCXintro_8.txt
+++ b/src/RCXintro_8.txt
diff --git a/AT91SAM7S256/Source/RCXintro_9.txt b/src/RCXintro_9.txt
index 3952437..3952437 100644
--- a/AT91SAM7S256/Source/RCXintro_9.txt
+++ b/src/RCXintro_9.txt
diff --git a/AT91SAM7S256/Source/Running.txt b/src/Running.txt
index 6bea492..6bea492 100644
--- a/AT91SAM7S256/Source/Running.txt
+++ b/src/Running.txt
diff --git a/AT91SAM7S256/Source/Status.txt b/src/Status.txt
index 6d1d5bd..6d1d5bd 100644
--- a/AT91SAM7S256/Source/Status.txt
+++ b/src/Status.txt
diff --git a/AT91SAM7S256/Source/Step.txt b/src/Step.txt
index cba0c0d..cba0c0d 100644
--- a/AT91SAM7S256/Source/Step.txt
+++ b/src/Step.txt
diff --git a/AT91SAM7S256/Source/Submenu01.rms b/src/Submenu01.rms
index aadf93d..aadf93d 100644
--- a/AT91SAM7S256/Source/Submenu01.rms
+++ b/src/Submenu01.rms
diff --git a/AT91SAM7S256/Source/Submenu02.rms b/src/Submenu02.rms
index a30478f..a30478f 100644
--- a/AT91SAM7S256/Source/Submenu02.rms
+++ b/src/Submenu02.rms
diff --git a/AT91SAM7S256/Source/Submenu03.rms b/src/Submenu03.rms
index cb7830b..cb7830b 100644
--- a/AT91SAM7S256/Source/Submenu03.rms
+++ b/src/Submenu03.rms
diff --git a/AT91SAM7S256/Source/Submenu04.rms b/src/Submenu04.rms
index 273e456..273e456 100644
--- a/AT91SAM7S256/Source/Submenu04.rms
+++ b/src/Submenu04.rms
diff --git a/AT91SAM7S256/Source/Submenu05.rms b/src/Submenu05.rms
index 5e03396..5e03396 100644
--- a/AT91SAM7S256/Source/Submenu05.rms
+++ b/src/Submenu05.rms
diff --git a/AT91SAM7S256/Source/Submenu06.rms b/src/Submenu06.rms
index 5cd1b06..5cd1b06 100644
--- a/AT91SAM7S256/Source/Submenu06.rms
+++ b/src/Submenu06.rms
diff --git a/AT91SAM7S256/Source/Submenu07.rms b/src/Submenu07.rms
index 43c292e..43c292e 100644
--- a/AT91SAM7S256/Source/Submenu07.rms
+++ b/src/Submenu07.rms
diff --git a/AT91SAM7S256/Source/Test1.txt b/src/Test1.txt
index 018d27d..018d27d 100644
--- a/AT91SAM7S256/Source/Test1.txt
+++ b/src/Test1.txt
diff --git a/AT91SAM7S256/Source/Test2.txt b/src/Test2.txt
index 2553335..2553335 100644
--- a/AT91SAM7S256/Source/Test2.txt
+++ b/src/Test2.txt
diff --git a/AT91SAM7S256/Source/Ui.txt b/src/Ui.txt
index 2cf47aa..2cf47aa 100644
--- a/AT91SAM7S256/Source/Ui.txt
+++ b/src/Ui.txt
diff --git a/AT91SAM7S256/Source/Wait.txt b/src/Wait.txt
index abdbd43..abdbd43 100644
--- a/AT91SAM7S256/Source/Wait.txt
+++ b/src/Wait.txt
diff --git a/AT91SAM7S256/Source/c_button.c b/src/c_button.c
index 3145d8f..3145d8f 100644
--- a/AT91SAM7S256/Source/c_button.c
+++ b/src/c_button.c
diff --git a/AT91SAM7S256/Source/c_button.h b/src/c_button.h
index c33b24d..c33b24d 100644
--- a/AT91SAM7S256/Source/c_button.h
+++ b/src/c_button.h
diff --git a/AT91SAM7S256/Source/c_button.iom b/src/c_button.iom
index 640a7cd..640a7cd 100644
--- a/AT91SAM7S256/Source/c_button.iom
+++ b/src/c_button.iom
diff --git a/AT91SAM7S256/Source/c_cmd.c b/src/c_cmd.c
index 87b3e24..87b3e24 100644
--- a/AT91SAM7S256/Source/c_cmd.c
+++ b/src/c_cmd.c
diff --git a/AT91SAM7S256/Source/c_cmd.h b/src/c_cmd.h
index c6e5267..c6e5267 100644
--- a/AT91SAM7S256/Source/c_cmd.h
+++ b/src/c_cmd.h
diff --git a/AT91SAM7S256/Source/c_cmd.iom b/src/c_cmd.iom
index 7c5906c..7c5906c 100644
--- a/AT91SAM7S256/Source/c_cmd.iom
+++ b/src/c_cmd.iom
diff --git a/AT91SAM7S256/Source/c_cmd_bytecodes.h b/src/c_cmd_bytecodes.h
index 5cd9dfd..5cd9dfd 100644
--- a/AT91SAM7S256/Source/c_cmd_bytecodes.h
+++ b/src/c_cmd_bytecodes.h
diff --git a/AT91SAM7S256/Source/c_cmd_drawing.inc b/src/c_cmd_drawing.inc
index 0132d44..0132d44 100644
--- a/AT91SAM7S256/Source/c_cmd_drawing.inc
+++ b/src/c_cmd_drawing.inc
diff --git a/AT91SAM7S256/Source/c_comm.c b/src/c_comm.c
index 176a1ff..176a1ff 100644
--- a/AT91SAM7S256/Source/c_comm.c
+++ b/src/c_comm.c
diff --git a/AT91SAM7S256/Source/c_comm.h b/src/c_comm.h
index 06137b2..06137b2 100644
--- a/AT91SAM7S256/Source/c_comm.h
+++ b/src/c_comm.h
diff --git a/AT91SAM7S256/Source/c_comm.iom b/src/c_comm.iom
index 2dfe994..2dfe994 100644
--- a/AT91SAM7S256/Source/c_comm.iom
+++ b/src/c_comm.iom
diff --git a/AT91SAM7S256/Source/c_display.c b/src/c_display.c
index 6b15495..6b15495 100644
--- a/AT91SAM7S256/Source/c_display.c
+++ b/src/c_display.c
diff --git a/AT91SAM7S256/Source/c_display.h b/src/c_display.h
index 56b6744..56b6744 100644
--- a/AT91SAM7S256/Source/c_display.h
+++ b/src/c_display.h
diff --git a/AT91SAM7S256/Source/c_display.iom b/src/c_display.iom
index 2e1ab74..2e1ab74 100644
--- a/AT91SAM7S256/Source/c_display.iom
+++ b/src/c_display.iom
diff --git a/AT91SAM7S256/Source/c_input.c b/src/c_input.c
index 2cb9be1..2cb9be1 100644
--- a/AT91SAM7S256/Source/c_input.c
+++ b/src/c_input.c
diff --git a/AT91SAM7S256/Source/c_input.h b/src/c_input.h
index 4e508f3..4e508f3 100644
--- a/AT91SAM7S256/Source/c_input.h
+++ b/src/c_input.h
diff --git a/AT91SAM7S256/Source/c_input.iom b/src/c_input.iom
index dee1309..dee1309 100644
--- a/AT91SAM7S256/Source/c_input.iom
+++ b/src/c_input.iom
diff --git a/AT91SAM7S256/Source/c_ioctrl.c b/src/c_ioctrl.c
index daab322..daab322 100644
--- a/AT91SAM7S256/Source/c_ioctrl.c
+++ b/src/c_ioctrl.c
diff --git a/AT91SAM7S256/Source/c_ioctrl.h b/src/c_ioctrl.h
index 5ad4c8f..5ad4c8f 100644
--- a/AT91SAM7S256/Source/c_ioctrl.h
+++ b/src/c_ioctrl.h
diff --git a/AT91SAM7S256/Source/c_ioctrl.iom b/src/c_ioctrl.iom
index 9742d04..9742d04 100644
--- a/AT91SAM7S256/Source/c_ioctrl.iom
+++ b/src/c_ioctrl.iom
diff --git a/AT91SAM7S256/Source/c_loader.c b/src/c_loader.c
index 995c920..995c920 100644
--- a/AT91SAM7S256/Source/c_loader.c
+++ b/src/c_loader.c
diff --git a/AT91SAM7S256/Source/c_loader.h b/src/c_loader.h
index 03f8062..03f8062 100644
--- a/AT91SAM7S256/Source/c_loader.h
+++ b/src/c_loader.h
diff --git a/AT91SAM7S256/Source/c_loader.iom b/src/c_loader.iom
index 80c8c4e..80c8c4e 100644
--- a/AT91SAM7S256/Source/c_loader.iom
+++ b/src/c_loader.iom
diff --git a/AT91SAM7S256/Source/c_lowspeed.c b/src/c_lowspeed.c
index 26851db..26851db 100644
--- a/AT91SAM7S256/Source/c_lowspeed.c
+++ b/src/c_lowspeed.c
diff --git a/AT91SAM7S256/Source/c_lowspeed.h b/src/c_lowspeed.h
index 1595158..1595158 100644
--- a/AT91SAM7S256/Source/c_lowspeed.h
+++ b/src/c_lowspeed.h
diff --git a/AT91SAM7S256/Source/c_lowspeed.iom b/src/c_lowspeed.iom
index 290ed35..290ed35 100644
--- a/AT91SAM7S256/Source/c_lowspeed.iom
+++ b/src/c_lowspeed.iom
diff --git a/AT91SAM7S256/Source/c_output.c b/src/c_output.c
index e0645e0..e0645e0 100644
--- a/AT91SAM7S256/Source/c_output.c
+++ b/src/c_output.c
diff --git a/AT91SAM7S256/Source/c_output.h b/src/c_output.h
index 14faa2c..14faa2c 100644
--- a/AT91SAM7S256/Source/c_output.h
+++ b/src/c_output.h
diff --git a/AT91SAM7S256/Source/c_output.iom b/src/c_output.iom
index 276bcba..276bcba 100644
--- a/AT91SAM7S256/Source/c_output.iom
+++ b/src/c_output.iom
diff --git a/AT91SAM7S256/Source/c_sound.c b/src/c_sound.c
index 9d0a81d..9d0a81d 100644
--- a/AT91SAM7S256/Source/c_sound.c
+++ b/src/c_sound.c
diff --git a/AT91SAM7S256/Source/c_sound.h b/src/c_sound.h
index ebdbb9a..ebdbb9a 100644
--- a/AT91SAM7S256/Source/c_sound.h
+++ b/src/c_sound.h
diff --git a/AT91SAM7S256/Source/c_sound.iom b/src/c_sound.iom
index ec12076..ec12076 100644
--- a/AT91SAM7S256/Source/c_sound.iom
+++ b/src/c_sound.iom
diff --git a/AT91SAM7S256/Source/c_ui.c b/src/c_ui.c
index 7e39d6f..7e39d6f 100644
--- a/AT91SAM7S256/Source/c_ui.c
+++ b/src/c_ui.c
diff --git a/AT91SAM7S256/Source/c_ui.h b/src/c_ui.h
index e0f8f4a..e0f8f4a 100644
--- a/AT91SAM7S256/Source/c_ui.h
+++ b/src/c_ui.h
diff --git a/AT91SAM7S256/Source/c_ui.iom b/src/c_ui.iom
index 770b682..770b682 100644
--- a/AT91SAM7S256/Source/c_ui.iom
+++ b/src/c_ui.iom
diff --git a/AT91SAM7S256/Source/config.h b/src/config.h
index d396771..d396771 100644
--- a/AT91SAM7S256/Source/config.h
+++ b/src/config.h
diff --git a/AT91SAM7S256/Source/d_bt.c b/src/d_bt.c
index 6e3e47d..6e3e47d 100644
--- a/AT91SAM7S256/Source/d_bt.c
+++ b/src/d_bt.c
diff --git a/AT91SAM7S256/Source/d_bt.h b/src/d_bt.h
index baf3ab6..baf3ab6 100644
--- a/AT91SAM7S256/Source/d_bt.h
+++ b/src/d_bt.h
diff --git a/AT91SAM7S256/Source/d_bt.r b/src/d_bt.r
index 8c9558f..8c9558f 100644
--- a/AT91SAM7S256/Source/d_bt.r
+++ b/src/d_bt.r
diff --git a/AT91SAM7S256/Source/d_button.c b/src/d_button.c
index 2691e8c..2691e8c 100644
--- a/AT91SAM7S256/Source/d_button.c
+++ b/src/d_button.c
diff --git a/AT91SAM7S256/Source/d_button.h b/src/d_button.h
index 10dacac..10dacac 100644
--- a/AT91SAM7S256/Source/d_button.h
+++ b/src/d_button.h
diff --git a/AT91SAM7S256/Source/d_button.r b/src/d_button.r
index c478394..c478394 100644
--- a/AT91SAM7S256/Source/d_button.r
+++ b/src/d_button.r
diff --git a/AT91SAM7S256/Source/d_display.c b/src/d_display.c
index 99f16c6..99f16c6 100644
--- a/AT91SAM7S256/Source/d_display.c
+++ b/src/d_display.c
diff --git a/AT91SAM7S256/Source/d_display.h b/src/d_display.h
index a894685..a894685 100644
--- a/AT91SAM7S256/Source/d_display.h
+++ b/src/d_display.h
diff --git a/AT91SAM7S256/Source/d_display.r b/src/d_display.r
index e38bb45..e38bb45 100644
--- a/AT91SAM7S256/Source/d_display.r
+++ b/src/d_display.r
diff --git a/AT91SAM7S256/Source/d_hispeed.c b/src/d_hispeed.c
index 01f2d07..01f2d07 100644
--- a/AT91SAM7S256/Source/d_hispeed.c
+++ b/src/d_hispeed.c
diff --git a/AT91SAM7S256/Source/d_hispeed.h b/src/d_hispeed.h
index 669a5d1..669a5d1 100644
--- a/AT91SAM7S256/Source/d_hispeed.h
+++ b/src/d_hispeed.h
diff --git a/AT91SAM7S256/Source/d_hispeed.r b/src/d_hispeed.r
index 52d5e14..52d5e14 100644
--- a/AT91SAM7S256/Source/d_hispeed.r
+++ b/src/d_hispeed.r
diff --git a/AT91SAM7S256/Source/d_input.c b/src/d_input.c
index 771eb3e..771eb3e 100644
--- a/AT91SAM7S256/Source/d_input.c
+++ b/src/d_input.c
diff --git a/AT91SAM7S256/Source/d_input.h b/src/d_input.h
index d365dd1..d365dd1 100644
--- a/AT91SAM7S256/Source/d_input.h
+++ b/src/d_input.h
diff --git a/AT91SAM7S256/Source/d_input.r b/src/d_input.r
index 3dc567e..3dc567e 100644
--- a/AT91SAM7S256/Source/d_input.r
+++ b/src/d_input.r
diff --git a/AT91SAM7S256/Source/d_ioctrl.c b/src/d_ioctrl.c
index 2506172..2506172 100644
--- a/AT91SAM7S256/Source/d_ioctrl.c
+++ b/src/d_ioctrl.c
diff --git a/AT91SAM7S256/Source/d_ioctrl.h b/src/d_ioctrl.h
index 4b7ae4f..4b7ae4f 100644
--- a/AT91SAM7S256/Source/d_ioctrl.h
+++ b/src/d_ioctrl.h
diff --git a/AT91SAM7S256/Source/d_ioctrl.r b/src/d_ioctrl.r
index 1071276..1071276 100644
--- a/AT91SAM7S256/Source/d_ioctrl.r
+++ b/src/d_ioctrl.r
diff --git a/AT91SAM7S256/Source/d_loader.c b/src/d_loader.c
index a5ceb7d..a5ceb7d 100644
--- a/AT91SAM7S256/Source/d_loader.c
+++ b/src/d_loader.c
diff --git a/AT91SAM7S256/Source/d_loader.h b/src/d_loader.h
index 902c7f7..902c7f7 100644
--- a/AT91SAM7S256/Source/d_loader.h
+++ b/src/d_loader.h
diff --git a/AT91SAM7S256/Source/d_loader.r b/src/d_loader.r
index 3fb2556..3fb2556 100644
--- a/AT91SAM7S256/Source/d_loader.r
+++ b/src/d_loader.r
diff --git a/AT91SAM7S256/Source/d_lowspeed.c b/src/d_lowspeed.c
index 91c1341..91c1341 100644
--- a/AT91SAM7S256/Source/d_lowspeed.c
+++ b/src/d_lowspeed.c
diff --git a/AT91SAM7S256/Source/d_lowspeed.h b/src/d_lowspeed.h
index 6ec62fd..6ec62fd 100644
--- a/AT91SAM7S256/Source/d_lowspeed.h
+++ b/src/d_lowspeed.h
diff --git a/AT91SAM7S256/Source/d_lowspeed.r b/src/d_lowspeed.r
index 279c10e..279c10e 100644
--- a/AT91SAM7S256/Source/d_lowspeed.r
+++ b/src/d_lowspeed.r
diff --git a/AT91SAM7S256/Source/d_output.c b/src/d_output.c
index 326f6f8..326f6f8 100644
--- a/AT91SAM7S256/Source/d_output.c
+++ b/src/d_output.c
diff --git a/AT91SAM7S256/Source/d_output.h b/src/d_output.h
index 4d5189b..4d5189b 100644
--- a/AT91SAM7S256/Source/d_output.h
+++ b/src/d_output.h
diff --git a/AT91SAM7S256/Source/d_output.r b/src/d_output.r
index 1a30c5f..1a30c5f 100644
--- a/AT91SAM7S256/Source/d_output.r
+++ b/src/d_output.r
diff --git a/AT91SAM7S256/Source/d_sound.c b/src/d_sound.c
index 72dfb60..72dfb60 100644
--- a/AT91SAM7S256/Source/d_sound.c
+++ b/src/d_sound.c
diff --git a/AT91SAM7S256/Source/d_sound.h b/src/d_sound.h
index c580342..c580342 100644
--- a/AT91SAM7S256/Source/d_sound.h
+++ b/src/d_sound.h
diff --git a/AT91SAM7S256/Source/d_sound.r b/src/d_sound.r
index 4851253..4851253 100644
--- a/AT91SAM7S256/Source/d_sound.r
+++ b/src/d_sound.r
diff --git a/AT91SAM7S256/Source/d_sound_adpcm.r b/src/d_sound_adpcm.r
index f04a760..f04a760 100644
--- a/AT91SAM7S256/Source/d_sound_adpcm.r
+++ b/src/d_sound_adpcm.r
diff --git a/AT91SAM7S256/Source/d_timer.c b/src/d_timer.c
index cba73d0..cba73d0 100644
--- a/AT91SAM7S256/Source/d_timer.c
+++ b/src/d_timer.c
diff --git a/AT91SAM7S256/Source/d_timer.h b/src/d_timer.h
index 9d7eadb..9d7eadb 100644
--- a/AT91SAM7S256/Source/d_timer.h
+++ b/src/d_timer.h
diff --git a/AT91SAM7S256/Source/d_timer.r b/src/d_timer.r
index 93c3a3b..93c3a3b 100644
--- a/AT91SAM7S256/Source/d_timer.r
+++ b/src/d_timer.r
diff --git a/AT91SAM7S256/Source/d_usb.c b/src/d_usb.c
index 0caf317..0caf317 100644
--- a/AT91SAM7S256/Source/d_usb.c
+++ b/src/d_usb.c
diff --git a/AT91SAM7S256/Source/d_usb.h b/src/d_usb.h
index b8e78c4..b8e78c4 100644
--- a/AT91SAM7S256/Source/d_usb.h
+++ b/src/d_usb.h
diff --git a/AT91SAM7S256/Source/d_usb.r b/src/d_usb.r
index 6c7a0c3..6c7a0c3 100644
--- a/AT91SAM7S256/Source/d_usb.r
+++ b/src/d_usb.r
diff --git a/AT91SAM7S256/Source/m_sched.c b/src/m_sched.c
index 7c69551..7c69551 100644
--- a/AT91SAM7S256/Source/m_sched.c
+++ b/src/m_sched.c
diff --git a/AT91SAM7S256/Source/m_sched.h b/src/m_sched.h
index b3bb27e..00794ee 100644
--- a/AT91SAM7S256/Source/m_sched.h
+++ b/src/m_sched.h
@@ -36,7 +36,7 @@
#define SYSFREQ 1000
-#include "../SAM7S256/Include/sam7s256.h"
+#include "sam7s256.h"
#if defined (PROTOTYPE_PCB_3) || (PROTOTYPE_PCB_4)
@@ -102,7 +102,7 @@ extern IOFROMAVR IoFromAvr;
#ifdef INCLUDE_OS
-#include "../SAM7S256/Include/sam7s256.c"
+#include "sam7s256.c"
IOTOAVR IoToAvr;
IOFROMAVR IoFromAvr;
diff --git a/AT91SAM7S256/Source/modules.h b/src/modules.h
index a5f3bb1..a5f3bb1 100644
--- a/AT91SAM7S256/Source/modules.h
+++ b/src/modules.h
diff --git a/AT91SAM7S256/SAM7S256/Include/sam7s256.c b/src/sam7s256.c
index b2657d5..b2657d5 100644
--- a/AT91SAM7S256/SAM7S256/Include/sam7s256.c
+++ b/src/sam7s256.c
diff --git a/AT91SAM7S256/SAM7S256/Include/sam7s256.h b/src/sam7s256.h
index 0118c40..0118c40 100644
--- a/AT91SAM7S256/SAM7S256/Include/sam7s256.h
+++ b/src/sam7s256.h
diff --git a/AT91SAM7S256/Source/stdconst.h b/src/stdconst.h
index 6c08175..6c08175 100644
--- a/AT91SAM7S256/Source/stdconst.h
+++ b/src/stdconst.h
diff --git a/AT91SAM7S256/SAM7S256/Include/Cstartup.S b/startup/Cstartup.S
index 0293251..0293251 100644
--- a/AT91SAM7S256/SAM7S256/Include/Cstartup.S
+++ b/startup/Cstartup.S
diff --git a/AT91SAM7S256/SAM7S256/Include/Cstartup_SAM7.c b/startup/Cstartup_SAM7.c
index c0a7da4..c0a7da4 100644
--- a/AT91SAM7S256/SAM7S256/Include/Cstartup_SAM7.c
+++ b/startup/Cstartup_SAM7.c