Fix kfile.c source include to allow the developers to build preset inside bertos.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4559 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/boards/arduino-mega/benchmark/context_switch/context_switch.mk b/boards/arduino-mega/benchmark/context_switch/context_switch.mk
index 207a3eab38d4b78adc0900dfb9c1994b4ef6582e..1d165f1eb5c0352cea0945166a285ffa040719b8 100644 (file)
--- a/boards/arduino-mega/benchmark/context_switch/context_switch.mk
+++ b/boards/arduino-mega/benchmark/context_switch/context_switch.mk
@@ -21,7 +21,7 @@ context_switch_HW_PATH = boards/arduino
 context_switch_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/mware/event.c \

diff --git a/boards/arduino-mega/benchmark/kernel_footprint/kernel_footprint.mk b/boards/arduino-mega/benchmark/kernel_footprint/kernel_footprint.mk
index 884abd34d40719854e71cfc80a345243e67256bf..e85a02fb69af0f217b9f29131135289abb902992 100644 (file)
--- a/boards/arduino-mega/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/arduino-mega/benchmark/kernel_footprint/kernel_footprint.mk
@@ -20,7 +20,7 @@ kernel_footprint_HW_PATH = boards/arduino
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_footprint_USER_CSRC INSTEAD!
 kernel_footprint_WIZARD_CSRC = \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \

diff --git a/boards/arduino-mega/examples/aprs/aprs.mk b/boards/arduino-mega/examples/aprs/aprs.mk
index 850dd90b6a3607bf6178dcf060521aa2c0d7c958..030dcbbed77e13702a15ac8cf3b4ef05f0ef1012 100644 (file)
--- a/boards/arduino-mega/examples/aprs/aprs.mk
+++ b/boards/arduino-mega/examples/aprs/aprs.mk
@@ -20,7 +20,7 @@ aprs_HW_PATH = boards/arduino
 # Files automatically generated by the wizard. DO NOT EDIT, USE aprs_USER_CSRC INSTEAD!
 aprs_WIZARD_CSRC = \
        aprs/hw/hw_afsk.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/net/afsk.c \
        bertos/net/ax25.c \

diff --git a/boards/arduino-mega/templates/empty/empty.mk b/boards/arduino-mega/templates/empty/empty.mk
index 986e3f6c69059af168fc367456aee7247f40258b..ea8ed172fe47cd4c1e7ecc86239bff8d277da613 100644 (file)
--- a/boards/arduino-mega/templates/empty/empty.mk
+++ b/boards/arduino-mega/templates/empty/empty.mk
@@ -21,7 +21,7 @@ empty_HW_PATH = boards/arduino
 empty_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/mware/event.c \

diff --git a/boards/arduino-mega/templates/kernel/kernel.mk b/boards/arduino-mega/templates/kernel/kernel.mk
index 487247c11c149b9ca1b3083c951e3a145717fdea..dbebab22ae0830e67e7e834229dd34bd8ca7ac22 100644 (file)
--- a/boards/arduino-mega/templates/kernel/kernel.mk
+++ b/boards/arduino-mega/templates/kernel/kernel.mk
@@ -19,7 +19,7 @@ kernel_HW_PATH = boards/arduino
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_USER_CSRC INSTEAD!
 kernel_WIZARD_CSRC = \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/signal.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/kern/sem.c \

diff --git a/boards/arduino/benchmark/context_switch/context_switch.mk b/boards/arduino/benchmark/context_switch/context_switch.mk
index 207a3eab38d4b78adc0900dfb9c1994b4ef6582e..1d165f1eb5c0352cea0945166a285ffa040719b8 100644 (file)
--- a/boards/arduino/benchmark/context_switch/context_switch.mk
+++ b/boards/arduino/benchmark/context_switch/context_switch.mk
@@ -21,7 +21,7 @@ context_switch_HW_PATH = boards/arduino
 context_switch_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/mware/event.c \

diff --git a/boards/arduino/benchmark/kernel_footprint/kernel_footprint.mk b/boards/arduino/benchmark/kernel_footprint/kernel_footprint.mk
index 884abd34d40719854e71cfc80a345243e67256bf..e85a02fb69af0f217b9f29131135289abb902992 100644 (file)
--- a/boards/arduino/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/arduino/benchmark/kernel_footprint/kernel_footprint.mk
@@ -20,7 +20,7 @@ kernel_footprint_HW_PATH = boards/arduino
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_footprint_USER_CSRC INSTEAD!
 kernel_footprint_WIZARD_CSRC = \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \

diff --git a/boards/arduino/examples/aprs/aprs.mk b/boards/arduino/examples/aprs/aprs.mk
index 850dd90b6a3607bf6178dcf060521aa2c0d7c958..17d8285b5a66f1716569960911585fb5506894e6 100644 (file)
--- a/boards/arduino/examples/aprs/aprs.mk
+++ b/boards/arduino/examples/aprs/aprs.mk
@@ -19,8 +19,7 @@ aprs_HW_PATH = boards/arduino
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE aprs_USER_CSRC INSTEAD!
 aprs_WIZARD_CSRC = \
-       aprs/hw/hw_afsk.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/net/afsk.c \
        bertos/net/ax25.c \

diff --git a/boards/arduino/examples/aprs/aprs_user.mk b/boards/arduino/examples/aprs/aprs_user.mk
index 5fb75d29559e6d8a64d2574c3bfb0862a24941ef..408d83c85a0e309e83dfe82f07d904bd15497119 100644 (file)
--- a/boards/arduino/examples/aprs/aprs_user.mk
+++ b/boards/arduino/examples/aprs/aprs_user.mk
@@ -10,7 +10,7 @@ aprs_PROGRAMMER_PORT = none
 # Files included by the user.
 aprs_USER_CSRC = \
        $(aprs_SRC_PATH)/main.c \
-       $(aprs_SRC_PATH)/hw/hw_afsk.c \
+       $(aprs_HW_PATH)/hw/hw_afsk.c \
        #
 
 # Files included by the user.

diff --git a/boards/arduino/templates/empty/empty.mk b/boards/arduino/templates/empty/empty.mk
index 986e3f6c69059af168fc367456aee7247f40258b..ea8ed172fe47cd4c1e7ecc86239bff8d277da613 100644 (file)
--- a/boards/arduino/templates/empty/empty.mk
+++ b/boards/arduino/templates/empty/empty.mk
@@ -21,7 +21,7 @@ empty_HW_PATH = boards/arduino
 empty_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/mware/event.c \

diff --git a/boards/arduino/templates/kernel/kernel.mk b/boards/arduino/templates/kernel/kernel.mk
index 487247c11c149b9ca1b3083c951e3a145717fdea..dbebab22ae0830e67e7e834229dd34bd8ca7ac22 100644 (file)
--- a/boards/arduino/templates/kernel/kernel.mk
+++ b/boards/arduino/templates/kernel/kernel.mk
@@ -19,7 +19,7 @@ kernel_HW_PATH = boards/arduino
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_USER_CSRC INSTEAD!
 kernel_WIZARD_CSRC = \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/signal.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/kern/sem.c \

diff --git a/boards/at91sam7s-ek/benchmark/context_switch/context_switch.mk b/boards/at91sam7s-ek/benchmark/context_switch/context_switch.mk
index 4579bdedb3f78a44bbd3e4cdd73cf3f22a97550b..dcb025e8417044b01e5871e8c07bfa7162896d37 100644 (file)
--- a/boards/at91sam7s-ek/benchmark/context_switch/context_switch.mk
+++ b/boards/at91sam7s-ek/benchmark/context_switch/context_switch.mk
@@ -22,7 +22,7 @@ context_switch_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/sysirq_at91.c \
        bertos/struct/heap.c \
        bertos/cpu/arm/drv/ser_arm.c \

diff --git a/boards/at91sam7s-ek/benchmark/kernel_footprint/kernel_footprint.mk b/boards/at91sam7s-ek/benchmark/kernel_footprint/kernel_footprint.mk
index 22b52340701d7119a32f7a7014ba945b0986d3b7..d49912035e2b7feff7a6e8927b812e04aee47878 100644 (file)
--- a/boards/at91sam7s-ek/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/at91sam7s-ek/benchmark/kernel_footprint/kernel_footprint.mk
@@ -21,7 +21,7 @@ kernel_footprint_HW_PATH = boards/at91sam7s-ek
 kernel_footprint_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/cpu/arm/drv/sysirq_at91.c \
        bertos/struct/heap.c \

diff --git a/boards/at91sam7s-ek/templates/empty/empty.mk b/boards/at91sam7s-ek/templates/empty/empty.mk
index 690ba166a6ef192fd19a160e3588bda136c9edc9..af8d6bec68b963dd09fe2a4bb0b97d20e48eba02 100644 (file)
--- a/boards/at91sam7s-ek/templates/empty/empty.mk
+++ b/boards/at91sam7s-ek/templates/empty/empty.mk
@@ -21,7 +21,7 @@ empty_HW_PATH = boards/at91sam7s-ek
 empty_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/cpu/arm/drv/sysirq_at91.c \
        bertos/struct/heap.c \

diff --git a/boards/at91sam7s-ek/templates/kernel/kernel.mk b/boards/at91sam7s-ek/templates/kernel/kernel.mk
index f6246c0065cc236ce7d40591914169b0d4fd363e..79bae92570a89a07f3a512e1640711e96fceee39 100644 (file)
--- a/boards/at91sam7s-ek/templates/kernel/kernel.mk
+++ b/boards/at91sam7s-ek/templates/kernel/kernel.mk
@@ -21,7 +21,7 @@ kernel_HW_PATH = boards/at91sam7s-ek
 kernel_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/kern/monitor.c \
        bertos/cpu/arm/drv/sysirq_at91.c \

diff --git a/boards/at91sam7x-ek/benchmark/context_switch/context_switch.mk b/boards/at91sam7x-ek/benchmark/context_switch/context_switch.mk
index 99447836172f83dfea69d04215fa20e420cf88c7..99bcffbad85354c5e796ced0dc1f53badbccec34 100644 (file)
--- a/boards/at91sam7x-ek/benchmark/context_switch/context_switch.mk
+++ b/boards/at91sam7x-ek/benchmark/context_switch/context_switch.mk
@@ -22,7 +22,7 @@ context_switch_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/sysirq_at91.c \
        bertos/struct/heap.c \
        bertos/cpu/arm/drv/ser_arm.c \

diff --git a/boards/at91sam7x-ek/benchmark/kernel_footprint/kernel_footprint.mk b/boards/at91sam7x-ek/benchmark/kernel_footprint/kernel_footprint.mk
index 4aa721379ca7348296c7e70154ce63c46976ffb4..4468ae694a59f105e457df9881d61f8c6b2f3b01 100644 (file)
--- a/boards/at91sam7x-ek/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/at91sam7x-ek/benchmark/kernel_footprint/kernel_footprint.mk
@@ -28,7 +28,7 @@ kernel_footprint_WIZARD_CSRC = \
        bertos/mware/formatwr.c \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/drv/timer.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/benchmark/kernel_footprint.c \
        bertos/mware/hex.c \

diff --git a/boards/at91sam7x-ek/templates/empty/empty.mk b/boards/at91sam7x-ek/templates/empty/empty.mk
index db387a92c4b79730cb6c9073a0ee1aacc17541f5..c767e1ab857cb4f05498515fda75981320acc33d 100644 (file)
--- a/boards/at91sam7x-ek/templates/empty/empty.mk
+++ b/boards/at91sam7x-ek/templates/empty/empty.mk
@@ -21,7 +21,7 @@ empty_HW_PATH = boards/at91sam7x-ek
 empty_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/sysirq_at91.c \
        bertos/struct/heap.c \
        bertos/cpu/arm/drv/ser_arm.c \

diff --git a/boards/at91sam7x-ek/templates/kernel/kernel.mk b/boards/at91sam7x-ek/templates/kernel/kernel.mk
index 5828c8a148df02075affc56da8f6fefb49bd1c41..07082f5390be9100798ec7811f2d63ec615d45ba 100644 (file)
--- a/boards/at91sam7x-ek/templates/kernel/kernel.mk
+++ b/boards/at91sam7x-ek/templates/kernel/kernel.mk
@@ -21,7 +21,7 @@ kernel_HW_PATH = boards/at91sam7x-ek
 kernel_WIZARD_CSRC = \
        bertos/cpu/arm/drv/timer_at91.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/kern/monitor.c \
        bertos/cpu/arm/drv/sysirq_at91.c \

diff --git a/boards/ek-lm3s1968/benchmark/context_switch/context_switch.mk b/boards/ek-lm3s1968/benchmark/context_switch/context_switch.mk
index b77876c6da5dc73b12ac69b6fce269d0a3c5b637..7ef31cf24bd4acc9918b8702f261a15a52253c65 100644 (file)
--- a/boards/ek-lm3s1968/benchmark/context_switch/context_switch.mk
+++ b/boards/ek-lm3s1968/benchmark/context_switch/context_switch.mk
@@ -13,7 +13,7 @@ context_switch_PREFIX = "arm-none-eabi-"
 
 context_switch_SUFFIX = ""
 
-context_switch_SRC_PATH = boards/ek-lm3s1968/benchmarck/context_switch
+context_switch_SRC_PATH = boards/ek-lm3s1968/benchmark/context_switch
 
 context_switch_HW_PATH = boards/ek-lm3s1968
 
@@ -21,7 +21,7 @@ context_switch_HW_PATH = boards/ek-lm3s1968
 context_switch_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/cortex-m3/drv/timer_cm3.c \
        bertos/drv/timer.c \
        bertos/mware/formatwr.c \
@@ -78,10 +78,10 @@ context_switch_ASRC = $(context_switch_CPU_ASRC) $(context_switch_WIZARD_ASRC) $
 
 # CPU specific flags and options, defined in the CPU definition files.
 # Automatically generated by the wizard. PLEASE DO NOT EDIT!
-context_switch_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S 
+context_switch_CPU_CPPASRC = bertos/cpu/cortex-m3/hw/crt_cm3.S bertos/cpu/cortex-m3/hw/vectors_cm3.S
 context_switch_CPU_CPPAFLAGS = -g -gdwarf-2 -mthumb -mno-thumb-interwork
 context_switch_CPU_CPPFLAGS = -O0 -g3 -gdwarf-2 -mthumb -mno-thumb-interwork -fno-strict-aliasing -fwrapv -fverbose-asm -Ibertos/cpu/cortex-m3/ -D__ARM_LM3S1968__
-context_switch_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/gpio_lm3s.c bertos/cpu/cortex-m3/drv/clock_lm3s.c 
+context_switch_CPU_CSRC = bertos/cpu/cortex-m3/hw/init_cm3.c bertos/cpu/cortex-m3/drv/irq_cm3.c bertos/cpu/cortex-m3/drv/gpio_lm3s.c bertos/cpu/cortex-m3/drv/clock_lm3s.c
 context_switch_PROGRAMMER_CPU = lm3s
 context_switch_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 context_switch_CPU = cortex-m3
@@ -91,3 +91,4 @@ context_switch_CPU_LDFLAGS = -mthumb -mno-thumb-interwork -nostartfiles -Wl,--no
 context_switch_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-lm3s.sh
 
 include $(context_switch_SRC_PATH)/context_switch_user.mk
+

diff --git a/boards/ek-lm3s1968/benchmark/kernel_footprint/kernel_footprint.mk b/boards/ek-lm3s1968/benchmark/kernel_footprint/kernel_footprint.mk
index ac890acc7c41179d5f6dd016996e4f669ead6241..32df97e0052640f471602746a91b1d8611b4feb8 100644 (file)
--- a/boards/ek-lm3s1968/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/ek-lm3s1968/benchmark/kernel_footprint/kernel_footprint.mk
@@ -26,7 +26,7 @@ kernel_footprint_WIZARD_CSRC = \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/drv/timer.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/benchmark/kernel_footprint.c \
        bertos/mware/hex.c \

diff --git a/boards/ek-lm3s1968/templates/empty/empty.mk b/boards/ek-lm3s1968/templates/empty/empty.mk
index a1f5fca4334b7bedfd9545aa63acfb1ce5de9e17..474f339918afcdbb1e60fc84c3a78758f461f3ed 100644 (file)
--- a/boards/ek-lm3s1968/templates/empty/empty.mk
+++ b/boards/ek-lm3s1968/templates/empty/empty.mk
@@ -33,7 +33,7 @@ empty_WIZARD_CSRC = \
        bertos/gfx/line.c \
        bertos/cpu/cortex-m3/drv/ser_lm3s.c \
        bertos/fonts/luBS14.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/drv/ser.c \
        bertos/mware/hex.c \

diff --git a/boards/ek-lm3s1968/templates/kernel/kernel.mk b/boards/ek-lm3s1968/templates/kernel/kernel.mk
index 48ec53518773f12bf7ea196e617bb5f3e9f7eaa6..40483164704f11a385217c1920842a70be8e57d6 100644 (file)
--- a/boards/ek-lm3s1968/templates/kernel/kernel.mk
+++ b/boards/ek-lm3s1968/templates/kernel/kernel.mk
@@ -33,7 +33,7 @@ kernel_WIZARD_CSRC = \
        bertos/gfx/line.c \
        bertos/cpu/cortex-m3/drv/ser_lm3s.c \
        bertos/fonts/luBS14.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/mware/formatwr.c \
        bertos/drv/ser.c \

diff --git a/boards/lpc-p2378/benchmark/context_switch/context_switch.mk b/boards/lpc-p2378/benchmark/context_switch/context_switch.mk
index 1d974e95e18c085e1ae7ef7acd2d2cc280b9c7ef..cc484ca5865b8b21652fa7ed3a46a66951ea156b 100644 (file)
--- a/boards/lpc-p2378/benchmark/context_switch/context_switch.mk
+++ b/boards/lpc-p2378/benchmark/context_switch/context_switch.mk
@@ -21,7 +21,7 @@ context_switch_HW_PATH = boards/ek-lpc-p2378
 context_switch_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/timer_lpc2.c \
        bertos/mware/formatwr.c \
        bertos/struct/heap.c \

diff --git a/boards/lpc-p2378/benchmark/kernel_footprint/kernel_footprint.mk b/boards/lpc-p2378/benchmark/kernel_footprint/kernel_footprint.mk
index ee65537a906aee36ad6f074579ad3cf813f5bb72..de6a55126e900353e271b41b55256a58ec78c670 100644 (file)
--- a/boards/lpc-p2378/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/lpc-p2378/benchmark/kernel_footprint/kernel_footprint.mk
@@ -25,7 +25,7 @@ kernel_footprint_WIZARD_CSRC = \
        bertos/drv/timer.c \
        bertos/mware/formatwr.c \
        bertos/cpu/arm/drv/timer_arm.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/mware/event.c \
        bertos/kern/proc.c \
        bertos/benchmark/kernel_footprint.c \

diff --git a/boards/lpc-p2378/templates/empty/empty.mk b/boards/lpc-p2378/templates/empty/empty.mk
index 8ba73a20eac4331b9356db90103b1d83fb916629..f67712fdbe3e562b7fcb9742451f725fb78ed623 100644 (file)
--- a/boards/lpc-p2378/templates/empty/empty.mk
+++ b/boards/lpc-p2378/templates/empty/empty.mk
@@ -20,7 +20,7 @@ empty_HW_PATH = boards/lpc-p2378
 # Files automatically generated by the wizard. DO NOT EDIT, USE empty_USER_CSRC INSTEAD!
 empty_WIZARD_CSRC = \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/timer_lpc2.c \
        bertos/kern/sem.c \
        bertos/mware/formatwr.c \

diff --git a/boards/lpc-p2378/templates/kernel/kernel.mk b/boards/lpc-p2378/templates/kernel/kernel.mk
index 0d12f9b17a0e0457674d7eeb82433693f61afa65..08f3af4118356d95e10aa1d1e32e1e6ba5299a64 100644 (file)
--- a/boards/lpc-p2378/templates/kernel/kernel.mk
+++ b/boards/lpc-p2378/templates/kernel/kernel.mk
@@ -20,7 +20,7 @@ kernel_HW_PATH = boards/lpc-p2378
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_USER_CSRC INSTEAD!
 kernel_WIZARD_CSRC = \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/cpu/arm/drv/timer_lpc2.c \
        bertos/kern/sem.c \
        bertos/kern/monitor.c \

diff --git a/boards/stm32-p103/benchmark/kernel_footprint/kernel_footprint.mk b/boards/stm32-p103/benchmark/kernel_footprint/kernel_footprint.mk
index ec8fc92deaede87aed60d91e618878b2eb67d76a..ad1e85c24301cf16a816fdd005755334bfcc468a 100644 (file)
--- a/boards/stm32-p103/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/stm32-p103/benchmark/kernel_footprint/kernel_footprint.mk
@@ -26,7 +26,7 @@ kernel_footprint_WIZARD_CSRC = \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/drv/timer.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/benchmark/kernel_footprint.c \
        bertos/mware/hex.c \

diff --git a/boards/stm32-p103/templates/empty/empty.mk b/boards/stm32-p103/templates/empty/empty.mk
index b2e86f64e27bf254568b4389810e9b5f227c6271..3010634fd9a0451fc682e5dfbcb4ce15b9f8d5d1 100644 (file)
--- a/boards/stm32-p103/templates/empty/empty.mk
+++ b/boards/stm32-p103/templates/empty/empty.mk
@@ -26,7 +26,7 @@ empty_WIZARD_CSRC = \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/drv/timer.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/mware/hex.c \
        bertos/kern/signal.c \

diff --git a/boards/stm32-p103/templates/kernel/kernel.mk b/boards/stm32-p103/templates/kernel/kernel.mk
index 2341d361b499a7c96bd44161fb10aa332ab3dea7..a14ab4b9f93785a8683766c3713b5df0a905b5a9 100644 (file)
--- a/boards/stm32-p103/templates/kernel/kernel.mk
+++ b/boards/stm32-p103/templates/kernel/kernel.mk
@@ -26,7 +26,7 @@ kernel_WIZARD_CSRC = \
        bertos/struct/heap.c \
        bertos/kern/monitor.c \
        bertos/drv/timer.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/proc.c \
        bertos/mware/formatwr.c \
        bertos/mware/hex.c \

diff --git a/boards/triface/benchmark/context_switch/context_switch.mk b/boards/triface/benchmark/context_switch/context_switch.mk
index 86571ec59602a8d637793cb831b83b5368f98ebb..0191a8ae441bade4e21cac1ffb03d2264dc89353 100644 (file)
--- a/boards/triface/benchmark/context_switch/context_switch.mk
+++ b/boards/triface/benchmark/context_switch/context_switch.mk
@@ -21,7 +21,7 @@ context_switch_HW_PATH = boards/triface
 context_switch_WIZARD_CSRC = \
        bertos/benchmark/context_switch.c \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \
        bertos/mware/event.c \

diff --git a/boards/triface/benchmark/kernel_footprint/kernel_footprint.mk b/boards/triface/benchmark/kernel_footprint/kernel_footprint.mk
index 4ab89f76983a0a701ce4fe0217162773ec81d78e..908c8705e3e0335a4f25aa139e6f0b33ef2ee4b7 100644 (file)
--- a/boards/triface/benchmark/kernel_footprint/kernel_footprint.mk
+++ b/boards/triface/benchmark/kernel_footprint/kernel_footprint.mk
@@ -20,7 +20,7 @@ kernel_footprint_HW_PATH = boards/triface
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_footprint_USER_CSRC INSTEAD!
 kernel_footprint_WIZARD_CSRC = \
        bertos/kern/signal.c \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/sem.c \
        bertos/struct/heap.c \
        bertos/mware/formatwr.c \

diff --git a/boards/triface/examples/triface/triface.mk b/boards/triface/examples/triface/triface.mk
index 095c4a60453733eefe7d0223fb938e0415572d63..674fd0e80c6d62c41ffd74f6064087bf0b4f6274 100644 (file)
--- a/boards/triface/examples/triface/triface.mk
+++ b/boards/triface/examples/triface/triface.mk
@@ -32,7 +32,7 @@ endif
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE triface_USER_CSRC INSTEAD!
 triface_WIZARD_CSRC = \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/mware/readline.c \
        bertos/mware/event.c \
        bertos/net/keytag.c \

diff --git a/boards/triface/templates/empty/empty.mk b/boards/triface/templates/empty/empty.mk
index eff89d9ff594d2553adc5d3f9c54c13d9ceb6187..8a4ae0e0262cd91f3e37f13468511b23dde29c44 100644 (file)
--- a/boards/triface/templates/empty/empty.mk
+++ b/boards/triface/templates/empty/empty.mk
@@ -19,7 +19,7 @@ empty_HW_PATH = boards/triface
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE empty_USER_CSRC INSTEAD!
 empty_WIZARD_CSRC = \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/signal.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/kern/sem.c \

diff --git a/boards/triface/templates/kernel/kernel.mk b/boards/triface/templates/kernel/kernel.mk
index 8169e703609f80d17f057c875657df9a609a8aaa..9ed303b6ff741fd1d3cf3d02d71cd07810c9986d 100644 (file)
--- a/boards/triface/templates/kernel/kernel.mk
+++ b/boards/triface/templates/kernel/kernel.mk
@@ -19,7 +19,7 @@ kernel_HW_PATH = boards/triface
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE kernel_USER_CSRC INSTEAD!
 kernel_WIZARD_CSRC = \
-       bertos/kern/kfile.c \
+       bertos/io/kfile.c \
        bertos/kern/signal.c \
        bertos/cpu/avr/drv/timer_avr.c \
        bertos/kern/sem.c \