From 791e167e053bdd9250d34a9a5ccae6ccde4d6679 Mon Sep 17 00:00:00 2001 From: batt Date: Fri, 4 Apr 2008 13:42:05 +0000 Subject: [PATCH] Refactor BeRTOS to be in his own directory. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1213 38d2e660-2303-0410-9eaa-f027e97ec537 --- Makefile | 4 +- app/demo/demo.mk | 86 +++++++++--------- {algo => bertos/algo}/crc.c | 0 {algo => bertos/algo}/crc.h | 0 {algo => bertos/algo}/md2.c | 0 {algo => bertos/algo}/md2.h | 0 {algo => bertos/algo}/ramp.c | 0 {algo => bertos/algo}/ramp.h | 0 {algo => bertos/algo}/ramp_test.c | 0 {algo => bertos/algo}/randpool.c | 0 {algo => bertos/algo}/randpool.h | 0 {algo => bertos/algo}/rotating_hash.h | 0 {algo => bertos/algo}/tea.c | 0 {algo => bertos/algo}/tea.h | 0 .../appconfig_common.h | 0 {cfg => bertos/cfg}/arch_config.h | 0 {cfg => bertos/cfg}/compiler.h | 0 {cfg => bertos/cfg}/debug.h | 0 {cfg => bertos/cfg}/macros.h | 0 {cfg => bertos/cfg}/module.h | 0 {cfg => bertos/cfg}/os.h | 0 config.mk => bertos/config.mk | 2 +- config_kern.h => bertos/config_kern.h | 0 {doc => bertos/doc}/TracFooter.html | 0 {doc => bertos/doc}/TracHeader.html | 0 {drv => bertos/drv}/adc.c | 0 {drv => bertos/drv}/adc.h | 0 {drv => bertos/drv}/buzzer.c | 0 {drv => bertos/drv}/buzzer.h | 0 {drv => bertos/drv}/buzzerled.c | 0 {drv => bertos/drv}/buzzerled.h | 0 {drv => bertos/drv}/dataflash.c | 0 {drv => bertos/drv}/dataflash.h | 0 {drv => bertos/drv}/eeprom.c | 0 {drv => bertos/drv}/eeprom.h | 0 {drv => bertos/drv}/flash25.c | 0 {drv => bertos/drv}/flash25.h | 0 {drv => bertos/drv}/kbd.c | 0 {drv => bertos/drv}/kbd.h | 0 {drv => bertos/drv}/kdebug.c | 0 {drv => bertos/drv}/lcd_gfx.h | 0 {drv => bertos/drv}/lcd_gfx_qt.cpp | 0 {drv => bertos/drv}/lcd_gfx_qt.h | 0 {drv => bertos/drv}/lcd_gfx_test.c | 0 {drv => bertos/drv}/lcd_hd44.c | 0 {drv => bertos/drv}/lcd_hd44.h | 0 {drv => bertos/drv}/lcd_lm44_qt.cpp | 0 {drv => bertos/drv}/lcd_lm44_qt.h | 0 {drv => bertos/drv}/lcd_text.c | 0 {drv => bertos/drv}/lcd_text.h | 0 {drv => bertos/drv}/mcp41.c | 0 {drv => bertos/drv}/mcp41.h | 0 {drv => bertos/drv}/ntc.c | 0 {drv => bertos/drv}/ntc.h | 0 {drv => bertos/drv}/phase.c | 0 {drv => bertos/drv}/phase.h | 0 {drv => bertos/drv}/pwm.c | 0 {drv => bertos/drv}/pwm.h | 0 {drv => bertos/drv}/pwm_test.c | 0 {drv => bertos/drv}/ser.c | 0 {drv => bertos/drv}/ser.h | 0 {drv => bertos/drv}/ser_p.h | 0 {drv => bertos/drv}/ser_posix.c | 0 {drv => bertos/drv}/spi_bitbang.c | 0 {drv => bertos/drv}/spi_bitbang.h | 0 {drv => bertos/drv}/tc520.c | 0 {drv => bertos/drv}/tc520.h | 0 {drv => bertos/drv}/thermo.c | 0 {drv => bertos/drv}/thermo.h | 0 {drv => bertos/drv}/timer.c | 0 {drv => bertos/drv}/timer.h | 0 {drv => bertos/drv}/timer_posix.c | 0 {drv => bertos/drv}/timer_posix.h | 0 {drv => bertos/drv}/timer_qt.c | 0 {drv => bertos/drv}/timer_qt.h | 0 {drv => bertos/drv}/timer_test.c | 0 {drv => bertos/drv}/wdt.h | 0 {dt => bertos/dt}/dnotifier.c | 0 {dt => bertos/dt}/dnotifier.h | 0 {dt => bertos/dt}/dtag.h | 0 {dt => bertos/dt}/dwidget.c | 0 {dt => bertos/dt}/dwidget.h | 0 {dt => bertos/dt}/editbool.c | 0 {dt => bertos/dt}/editbool.h | 0 {dt => bertos/dt}/editint.c | 0 {dt => bertos/dt}/editint.h | 0 {emul => bertos/emul}/emul.cpp | 0 {emul => bertos/emul}/emul.h | 0 {emul => bertos/emul}/emul.mk | 0 {emul => bertos/emul}/emulkbd.cpp | 0 {emul => bertos/emul}/emulkbd.h | 0 {emul => bertos/emul}/emulwin.cpp | 0 {emul => bertos/emul}/emulwin.h | 0 {fonts => bertos/fonts}/convbdf | 0 {fonts => bertos/fonts}/fixed6x8.c | 0 {fonts => bertos/fonts}/fonts.mk | 2 +- {fonts => bertos/fonts}/helvB10.bdf | 0 {fonts => bertos/fonts}/luBS14.bdf | 0 {fonts => bertos/fonts}/ncenB18.bdf | 0 {fs => bertos/fs}/battfs.c | 0 {fs => bertos/fs}/battfs.h | 0 {gfx => bertos/gfx}/bitmap.c | 0 {gfx => bertos/gfx}/charts.c | 0 {gfx => bertos/gfx}/charts.h | 0 {gfx => bertos/gfx}/fillpoly.cpp | 0 {gfx => bertos/gfx}/font.h | 0 {gfx => bertos/gfx}/font_10x20.c | 0 {gfx => bertos/gfx}/gfx.h | 0 {gfx => bertos/gfx}/gfx_p.h | 0 {gfx => bertos/gfx}/line.c | 0 {gfx => bertos/gfx}/text.c | 0 {gfx => bertos/gfx}/text.h | 0 {gfx => bertos/gfx}/text_format.c | 0 {gfx => bertos/gfx}/win.c | 0 {gfx => bertos/gfx}/win.h | 0 {gui => bertos/gui}/levelbar.c | 0 {gui => bertos/gui}/levelbar.h | 0 {gui => bertos/gui}/leveledit.c | 0 {gui => bertos/gui}/leveledit.h | 0 {gui => bertos/gui}/menu.c | 0 {gui => bertos/gui}/menu.h | 0 {hw => bertos/hw}/hw_buzzer.h | 0 {hw => bertos/hw}/hw_kbd.h | 0 {hw => bertos/hw}/hw_lcd.h | 0 {hw => bertos/hw}/hw_mcp41.c | 0 {hw => bertos/hw}/hw_mcp41.h | 0 {hw => bertos/hw}/hw_tc520.h | 0 {hw => bertos/hw}/kbd_map.h | 0 {hw => bertos/hw}/mcp41_map.h | 0 {icons => bertos/icons}/Makefile | 0 {icons => bertos/icons}/flipimage.cpp | 0 {icons => bertos/icons}/logo.c | 0 {icons => bertos/icons}/logo.h | 0 {icons => bertos/icons}/logo.png | Bin {kern => bertos/kern}/kfile.c | 0 {kern => bertos/kern}/kfile.h | 0 {kern => bertos/kern}/kfile_test.c | 0 {kern => bertos/kern}/monitor.c | 0 {kern => bertos/kern}/monitor.h | 0 {kern => bertos/kern}/msg.h | 0 {kern => bertos/kern}/proc.c | 0 {kern => bertos/kern}/proc.h | 0 {kern => bertos/kern}/proc_p.h | 0 {kern => bertos/kern}/proc_test.c | 0 {kern => bertos/kern}/sem.c | 0 {kern => bertos/kern}/sem.h | 0 {kern => bertos/kern}/signal.c | 0 {kern => bertos/kern}/signal.h | 0 {kern => bertos/kern}/switch.S | 0 {kern => bertos/kern}/switch_arm.S | 0 {kern => bertos/kern}/switch_avr.S | 0 {kern => bertos/kern}/switch_dsp56k.c | 0 {kern => bertos/kern}/switch_i196.s32 | 0 {kern => bertos/kern}/switch_i386.s | 0 {kern => bertos/kern}/switch_win32.s | 0 {kern => bertos/kern}/switch_x86_64.s | 0 {mware => bertos/mware}/blanker.c | 0 {mware => bertos/mware}/blanker.h | 0 {mware => bertos/mware}/byteorder.h | 0 {mware => bertos/mware}/cmd_hunk.h | 0 {mware => bertos/mware}/event.c | 0 {mware => bertos/mware}/event.h | 0 {mware => bertos/mware}/except.h | 0 {mware => bertos/mware}/fifobuf.h | 0 {mware => bertos/mware}/formatwr.c | 0 {mware => bertos/mware}/formatwr.h | 0 {mware => bertos/mware}/hashtable.c | 0 {mware => bertos/mware}/hashtable.h | 0 {mware => bertos/mware}/heap.c | 0 {mware => bertos/mware}/heap.h | 0 {mware => bertos/mware}/hex.c | 0 {mware => bertos/mware}/hex.h | 0 {mware => bertos/mware}/list.h | 0 {mware => bertos/mware}/mean.h | 0 {mware => bertos/mware}/msg.c | 0 {mware => bertos/mware}/msg.h | 0 {mware => bertos/mware}/observer.c | 0 {mware => bertos/mware}/observer.h | 0 {mware => bertos/mware}/parser.c | 0 {mware => bertos/mware}/parser.h | 0 {mware => bertos/mware}/pgm.h | 0 {mware => bertos/mware}/pool.h | 0 {mware => bertos/mware}/rand.c | 0 {mware => bertos/mware}/readline.c | 0 {mware => bertos/mware}/readline.h | 0 {mware => bertos/mware}/resource.c | 0 {mware => bertos/mware}/resource.h | 0 {mware => bertos/mware}/rle.c | 0 {mware => bertos/mware}/rle.h | 0 {mware => bertos/mware}/sprintf.c | 0 {mware => bertos/mware}/sprintf_test.c | 0 {mware => bertos/mware}/strtol10.c | 0 {mware => bertos/mware}/strtol10.h | 0 {mware => bertos/mware}/xmodem.c | 0 {mware => bertos/mware}/xmodem.h | 0 {net => bertos/net}/keytag.c | 0 {net => bertos/net}/keytag.h | 0 {net => bertos/net}/pocketbus.c | 0 {net => bertos/net}/pocketbus.h | 0 {net => bertos/net}/pocketcmd.c | 0 {net => bertos/net}/pocketcmd.h | 0 {os => bertos/os}/hptime.c | 0 {os => bertos/os}/hptime.h | 0 rules.mk => bertos/rules.mk | 2 +- run_tests.sh => bertos/run_tests.sh | 0 verstag.c => bertos/verstag.c | 0 verstag.h => bertos/verstag.h | 0 207 files changed, 48 insertions(+), 48 deletions(-) rename {algo => bertos/algo}/crc.c (100%) rename {algo => bertos/algo}/crc.h (100%) rename {algo => bertos/algo}/md2.c (100%) rename {algo => bertos/algo}/md2.h (100%) rename {algo => bertos/algo}/ramp.c (100%) rename {algo => bertos/algo}/ramp.h (100%) rename {algo => bertos/algo}/ramp_test.c (100%) rename {algo => bertos/algo}/randpool.c (100%) rename {algo => bertos/algo}/randpool.h (100%) rename {algo => bertos/algo}/rotating_hash.h (100%) rename {algo => bertos/algo}/tea.c (100%) rename {algo => bertos/algo}/tea.h (100%) rename appconfig_common.h => bertos/appconfig_common.h (100%) rename {cfg => bertos/cfg}/arch_config.h (100%) rename {cfg => bertos/cfg}/compiler.h (100%) rename {cfg => bertos/cfg}/debug.h (100%) rename {cfg => bertos/cfg}/macros.h (100%) rename {cfg => bertos/cfg}/module.h (100%) rename {cfg => bertos/cfg}/os.h (100%) rename config.mk => bertos/config.mk (98%) rename config_kern.h => bertos/config_kern.h (100%) rename {doc => bertos/doc}/TracFooter.html (100%) rename {doc => bertos/doc}/TracHeader.html (100%) rename {drv => bertos/drv}/adc.c (100%) rename {drv => bertos/drv}/adc.h (100%) rename {drv => bertos/drv}/buzzer.c (100%) rename {drv => bertos/drv}/buzzer.h (100%) rename {drv => bertos/drv}/buzzerled.c (100%) rename {drv => bertos/drv}/buzzerled.h (100%) rename {drv => bertos/drv}/dataflash.c (100%) rename {drv => bertos/drv}/dataflash.h (100%) rename {drv => bertos/drv}/eeprom.c (100%) rename {drv => bertos/drv}/eeprom.h (100%) rename {drv => bertos/drv}/flash25.c (100%) rename {drv => bertos/drv}/flash25.h (100%) rename {drv => bertos/drv}/kbd.c (100%) rename {drv => bertos/drv}/kbd.h (100%) rename {drv => bertos/drv}/kdebug.c (100%) rename {drv => bertos/drv}/lcd_gfx.h (100%) rename {drv => bertos/drv}/lcd_gfx_qt.cpp (100%) rename {drv => bertos/drv}/lcd_gfx_qt.h (100%) rename {drv => bertos/drv}/lcd_gfx_test.c (100%) rename {drv => bertos/drv}/lcd_hd44.c (100%) rename {drv => bertos/drv}/lcd_hd44.h (100%) rename {drv => bertos/drv}/lcd_lm44_qt.cpp (100%) rename {drv => bertos/drv}/lcd_lm44_qt.h (100%) rename {drv => bertos/drv}/lcd_text.c (100%) rename {drv => bertos/drv}/lcd_text.h (100%) rename {drv => bertos/drv}/mcp41.c (100%) rename {drv => bertos/drv}/mcp41.h (100%) rename {drv => bertos/drv}/ntc.c (100%) rename {drv => bertos/drv}/ntc.h (100%) rename {drv => bertos/drv}/phase.c (100%) rename {drv => bertos/drv}/phase.h (100%) rename {drv => bertos/drv}/pwm.c (100%) rename {drv => bertos/drv}/pwm.h (100%) rename {drv => bertos/drv}/pwm_test.c (100%) rename {drv => bertos/drv}/ser.c (100%) rename {drv => bertos/drv}/ser.h (100%) rename {drv => bertos/drv}/ser_p.h (100%) rename {drv => bertos/drv}/ser_posix.c (100%) rename {drv => bertos/drv}/spi_bitbang.c (100%) rename {drv => bertos/drv}/spi_bitbang.h (100%) rename {drv => bertos/drv}/tc520.c (100%) rename {drv => bertos/drv}/tc520.h (100%) rename {drv => bertos/drv}/thermo.c (100%) rename {drv => bertos/drv}/thermo.h (100%) rename {drv => bertos/drv}/timer.c (100%) rename {drv => bertos/drv}/timer.h (100%) rename {drv => bertos/drv}/timer_posix.c (100%) rename {drv => bertos/drv}/timer_posix.h (100%) rename {drv => bertos/drv}/timer_qt.c (100%) rename {drv => bertos/drv}/timer_qt.h (100%) rename {drv => bertos/drv}/timer_test.c (100%) rename {drv => bertos/drv}/wdt.h (100%) rename {dt => bertos/dt}/dnotifier.c (100%) rename {dt => bertos/dt}/dnotifier.h (100%) rename {dt => bertos/dt}/dtag.h (100%) rename {dt => bertos/dt}/dwidget.c (100%) rename {dt => bertos/dt}/dwidget.h (100%) rename {dt => bertos/dt}/editbool.c (100%) rename {dt => bertos/dt}/editbool.h (100%) rename {dt => bertos/dt}/editint.c (100%) rename {dt => bertos/dt}/editint.h (100%) rename {emul => bertos/emul}/emul.cpp (100%) rename {emul => bertos/emul}/emul.h (100%) rename {emul => bertos/emul}/emul.mk (100%) rename {emul => bertos/emul}/emulkbd.cpp (100%) rename {emul => bertos/emul}/emulkbd.h (100%) rename {emul => bertos/emul}/emulwin.cpp (100%) rename {emul => bertos/emul}/emulwin.h (100%) rename {fonts => bertos/fonts}/convbdf (100%) rename {fonts => bertos/fonts}/fixed6x8.c (100%) rename {fonts => bertos/fonts}/fonts.mk (88%) rename {fonts => bertos/fonts}/helvB10.bdf (100%) rename {fonts => bertos/fonts}/luBS14.bdf (100%) rename {fonts => bertos/fonts}/ncenB18.bdf (100%) rename {fs => bertos/fs}/battfs.c (100%) rename {fs => bertos/fs}/battfs.h (100%) rename {gfx => bertos/gfx}/bitmap.c (100%) rename {gfx => bertos/gfx}/charts.c (100%) rename {gfx => bertos/gfx}/charts.h (100%) rename {gfx => bertos/gfx}/fillpoly.cpp (100%) rename {gfx => bertos/gfx}/font.h (100%) rename {gfx => bertos/gfx}/font_10x20.c (100%) rename {gfx => bertos/gfx}/gfx.h (100%) rename {gfx => bertos/gfx}/gfx_p.h (100%) rename {gfx => bertos/gfx}/line.c (100%) rename {gfx => bertos/gfx}/text.c (100%) rename {gfx => bertos/gfx}/text.h (100%) rename {gfx => bertos/gfx}/text_format.c (100%) rename {gfx => bertos/gfx}/win.c (100%) rename {gfx => bertos/gfx}/win.h (100%) rename {gui => bertos/gui}/levelbar.c (100%) rename {gui => bertos/gui}/levelbar.h (100%) rename {gui => bertos/gui}/leveledit.c (100%) rename {gui => bertos/gui}/leveledit.h (100%) rename {gui => bertos/gui}/menu.c (100%) rename {gui => bertos/gui}/menu.h (100%) rename {hw => bertos/hw}/hw_buzzer.h (100%) rename {hw => bertos/hw}/hw_kbd.h (100%) rename {hw => bertos/hw}/hw_lcd.h (100%) rename {hw => bertos/hw}/hw_mcp41.c (100%) rename {hw => bertos/hw}/hw_mcp41.h (100%) rename {hw => bertos/hw}/hw_tc520.h (100%) rename {hw => bertos/hw}/kbd_map.h (100%) rename {hw => bertos/hw}/mcp41_map.h (100%) rename {icons => bertos/icons}/Makefile (100%) rename {icons => bertos/icons}/flipimage.cpp (100%) rename {icons => bertos/icons}/logo.c (100%) rename {icons => bertos/icons}/logo.h (100%) rename {icons => bertos/icons}/logo.png (100%) rename {kern => bertos/kern}/kfile.c (100%) rename {kern => bertos/kern}/kfile.h (100%) rename {kern => bertos/kern}/kfile_test.c (100%) rename {kern => bertos/kern}/monitor.c (100%) rename {kern => bertos/kern}/monitor.h (100%) rename {kern => bertos/kern}/msg.h (100%) rename {kern => bertos/kern}/proc.c (100%) rename {kern => bertos/kern}/proc.h (100%) rename {kern => bertos/kern}/proc_p.h (100%) rename {kern => bertos/kern}/proc_test.c (100%) rename {kern => bertos/kern}/sem.c (100%) rename {kern => bertos/kern}/sem.h (100%) rename {kern => bertos/kern}/signal.c (100%) rename {kern => bertos/kern}/signal.h (100%) rename {kern => bertos/kern}/switch.S (100%) rename {kern => bertos/kern}/switch_arm.S (100%) rename {kern => bertos/kern}/switch_avr.S (100%) rename {kern => bertos/kern}/switch_dsp56k.c (100%) rename {kern => bertos/kern}/switch_i196.s32 (100%) rename {kern => bertos/kern}/switch_i386.s (100%) rename {kern => bertos/kern}/switch_win32.s (100%) rename {kern => bertos/kern}/switch_x86_64.s (100%) rename {mware => bertos/mware}/blanker.c (100%) rename {mware => bertos/mware}/blanker.h (100%) rename {mware => bertos/mware}/byteorder.h (100%) rename {mware => bertos/mware}/cmd_hunk.h (100%) rename {mware => bertos/mware}/event.c (100%) rename {mware => bertos/mware}/event.h (100%) rename {mware => bertos/mware}/except.h (100%) rename {mware => bertos/mware}/fifobuf.h (100%) rename {mware => bertos/mware}/formatwr.c (100%) rename {mware => bertos/mware}/formatwr.h (100%) rename {mware => bertos/mware}/hashtable.c (100%) rename {mware => bertos/mware}/hashtable.h (100%) rename {mware => bertos/mware}/heap.c (100%) rename {mware => bertos/mware}/heap.h (100%) rename {mware => bertos/mware}/hex.c (100%) rename {mware => bertos/mware}/hex.h (100%) rename {mware => bertos/mware}/list.h (100%) rename {mware => bertos/mware}/mean.h (100%) rename {mware => bertos/mware}/msg.c (100%) rename {mware => bertos/mware}/msg.h (100%) rename {mware => bertos/mware}/observer.c (100%) rename {mware => bertos/mware}/observer.h (100%) rename {mware => bertos/mware}/parser.c (100%) rename {mware => bertos/mware}/parser.h (100%) rename {mware => bertos/mware}/pgm.h (100%) rename {mware => bertos/mware}/pool.h (100%) rename {mware => bertos/mware}/rand.c (100%) rename {mware => bertos/mware}/readline.c (100%) rename {mware => bertos/mware}/readline.h (100%) rename {mware => bertos/mware}/resource.c (100%) rename {mware => bertos/mware}/resource.h (100%) rename {mware => bertos/mware}/rle.c (100%) rename {mware => bertos/mware}/rle.h (100%) rename {mware => bertos/mware}/sprintf.c (100%) rename {mware => bertos/mware}/sprintf_test.c (100%) rename {mware => bertos/mware}/strtol10.c (100%) rename {mware => bertos/mware}/strtol10.h (100%) rename {mware => bertos/mware}/xmodem.c (100%) rename {mware => bertos/mware}/xmodem.h (100%) rename {net => bertos/net}/keytag.c (100%) rename {net => bertos/net}/keytag.h (100%) rename {net => bertos/net}/pocketbus.c (100%) rename {net => bertos/net}/pocketbus.h (100%) rename {net => bertos/net}/pocketcmd.c (100%) rename {net => bertos/net}/pocketcmd.h (100%) rename {os => bertos/os}/hptime.c (100%) rename {os => bertos/os}/hptime.h (100%) rename rules.mk => bertos/rules.mk (99%) rename run_tests.sh => bertos/run_tests.sh (100%) rename verstag.c => bertos/verstag.c (100%) rename verstag.h => bertos/verstag.h (100%) diff --git a/Makefile b/Makefile index 43b9ec7b..c899766b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ V := 0 default: all -include config.mk +include bertos/config.mk #Include subtargets include app/demo/demo.mk @@ -19,4 +19,4 @@ include app/demo/demo.mk #include app/battfs/battfs_test.mk #include app/triface/triface.mk -include rules.mk +include bertos/rules.mk diff --git a/app/demo/demo.mk b/app/demo/demo.mk index d8d1dbcf..7c264683 100644 --- a/app/demo/demo.mk +++ b/app/demo/demo.mk @@ -8,8 +8,8 @@ # Author: Bernardo Innocenti # -include fonts/fonts.mk -include emul/emul.mk +include bertos/fonts/fonts.mk +include bertos/emul/emul.mk # Set to 1 for debug builds demo_DEBUG = 1 @@ -21,65 +21,65 @@ TRG += demo CC = g++ demo_CXXSRC = \ - emul/emul.cpp \ - emul/emulwin.cpp \ - emul/emulkbd.cpp \ - drv/lcd_gfx_qt.cpp + bertos/emul/emul.cpp \ + bertos/emul/emulwin.cpp \ + bertos/emul/emulkbd.cpp \ + bertos/drv/lcd_gfx_qt.cpp demo_CSRC = \ app/demo/demo.c \ - os/hptime.c \ - gfx/bitmap.c \ - gfx/line.c \ - gfx/win.c \ - gfx/text.c \ - gfx/text_format.c \ - gui/menu.c \ - fonts/helvB10.c \ - fonts/luBS14.c \ - fonts/ncenB18.c \ - icons/logo.c \ - drv/kbd.c \ - drv/timer.c \ - drv/buzzer.c \ - drv/ser.c \ - drv/ser_posix.c \ - mware/formatwr.c \ - mware/hex.c \ - mware/event.c \ - mware/observer.c \ - mware/resource.c \ - mware/sprintf.c \ - kern/proc.c \ - kern/sem.c \ - kern/signal.c \ - kern/monitor.c \ - kern/proc_test.c \ - verstag.c + bertos/os/hptime.c \ + bertos/gfx/bitmap.c \ + bertos/gfx/line.c \ + bertos/gfx/win.c \ + bertos/gfx/text.c \ + bertos/gfx/text_format.c \ + bertos/gui/menu.c \ + bertos/fonts/helvB10.c \ + bertos/fonts/luBS14.c \ + bertos/fonts/ncenB18.c \ + bertos/icons/logo.c \ + bertos/drv/kbd.c \ + bertos/drv/timer.c \ + bertos/drv/buzzer.c \ + bertos/drv/ser.c \ + bertos/drv/ser_posix.c \ + bertos/mware/formatwr.c \ + bertos/mware/hex.c \ + bertos/mware/event.c \ + bertos/mware/observer.c \ + bertos/mware/resource.c \ + bertos/mware/sprintf.c \ + bertos/kern/proc.c \ + bertos/kern/sem.c \ + bertos/kern/signal.c \ + bertos/kern/monitor.c \ + bertos/kern/proc_test.c \ + bertos/verstag.c demo_CPPASRC = \ - kern/switch.S + bertos/kern/switch.S # FIXME: maybe this junk should go in emul/emul.mk? -$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp -$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp -$(OBJDIR)/demo/drv/timer.o: drv/timer_qt_moc.cpp -$(OBJDIR)/demo/emul/emulkbd.o: emul/emulkbd_moc.cpp +$(OBJDIR)/demo/bertos/emul/emulwin.o: bertos/emul/emulwin_moc.cpp +$(OBJDIR)/demo/bertos/drv/lcd_gfx_qt.o: bertos/drv/lcd_gfx_qt_moc.cpp +$(OBJDIR)/demo/bertos/drv/timer.o: bertos/drv/timer_qt_moc.cpp +$(OBJDIR)/demo/bertos/emul/emulkbd.o: bertos/emul/emulkbd_moc.cpp #FIXME: isn't there a way to avoid repeating the pattern rule? -drv/timer_qt_moc.cpp: drv/timer_qt.c +bertos/drv/timer_qt_moc.cpp: bertos/drv/timer_qt.c $(QT_MOC) -o $@ $< -demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ihw $(EMUL_CFLAGS) -demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ihw $(EMUL_CFLAGS) +demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS) +demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo $(EMUL_CFLAGS) demo_LDFLAGS = $(EMUL_LDFLAGS) # Debug stuff ifeq ($(demo_DEBUG),1) demo_CFLAGS += -D_DEBUG demo_CXXFLAGS += -D_DEBUG - demo_CSRC += drv/kdebug.c + demo_CSRC += bertos/drv/kdebug.c else demo_CFLAGS += -Os demo_CXXFLAGS += -Os diff --git a/algo/crc.c b/bertos/algo/crc.c similarity index 100% rename from algo/crc.c rename to bertos/algo/crc.c diff --git a/algo/crc.h b/bertos/algo/crc.h similarity index 100% rename from algo/crc.h rename to bertos/algo/crc.h diff --git a/algo/md2.c b/bertos/algo/md2.c similarity index 100% rename from algo/md2.c rename to bertos/algo/md2.c diff --git a/algo/md2.h b/bertos/algo/md2.h similarity index 100% rename from algo/md2.h rename to bertos/algo/md2.h diff --git a/algo/ramp.c b/bertos/algo/ramp.c similarity index 100% rename from algo/ramp.c rename to bertos/algo/ramp.c diff --git a/algo/ramp.h b/bertos/algo/ramp.h similarity index 100% rename from algo/ramp.h rename to bertos/algo/ramp.h diff --git a/algo/ramp_test.c b/bertos/algo/ramp_test.c similarity index 100% rename from algo/ramp_test.c rename to bertos/algo/ramp_test.c diff --git a/algo/randpool.c b/bertos/algo/randpool.c similarity index 100% rename from algo/randpool.c rename to bertos/algo/randpool.c diff --git a/algo/randpool.h b/bertos/algo/randpool.h similarity index 100% rename from algo/randpool.h rename to bertos/algo/randpool.h diff --git a/algo/rotating_hash.h b/bertos/algo/rotating_hash.h similarity index 100% rename from algo/rotating_hash.h rename to bertos/algo/rotating_hash.h diff --git a/algo/tea.c b/bertos/algo/tea.c similarity index 100% rename from algo/tea.c rename to bertos/algo/tea.c diff --git a/algo/tea.h b/bertos/algo/tea.h similarity index 100% rename from algo/tea.h rename to bertos/algo/tea.h diff --git a/appconfig_common.h b/bertos/appconfig_common.h similarity index 100% rename from appconfig_common.h rename to bertos/appconfig_common.h diff --git a/cfg/arch_config.h b/bertos/cfg/arch_config.h similarity index 100% rename from cfg/arch_config.h rename to bertos/cfg/arch_config.h diff --git a/cfg/compiler.h b/bertos/cfg/compiler.h similarity index 100% rename from cfg/compiler.h rename to bertos/cfg/compiler.h diff --git a/cfg/debug.h b/bertos/cfg/debug.h similarity index 100% rename from cfg/debug.h rename to bertos/cfg/debug.h diff --git a/cfg/macros.h b/bertos/cfg/macros.h similarity index 100% rename from cfg/macros.h rename to bertos/cfg/macros.h diff --git a/cfg/module.h b/bertos/cfg/module.h similarity index 100% rename from cfg/module.h rename to bertos/cfg/module.h diff --git a/cfg/os.h b/bertos/cfg/os.h similarity index 100% rename from cfg/os.h rename to bertos/cfg/os.h diff --git a/config.mk b/bertos/config.mk similarity index 98% rename from config.mk rename to bertos/config.mk index 5ace0dbd..cfe8ca6e 100644 --- a/config.mk +++ b/bertos/config.mk @@ -58,7 +58,7 @@ COFFCONVERT=$(OBJCOPY) \ --change-section-address .noinit-0x800000 \ --change-section-address .eeprom-0x810000 -INCDIR = -I. -Ihw +INCDIR = -I. -Ibertos -Ibertos/hw LIBDIR = lib OBJDIR = obj OUTDIR = images diff --git a/config_kern.h b/bertos/config_kern.h similarity index 100% rename from config_kern.h rename to bertos/config_kern.h diff --git a/doc/TracFooter.html b/bertos/doc/TracFooter.html similarity index 100% rename from doc/TracFooter.html rename to bertos/doc/TracFooter.html diff --git a/doc/TracHeader.html b/bertos/doc/TracHeader.html similarity index 100% rename from doc/TracHeader.html rename to bertos/doc/TracHeader.html diff --git a/drv/adc.c b/bertos/drv/adc.c similarity index 100% rename from drv/adc.c rename to bertos/drv/adc.c diff --git a/drv/adc.h b/bertos/drv/adc.h similarity index 100% rename from drv/adc.h rename to bertos/drv/adc.h diff --git a/drv/buzzer.c b/bertos/drv/buzzer.c similarity index 100% rename from drv/buzzer.c rename to bertos/drv/buzzer.c diff --git a/drv/buzzer.h b/bertos/drv/buzzer.h similarity index 100% rename from drv/buzzer.h rename to bertos/drv/buzzer.h diff --git a/drv/buzzerled.c b/bertos/drv/buzzerled.c similarity index 100% rename from drv/buzzerled.c rename to bertos/drv/buzzerled.c diff --git a/drv/buzzerled.h b/bertos/drv/buzzerled.h similarity index 100% rename from drv/buzzerled.h rename to bertos/drv/buzzerled.h diff --git a/drv/dataflash.c b/bertos/drv/dataflash.c similarity index 100% rename from drv/dataflash.c rename to bertos/drv/dataflash.c diff --git a/drv/dataflash.h b/bertos/drv/dataflash.h similarity index 100% rename from drv/dataflash.h rename to bertos/drv/dataflash.h diff --git a/drv/eeprom.c b/bertos/drv/eeprom.c similarity index 100% rename from drv/eeprom.c rename to bertos/drv/eeprom.c diff --git a/drv/eeprom.h b/bertos/drv/eeprom.h similarity index 100% rename from drv/eeprom.h rename to bertos/drv/eeprom.h diff --git a/drv/flash25.c b/bertos/drv/flash25.c similarity index 100% rename from drv/flash25.c rename to bertos/drv/flash25.c diff --git a/drv/flash25.h b/bertos/drv/flash25.h similarity index 100% rename from drv/flash25.h rename to bertos/drv/flash25.h diff --git a/drv/kbd.c b/bertos/drv/kbd.c similarity index 100% rename from drv/kbd.c rename to bertos/drv/kbd.c diff --git a/drv/kbd.h b/bertos/drv/kbd.h similarity index 100% rename from drv/kbd.h rename to bertos/drv/kbd.h diff --git a/drv/kdebug.c b/bertos/drv/kdebug.c similarity index 100% rename from drv/kdebug.c rename to bertos/drv/kdebug.c diff --git a/drv/lcd_gfx.h b/bertos/drv/lcd_gfx.h similarity index 100% rename from drv/lcd_gfx.h rename to bertos/drv/lcd_gfx.h diff --git a/drv/lcd_gfx_qt.cpp b/bertos/drv/lcd_gfx_qt.cpp similarity index 100% rename from drv/lcd_gfx_qt.cpp rename to bertos/drv/lcd_gfx_qt.cpp diff --git a/drv/lcd_gfx_qt.h b/bertos/drv/lcd_gfx_qt.h similarity index 100% rename from drv/lcd_gfx_qt.h rename to bertos/drv/lcd_gfx_qt.h diff --git a/drv/lcd_gfx_test.c b/bertos/drv/lcd_gfx_test.c similarity index 100% rename from drv/lcd_gfx_test.c rename to bertos/drv/lcd_gfx_test.c diff --git a/drv/lcd_hd44.c b/bertos/drv/lcd_hd44.c similarity index 100% rename from drv/lcd_hd44.c rename to bertos/drv/lcd_hd44.c diff --git a/drv/lcd_hd44.h b/bertos/drv/lcd_hd44.h similarity index 100% rename from drv/lcd_hd44.h rename to bertos/drv/lcd_hd44.h diff --git a/drv/lcd_lm44_qt.cpp b/bertos/drv/lcd_lm44_qt.cpp similarity index 100% rename from drv/lcd_lm44_qt.cpp rename to bertos/drv/lcd_lm44_qt.cpp diff --git a/drv/lcd_lm44_qt.h b/bertos/drv/lcd_lm44_qt.h similarity index 100% rename from drv/lcd_lm44_qt.h rename to bertos/drv/lcd_lm44_qt.h diff --git a/drv/lcd_text.c b/bertos/drv/lcd_text.c similarity index 100% rename from drv/lcd_text.c rename to bertos/drv/lcd_text.c diff --git a/drv/lcd_text.h b/bertos/drv/lcd_text.h similarity index 100% rename from drv/lcd_text.h rename to bertos/drv/lcd_text.h diff --git a/drv/mcp41.c b/bertos/drv/mcp41.c similarity index 100% rename from drv/mcp41.c rename to bertos/drv/mcp41.c diff --git a/drv/mcp41.h b/bertos/drv/mcp41.h similarity index 100% rename from drv/mcp41.h rename to bertos/drv/mcp41.h diff --git a/drv/ntc.c b/bertos/drv/ntc.c similarity index 100% rename from drv/ntc.c rename to bertos/drv/ntc.c diff --git a/drv/ntc.h b/bertos/drv/ntc.h similarity index 100% rename from drv/ntc.h rename to bertos/drv/ntc.h diff --git a/drv/phase.c b/bertos/drv/phase.c similarity index 100% rename from drv/phase.c rename to bertos/drv/phase.c diff --git a/drv/phase.h b/bertos/drv/phase.h similarity index 100% rename from drv/phase.h rename to bertos/drv/phase.h diff --git a/drv/pwm.c b/bertos/drv/pwm.c similarity index 100% rename from drv/pwm.c rename to bertos/drv/pwm.c diff --git a/drv/pwm.h b/bertos/drv/pwm.h similarity index 100% rename from drv/pwm.h rename to bertos/drv/pwm.h diff --git a/drv/pwm_test.c b/bertos/drv/pwm_test.c similarity index 100% rename from drv/pwm_test.c rename to bertos/drv/pwm_test.c diff --git a/drv/ser.c b/bertos/drv/ser.c similarity index 100% rename from drv/ser.c rename to bertos/drv/ser.c diff --git a/drv/ser.h b/bertos/drv/ser.h similarity index 100% rename from drv/ser.h rename to bertos/drv/ser.h diff --git a/drv/ser_p.h b/bertos/drv/ser_p.h similarity index 100% rename from drv/ser_p.h rename to bertos/drv/ser_p.h diff --git a/drv/ser_posix.c b/bertos/drv/ser_posix.c similarity index 100% rename from drv/ser_posix.c rename to bertos/drv/ser_posix.c diff --git a/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c similarity index 100% rename from drv/spi_bitbang.c rename to bertos/drv/spi_bitbang.c diff --git a/drv/spi_bitbang.h b/bertos/drv/spi_bitbang.h similarity index 100% rename from drv/spi_bitbang.h rename to bertos/drv/spi_bitbang.h diff --git a/drv/tc520.c b/bertos/drv/tc520.c similarity index 100% rename from drv/tc520.c rename to bertos/drv/tc520.c diff --git a/drv/tc520.h b/bertos/drv/tc520.h similarity index 100% rename from drv/tc520.h rename to bertos/drv/tc520.h diff --git a/drv/thermo.c b/bertos/drv/thermo.c similarity index 100% rename from drv/thermo.c rename to bertos/drv/thermo.c diff --git a/drv/thermo.h b/bertos/drv/thermo.h similarity index 100% rename from drv/thermo.h rename to bertos/drv/thermo.h diff --git a/drv/timer.c b/bertos/drv/timer.c similarity index 100% rename from drv/timer.c rename to bertos/drv/timer.c diff --git a/drv/timer.h b/bertos/drv/timer.h similarity index 100% rename from drv/timer.h rename to bertos/drv/timer.h diff --git a/drv/timer_posix.c b/bertos/drv/timer_posix.c similarity index 100% rename from drv/timer_posix.c rename to bertos/drv/timer_posix.c diff --git a/drv/timer_posix.h b/bertos/drv/timer_posix.h similarity index 100% rename from drv/timer_posix.h rename to bertos/drv/timer_posix.h diff --git a/drv/timer_qt.c b/bertos/drv/timer_qt.c similarity index 100% rename from drv/timer_qt.c rename to bertos/drv/timer_qt.c diff --git a/drv/timer_qt.h b/bertos/drv/timer_qt.h similarity index 100% rename from drv/timer_qt.h rename to bertos/drv/timer_qt.h diff --git a/drv/timer_test.c b/bertos/drv/timer_test.c similarity index 100% rename from drv/timer_test.c rename to bertos/drv/timer_test.c diff --git a/drv/wdt.h b/bertos/drv/wdt.h similarity index 100% rename from drv/wdt.h rename to bertos/drv/wdt.h diff --git a/dt/dnotifier.c b/bertos/dt/dnotifier.c similarity index 100% rename from dt/dnotifier.c rename to bertos/dt/dnotifier.c diff --git a/dt/dnotifier.h b/bertos/dt/dnotifier.h similarity index 100% rename from dt/dnotifier.h rename to bertos/dt/dnotifier.h diff --git a/dt/dtag.h b/bertos/dt/dtag.h similarity index 100% rename from dt/dtag.h rename to bertos/dt/dtag.h diff --git a/dt/dwidget.c b/bertos/dt/dwidget.c similarity index 100% rename from dt/dwidget.c rename to bertos/dt/dwidget.c diff --git a/dt/dwidget.h b/bertos/dt/dwidget.h similarity index 100% rename from dt/dwidget.h rename to bertos/dt/dwidget.h diff --git a/dt/editbool.c b/bertos/dt/editbool.c similarity index 100% rename from dt/editbool.c rename to bertos/dt/editbool.c diff --git a/dt/editbool.h b/bertos/dt/editbool.h similarity index 100% rename from dt/editbool.h rename to bertos/dt/editbool.h diff --git a/dt/editint.c b/bertos/dt/editint.c similarity index 100% rename from dt/editint.c rename to bertos/dt/editint.c diff --git a/dt/editint.h b/bertos/dt/editint.h similarity index 100% rename from dt/editint.h rename to bertos/dt/editint.h diff --git a/emul/emul.cpp b/bertos/emul/emul.cpp similarity index 100% rename from emul/emul.cpp rename to bertos/emul/emul.cpp diff --git a/emul/emul.h b/bertos/emul/emul.h similarity index 100% rename from emul/emul.h rename to bertos/emul/emul.h diff --git a/emul/emul.mk b/bertos/emul/emul.mk similarity index 100% rename from emul/emul.mk rename to bertos/emul/emul.mk diff --git a/emul/emulkbd.cpp b/bertos/emul/emulkbd.cpp similarity index 100% rename from emul/emulkbd.cpp rename to bertos/emul/emulkbd.cpp diff --git a/emul/emulkbd.h b/bertos/emul/emulkbd.h similarity index 100% rename from emul/emulkbd.h rename to bertos/emul/emulkbd.h diff --git a/emul/emulwin.cpp b/bertos/emul/emulwin.cpp similarity index 100% rename from emul/emulwin.cpp rename to bertos/emul/emulwin.cpp diff --git a/emul/emulwin.h b/bertos/emul/emulwin.h similarity index 100% rename from emul/emulwin.h rename to bertos/emul/emulwin.h diff --git a/fonts/convbdf b/bertos/fonts/convbdf similarity index 100% rename from fonts/convbdf rename to bertos/fonts/convbdf diff --git a/fonts/fixed6x8.c b/bertos/fonts/fixed6x8.c similarity index 100% rename from fonts/fixed6x8.c rename to bertos/fonts/fixed6x8.c diff --git a/fonts/fonts.mk b/bertos/fonts/fonts.mk similarity index 88% rename from fonts/fonts.mk rename to bertos/fonts/fonts.mk index dfc1baf1..e3831ee1 100644 --- a/fonts/fonts.mk +++ b/bertos/fonts/fonts.mk @@ -9,4 +9,4 @@ # %.c: %.bdf - fonts/convbdf $< > $@ + bertos/fonts/convbdf $< > $@ diff --git a/fonts/helvB10.bdf b/bertos/fonts/helvB10.bdf similarity index 100% rename from fonts/helvB10.bdf rename to bertos/fonts/helvB10.bdf diff --git a/fonts/luBS14.bdf b/bertos/fonts/luBS14.bdf similarity index 100% rename from fonts/luBS14.bdf rename to bertos/fonts/luBS14.bdf diff --git a/fonts/ncenB18.bdf b/bertos/fonts/ncenB18.bdf similarity index 100% rename from fonts/ncenB18.bdf rename to bertos/fonts/ncenB18.bdf diff --git a/fs/battfs.c b/bertos/fs/battfs.c similarity index 100% rename from fs/battfs.c rename to bertos/fs/battfs.c diff --git a/fs/battfs.h b/bertos/fs/battfs.h similarity index 100% rename from fs/battfs.h rename to bertos/fs/battfs.h diff --git a/gfx/bitmap.c b/bertos/gfx/bitmap.c similarity index 100% rename from gfx/bitmap.c rename to bertos/gfx/bitmap.c diff --git a/gfx/charts.c b/bertos/gfx/charts.c similarity index 100% rename from gfx/charts.c rename to bertos/gfx/charts.c diff --git a/gfx/charts.h b/bertos/gfx/charts.h similarity index 100% rename from gfx/charts.h rename to bertos/gfx/charts.h diff --git a/gfx/fillpoly.cpp b/bertos/gfx/fillpoly.cpp similarity index 100% rename from gfx/fillpoly.cpp rename to bertos/gfx/fillpoly.cpp diff --git a/gfx/font.h b/bertos/gfx/font.h similarity index 100% rename from gfx/font.h rename to bertos/gfx/font.h diff --git a/gfx/font_10x20.c b/bertos/gfx/font_10x20.c similarity index 100% rename from gfx/font_10x20.c rename to bertos/gfx/font_10x20.c diff --git a/gfx/gfx.h b/bertos/gfx/gfx.h similarity index 100% rename from gfx/gfx.h rename to bertos/gfx/gfx.h diff --git a/gfx/gfx_p.h b/bertos/gfx/gfx_p.h similarity index 100% rename from gfx/gfx_p.h rename to bertos/gfx/gfx_p.h diff --git a/gfx/line.c b/bertos/gfx/line.c similarity index 100% rename from gfx/line.c rename to bertos/gfx/line.c diff --git a/gfx/text.c b/bertos/gfx/text.c similarity index 100% rename from gfx/text.c rename to bertos/gfx/text.c diff --git a/gfx/text.h b/bertos/gfx/text.h similarity index 100% rename from gfx/text.h rename to bertos/gfx/text.h diff --git a/gfx/text_format.c b/bertos/gfx/text_format.c similarity index 100% rename from gfx/text_format.c rename to bertos/gfx/text_format.c diff --git a/gfx/win.c b/bertos/gfx/win.c similarity index 100% rename from gfx/win.c rename to bertos/gfx/win.c diff --git a/gfx/win.h b/bertos/gfx/win.h similarity index 100% rename from gfx/win.h rename to bertos/gfx/win.h diff --git a/gui/levelbar.c b/bertos/gui/levelbar.c similarity index 100% rename from gui/levelbar.c rename to bertos/gui/levelbar.c diff --git a/gui/levelbar.h b/bertos/gui/levelbar.h similarity index 100% rename from gui/levelbar.h rename to bertos/gui/levelbar.h diff --git a/gui/leveledit.c b/bertos/gui/leveledit.c similarity index 100% rename from gui/leveledit.c rename to bertos/gui/leveledit.c diff --git a/gui/leveledit.h b/bertos/gui/leveledit.h similarity index 100% rename from gui/leveledit.h rename to bertos/gui/leveledit.h diff --git a/gui/menu.c b/bertos/gui/menu.c similarity index 100% rename from gui/menu.c rename to bertos/gui/menu.c diff --git a/gui/menu.h b/bertos/gui/menu.h similarity index 100% rename from gui/menu.h rename to bertos/gui/menu.h diff --git a/hw/hw_buzzer.h b/bertos/hw/hw_buzzer.h similarity index 100% rename from hw/hw_buzzer.h rename to bertos/hw/hw_buzzer.h diff --git a/hw/hw_kbd.h b/bertos/hw/hw_kbd.h similarity index 100% rename from hw/hw_kbd.h rename to bertos/hw/hw_kbd.h diff --git a/hw/hw_lcd.h b/bertos/hw/hw_lcd.h similarity index 100% rename from hw/hw_lcd.h rename to bertos/hw/hw_lcd.h diff --git a/hw/hw_mcp41.c b/bertos/hw/hw_mcp41.c similarity index 100% rename from hw/hw_mcp41.c rename to bertos/hw/hw_mcp41.c diff --git a/hw/hw_mcp41.h b/bertos/hw/hw_mcp41.h similarity index 100% rename from hw/hw_mcp41.h rename to bertos/hw/hw_mcp41.h diff --git a/hw/hw_tc520.h b/bertos/hw/hw_tc520.h similarity index 100% rename from hw/hw_tc520.h rename to bertos/hw/hw_tc520.h diff --git a/hw/kbd_map.h b/bertos/hw/kbd_map.h similarity index 100% rename from hw/kbd_map.h rename to bertos/hw/kbd_map.h diff --git a/hw/mcp41_map.h b/bertos/hw/mcp41_map.h similarity index 100% rename from hw/mcp41_map.h rename to bertos/hw/mcp41_map.h diff --git a/icons/Makefile b/bertos/icons/Makefile similarity index 100% rename from icons/Makefile rename to bertos/icons/Makefile diff --git a/icons/flipimage.cpp b/bertos/icons/flipimage.cpp similarity index 100% rename from icons/flipimage.cpp rename to bertos/icons/flipimage.cpp diff --git a/icons/logo.c b/bertos/icons/logo.c similarity index 100% rename from icons/logo.c rename to bertos/icons/logo.c diff --git a/icons/logo.h b/bertos/icons/logo.h similarity index 100% rename from icons/logo.h rename to bertos/icons/logo.h diff --git a/icons/logo.png b/bertos/icons/logo.png similarity index 100% rename from icons/logo.png rename to bertos/icons/logo.png diff --git a/kern/kfile.c b/bertos/kern/kfile.c similarity index 100% rename from kern/kfile.c rename to bertos/kern/kfile.c diff --git a/kern/kfile.h b/bertos/kern/kfile.h similarity index 100% rename from kern/kfile.h rename to bertos/kern/kfile.h diff --git a/kern/kfile_test.c b/bertos/kern/kfile_test.c similarity index 100% rename from kern/kfile_test.c rename to bertos/kern/kfile_test.c diff --git a/kern/monitor.c b/bertos/kern/monitor.c similarity index 100% rename from kern/monitor.c rename to bertos/kern/monitor.c diff --git a/kern/monitor.h b/bertos/kern/monitor.h similarity index 100% rename from kern/monitor.h rename to bertos/kern/monitor.h diff --git a/kern/msg.h b/bertos/kern/msg.h similarity index 100% rename from kern/msg.h rename to bertos/kern/msg.h diff --git a/kern/proc.c b/bertos/kern/proc.c similarity index 100% rename from kern/proc.c rename to bertos/kern/proc.c diff --git a/kern/proc.h b/bertos/kern/proc.h similarity index 100% rename from kern/proc.h rename to bertos/kern/proc.h diff --git a/kern/proc_p.h b/bertos/kern/proc_p.h similarity index 100% rename from kern/proc_p.h rename to bertos/kern/proc_p.h diff --git a/kern/proc_test.c b/bertos/kern/proc_test.c similarity index 100% rename from kern/proc_test.c rename to bertos/kern/proc_test.c diff --git a/kern/sem.c b/bertos/kern/sem.c similarity index 100% rename from kern/sem.c rename to bertos/kern/sem.c diff --git a/kern/sem.h b/bertos/kern/sem.h similarity index 100% rename from kern/sem.h rename to bertos/kern/sem.h diff --git a/kern/signal.c b/bertos/kern/signal.c similarity index 100% rename from kern/signal.c rename to bertos/kern/signal.c diff --git a/kern/signal.h b/bertos/kern/signal.h similarity index 100% rename from kern/signal.h rename to bertos/kern/signal.h diff --git a/kern/switch.S b/bertos/kern/switch.S similarity index 100% rename from kern/switch.S rename to bertos/kern/switch.S diff --git a/kern/switch_arm.S b/bertos/kern/switch_arm.S similarity index 100% rename from kern/switch_arm.S rename to bertos/kern/switch_arm.S diff --git a/kern/switch_avr.S b/bertos/kern/switch_avr.S similarity index 100% rename from kern/switch_avr.S rename to bertos/kern/switch_avr.S diff --git a/kern/switch_dsp56k.c b/bertos/kern/switch_dsp56k.c similarity index 100% rename from kern/switch_dsp56k.c rename to bertos/kern/switch_dsp56k.c diff --git a/kern/switch_i196.s32 b/bertos/kern/switch_i196.s32 similarity index 100% rename from kern/switch_i196.s32 rename to bertos/kern/switch_i196.s32 diff --git a/kern/switch_i386.s b/bertos/kern/switch_i386.s similarity index 100% rename from kern/switch_i386.s rename to bertos/kern/switch_i386.s diff --git a/kern/switch_win32.s b/bertos/kern/switch_win32.s similarity index 100% rename from kern/switch_win32.s rename to bertos/kern/switch_win32.s diff --git a/kern/switch_x86_64.s b/bertos/kern/switch_x86_64.s similarity index 100% rename from kern/switch_x86_64.s rename to bertos/kern/switch_x86_64.s diff --git a/mware/blanker.c b/bertos/mware/blanker.c similarity index 100% rename from mware/blanker.c rename to bertos/mware/blanker.c diff --git a/mware/blanker.h b/bertos/mware/blanker.h similarity index 100% rename from mware/blanker.h rename to bertos/mware/blanker.h diff --git a/mware/byteorder.h b/bertos/mware/byteorder.h similarity index 100% rename from mware/byteorder.h rename to bertos/mware/byteorder.h diff --git a/mware/cmd_hunk.h b/bertos/mware/cmd_hunk.h similarity index 100% rename from mware/cmd_hunk.h rename to bertos/mware/cmd_hunk.h diff --git a/mware/event.c b/bertos/mware/event.c similarity index 100% rename from mware/event.c rename to bertos/mware/event.c diff --git a/mware/event.h b/bertos/mware/event.h similarity index 100% rename from mware/event.h rename to bertos/mware/event.h diff --git a/mware/except.h b/bertos/mware/except.h similarity index 100% rename from mware/except.h rename to bertos/mware/except.h diff --git a/mware/fifobuf.h b/bertos/mware/fifobuf.h similarity index 100% rename from mware/fifobuf.h rename to bertos/mware/fifobuf.h diff --git a/mware/formatwr.c b/bertos/mware/formatwr.c similarity index 100% rename from mware/formatwr.c rename to bertos/mware/formatwr.c diff --git a/mware/formatwr.h b/bertos/mware/formatwr.h similarity index 100% rename from mware/formatwr.h rename to bertos/mware/formatwr.h diff --git a/mware/hashtable.c b/bertos/mware/hashtable.c similarity index 100% rename from mware/hashtable.c rename to bertos/mware/hashtable.c diff --git a/mware/hashtable.h b/bertos/mware/hashtable.h similarity index 100% rename from mware/hashtable.h rename to bertos/mware/hashtable.h diff --git a/mware/heap.c b/bertos/mware/heap.c similarity index 100% rename from mware/heap.c rename to bertos/mware/heap.c diff --git a/mware/heap.h b/bertos/mware/heap.h similarity index 100% rename from mware/heap.h rename to bertos/mware/heap.h diff --git a/mware/hex.c b/bertos/mware/hex.c similarity index 100% rename from mware/hex.c rename to bertos/mware/hex.c diff --git a/mware/hex.h b/bertos/mware/hex.h similarity index 100% rename from mware/hex.h rename to bertos/mware/hex.h diff --git a/mware/list.h b/bertos/mware/list.h similarity index 100% rename from mware/list.h rename to bertos/mware/list.h diff --git a/mware/mean.h b/bertos/mware/mean.h similarity index 100% rename from mware/mean.h rename to bertos/mware/mean.h diff --git a/mware/msg.c b/bertos/mware/msg.c similarity index 100% rename from mware/msg.c rename to bertos/mware/msg.c diff --git a/mware/msg.h b/bertos/mware/msg.h similarity index 100% rename from mware/msg.h rename to bertos/mware/msg.h diff --git a/mware/observer.c b/bertos/mware/observer.c similarity index 100% rename from mware/observer.c rename to bertos/mware/observer.c diff --git a/mware/observer.h b/bertos/mware/observer.h similarity index 100% rename from mware/observer.h rename to bertos/mware/observer.h diff --git a/mware/parser.c b/bertos/mware/parser.c similarity index 100% rename from mware/parser.c rename to bertos/mware/parser.c diff --git a/mware/parser.h b/bertos/mware/parser.h similarity index 100% rename from mware/parser.h rename to bertos/mware/parser.h diff --git a/mware/pgm.h b/bertos/mware/pgm.h similarity index 100% rename from mware/pgm.h rename to bertos/mware/pgm.h diff --git a/mware/pool.h b/bertos/mware/pool.h similarity index 100% rename from mware/pool.h rename to bertos/mware/pool.h diff --git a/mware/rand.c b/bertos/mware/rand.c similarity index 100% rename from mware/rand.c rename to bertos/mware/rand.c diff --git a/mware/readline.c b/bertos/mware/readline.c similarity index 100% rename from mware/readline.c rename to bertos/mware/readline.c diff --git a/mware/readline.h b/bertos/mware/readline.h similarity index 100% rename from mware/readline.h rename to bertos/mware/readline.h diff --git a/mware/resource.c b/bertos/mware/resource.c similarity index 100% rename from mware/resource.c rename to bertos/mware/resource.c diff --git a/mware/resource.h b/bertos/mware/resource.h similarity index 100% rename from mware/resource.h rename to bertos/mware/resource.h diff --git a/mware/rle.c b/bertos/mware/rle.c similarity index 100% rename from mware/rle.c rename to bertos/mware/rle.c diff --git a/mware/rle.h b/bertos/mware/rle.h similarity index 100% rename from mware/rle.h rename to bertos/mware/rle.h diff --git a/mware/sprintf.c b/bertos/mware/sprintf.c similarity index 100% rename from mware/sprintf.c rename to bertos/mware/sprintf.c diff --git a/mware/sprintf_test.c b/bertos/mware/sprintf_test.c similarity index 100% rename from mware/sprintf_test.c rename to bertos/mware/sprintf_test.c diff --git a/mware/strtol10.c b/bertos/mware/strtol10.c similarity index 100% rename from mware/strtol10.c rename to bertos/mware/strtol10.c diff --git a/mware/strtol10.h b/bertos/mware/strtol10.h similarity index 100% rename from mware/strtol10.h rename to bertos/mware/strtol10.h diff --git a/mware/xmodem.c b/bertos/mware/xmodem.c similarity index 100% rename from mware/xmodem.c rename to bertos/mware/xmodem.c diff --git a/mware/xmodem.h b/bertos/mware/xmodem.h similarity index 100% rename from mware/xmodem.h rename to bertos/mware/xmodem.h diff --git a/net/keytag.c b/bertos/net/keytag.c similarity index 100% rename from net/keytag.c rename to bertos/net/keytag.c diff --git a/net/keytag.h b/bertos/net/keytag.h similarity index 100% rename from net/keytag.h rename to bertos/net/keytag.h diff --git a/net/pocketbus.c b/bertos/net/pocketbus.c similarity index 100% rename from net/pocketbus.c rename to bertos/net/pocketbus.c diff --git a/net/pocketbus.h b/bertos/net/pocketbus.h similarity index 100% rename from net/pocketbus.h rename to bertos/net/pocketbus.h diff --git a/net/pocketcmd.c b/bertos/net/pocketcmd.c similarity index 100% rename from net/pocketcmd.c rename to bertos/net/pocketcmd.c diff --git a/net/pocketcmd.h b/bertos/net/pocketcmd.h similarity index 100% rename from net/pocketcmd.h rename to bertos/net/pocketcmd.h diff --git a/os/hptime.c b/bertos/os/hptime.c similarity index 100% rename from os/hptime.c rename to bertos/os/hptime.c diff --git a/os/hptime.h b/bertos/os/hptime.h similarity index 100% rename from os/hptime.h rename to bertos/os/hptime.h diff --git a/rules.mk b/bertos/rules.mk similarity index 99% rename from rules.mk rename to bertos/rules.mk index a3ce5842..68426c43 100644 --- a/rules.mk +++ b/bertos/rules.mk @@ -266,7 +266,7 @@ $(RECURSIVE_TARGETS): BUILDREV_H = buildrev.h -ifeq ($(shell [ -e verstag.c ] && echo yes),yes) +ifeq ($(shell [ -e bertos/verstag.c ] && echo yes),yes) .PHONY: bumprev bumprev: @buildnr=0; \ diff --git a/run_tests.sh b/bertos/run_tests.sh similarity index 100% rename from run_tests.sh rename to bertos/run_tests.sh diff --git a/verstag.c b/bertos/verstag.c similarity index 100% rename from verstag.c rename to bertos/verstag.c diff --git a/verstag.h b/bertos/verstag.h similarity index 100% rename from verstag.h rename to bertos/verstag.h -- 2.25.1