From 24c21c92d29b76a3f0de0a107f4bafef7bb0f812 Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 7 Nov 2008 22:21:30 +0000 Subject: [PATCH] Rename app dir to examples. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1913 38d2e660-2303-0410-9eaa-f027e97ec537 --- Makefile | 6 +++--- Makefile.test | 4 ++-- {app => examples}/at91sam7s/at91sam7s.c | 0 {app => examples}/at91sam7s/at91sam7s.mk | 4 ++-- {app => examples}/at91sam7s/cfg/cfg_kern.h | 0 {app => examples}/at91sam7s/hw/hw_cpu.h | 0 {app => examples}/at91sam7s/hw/hw_ser.h | 0 {app => examples}/at91sam7s/verstag.h | 0 {app => examples}/demo/cfg/cfg_kern.h | 0 {app => examples}/demo/demo.c | 0 {app => examples}/demo/demo.mk | 6 +++--- {app => examples}/demo/hw/kbd_map.h | 0 {app => examples}/demo/verstag.h | 0 {app => examples}/lm3s1968/hw/hw_cpu.h | 0 {app => examples}/lm3s1968/lm3s1968.c | 0 {app => examples}/lm3s1968/lm3s1968.mk | 6 +++--- {app => examples}/randpool/appconfig.h | 0 {app => examples}/randpool/randpool_demo.c | 0 {app => examples}/randpool/randpool_demo.mk | 4 ++-- {app => examples}/test/armtest.mk | 6 +++--- {app => examples}/test/avrtest.mk | 6 +++--- {app => examples}/test/empty_main.c | 0 {app => examples}/triface/boot/boot.ld | 0 {app => examples}/triface/boot/cfg/cfg_arch.h | 0 {app => examples}/triface/boot/cfg/cfg_boot.h | 0 {app => examples}/triface/boot/cfg/cfg_formatwr.h | 0 {app => examples}/triface/boot/cfg/cfg_kern.h | 0 {app => examples}/triface/boot/cfg/cfg_kfile.h | 0 {app => examples}/triface/boot/cfg/cfg_ser.h | 0 {app => examples}/triface/boot/hw/hw_boot.h | 0 {app => examples}/triface/boot/hw/hw_cpu.h | 0 {app => examples}/triface/boot/hw/hw_ser.h | 0 {app => examples}/triface/boot/main.c | 0 {app => examples}/triface/cfg/cfg_arch.h | 0 {app => examples}/triface/cfg/cfg_debug.h | 0 {app => examples}/triface/cfg/cfg_kern.h | 0 {app => examples}/triface/cfg/cfg_kfile.h | 0 {app => examples}/triface/cfg/cfg_ser.h | 0 {app => examples}/triface/cfg/cfg_wdt.h | 0 {app => examples}/triface/cmd_ctor.h | 0 {app => examples}/triface/doc/PROTOCOL | 0 .../triface/doc/schematics/TRIFACE.DSN | Bin .../triface/doc/schematics/triface.opj | 0 {app => examples}/triface/hw/hw_adc.c | 0 {app => examples}/triface/hw/hw_adc.h | 0 {app => examples}/triface/hw/hw_buzzer.h | 0 {app => examples}/triface/hw/hw_cpu.h | 0 {app => examples}/triface/hw/hw_input.h | 0 {app => examples}/triface/hw/hw_ser.h | 0 {app => examples}/triface/hw/hw_sipo.h | 0 {app => examples}/triface/protocol.c | 0 {app => examples}/triface/protocol.h | 0 {app => examples}/triface/triface.c | 0 {app => examples}/triface/triface.mk | 14 +++++++------- {app => examples}/triface/verstag.h | 0 55 files changed, 28 insertions(+), 28 deletions(-) rename {app => examples}/at91sam7s/at91sam7s.c (100%) rename {app => examples}/at91sam7s/at91sam7s.mk (89%) rename {app => examples}/at91sam7s/cfg/cfg_kern.h (100%) rename {app => examples}/at91sam7s/hw/hw_cpu.h (100%) rename {app => examples}/at91sam7s/hw/hw_ser.h (100%) rename {app => examples}/at91sam7s/verstag.h (100%) rename {app => examples}/demo/cfg/cfg_kern.h (100%) rename {app => examples}/demo/demo.c (100%) rename {app => examples}/demo/demo.mk (94%) rename {app => examples}/demo/hw/kbd_map.h (100%) rename {app => examples}/demo/verstag.h (100%) rename {app => examples}/lm3s1968/hw/hw_cpu.h (100%) rename {app => examples}/lm3s1968/lm3s1968.c (100%) rename {app => examples}/lm3s1968/lm3s1968.mk (74%) rename {app => examples}/randpool/appconfig.h (100%) rename {app => examples}/randpool/randpool_demo.c (100%) rename {app => examples}/randpool/randpool_demo.mk (83%) rename {app => examples}/test/armtest.mk (80%) rename {app => examples}/test/avrtest.mk (76%) rename {app => examples}/test/empty_main.c (100%) rename {app => examples}/triface/boot/boot.ld (100%) rename {app => examples}/triface/boot/cfg/cfg_arch.h (100%) rename {app => examples}/triface/boot/cfg/cfg_boot.h (100%) rename {app => examples}/triface/boot/cfg/cfg_formatwr.h (100%) rename {app => examples}/triface/boot/cfg/cfg_kern.h (100%) rename {app => examples}/triface/boot/cfg/cfg_kfile.h (100%) rename {app => examples}/triface/boot/cfg/cfg_ser.h (100%) rename {app => examples}/triface/boot/hw/hw_boot.h (100%) rename {app => examples}/triface/boot/hw/hw_cpu.h (100%) rename {app => examples}/triface/boot/hw/hw_ser.h (100%) rename {app => examples}/triface/boot/main.c (100%) rename {app => examples}/triface/cfg/cfg_arch.h (100%) rename {app => examples}/triface/cfg/cfg_debug.h (100%) rename {app => examples}/triface/cfg/cfg_kern.h (100%) rename {app => examples}/triface/cfg/cfg_kfile.h (100%) rename {app => examples}/triface/cfg/cfg_ser.h (100%) rename {app => examples}/triface/cfg/cfg_wdt.h (100%) rename {app => examples}/triface/cmd_ctor.h (100%) rename {app => examples}/triface/doc/PROTOCOL (100%) rename {app => examples}/triface/doc/schematics/TRIFACE.DSN (100%) rename {app => examples}/triface/doc/schematics/triface.opj (100%) rename {app => examples}/triface/hw/hw_adc.c (100%) rename {app => examples}/triface/hw/hw_adc.h (100%) rename {app => examples}/triface/hw/hw_buzzer.h (100%) rename {app => examples}/triface/hw/hw_cpu.h (100%) rename {app => examples}/triface/hw/hw_input.h (100%) rename {app => examples}/triface/hw/hw_ser.h (100%) rename {app => examples}/triface/hw/hw_sipo.h (100%) rename {app => examples}/triface/protocol.c (100%) rename {app => examples}/triface/protocol.h (100%) rename {app => examples}/triface/triface.c (100%) rename {app => examples}/triface/triface.mk (81%) rename {app => examples}/triface/verstag.h (100%) diff --git a/Makefile b/Makefile index a7c0b12c..1eb5c26e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ default: all include bertos/config.mk #Include subtargets -include app/demo/demo.mk -#include app/at91sam7s/at91sam7s.mk -#include app/triface/triface.mk +include examples/demo/demo.mk +#include examples/at91sam7s/at91sam7s.mk +#include examples/triface/triface.mk include bertos/rules.mk diff --git a/Makefile.test b/Makefile.test index 4ddda36b..5b485c11 100644 --- a/Makefile.test +++ b/Makefile.test @@ -5,6 +5,6 @@ V:= 0 default: all include bertos/config.mk -include ./app/test/avrtest.mk -include ./app/test/armtest.mk +include ./examples/test/avrtest.mk +include ./examples/test/armtest.mk include bertos/rules.mk diff --git a/app/at91sam7s/at91sam7s.c b/examples/at91sam7s/at91sam7s.c similarity index 100% rename from app/at91sam7s/at91sam7s.c rename to examples/at91sam7s/at91sam7s.c diff --git a/app/at91sam7s/at91sam7s.mk b/examples/at91sam7s/at91sam7s.mk similarity index 89% rename from app/at91sam7s/at91sam7s.mk rename to examples/at91sam7s/at91sam7s.mk index 44017904..f7d2a9d9 100644 --- a/app/at91sam7s/at91sam7s.mk +++ b/examples/at91sam7s/at91sam7s.mk @@ -16,7 +16,7 @@ at91sam7s_DEBUG = 1 TRG += at91sam7s at91sam7s_CSRC = \ - app/at91sam7s/at91sam7s.c \ + examples/at91sam7s/at91sam7s.c \ bertos/drv/timer.c \ bertos/drv/ser.c \ bertos/cpu/arm/drv/sysirq_at91.c \ @@ -38,7 +38,7 @@ at91sam7s_CPPASRC = \ at91sam7s_CROSS = arm-none-eabi- at91sam7s_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug -at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Ibertos/cpu/arm +at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/at91sam7s/hw -Iexamples/at91sam7s -Ibertos/cpu/arm at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch at91sam7s_CPU = arm7tdmi diff --git a/app/at91sam7s/cfg/cfg_kern.h b/examples/at91sam7s/cfg/cfg_kern.h similarity index 100% rename from app/at91sam7s/cfg/cfg_kern.h rename to examples/at91sam7s/cfg/cfg_kern.h diff --git a/app/at91sam7s/hw/hw_cpu.h b/examples/at91sam7s/hw/hw_cpu.h similarity index 100% rename from app/at91sam7s/hw/hw_cpu.h rename to examples/at91sam7s/hw/hw_cpu.h diff --git a/app/at91sam7s/hw/hw_ser.h b/examples/at91sam7s/hw/hw_ser.h similarity index 100% rename from app/at91sam7s/hw/hw_ser.h rename to examples/at91sam7s/hw/hw_ser.h diff --git a/app/at91sam7s/verstag.h b/examples/at91sam7s/verstag.h similarity index 100% rename from app/at91sam7s/verstag.h rename to examples/at91sam7s/verstag.h diff --git a/app/demo/cfg/cfg_kern.h b/examples/demo/cfg/cfg_kern.h similarity index 100% rename from app/demo/cfg/cfg_kern.h rename to examples/demo/cfg/cfg_kern.h diff --git a/app/demo/demo.c b/examples/demo/demo.c similarity index 100% rename from app/demo/demo.c rename to examples/demo/demo.c diff --git a/app/demo/demo.mk b/examples/demo/demo.mk similarity index 94% rename from app/demo/demo.mk rename to examples/demo/demo.mk index 3b318d20..504d80fa 100644 --- a/app/demo/demo.mk +++ b/examples/demo/demo.mk @@ -28,7 +28,7 @@ demo_CXXSRC = \ bertos/drv/lcd_gfx_qt.cpp demo_CSRC = \ - app/demo/demo.c \ + examples/demo/demo.c \ bertos/os/hptime.c \ bertos/gfx/bitmap.c \ bertos/gfx/line.c \ @@ -76,8 +76,8 @@ bertos/emul/timer_qt_moc.cpp: bertos/emul/timer_qt.c $(QT_MOC) -o $@ $< -demo_CFLAGS = -Iapp/demo $(EMUL_CFLAGS) -demo_CXXFLAGS = -Iapp/demo $(EMUL_CFLAGS) +demo_CFLAGS = -Iexamples/demo $(EMUL_CFLAGS) +demo_CXXFLAGS = -Iexamples/demo $(EMUL_CFLAGS) demo_LDFLAGS = $(EMUL_LDFLAGS) # Debug stuff diff --git a/app/demo/hw/kbd_map.h b/examples/demo/hw/kbd_map.h similarity index 100% rename from app/demo/hw/kbd_map.h rename to examples/demo/hw/kbd_map.h diff --git a/app/demo/verstag.h b/examples/demo/verstag.h similarity index 100% rename from app/demo/verstag.h rename to examples/demo/verstag.h diff --git a/app/lm3s1968/hw/hw_cpu.h b/examples/lm3s1968/hw/hw_cpu.h similarity index 100% rename from app/lm3s1968/hw/hw_cpu.h rename to examples/lm3s1968/hw/hw_cpu.h diff --git a/app/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c similarity index 100% rename from app/lm3s1968/lm3s1968.c rename to examples/lm3s1968/lm3s1968.c diff --git a/app/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk similarity index 74% rename from app/lm3s1968/lm3s1968.mk rename to examples/lm3s1968/lm3s1968.mk index 8d1b32d9..bf516125 100644 --- a/app/lm3s1968/lm3s1968.mk +++ b/examples/lm3s1968/lm3s1968.mk @@ -17,15 +17,15 @@ lm3s1968_DEBUG = 0 TRG += lm3s1968 lm3s1968_CSRC = \ - app/lm3s1968/lm3s1968.c \ + examples/lm3s1968/lm3s1968.c \ #bertos/cpu/cortex-m3/startup_lm3s.c lm3s1968_CROSS = arm-none-eabi- lm3s1968_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug -mthumb -lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -g3 -gdwarf-2 -fverbose-asm -mthumb -Iapp/lm3s1968 -Ibertos/cpu/cortex-m3 -lm3s1968_LDFLAGS = -nostartfiles -T app/lm3s1968/standalone.ld -Wl,--no-warn-mismatch +lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -g3 -gdwarf-2 -fverbose-asm -mthumb -Iexamples/lm3s1968 -Ibertos/cpu/cortex-m3 +lm3s1968_LDFLAGS = -nostartfiles -T examples/lm3s1968/standalone.ld -Wl,--no-warn-mismatch lm3s1968_CPU = cortex-m3 diff --git a/app/randpool/appconfig.h b/examples/randpool/appconfig.h similarity index 100% rename from app/randpool/appconfig.h rename to examples/randpool/appconfig.h diff --git a/app/randpool/randpool_demo.c b/examples/randpool/randpool_demo.c similarity index 100% rename from app/randpool/randpool_demo.c rename to examples/randpool/randpool_demo.c diff --git a/app/randpool/randpool_demo.mk b/examples/randpool/randpool_demo.mk similarity index 83% rename from app/randpool/randpool_demo.mk rename to examples/randpool/randpool_demo.mk index 11d947e6..680f3cff 100644 --- a/app/randpool/randpool_demo.mk +++ b/examples/randpool/randpool_demo.mk @@ -21,13 +21,13 @@ randpool_demo_DEBUG = 0 TRG += randpool_demo randpool_demo_CSRC = \ - app/randpool/randpool_demo.c \ + examples/randpool/randpool_demo.c \ algos/randpool.c \ algos/md2.c \ drv/timer.c \ os/hptime.c -randpool_demo_CFLAGS = -O0 -D'ARCH=0' -Iapp/randpool/ -Iapp/randpool/hw +randpool_demo_CFLAGS = -O0 -D'ARCH=0' -Iexamples/randpool/ -Iexamples/randpool/hw # Debug stuff ifeq ($(randpool_demo_DEBUG),1) diff --git a/app/test/armtest.mk b/examples/test/armtest.mk similarity index 80% rename from app/test/armtest.mk rename to examples/test/armtest.mk index 4a36082b..c5a8204f 100644 --- a/app/test/armtest.mk +++ b/examples/test/armtest.mk @@ -16,16 +16,16 @@ armtest_DEBUG = 1 TRG += armtest #include arm c and asm sources -include ./app/test/arm_src.mk +include ./examples/test/arm_src.mk -armtest_CSRC = $(arm_CSRC) app/test/empty_main.c +armtest_CSRC = $(arm_CSRC) examples/test/empty_main.c armtest_CPPASRC = $(arm_ASRC) armtest_CROSS = arm-elf- armtest_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug -armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/test -Ibertos/cpu/arm +armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/test -Ibertos/cpu/arm armtest_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld -Wl,--no-warn-mismatch armtest_CPU = arm7tdmi diff --git a/app/test/avrtest.mk b/examples/test/avrtest.mk similarity index 76% rename from app/test/avrtest.mk rename to examples/test/avrtest.mk index a6ff97ff..dc72d83e 100644 --- a/app/test/avrtest.mk +++ b/examples/test/avrtest.mk @@ -19,14 +19,14 @@ TRG += avrtest avrtest_MCU = atmega64 #include avr c and asm sources -include app/test/avr_src.mk +include examples/test/avr_src.mk -avrtest_CSRC = $(avr_CSRC) app/test/empty_main.c +avrtest_CSRC = $(avr_CSRC) examples/test/empty_main.c avrtest_CPPASRC = $(avr_ASRC) avrtest_PCSRC += bertos/mware/formatwr.c avrtest_CROSS = avr- -avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iapp/test -Ibertos/cpu/avr +avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iexamples/test -Ibertos/cpu/avr avrtest_CFLAGS = -Os -mcall-prologues -fno-strict-aliasing diff --git a/app/test/empty_main.c b/examples/test/empty_main.c similarity index 100% rename from app/test/empty_main.c rename to examples/test/empty_main.c diff --git a/app/triface/boot/boot.ld b/examples/triface/boot/boot.ld similarity index 100% rename from app/triface/boot/boot.ld rename to examples/triface/boot/boot.ld diff --git a/app/triface/boot/cfg/cfg_arch.h b/examples/triface/boot/cfg/cfg_arch.h similarity index 100% rename from app/triface/boot/cfg/cfg_arch.h rename to examples/triface/boot/cfg/cfg_arch.h diff --git a/app/triface/boot/cfg/cfg_boot.h b/examples/triface/boot/cfg/cfg_boot.h similarity index 100% rename from app/triface/boot/cfg/cfg_boot.h rename to examples/triface/boot/cfg/cfg_boot.h diff --git a/app/triface/boot/cfg/cfg_formatwr.h b/examples/triface/boot/cfg/cfg_formatwr.h similarity index 100% rename from app/triface/boot/cfg/cfg_formatwr.h rename to examples/triface/boot/cfg/cfg_formatwr.h diff --git a/app/triface/boot/cfg/cfg_kern.h b/examples/triface/boot/cfg/cfg_kern.h similarity index 100% rename from app/triface/boot/cfg/cfg_kern.h rename to examples/triface/boot/cfg/cfg_kern.h diff --git a/app/triface/boot/cfg/cfg_kfile.h b/examples/triface/boot/cfg/cfg_kfile.h similarity index 100% rename from app/triface/boot/cfg/cfg_kfile.h rename to examples/triface/boot/cfg/cfg_kfile.h diff --git a/app/triface/boot/cfg/cfg_ser.h b/examples/triface/boot/cfg/cfg_ser.h similarity index 100% rename from app/triface/boot/cfg/cfg_ser.h rename to examples/triface/boot/cfg/cfg_ser.h diff --git a/app/triface/boot/hw/hw_boot.h b/examples/triface/boot/hw/hw_boot.h similarity index 100% rename from app/triface/boot/hw/hw_boot.h rename to examples/triface/boot/hw/hw_boot.h diff --git a/app/triface/boot/hw/hw_cpu.h b/examples/triface/boot/hw/hw_cpu.h similarity index 100% rename from app/triface/boot/hw/hw_cpu.h rename to examples/triface/boot/hw/hw_cpu.h diff --git a/app/triface/boot/hw/hw_ser.h b/examples/triface/boot/hw/hw_ser.h similarity index 100% rename from app/triface/boot/hw/hw_ser.h rename to examples/triface/boot/hw/hw_ser.h diff --git a/app/triface/boot/main.c b/examples/triface/boot/main.c similarity index 100% rename from app/triface/boot/main.c rename to examples/triface/boot/main.c diff --git a/app/triface/cfg/cfg_arch.h b/examples/triface/cfg/cfg_arch.h similarity index 100% rename from app/triface/cfg/cfg_arch.h rename to examples/triface/cfg/cfg_arch.h diff --git a/app/triface/cfg/cfg_debug.h b/examples/triface/cfg/cfg_debug.h similarity index 100% rename from app/triface/cfg/cfg_debug.h rename to examples/triface/cfg/cfg_debug.h diff --git a/app/triface/cfg/cfg_kern.h b/examples/triface/cfg/cfg_kern.h similarity index 100% rename from app/triface/cfg/cfg_kern.h rename to examples/triface/cfg/cfg_kern.h diff --git a/app/triface/cfg/cfg_kfile.h b/examples/triface/cfg/cfg_kfile.h similarity index 100% rename from app/triface/cfg/cfg_kfile.h rename to examples/triface/cfg/cfg_kfile.h diff --git a/app/triface/cfg/cfg_ser.h b/examples/triface/cfg/cfg_ser.h similarity index 100% rename from app/triface/cfg/cfg_ser.h rename to examples/triface/cfg/cfg_ser.h diff --git a/app/triface/cfg/cfg_wdt.h b/examples/triface/cfg/cfg_wdt.h similarity index 100% rename from app/triface/cfg/cfg_wdt.h rename to examples/triface/cfg/cfg_wdt.h diff --git a/app/triface/cmd_ctor.h b/examples/triface/cmd_ctor.h similarity index 100% rename from app/triface/cmd_ctor.h rename to examples/triface/cmd_ctor.h diff --git a/app/triface/doc/PROTOCOL b/examples/triface/doc/PROTOCOL similarity index 100% rename from app/triface/doc/PROTOCOL rename to examples/triface/doc/PROTOCOL diff --git a/app/triface/doc/schematics/TRIFACE.DSN b/examples/triface/doc/schematics/TRIFACE.DSN similarity index 100% rename from app/triface/doc/schematics/TRIFACE.DSN rename to examples/triface/doc/schematics/TRIFACE.DSN diff --git a/app/triface/doc/schematics/triface.opj b/examples/triface/doc/schematics/triface.opj similarity index 100% rename from app/triface/doc/schematics/triface.opj rename to examples/triface/doc/schematics/triface.opj diff --git a/app/triface/hw/hw_adc.c b/examples/triface/hw/hw_adc.c similarity index 100% rename from app/triface/hw/hw_adc.c rename to examples/triface/hw/hw_adc.c diff --git a/app/triface/hw/hw_adc.h b/examples/triface/hw/hw_adc.h similarity index 100% rename from app/triface/hw/hw_adc.h rename to examples/triface/hw/hw_adc.h diff --git a/app/triface/hw/hw_buzzer.h b/examples/triface/hw/hw_buzzer.h similarity index 100% rename from app/triface/hw/hw_buzzer.h rename to examples/triface/hw/hw_buzzer.h diff --git a/app/triface/hw/hw_cpu.h b/examples/triface/hw/hw_cpu.h similarity index 100% rename from app/triface/hw/hw_cpu.h rename to examples/triface/hw/hw_cpu.h diff --git a/app/triface/hw/hw_input.h b/examples/triface/hw/hw_input.h similarity index 100% rename from app/triface/hw/hw_input.h rename to examples/triface/hw/hw_input.h diff --git a/app/triface/hw/hw_ser.h b/examples/triface/hw/hw_ser.h similarity index 100% rename from app/triface/hw/hw_ser.h rename to examples/triface/hw/hw_ser.h diff --git a/app/triface/hw/hw_sipo.h b/examples/triface/hw/hw_sipo.h similarity index 100% rename from app/triface/hw/hw_sipo.h rename to examples/triface/hw/hw_sipo.h diff --git a/app/triface/protocol.c b/examples/triface/protocol.c similarity index 100% rename from app/triface/protocol.c rename to examples/triface/protocol.c diff --git a/app/triface/protocol.h b/examples/triface/protocol.h similarity index 100% rename from app/triface/protocol.h rename to examples/triface/protocol.h diff --git a/app/triface/triface.c b/examples/triface/triface.c similarity index 100% rename from app/triface/triface.c rename to examples/triface/triface.c diff --git a/app/triface/triface.mk b/examples/triface/triface.mk similarity index 81% rename from app/triface/triface.mk rename to examples/triface/triface.mk index f208dfa3..871f02d0 100644 --- a/app/triface/triface.mk +++ b/examples/triface/triface.mk @@ -20,9 +20,9 @@ triface_lfuse = 0xff triface_efuse = 0xff triface_lock = 0x2f triface_CSRC = \ - app/triface/triface.c \ - app/triface/protocol.c \ - app/triface/hw/hw_adc.c \ + examples/triface/triface.c \ + examples/triface/protocol.c \ + examples/triface/hw/hw_adc.c \ bertos/drv/timer.c \ bertos/drv/ser.c \ bertos/drv/buzzer.c \ @@ -41,7 +41,7 @@ triface_CSRC = \ triface_PCSRC += bertos/mware/formatwr.c -triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr +triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr triface_LDFLAGS = -Wl triface_MCU = atmega64 @@ -55,7 +55,7 @@ TRG += boot boot_MCU = atmega64 boot_CSRC = \ - app/triface/boot/main.c \ + examples/triface/boot/main.c \ bertos/net/xmodem.c \ bertos/drv/ser.c \ bertos/cpu/avr/drv/ser_avr.c \ @@ -66,7 +66,7 @@ boot_CSRC = \ bertos/kern/kfile.c \ # boot_CROSS = avr- -boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iapp/triface/boot -Ibertos/cpu/avr +boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iexamples/triface/boot -Ibertos/cpu/avr boot_CFLAGS = -Os -mcall-prologues -boot_LDSCRIPT = app/triface/boot/boot.ld +boot_LDSCRIPT = examples/triface/boot/boot.ld boot_LDFLAGS = -Wl,--relax diff --git a/app/triface/verstag.h b/examples/triface/verstag.h similarity index 100% rename from app/triface/verstag.h rename to examples/triface/verstag.h -- 2.25.1