From 55505c08a6b5a6658a38b1c00e053d0f8d9bff23 Mon Sep 17 00:00:00 2001 From: Christian Kroll Date: Tue, 18 Mar 2014 07:00:13 +0100 Subject: [PATCH] moving source files to dedicated directory --- .gitignore | 64 +++++++-------- Doxyfile | 4 +- Makefile | 79 ++++++++++--------- can/Makefile | 13 --- config.in | 16 ++-- defaults.mk | 26 +++--- games/breakout/Makefile | 10 --- games/games.mk | 22 ------ games/snake/Makefile | 8 -- games/space_invaders/Makefile | 8 -- avr5.x => ld_scripts/avr5.x | 0 avr51.x => ld_scripts/avr51.x | 0 {simulator => ld_scripts}/elf_i386.x | 0 {simulator => ld_scripts}/elf_i386_fbsd.x | 0 {simulator => ld_scripts}/elf_x86_64.x | 0 {simulator => ld_scripts}/elf_x86_64_fbsd.x | 0 {simulator => ld_scripts}/i386pe.x | 0 {simulator => ld_scripts}/i386pep.x | 0 menu/Makefile | 9 --- rfm12/Makefile | 8 -- rules.mk | 11 +-- scripts/Menuconfig | 2 +- scrolltext/Makefile | 10 --- {animations => src/animations}/Makefile | 11 ++- .../animations}/bitmapscroller/Makefile | 8 +- .../animations}/bitmapscroller/amphibian.c | 0 .../animations}/bitmapscroller/amphibian.h | 0 .../bitmapscroller/bitmapscroller.c | 0 .../bitmapscroller/bitmapscroller.h | 0 .../animations}/bitmapscroller/config.in | 0 .../animations}/bitmapscroller/fairydust.c | 0 .../animations}/bitmapscroller/fairydust.h | 0 .../animations}/bitmapscroller/laborlogo.c | 0 .../animations}/bitmapscroller/laborlogo.h | 0 .../animations}/bitmapscroller/outofspec.c | 0 .../animations}/bitmapscroller/outofspec.h | 0 {animations => src/animations}/blackhole.c | 0 {animations => src/animations}/blackhole.h | 0 {animations => src/animations}/borg_time.c | 0 {animations => src/animations}/borg_time.h | 0 .../animations}/breakout_demo.c | 0 .../animations}/breakout_demo.h | 0 {animations => src/animations}/config.in | 2 +- {animations => src/animations}/flyingdots.c | 0 {animations => src/animations}/flyingdots.h | 0 .../animations}/fpmath_patterns.c | 0 .../animations}/fpmath_patterns.h | 0 {animations => src/animations}/gameoflife.c | 0 {animations => src/animations}/gameoflife.h | 0 {animations => src/animations}/ltn_ant.c | 0 {animations => src/animations}/ltn_ant.h | 0 {animations => src/animations}/matrix.c | 0 {animations => src/animations}/matrix.h | 0 {animations => src/animations}/mherweg.c | 0 {animations => src/animations}/mherweg.h | 0 {animations => src/animations}/program.c | 0 {animations => src/animations}/program.h | 0 {animations => src/animations}/snake.c | 0 {animations => src/animations}/snake.h | 0 {animations => src/animations}/squares.c | 0 {animations => src/animations}/squares.h | 0 {animations => src/animations}/stonefly.c | 0 {animations => src/animations}/stonefly.h | 0 {borg_hw => src/borg_hw}/Makefile | 9 ++- {borg_hw => src/borg_hw}/borg_hw.h | 0 {borg_hw => src/borg_hw}/borg_hw_ancient.c | 0 {borg_hw => src/borg_hw}/borg_hw_andreborg.c | 0 {borg_hw => src/borg_hw}/borg_hw_borg16.c | 0 .../borg_hw}/borg_hw_borg16_hgmod.c | 0 {borg_hw => src/borg_hw}/borg_hw_borg_ls.c | 0 {borg_hw => src/borg_hw}/borg_hw_borg_lsjo.c | 0 {borg_hw => src/borg_hw}/borg_hw_borg_mh.c | 0 {borg_hw => src/borg_hw}/borg_hw_borg_mini.c | 0 {borg_hw => src/borg_hw}/borg_hw_gigaborg.c | 0 {borg_hw => src/borg_hw}/borg_hw_ledbrett.c | 0 {borg_hw => src/borg_hw}/borg_hw_panel_one.c | 0 {borg_hw => src/borg_hw}/borg_hw_pd1165.c | 0 {borg_hw => src/borg_hw}/borg_hw_pingpong.c | 0 {borg_hw => src/borg_hw}/borg_hw_rotor.c | 0 {borg_hw => src/borg_hw}/config.in | 28 +++---- {borg_hw => src/borg_hw}/config_ancient.in | 0 {borg_hw => src/borg_hw}/config_andreborg.in | 0 {borg_hw => src/borg_hw}/config_borg16.in | 0 .../borg_hw}/config_borg16_hgmod.in | 0 {borg_hw => src/borg_hw}/config_borg_ls.in | 0 {borg_hw => src/borg_hw}/config_borg_lsjo.in | 0 {borg_hw => src/borg_hw}/config_borg_mh.in | 0 {borg_hw => src/borg_hw}/config_borg_mini.in | 0 {borg_hw => src/borg_hw}/config_gigaborg.in | 0 {borg_hw => src/borg_hw}/config_ledbrett.in | 0 {borg_hw => src/borg_hw}/config_panel_one.in | 0 {borg_hw => src/borg_hw}/config_pd1165.in | 0 {borg_hw => src/borg_hw}/config_pingpong.in | 0 {borg_hw => src/borg_hw}/config_rotor.in | 0 src/can/Makefile | 16 ++++ {can => src/can}/borg_can.c | 0 {can => src/can}/borg_can.h | 0 {can => src/can}/can.c | 0 {can => src/can}/can.h | 0 {can => src/can}/config.in | 0 {can => src/can}/lap.c | 0 {can => src/can}/lap.h | 0 {can => src/can}/spi.c | 0 {can => src/can}/spi.h | 0 {compat => src/compat}/eeprom.h | 0 {compat => src/compat}/interrupt.h | 0 {compat => src/compat}/pgmspace.h | 0 config.h => src/config.h | 0 display_loop.c => src/display_loop.c | 0 display_loop.h => src/display_loop.h | 0 eeprom_reserve.c => src/eeprom_reserve.c | 0 src/games/breakout/Makefile | 13 +++ {games => src/games}/breakout/ball.c | 0 {games => src/games}/breakout/ball.h | 0 {games => src/games}/breakout/breakout.c | 0 {games => src/games}/breakout/breakout.h | 0 {games => src/games}/breakout/common.h | 0 {games => src/games}/breakout/config.h | 0 {games => src/games}/breakout/level.c | 0 {games => src/games}/breakout/level.h | 0 {games => src/games}/breakout/messages.c | 0 {games => src/games}/breakout/messages.h | 0 {games => src/games}/breakout/playfield.c | 0 {games => src/games}/breakout/playfield.h | 0 {games => src/games}/breakout/rebound.c | 0 {games => src/games}/breakout/rebound.h | 0 {games => src/games}/breakout/score.c | 0 {games => src/games}/breakout/score.h | 0 {games => src/games}/config.in | 0 src/games/games.mk | 22 ++++++ src/games/snake/Makefile | 11 +++ {games => src/games}/snake/snake_game.c | 0 {games => src/games}/snake/snake_game.h | 0 src/games/space_invaders/Makefile | 11 +++ .../games}/space_invaders/invader_draw.c | 0 .../games}/space_invaders/invader_init.c | 0 .../games}/space_invaders/invader_proc.c | 0 .../games}/space_invaders/invaders2.c | 0 .../games}/space_invaders/invaders2.h | 0 {games => src/games}/tetris/COPYING | 0 {games => src/games}/tetris/LICENSE | 0 {games => src/games}/tetris/Makefile | 11 ++- {games => src/games}/tetris/bearing.h | 0 {games => src/games}/tetris/bucket.c | 0 {games => src/games}/tetris/bucket.h | 0 {games => src/games}/tetris/highscore.c | 0 {games => src/games}/tetris/highscore.h | 0 {games => src/games}/tetris/input.c | 0 {games => src/games}/tetris/input.h | 0 {games => src/games}/tetris/piece.c | 0 {games => src/games}/tetris/piece.h | 0 {games => src/games}/tetris/tetris_main.c | 0 {games => src/games}/tetris/tetris_main.h | 0 {games => src/games}/tetris/variant_bastet.c | 0 {games => src/games}/tetris/variant_bastet.h | 0 {games => src/games}/tetris/variant_fp.c | 0 {games => src/games}/tetris/variant_fp.h | 0 {games => src/games}/tetris/variant_std.c | 0 {games => src/games}/tetris/variant_std.h | 0 {games => src/games}/tetris/variants.h | 0 {games => src/games}/tetris/view.c | 0 {games => src/games}/tetris/view.h | 0 ioport.h => src/ioport.h | 0 {joystick => src/joystick}/Makefile | 11 ++- {joystick => src/joystick}/config.in | 0 {joystick => src/joystick}/hc165_joystick.c | 0 {joystick => src/joystick}/joystick.c | 0 {joystick => src/joystick}/joystick.h | 0 {joystick => src/joystick}/nes_pad.c | 0 {joystick => src/joystick}/rfm12_joystick.c | 0 main.c => src/main.c | 0 makros.h => src/makros.h | 0 {mcuf => src/mcuf}/mcuf.c | 0 {mcuf => src/mcuf}/mcuf.h | 0 src/menu/Makefile | 11 +++ {menu => src/menu}/menu.c | 0 {menu => src/menu}/menu.h | 0 pixel.c => src/pixel.c | 0 pixel.h => src/pixel.h | 0 {random => src/random}/Makefile | 12 +-- {random => src/random}/memxor.S | 0 {random => src/random}/memxor.h | 0 {random => src/random}/memxor_c.c | 0 {random => src/random}/noekeon.c | 0 {random => src/random}/noekeon.h | 0 {random => src/random}/noekeon_asm.S | 0 {random => src/random}/persistentCounter.c | 0 {random => src/random}/persistentCounter.h | 0 {random => src/random}/prng.c | 0 {random => src/random}/prng.h | 0 src/rfm12/Makefile | 11 +++ {rfm12 => src/rfm12}/borg_rfm12.c | 0 {rfm12 => src/rfm12}/borg_rfm12.h | 0 {rfm12 => src/rfm12}/config.in | 0 {rfm12 => src/rfm12}/rfm12.c | 0 {rfm12 => src/rfm12}/rfm12.h | 0 {rfm12 => src/rfm12}/rfm12_config.h | 0 src/scrolltext/Makefile | 12 +++ {scrolltext => src/scrolltext}/config.in | 0 {scrolltext => src/scrolltext}/font.h | 0 {scrolltext => src/scrolltext}/font_arial8.c | 0 {scrolltext => src/scrolltext}/font_arial8.h | 0 {scrolltext => src/scrolltext}/font_c64.c | 0 {scrolltext => src/scrolltext}/font_c64.h | 0 {scrolltext => src/scrolltext}/font_small6.c | 0 {scrolltext => src/scrolltext}/font_small6.h | 0 {scrolltext => src/scrolltext}/font_uni53.c | 0 {scrolltext => src/scrolltext}/font_uni53.h | 0 {scrolltext => src/scrolltext}/scrolltext.h | 0 {scrolltext => src/scrolltext}/scrolltext3.c | 0 {simulator => src/simulator}/Makefile | 11 ++- {simulator => src/simulator}/Makefile.osx | 0 {simulator => src/simulator}/eeprom.c | 0 {simulator => src/simulator}/main.c | 0 {simulator => src/simulator}/trackball.c | 0 {simulator => src/simulator}/trackball.h | 0 {simulator => src/simulator}/winmain.c | 0 {smallani => src/smallani}/Makefile | 11 ++- {smallani => src/smallani}/colbounce.c | 0 {smallani => src/smallani}/colbounce.h | 0 {smallani => src/smallani}/colwalk.c | 0 {smallani => src/smallani}/colwalk.h | 0 {smallani => src/smallani}/config.in | 0 {smallani => src/smallani}/rowbounce.c | 0 {smallani => src/smallani}/rowbounce.h | 0 {smallani => src/smallani}/rowwalk.c | 0 {smallani => src/smallani}/rowwalk.h | 0 {uart => src/uart}/uart.c | 0 {uart => src/uart}/uart.h | 0 util.c => src/util.c | 0 util.h => src/util.h | 0 231 files changed, 275 insertions(+), 236 deletions(-) delete mode 100644 can/Makefile delete mode 100644 games/breakout/Makefile delete mode 100644 games/games.mk delete mode 100644 games/snake/Makefile delete mode 100644 games/space_invaders/Makefile rename avr5.x => ld_scripts/avr5.x (100%) rename avr51.x => ld_scripts/avr51.x (100%) rename {simulator => ld_scripts}/elf_i386.x (100%) rename {simulator => ld_scripts}/elf_i386_fbsd.x (100%) rename {simulator => ld_scripts}/elf_x86_64.x (100%) rename {simulator => ld_scripts}/elf_x86_64_fbsd.x (100%) rename {simulator => ld_scripts}/i386pe.x (100%) rename {simulator => ld_scripts}/i386pep.x (100%) delete mode 100644 menu/Makefile delete mode 100644 rfm12/Makefile delete mode 100644 scrolltext/Makefile rename {animations => src/animations}/Makefile (86%) rename {animations => src/animations}/bitmapscroller/Makefile (71%) rename {animations => src/animations}/bitmapscroller/amphibian.c (100%) rename {animations => src/animations}/bitmapscroller/amphibian.h (100%) rename {animations => src/animations}/bitmapscroller/bitmapscroller.c (100%) rename {animations => src/animations}/bitmapscroller/bitmapscroller.h (100%) rename {animations => src/animations}/bitmapscroller/config.in (100%) rename {animations => src/animations}/bitmapscroller/fairydust.c (100%) rename {animations => src/animations}/bitmapscroller/fairydust.h (100%) rename {animations => src/animations}/bitmapscroller/laborlogo.c (100%) rename {animations => src/animations}/bitmapscroller/laborlogo.h (100%) rename {animations => src/animations}/bitmapscroller/outofspec.c (100%) rename {animations => src/animations}/bitmapscroller/outofspec.h (100%) rename {animations => src/animations}/blackhole.c (100%) rename {animations => src/animations}/blackhole.h (100%) rename {animations => src/animations}/borg_time.c (100%) rename {animations => src/animations}/borg_time.h (100%) rename {animations => src/animations}/breakout_demo.c (100%) rename {animations => src/animations}/breakout_demo.h (100%) rename {animations => src/animations}/config.in (98%) rename {animations => src/animations}/flyingdots.c (100%) rename {animations => src/animations}/flyingdots.h (100%) rename {animations => src/animations}/fpmath_patterns.c (100%) rename {animations => src/animations}/fpmath_patterns.h (100%) rename {animations => src/animations}/gameoflife.c (100%) rename {animations => src/animations}/gameoflife.h (100%) rename {animations => src/animations}/ltn_ant.c (100%) rename {animations => src/animations}/ltn_ant.h (100%) rename {animations => src/animations}/matrix.c (100%) rename {animations => src/animations}/matrix.h (100%) rename {animations => src/animations}/mherweg.c (100%) rename {animations => src/animations}/mherweg.h (100%) rename {animations => src/animations}/program.c (100%) rename {animations => src/animations}/program.h (100%) rename {animations => src/animations}/snake.c (100%) rename {animations => src/animations}/snake.h (100%) rename {animations => src/animations}/squares.c (100%) rename {animations => src/animations}/squares.h (100%) rename {animations => src/animations}/stonefly.c (100%) rename {animations => src/animations}/stonefly.h (100%) rename {borg_hw => src/borg_hw}/Makefile (89%) rename {borg_hw => src/borg_hw}/borg_hw.h (100%) rename {borg_hw => src/borg_hw}/borg_hw_ancient.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_andreborg.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg16.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg16_hgmod.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg_ls.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg_lsjo.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg_mh.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_borg_mini.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_gigaborg.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_ledbrett.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_panel_one.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_pd1165.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_pingpong.c (100%) rename {borg_hw => src/borg_hw}/borg_hw_rotor.c (100%) rename {borg_hw => src/borg_hw}/config.in (73%) rename {borg_hw => src/borg_hw}/config_ancient.in (100%) rename {borg_hw => src/borg_hw}/config_andreborg.in (100%) rename {borg_hw => src/borg_hw}/config_borg16.in (100%) rename {borg_hw => src/borg_hw}/config_borg16_hgmod.in (100%) rename {borg_hw => src/borg_hw}/config_borg_ls.in (100%) rename {borg_hw => src/borg_hw}/config_borg_lsjo.in (100%) rename {borg_hw => src/borg_hw}/config_borg_mh.in (100%) rename {borg_hw => src/borg_hw}/config_borg_mini.in (100%) rename {borg_hw => src/borg_hw}/config_gigaborg.in (100%) rename {borg_hw => src/borg_hw}/config_ledbrett.in (100%) rename {borg_hw => src/borg_hw}/config_panel_one.in (100%) rename {borg_hw => src/borg_hw}/config_pd1165.in (100%) rename {borg_hw => src/borg_hw}/config_pingpong.in (100%) rename {borg_hw => src/borg_hw}/config_rotor.in (100%) create mode 100644 src/can/Makefile rename {can => src/can}/borg_can.c (100%) rename {can => src/can}/borg_can.h (100%) rename {can => src/can}/can.c (100%) rename {can => src/can}/can.h (100%) rename {can => src/can}/config.in (100%) rename {can => src/can}/lap.c (100%) rename {can => src/can}/lap.h (100%) rename {can => src/can}/spi.c (100%) rename {can => src/can}/spi.h (100%) rename {compat => src/compat}/eeprom.h (100%) rename {compat => src/compat}/interrupt.h (100%) rename {compat => src/compat}/pgmspace.h (100%) rename config.h => src/config.h (100%) rename display_loop.c => src/display_loop.c (100%) rename display_loop.h => src/display_loop.h (100%) rename eeprom_reserve.c => src/eeprom_reserve.c (100%) create mode 100644 src/games/breakout/Makefile rename {games => src/games}/breakout/ball.c (100%) rename {games => src/games}/breakout/ball.h (100%) rename {games => src/games}/breakout/breakout.c (100%) rename {games => src/games}/breakout/breakout.h (100%) rename {games => src/games}/breakout/common.h (100%) rename {games => src/games}/breakout/config.h (100%) rename {games => src/games}/breakout/level.c (100%) rename {games => src/games}/breakout/level.h (100%) rename {games => src/games}/breakout/messages.c (100%) rename {games => src/games}/breakout/messages.h (100%) rename {games => src/games}/breakout/playfield.c (100%) rename {games => src/games}/breakout/playfield.h (100%) rename {games => src/games}/breakout/rebound.c (100%) rename {games => src/games}/breakout/rebound.h (100%) rename {games => src/games}/breakout/score.c (100%) rename {games => src/games}/breakout/score.h (100%) rename {games => src/games}/config.in (100%) create mode 100644 src/games/games.mk create mode 100644 src/games/snake/Makefile rename {games => src/games}/snake/snake_game.c (100%) rename {games => src/games}/snake/snake_game.h (100%) create mode 100644 src/games/space_invaders/Makefile rename {games => src/games}/space_invaders/invader_draw.c (100%) rename {games => src/games}/space_invaders/invader_init.c (100%) rename {games => src/games}/space_invaders/invader_proc.c (100%) rename {games => src/games}/space_invaders/invaders2.c (100%) rename {games => src/games}/space_invaders/invaders2.h (100%) rename {games => src/games}/tetris/COPYING (100%) rename {games => src/games}/tetris/LICENSE (100%) rename {games => src/games}/tetris/Makefile (71%) rename {games => src/games}/tetris/bearing.h (100%) rename {games => src/games}/tetris/bucket.c (100%) rename {games => src/games}/tetris/bucket.h (100%) rename {games => src/games}/tetris/highscore.c (100%) rename {games => src/games}/tetris/highscore.h (100%) rename {games => src/games}/tetris/input.c (100%) rename {games => src/games}/tetris/input.h (100%) rename {games => src/games}/tetris/piece.c (100%) rename {games => src/games}/tetris/piece.h (100%) rename {games => src/games}/tetris/tetris_main.c (100%) rename {games => src/games}/tetris/tetris_main.h (100%) rename {games => src/games}/tetris/variant_bastet.c (100%) rename {games => src/games}/tetris/variant_bastet.h (100%) rename {games => src/games}/tetris/variant_fp.c (100%) rename {games => src/games}/tetris/variant_fp.h (100%) rename {games => src/games}/tetris/variant_std.c (100%) rename {games => src/games}/tetris/variant_std.h (100%) rename {games => src/games}/tetris/variants.h (100%) rename {games => src/games}/tetris/view.c (100%) rename {games => src/games}/tetris/view.h (100%) rename ioport.h => src/ioport.h (100%) rename {joystick => src/joystick}/Makefile (70%) rename {joystick => src/joystick}/config.in (100%) rename {joystick => src/joystick}/hc165_joystick.c (100%) rename {joystick => src/joystick}/joystick.c (100%) rename {joystick => src/joystick}/joystick.h (100%) rename {joystick => src/joystick}/nes_pad.c (100%) rename {joystick => src/joystick}/rfm12_joystick.c (100%) rename main.c => src/main.c (100%) rename makros.h => src/makros.h (100%) rename {mcuf => src/mcuf}/mcuf.c (100%) rename {mcuf => src/mcuf}/mcuf.h (100%) create mode 100644 src/menu/Makefile rename {menu => src/menu}/menu.c (100%) rename {menu => src/menu}/menu.h (100%) rename pixel.c => src/pixel.c (100%) rename pixel.h => src/pixel.h (100%) rename {random => src/random}/Makefile (60%) rename {random => src/random}/memxor.S (100%) rename {random => src/random}/memxor.h (100%) rename {random => src/random}/memxor_c.c (100%) rename {random => src/random}/noekeon.c (100%) rename {random => src/random}/noekeon.h (100%) rename {random => src/random}/noekeon_asm.S (100%) rename {random => src/random}/persistentCounter.c (100%) rename {random => src/random}/persistentCounter.h (100%) rename {random => src/random}/prng.c (100%) rename {random => src/random}/prng.h (100%) create mode 100644 src/rfm12/Makefile rename {rfm12 => src/rfm12}/borg_rfm12.c (100%) rename {rfm12 => src/rfm12}/borg_rfm12.h (100%) rename {rfm12 => src/rfm12}/config.in (100%) rename {rfm12 => src/rfm12}/rfm12.c (100%) rename {rfm12 => src/rfm12}/rfm12.h (100%) rename {rfm12 => src/rfm12}/rfm12_config.h (100%) create mode 100644 src/scrolltext/Makefile rename {scrolltext => src/scrolltext}/config.in (100%) rename {scrolltext => src/scrolltext}/font.h (100%) rename {scrolltext => src/scrolltext}/font_arial8.c (100%) rename {scrolltext => src/scrolltext}/font_arial8.h (100%) rename {scrolltext => src/scrolltext}/font_c64.c (100%) rename {scrolltext => src/scrolltext}/font_c64.h (100%) rename {scrolltext => src/scrolltext}/font_small6.c (100%) rename {scrolltext => src/scrolltext}/font_small6.h (100%) rename {scrolltext => src/scrolltext}/font_uni53.c (100%) rename {scrolltext => src/scrolltext}/font_uni53.h (100%) rename {scrolltext => src/scrolltext}/scrolltext.h (100%) rename {scrolltext => src/scrolltext}/scrolltext3.c (100%) rename {simulator => src/simulator}/Makefile (56%) rename {simulator => src/simulator}/Makefile.osx (100%) rename {simulator => src/simulator}/eeprom.c (100%) rename {simulator => src/simulator}/main.c (100%) rename {simulator => src/simulator}/trackball.c (100%) rename {simulator => src/simulator}/trackball.h (100%) rename {simulator => src/simulator}/winmain.c (100%) rename {smallani => src/smallani}/Makefile (70%) rename {smallani => src/smallani}/colbounce.c (100%) rename {smallani => src/smallani}/colbounce.h (100%) rename {smallani => src/smallani}/colwalk.c (100%) rename {smallani => src/smallani}/colwalk.h (100%) rename {smallani => src/smallani}/config.in (100%) rename {smallani => src/smallani}/rowbounce.c (100%) rename {smallani => src/smallani}/rowbounce.h (100%) rename {smallani => src/smallani}/rowwalk.c (100%) rename {smallani => src/smallani}/rowwalk.h (100%) rename {uart => src/uart}/uart.c (100%) rename {uart => src/uart}/uart.h (100%) rename util.c => src/util.c (100%) rename util.h => src/util.h (100%) diff --git a/.gitignore b/.gitignore index 7caf0f6..d53c095 100644 --- a/.gitignore +++ b/.gitignore @@ -7,27 +7,12 @@ .settings .simulated_eeprom.bin .subdirs -animations/bitmapscroller/obj_avr -animations/bitmapscroller/obj_sim -animations/obj_avr -animations/obj_sim -autoconf.h -borg_hw/obj_avr borgsim borgsim.exe -can/obj_avr -can/obj_sim config.mk -games/breakout/obj_avr -games/breakout/obj_sim -games/snake/obj_avr -games/snake/obj_sim -games/space_invaders/obj_avr -games/space_invaders/obj_sim -games/tetris/obj_avr -games/tetris/obj_sim +docs/html +docs/latex gmon.out -html image image.bin image.elf @@ -38,23 +23,38 @@ image.srec image_eeprom.bin image_eeprom.hex image_eeprom.srec -joystick/obj_avr -joystick/obj_sim -latex -menu/obj_avr -menu/obj_sim obj_avr obj_sim -random/obj_avr -random/obj_sim -rfm12/obj_avr -rfm12/obj_sim +scripts/lxdialog/*.o scripts/lxdialog/a.exe scripts/lxdialog/lxdialog scripts/lxdialog/lxdialog.exe -scripts/lxdialog/*.o -scrolltext/obj_avr -scrolltext/obj_sim -simulator/obj_sim -smallani/obj_avr -smallani/obj_sim +src/animations/bitmapscroller/obj_avr +src/animations/bitmapscroller/obj_sim +src/animations/obj_avr +src/animations/obj_sim +src/autoconf.h +src/borg_hw/obj_avr +src/can/obj_avr +src/can/obj_sim +src/games/breakout/obj_avr +src/games/breakout/obj_sim +src/games/snake/obj_avr +src/games/snake/obj_sim +src/games/space_invaders/obj_avr +src/games/space_invaders/obj_sim +src/games/tetris/obj_avr +src/games/tetris/obj_sim +src/joystick/obj_avr +src/joystick/obj_sim +src/menu/obj_avr +src/menu/obj_sim +src/random/obj_avr +src/random/obj_sim +src/rfm12/obj_avr +src/rfm12/obj_sim +src/scrolltext/obj_avr +src/scrolltext/obj_sim +src/simulator/obj_sim +src/smallani/obj_avr +src/smallani/obj_sim diff --git a/Doxyfile b/Doxyfile index c69f0c9..d10f87e 100644 --- a/Doxyfile +++ b/Doxyfile @@ -52,7 +52,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = docs # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -647,7 +647,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = +INPUT = src # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/Makefile b/Makefile index 5aa560c..550d826 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,18 @@ TARGET := image TARGET_SIM := borgsim -TOPDIR = . +TOPDIR = src +MAKETOPDIR = . SRC = \ - main.c \ - display_loop.c \ - eeprom_reserve.c \ - pixel.c \ - util.c \ + $(TOPDIR)/main.c \ + $(TOPDIR)/display_loop.c \ + $(TOPDIR)/eeprom_reserve.c \ + $(TOPDIR)/pixel.c \ + $(TOPDIR)/util.c \ SRC_SIM = \ - display_loop.c \ - pixel.c \ + $(TOPDIR)/display_loop.c \ + $(TOPDIR)/pixel.c \ LAUNCH_BOOTLOADER = launch-bootloader @@ -24,26 +25,26 @@ all: compile-$(TARGET) @echo "===============================" @echo "$(TARGET) compiled for: $(MCU)" @echo "size is: " - @$(CONFIG_SHELL) ${TOPDIR}/scripts/size $(TARGET) + @$(CONFIG_SHELL) scripts/size $(TARGET) @echo "===============================" ############################################################################## # generic fluff -include defaults.mk -#include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/defaults.mk +#include $(MAKETOPDIR)/rules.mk ############################################################################## # generate SUBDIRS variable # -.subdirs: autoconf.h +.subdirs: $(TOPDIR)/autoconf.h @ echo "checking in which subdirs to build" @ $(RM) -f $@ - @ echo "SUBDIRS += animations" >> $@ - @ echo "SUBDIRS += animations/bitmapscroller" >> $@ - @ echo "SUBDIRS += smallani" >> $@ - @ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \ - | sed -e "s/^#define //" -e "s/_SUPPORT.*//" \ + @ echo "SUBDIRS += $(TOPDIR)/animations" >> $@ + @ echo "SUBDIRS += $(TOPDIR)/animations/bitmapscroller" >> $@ + @ echo "SUBDIRS += $(TOPDIR)/smallani" >> $@ + @ (for subdir in `grep -e "^#define .*_SUPPORT" $(TOPDIR)/autoconf.h \ + | sed -e "s/^#define /$(TOPDIR)\//" -e "s/_SUPPORT.*//" \ | tr "[A-Z]\\n" "[a-z] " `; do \ test -d $$subdir && echo "SUBDIRS += $$subdir" ; \ done) | sort -u >> $@ @@ -53,8 +54,8 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),mrproper) ifneq ($(MAKECMDGOALS),menuconfig) -include $(TOPDIR)/.subdirs -include $(TOPDIR)/.config +include $(MAKETOPDIR)/.subdirs +include $(MAKETOPDIR)/.config include $(TOPDIR)/games/games.mk endif # MAKECMDGOALS!=menuconfig @@ -65,7 +66,7 @@ endif # no_deps!=t ############################################################################## -SUBDIRS_AVR = borg_hw +SUBDIRS_AVR = $(TOPDIR)/borg_hw SUBDIRS_AVR += $(SUBDIRS) .PHONY: compile-subdirs_avr @@ -77,7 +78,7 @@ compile-$(TARGET): compile-subdirs_avr $(TARGET).hex $(TARGET).bin $(TARGET).lst -OBJECTS += $(patsubst %.c,./obj_avr/%.o,${SRC}) +OBJECTS += $(patsubst $(TOPDIR)/%.c,$(TOPDIR)/obj_avr/%.o,${SRC}) SUBDIROBJECTS = $(foreach subdir,$(SUBDIRS_AVR),$(foreach object,$(shell cat $(subdir)/obj_avr/.objects 2>/dev/null),$(subdir)/$(object))) $(TARGET): $(OBJECTS) $(SUBDIROBJECTS) @@ -86,8 +87,8 @@ $(TARGET): $(OBJECTS) $(SUBDIROBJECTS) ############################################################################## #generic rules for AVR-Build -./obj_avr/%.o: %.c - @ if [ ! -d obj_avr ]; then mkdir obj_avr ; fi +$(TOPDIR)/obj_avr/%.o: $(TOPDIR)/%.c + @ if [ ! -d $(TOPDIR)/obj_avr ]; then mkdir $(TOPDIR)/obj_avr ; fi @ echo "compiling $<" @ $(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< @@ -109,25 +110,25 @@ $(TARGET): $(OBJECTS) $(SUBDIROBJECTS) ############################################################################## #Rules for simulator build -SUBDIRS_SIM = simulator +SUBDIRS_SIM = $(TOPDIR)/simulator SUBDIRS_SIM += $(SUBDIRS) .PHONY: compile-subdirs_sim compile-subdirs_sim: @ for dir in $(SUBDIRS_SIM); do $(MAKE) -C $$dir objects_sim || exit 5; done - @ $(MAKE) -C ./simulator/ objects_sim || exit 5; + @ $(MAKE) -C $(TOPDIR)/simulator/ objects_sim || exit 5; -simulator: autoconf.h .config .subdirs compile-subdirs_sim $(TARGET_SIM) +simulator: $(TOPDIR)/autoconf.h .config .subdirs compile-subdirs_sim $(TARGET_SIM) SUBDIROBJECTS_SIM = $(foreach subdir,$(SUBDIRS_SIM),$(foreach object,$(shell cat $(subdir)/obj_sim/.objects 2>/dev/null),$(subdir)/$(object))) -OBJECTS_SIM = $(patsubst %.c,obj_sim/%.o,${SRC_SIM}) +OBJECTS_SIM = $(patsubst $(TOPDIR)/%.c,$(TOPDIR)/obj_sim/%.o,${SRC_SIM}) $(TARGET_SIM): $(OBJECTS_SIM) $(SUBDIROBJECTS_SIM) $(HOSTCC) $(LDFLAGS_SIM) -o $@ $(OBJECTS_SIM) $(SUBDIROBJECTS_SIM) $(LIBS_SIM) -./obj_sim/%.o: %.c - @ if [ ! -d obj_sim ]; then mkdir obj_sim ; fi +$(TOPDIR)/obj_sim/%.o: $(TOPDIR)/%.c + @ if [ ! -d $(TOPDIR)/obj_sim ]; then mkdir $(TOPDIR)/obj_sim ; fi @ echo "compiling $<" @ $(HOSTCC) -o $@ $(CFLAGS_SIM) -c $< @@ -172,10 +173,14 @@ clean: test "x$$subdir" != "x." \ && test -e $$subdir/Makefile \ && $(MAKE) no_deps=t -C $$subdir clean ; done ; true + $(RM) -r $(TOPDIR)/obj_avr + $(RM) -r $(TOPDIR)/obj_sim + $(RM) $(TARGET)* + $(RM) $(TARGET_SIM) $(TARGET_SIM).exe mrproper: $(MAKE) clean - $(RM) -f autoconf.h .config config.mk .menuconfig.log .config.old + $(RM) -f $(TOPDIR)/autoconf.h .config config.mk .menuconfig.log .config.old sflash: $(TARGET).hex # $(LAUNCH_BOOTLOADER) $(SERIAL) 115200 @@ -189,23 +194,23 @@ uflash: $(TARGET).hex ############################################################################## # configure ethersex # -show-config: autoconf.h +show-config: $(TOPDIR)/autoconf.h @echo @echo "These modules are currently enabled: " @echo "======================================" - @grep -e "^#define .*_SUPPORT" autoconf.h | sed -e "s/^#define / * /" -e "s/_SUPPORT.*//" + @grep -e "^#define .*_SUPPORT" $(TOPDIR)/autoconf.h | sed -e "s/^#define / * /" -e "s/_SUPPORT.*//" .PHONY: show-config -autoconf.h .config: +$(TOPDIR)/autoconf.h .config: @echo make\'s goal: $(MAKECMDGOALS) ifneq ($(MAKECMDGOALS),menuconfig) # make sure menuconfig isn't called twice, on `make menuconfig' - #test -s autoconf.h -a -s .config || $(MAKE) no_deps=t menuconfig + #test -s $(TOPDIR)/autoconf.h -a -s .config || $(MAKE) no_deps=t menuconfig # test the target file, test fails if it doesn't exist # and will keep make from looping menuconfig. - #test -s autoconf.h -a -s .config - touch autoconf.h .config + #test -s $(TOPDIR)/autoconf.h -a -s .config + touch $(TOPDIR)/autoconf.h .config endif -include depend.mk +include $(MAKETOPDIR)/depend.mk diff --git a/can/Makefile b/can/Makefile deleted file mode 100644 index bc1001a..0000000 --- a/can/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = libcan.a -TOPDIR = .. - -include $(TOPDIR)/defaults.mk - -ifeq ($(CAN_SUPPORT),y) - SRC = can.c - SRC += borg_can.c - SRC += lap.c - SRC += spi.c -endif - -include $(TOPDIR)/rules.mk diff --git a/config.in b/config.in index de42852..57cb324 100644 --- a/config.in +++ b/config.in @@ -22,7 +22,7 @@ endmenu ### Borg Hardware Menu ######################################################## -source borg_hw/config.in +source src/borg_hw/config.in ############################################################################### @@ -36,22 +36,22 @@ endmenu ### Scrolltext Menu ########################################################### -source scrolltext/config.in +source src/scrolltext/config.in ############################################################################### ### RFM12 Menu ################################################################ -source rfm12/config.in +source src/rfm12/config.in ############################################################################### ### Joystick Menu ############################################################# -source joystick/config.in +source src/joystick/config.in ############################################################################### ### CAN Menu ################################################################## -source can/config.in +source src/can/config.in ############################################################################### @@ -62,15 +62,15 @@ depends on JOYSTICK_SUPPORT ### Game Menu ################################################################# -source games/config.in +source src/games/config.in ############################################################################### ### Animations Menu ########################################################### -source animations/config.in +source src/animations/config.in ############################################################################### ### small Animations Menu ##################################################### -source smallani/config.in +source src/smallani/config.in ############################################################################### diff --git a/defaults.mk b/defaults.mk index 6359233..13e3ac3 100644 --- a/defaults.mk +++ b/defaults.mk @@ -38,27 +38,27 @@ MACHINE = $(shell uname -m) ifeq ($(findstring CYGWIN,$(OSTYPE)),CYGWIN) CFLAGS_SIM = -g -Wall -pedantic -std=c99 -O0 -D_WIN32 -D_XOPEN_SOURCE=600 ifeq ($(MACHINE),x86_64) - LDFLAGS_SIM = -T simulator/i386pep.x + LDFLAGS_SIM = -T ld_scripts/i386pep.x else - LDFLAGS_SIM = -T simulator/i386pe.x + LDFLAGS_SIM = -T ld_scripts/i386pe.x endif LIBS_SIM = -lgdi32 -lwinmm -lm else ifeq ($(OSTYPE),FreeBSD) CFLAGS_SIM = -g -I/usr/local/include -Wall -pedantic -std=c99 -O0 -D_XOPEN_SOURCE=600 ifeq ($(MACHINE),amd64) - LDFLAGS_SIM = -L/usr/local/lib -T simulator/elf_x86_64_fbsd.x + LDFLAGS_SIM = -L/usr/local/lib -T ld_scripts/elf_x86_64_fbsd.x else - LDFLAGS_SIM = -L/usr/local/lib -T simulator/elf_i386_fbsd.x + LDFLAGS_SIM = -L/usr/local/lib -T ld_scripts/elf_i386_fbsd.x endif LIBS_SIM = -lglut -lpthread -lGL -lGLU -lm else ifeq ($(OSTYPE),Linux) CFLAGS_SIM = -g -Wall -pedantic -std=c99 -O0 -D_XOPEN_SOURCE=600 ifeq ($(MACHINE),x86_64) - LDFLAGS_SIM = -g -T simulator/elf_x86_64.x + LDFLAGS_SIM = -T ld_scripts/elf_x86_64.x else - LDFLAGS_SIM = -T simulator/elf_i386.x + LDFLAGS_SIM = -T ld_scripts/elf_i386.x endif LIBS_SIM = -lglut -lpthread -lGL -lGLU -lm else @@ -78,12 +78,12 @@ $(TARGET): ############################################################################## # include user's config.mk file -$(TOPDIR)/config.mk: +config.mk: @echo "# Put your own config here!" > $@ @echo "#F_CPU = $(F_CPU)" >> $@ @echo "#MCU = $(MCU)" >> $@ @echo "created default config.mk, tune your settings there!" --include $(TOPDIR)/config.mk +-include config.mk ############################################################################## @@ -93,15 +93,15 @@ ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),mrproper) ifneq ($(MAKECMDGOALS),menuconfig) -include $(TOPDIR)/.config +include $(MAKETOPDIR)/.config CPPFLAGS += -DF_CPU=$(FREQ)UL -mmcu=$(MCU) # flags for the linker ifeq ($(findstring atmega128,$(MCU)),atmega128) - LDFLAGS += -T ./avr51.x -Wl,-Map,image.map -mmcu=$(MCU) + LDFLAGS += -T ld_scripts/avr51.x -Wl,-Map,image.map -mmcu=$(MCU) else - LDFLAGS += -T ./avr5.x -Wl,-Map,image.map -mmcu=$(MCU) + LDFLAGS += -T ld_scripts/avr5.x -Wl,-Map,image.map -mmcu=$(MCU) endif endif # MAKECMDGOALS!=menuconfig @@ -109,8 +109,8 @@ endif # MAKECMDGOALS!=mrproper endif # MAKECMDGOALS!=clean ifeq ($(BOOTLOADER_SUPPORT),y) -LDFLAGS += -Wl,--section-start=.text=0xE000 -CFLAGS += -mcall-prologues + LDFLAGS += -Wl,--section-start=.text=0xE000 + CFLAGS += -mcall-prologues endif diff --git a/games/breakout/Makefile b/games/breakout/Makefile deleted file mode 100644 index c5dae36..0000000 --- a/games/breakout/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = -TOPDIR = ../.. - -include $(TOPDIR)/defaults.mk - -ifeq ($(GAME_BREAKOUT),y) - SRC = breakout.c playfield.c rebound.c score.c level.c ball.c messages.c -endif - -include $(TOPDIR)/rules.mk diff --git a/games/games.mk b/games/games.mk deleted file mode 100644 index ff98d4d..0000000 --- a/games/games.mk +++ /dev/null @@ -1,22 +0,0 @@ - -ifeq ($(GAME_TETRIS_CORE),y) - SUBDIRS += games/tetris -endif - -ifeq ($(GAME_SPACE_INVADERS),y) - SUBDIRS += games/space_invaders -endif - -ifeq ($(GAME_SNAKE),y) - SUBDIRS += games/snake -endif - -ifeq ($(ANIMATION_SNAKE),y) - ifneq ($(GAME_SNAKE),y) - SUBDIRS += games/snake - endif -endif - -ifeq ($(GAME_BREAKOUT),y) - SUBDIRS += games/breakout -endif diff --git a/games/snake/Makefile b/games/snake/Makefile deleted file mode 100644 index 6419b6d..0000000 --- a/games/snake/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = -TOPDIR = ../.. - -include $(TOPDIR)/defaults.mk - -SRC = snake_game.c - -include $(TOPDIR)/rules.mk diff --git a/games/space_invaders/Makefile b/games/space_invaders/Makefile deleted file mode 100644 index cf00935..0000000 --- a/games/space_invaders/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = -TOPDIR = ../.. - -include $(TOPDIR)/defaults.mk - -SRC = invader_init.c invader_draw.c invader_proc.c invaders2.c - -include $(TOPDIR)/rules.mk diff --git a/avr5.x b/ld_scripts/avr5.x similarity index 100% rename from avr5.x rename to ld_scripts/avr5.x diff --git a/avr51.x b/ld_scripts/avr51.x similarity index 100% rename from avr51.x rename to ld_scripts/avr51.x diff --git a/simulator/elf_i386.x b/ld_scripts/elf_i386.x similarity index 100% rename from simulator/elf_i386.x rename to ld_scripts/elf_i386.x diff --git a/simulator/elf_i386_fbsd.x b/ld_scripts/elf_i386_fbsd.x similarity index 100% rename from simulator/elf_i386_fbsd.x rename to ld_scripts/elf_i386_fbsd.x diff --git a/simulator/elf_x86_64.x b/ld_scripts/elf_x86_64.x similarity index 100% rename from simulator/elf_x86_64.x rename to ld_scripts/elf_x86_64.x diff --git a/simulator/elf_x86_64_fbsd.x b/ld_scripts/elf_x86_64_fbsd.x similarity index 100% rename from simulator/elf_x86_64_fbsd.x rename to ld_scripts/elf_x86_64_fbsd.x diff --git a/simulator/i386pe.x b/ld_scripts/i386pe.x similarity index 100% rename from simulator/i386pe.x rename to ld_scripts/i386pe.x diff --git a/simulator/i386pep.x b/ld_scripts/i386pep.x similarity index 100% rename from simulator/i386pep.x rename to ld_scripts/i386pep.x diff --git a/menu/Makefile b/menu/Makefile deleted file mode 100644 index 22df523..0000000 --- a/menu/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = libanimations.a -TOPDIR = .. - -include $(TOPDIR)/defaults.mk - -SRC = menu.c - - -include $(TOPDIR)/rules.mk diff --git a/rfm12/Makefile b/rfm12/Makefile deleted file mode 100644 index 060edd2..0000000 --- a/rfm12/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -TARGET = objects -TOPDIR = .. - -include $(TOPDIR)/defaults.mk - -SRC = rfm12.c borg_rfm12.c - -include $(TOPDIR)/rules.mk diff --git a/rules.mk b/rules.mk index 55160be..f2978c0 100644 --- a/rules.mk +++ b/rules.mk @@ -1,5 +1,3 @@ - - ############################################################################## # rules for buildung AVR objects @@ -35,17 +33,14 @@ objects_sim: $(OBJECTS_SIM) @ if [ ! -d obj_sim ]; then mkdir obj_sim ; fi @ echo $(OBJECTS_SIM) > obj_sim/.objects - - - clean-common: $(RM) $(TARGET) *.[odasE] *.d.new *~ - $(RM) -r ./obj_avr - $(RM) -r ./obj_sim + $(RM) -r obj_avr + $(RM) -r obj_sim clean: clean-common all: $(MAKE) -C $(TOPDIR) all -include $(TOPDIR)/depend.mk +#include depend.mk diff --git a/scripts/Menuconfig b/scripts/Menuconfig index ce541e2..1abb5e3 100644 --- a/scripts/Menuconfig +++ b/scripts/Menuconfig @@ -1564,7 +1564,7 @@ save_configuration () { echo -n "." DEF_CONFIG="${1:-.config}" - DEF_CONFIG_H="autoconf.h" + DEF_CONFIG_H="src/autoconf.h" CONFIG=.tmpconfig CONFIG_H=.tmpconfig.h diff --git a/scrolltext/Makefile b/scrolltext/Makefile deleted file mode 100644 index 3c9c740..0000000 --- a/scrolltext/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -TARGET = objects -TOPDIR = .. - -include $(TOPDIR)/defaults.mk - -SRC = scrolltext3.c - -SRC += $(shell echo $(SCROLLTEXT_FONT) | tr A-Z a-z).c - -include $(TOPDIR)/rules.mk diff --git a/animations/Makefile b/src/animations/Makefile similarity index 86% rename from animations/Makefile rename to src/animations/Makefile index 248f9c8..3b4a409 100644 --- a/animations/Makefile +++ b/src/animations/Makefile @@ -1,7 +1,8 @@ -TARGET = libanimations.a -TOPDIR = .. +MAKETOPDIR = ../.. -include $(TOPDIR)/defaults.mk +TARGET = libanimations.a + +include $(MAKETOPDIR)/defaults.mk SRC = program.c @@ -53,4 +54,6 @@ ifeq ($(ANIMATION_TIME),y) SRC += borg_time.c endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/animations/bitmapscroller/Makefile b/src/animations/bitmapscroller/Makefile similarity index 71% rename from animations/bitmapscroller/Makefile rename to src/animations/bitmapscroller/Makefile index 8779382..2bdc1c7 100644 --- a/animations/bitmapscroller/Makefile +++ b/src/animations/bitmapscroller/Makefile @@ -1,6 +1,6 @@ -TOPDIR = ../.. +MAKETOPDIR = ../../.. -include $(TOPDIR)/defaults.mk +include $(MAKETOPDIR)/defaults.mk ifeq ($(ANIMATION_BMSCROLLER),y) SRC = bitmapscroller.c @@ -22,4 +22,6 @@ ifeq ($(ANIMATION_FAIRYDUST),y) SRC += fairydust.c endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/animations/bitmapscroller/amphibian.c b/src/animations/bitmapscroller/amphibian.c similarity index 100% rename from animations/bitmapscroller/amphibian.c rename to src/animations/bitmapscroller/amphibian.c diff --git a/animations/bitmapscroller/amphibian.h b/src/animations/bitmapscroller/amphibian.h similarity index 100% rename from animations/bitmapscroller/amphibian.h rename to src/animations/bitmapscroller/amphibian.h diff --git a/animations/bitmapscroller/bitmapscroller.c b/src/animations/bitmapscroller/bitmapscroller.c similarity index 100% rename from animations/bitmapscroller/bitmapscroller.c rename to src/animations/bitmapscroller/bitmapscroller.c diff --git a/animations/bitmapscroller/bitmapscroller.h b/src/animations/bitmapscroller/bitmapscroller.h similarity index 100% rename from animations/bitmapscroller/bitmapscroller.h rename to src/animations/bitmapscroller/bitmapscroller.h diff --git a/animations/bitmapscroller/config.in b/src/animations/bitmapscroller/config.in similarity index 100% rename from animations/bitmapscroller/config.in rename to src/animations/bitmapscroller/config.in diff --git a/animations/bitmapscroller/fairydust.c b/src/animations/bitmapscroller/fairydust.c similarity index 100% rename from animations/bitmapscroller/fairydust.c rename to src/animations/bitmapscroller/fairydust.c diff --git a/animations/bitmapscroller/fairydust.h b/src/animations/bitmapscroller/fairydust.h similarity index 100% rename from animations/bitmapscroller/fairydust.h rename to src/animations/bitmapscroller/fairydust.h diff --git a/animations/bitmapscroller/laborlogo.c b/src/animations/bitmapscroller/laborlogo.c similarity index 100% rename from animations/bitmapscroller/laborlogo.c rename to src/animations/bitmapscroller/laborlogo.c diff --git a/animations/bitmapscroller/laborlogo.h b/src/animations/bitmapscroller/laborlogo.h similarity index 100% rename from animations/bitmapscroller/laborlogo.h rename to src/animations/bitmapscroller/laborlogo.h diff --git a/animations/bitmapscroller/outofspec.c b/src/animations/bitmapscroller/outofspec.c similarity index 100% rename from animations/bitmapscroller/outofspec.c rename to src/animations/bitmapscroller/outofspec.c diff --git a/animations/bitmapscroller/outofspec.h b/src/animations/bitmapscroller/outofspec.h similarity index 100% rename from animations/bitmapscroller/outofspec.h rename to src/animations/bitmapscroller/outofspec.h diff --git a/animations/blackhole.c b/src/animations/blackhole.c similarity index 100% rename from animations/blackhole.c rename to src/animations/blackhole.c diff --git a/animations/blackhole.h b/src/animations/blackhole.h similarity index 100% rename from animations/blackhole.h rename to src/animations/blackhole.h diff --git a/animations/borg_time.c b/src/animations/borg_time.c similarity index 100% rename from animations/borg_time.c rename to src/animations/borg_time.c diff --git a/animations/borg_time.h b/src/animations/borg_time.h similarity index 100% rename from animations/borg_time.h rename to src/animations/borg_time.h diff --git a/animations/breakout_demo.c b/src/animations/breakout_demo.c similarity index 100% rename from animations/breakout_demo.c rename to src/animations/breakout_demo.c diff --git a/animations/breakout_demo.h b/src/animations/breakout_demo.h similarity index 100% rename from animations/breakout_demo.h rename to src/animations/breakout_demo.h diff --git a/animations/config.in b/src/animations/config.in similarity index 98% rename from animations/config.in rename to src/animations/config.in index fe99f3a..2a17321 100644 --- a/animations/config.in +++ b/src/animations/config.in @@ -49,7 +49,7 @@ comment "Animations" int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50 endmenu - source animations/bitmapscroller/config.in + source src/animations/bitmapscroller/config.in mainmenu_option next_comment comment "Fixed-point math patterns" diff --git a/animations/flyingdots.c b/src/animations/flyingdots.c similarity index 100% rename from animations/flyingdots.c rename to src/animations/flyingdots.c diff --git a/animations/flyingdots.h b/src/animations/flyingdots.h similarity index 100% rename from animations/flyingdots.h rename to src/animations/flyingdots.h diff --git a/animations/fpmath_patterns.c b/src/animations/fpmath_patterns.c similarity index 100% rename from animations/fpmath_patterns.c rename to src/animations/fpmath_patterns.c diff --git a/animations/fpmath_patterns.h b/src/animations/fpmath_patterns.h similarity index 100% rename from animations/fpmath_patterns.h rename to src/animations/fpmath_patterns.h diff --git a/animations/gameoflife.c b/src/animations/gameoflife.c similarity index 100% rename from animations/gameoflife.c rename to src/animations/gameoflife.c diff --git a/animations/gameoflife.h b/src/animations/gameoflife.h similarity index 100% rename from animations/gameoflife.h rename to src/animations/gameoflife.h diff --git a/animations/ltn_ant.c b/src/animations/ltn_ant.c similarity index 100% rename from animations/ltn_ant.c rename to src/animations/ltn_ant.c diff --git a/animations/ltn_ant.h b/src/animations/ltn_ant.h similarity index 100% rename from animations/ltn_ant.h rename to src/animations/ltn_ant.h diff --git a/animations/matrix.c b/src/animations/matrix.c similarity index 100% rename from animations/matrix.c rename to src/animations/matrix.c diff --git a/animations/matrix.h b/src/animations/matrix.h similarity index 100% rename from animations/matrix.h rename to src/animations/matrix.h diff --git a/animations/mherweg.c b/src/animations/mherweg.c similarity index 100% rename from animations/mherweg.c rename to src/animations/mherweg.c diff --git a/animations/mherweg.h b/src/animations/mherweg.h similarity index 100% rename from animations/mherweg.h rename to src/animations/mherweg.h diff --git a/animations/program.c b/src/animations/program.c similarity index 100% rename from animations/program.c rename to src/animations/program.c diff --git a/animations/program.h b/src/animations/program.h similarity index 100% rename from animations/program.h rename to src/animations/program.h diff --git a/animations/snake.c b/src/animations/snake.c similarity index 100% rename from animations/snake.c rename to src/animations/snake.c diff --git a/animations/snake.h b/src/animations/snake.h similarity index 100% rename from animations/snake.h rename to src/animations/snake.h diff --git a/animations/squares.c b/src/animations/squares.c similarity index 100% rename from animations/squares.c rename to src/animations/squares.c diff --git a/animations/squares.h b/src/animations/squares.h similarity index 100% rename from animations/squares.h rename to src/animations/squares.h diff --git a/animations/stonefly.c b/src/animations/stonefly.c similarity index 100% rename from animations/stonefly.c rename to src/animations/stonefly.c diff --git a/animations/stonefly.h b/src/animations/stonefly.h similarity index 100% rename from animations/stonefly.h rename to src/animations/stonefly.h diff --git a/borg_hw/Makefile b/src/borg_hw/Makefile similarity index 89% rename from borg_hw/Makefile rename to src/borg_hw/Makefile index aeb6ee8..78c6d38 100644 --- a/borg_hw/Makefile +++ b/src/borg_hw/Makefile @@ -1,9 +1,10 @@ +MAKETOPDIR = ../.. + TARGET = libborg_hw.a -TOPDIR = .. SRC_SIM := -include $(TOPDIR)/defaults.mk +include $(MAKETOPDIR)/defaults.mk ifeq ($(BORG_HW),HW_BORG_16) @@ -66,4 +67,6 @@ ifeq ($(SRC),'') $(error no valid hardware driver selected ) endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/borg_hw/borg_hw.h b/src/borg_hw/borg_hw.h similarity index 100% rename from borg_hw/borg_hw.h rename to src/borg_hw/borg_hw.h diff --git a/borg_hw/borg_hw_ancient.c b/src/borg_hw/borg_hw_ancient.c similarity index 100% rename from borg_hw/borg_hw_ancient.c rename to src/borg_hw/borg_hw_ancient.c diff --git a/borg_hw/borg_hw_andreborg.c b/src/borg_hw/borg_hw_andreborg.c similarity index 100% rename from borg_hw/borg_hw_andreborg.c rename to src/borg_hw/borg_hw_andreborg.c diff --git a/borg_hw/borg_hw_borg16.c b/src/borg_hw/borg_hw_borg16.c similarity index 100% rename from borg_hw/borg_hw_borg16.c rename to src/borg_hw/borg_hw_borg16.c diff --git a/borg_hw/borg_hw_borg16_hgmod.c b/src/borg_hw/borg_hw_borg16_hgmod.c similarity index 100% rename from borg_hw/borg_hw_borg16_hgmod.c rename to src/borg_hw/borg_hw_borg16_hgmod.c diff --git a/borg_hw/borg_hw_borg_ls.c b/src/borg_hw/borg_hw_borg_ls.c similarity index 100% rename from borg_hw/borg_hw_borg_ls.c rename to src/borg_hw/borg_hw_borg_ls.c diff --git a/borg_hw/borg_hw_borg_lsjo.c b/src/borg_hw/borg_hw_borg_lsjo.c similarity index 100% rename from borg_hw/borg_hw_borg_lsjo.c rename to src/borg_hw/borg_hw_borg_lsjo.c diff --git a/borg_hw/borg_hw_borg_mh.c b/src/borg_hw/borg_hw_borg_mh.c similarity index 100% rename from borg_hw/borg_hw_borg_mh.c rename to src/borg_hw/borg_hw_borg_mh.c diff --git a/borg_hw/borg_hw_borg_mini.c b/src/borg_hw/borg_hw_borg_mini.c similarity index 100% rename from borg_hw/borg_hw_borg_mini.c rename to src/borg_hw/borg_hw_borg_mini.c diff --git a/borg_hw/borg_hw_gigaborg.c b/src/borg_hw/borg_hw_gigaborg.c similarity index 100% rename from borg_hw/borg_hw_gigaborg.c rename to src/borg_hw/borg_hw_gigaborg.c diff --git a/borg_hw/borg_hw_ledbrett.c b/src/borg_hw/borg_hw_ledbrett.c similarity index 100% rename from borg_hw/borg_hw_ledbrett.c rename to src/borg_hw/borg_hw_ledbrett.c diff --git a/borg_hw/borg_hw_panel_one.c b/src/borg_hw/borg_hw_panel_one.c similarity index 100% rename from borg_hw/borg_hw_panel_one.c rename to src/borg_hw/borg_hw_panel_one.c diff --git a/borg_hw/borg_hw_pd1165.c b/src/borg_hw/borg_hw_pd1165.c similarity index 100% rename from borg_hw/borg_hw_pd1165.c rename to src/borg_hw/borg_hw_pd1165.c diff --git a/borg_hw/borg_hw_pingpong.c b/src/borg_hw/borg_hw_pingpong.c similarity index 100% rename from borg_hw/borg_hw_pingpong.c rename to src/borg_hw/borg_hw_pingpong.c diff --git a/borg_hw/borg_hw_rotor.c b/src/borg_hw/borg_hw_rotor.c similarity index 100% rename from borg_hw/borg_hw_rotor.c rename to src/borg_hw/borg_hw_rotor.c diff --git a/borg_hw/config.in b/src/borg_hw/config.in similarity index 73% rename from borg_hw/config.in rename to src/borg_hw/config.in index 12ee793..d494ec3 100644 --- a/borg_hw/config.in +++ b/src/borg_hw/config.in @@ -26,59 +26,59 @@ choice 'Hardware Driver' \ if [ "$BORG_HW" == "HW_BORG_16" ] ; then - source borg_hw/config_borg16.in + source src/borg_hw/config_borg16.in fi if [ "$BORG_HW" == "HW_BORG_16_HGM" ] ; then - source borg_hw/config_borg16_hgmod.in + source src/borg_hw/config_borg16_hgmod.in fi if [ "$BORG_HW" == "HW_BORG_ANDRE" ] ; then - source borg_hw/config_andreborg.in + source src/borg_hw/config_andreborg.in fi if [ "$BORG_HW" == "HW_BORG_LS" ] ; then - source borg_hw/config_borg_ls.in + source src/borg_hw/config_borg_ls.in fi if [ "$BORG_HW" == "HW_BORG_MH" ] ; then - source borg_hw/config_borg_mh.in + source src/borg_hw/config_borg_mh.in fi if [ "$BORG_HW" == "HW_BORG_LSJO" ] ; then - source borg_hw/config_borg_lsjo.in + source src/borg_hw/config_borg_lsjo.in fi if [ "$BORG_HW" == "HW_LEDBRETT" ] ; then - source borg_hw/config_ledbrett.in + source src/borg_hw/config_ledbrett.in fi if [ "$BORG_HW" == "HW_BORG_MINI" ] ; then - source borg_hw/config_borg_mini.in + source src/borg_hw/config_borg_mini.in fi if [ "$BORG_HW" == "HW_PANEL_ONE" ] ; then - source borg_hw/config_panel_one.in + source src/borg_hw/config_panel_one.in fi if [ "$BORG_HW" == "HW_PD1165" ] ; then - source borg_hw/config_pd1165.in + source src/borg_hw/config_pd1165.in fi if [ "$BORG_HW" == "HW_PINGPONG" ] ; then - source borg_hw/config_pingpong.in + source src/borg_hw/config_pingpong.in fi if [ "$BORG_HW" == "HW_ROTOR" ] ; then - source borg_hw/config_rotor.in + source src/borg_hw/config_rotor.in fi if [ "$BORG_HW" == "HW_GIGABORG" ] ; then - source borg_hw/config_gigaborg.in + source src/borg_hw/config_gigaborg.in fi if [ "$BORG_HW" == "HW_ANCIENTBORG" ] ; then - source borg_hw/config_ancient.in + source src/borg_hw/config_ancient.in fi endmenu diff --git a/borg_hw/config_ancient.in b/src/borg_hw/config_ancient.in similarity index 100% rename from borg_hw/config_ancient.in rename to src/borg_hw/config_ancient.in diff --git a/borg_hw/config_andreborg.in b/src/borg_hw/config_andreborg.in similarity index 100% rename from borg_hw/config_andreborg.in rename to src/borg_hw/config_andreborg.in diff --git a/borg_hw/config_borg16.in b/src/borg_hw/config_borg16.in similarity index 100% rename from borg_hw/config_borg16.in rename to src/borg_hw/config_borg16.in diff --git a/borg_hw/config_borg16_hgmod.in b/src/borg_hw/config_borg16_hgmod.in similarity index 100% rename from borg_hw/config_borg16_hgmod.in rename to src/borg_hw/config_borg16_hgmod.in diff --git a/borg_hw/config_borg_ls.in b/src/borg_hw/config_borg_ls.in similarity index 100% rename from borg_hw/config_borg_ls.in rename to src/borg_hw/config_borg_ls.in diff --git a/borg_hw/config_borg_lsjo.in b/src/borg_hw/config_borg_lsjo.in similarity index 100% rename from borg_hw/config_borg_lsjo.in rename to src/borg_hw/config_borg_lsjo.in diff --git a/borg_hw/config_borg_mh.in b/src/borg_hw/config_borg_mh.in similarity index 100% rename from borg_hw/config_borg_mh.in rename to src/borg_hw/config_borg_mh.in diff --git a/borg_hw/config_borg_mini.in b/src/borg_hw/config_borg_mini.in similarity index 100% rename from borg_hw/config_borg_mini.in rename to src/borg_hw/config_borg_mini.in diff --git a/borg_hw/config_gigaborg.in b/src/borg_hw/config_gigaborg.in similarity index 100% rename from borg_hw/config_gigaborg.in rename to src/borg_hw/config_gigaborg.in diff --git a/borg_hw/config_ledbrett.in b/src/borg_hw/config_ledbrett.in similarity index 100% rename from borg_hw/config_ledbrett.in rename to src/borg_hw/config_ledbrett.in diff --git a/borg_hw/config_panel_one.in b/src/borg_hw/config_panel_one.in similarity index 100% rename from borg_hw/config_panel_one.in rename to src/borg_hw/config_panel_one.in diff --git a/borg_hw/config_pd1165.in b/src/borg_hw/config_pd1165.in similarity index 100% rename from borg_hw/config_pd1165.in rename to src/borg_hw/config_pd1165.in diff --git a/borg_hw/config_pingpong.in b/src/borg_hw/config_pingpong.in similarity index 100% rename from borg_hw/config_pingpong.in rename to src/borg_hw/config_pingpong.in diff --git a/borg_hw/config_rotor.in b/src/borg_hw/config_rotor.in similarity index 100% rename from borg_hw/config_rotor.in rename to src/borg_hw/config_rotor.in diff --git a/src/can/Makefile b/src/can/Makefile new file mode 100644 index 0000000..6124560 --- /dev/null +++ b/src/can/Makefile @@ -0,0 +1,16 @@ +MAKETOPDIR = ../.. + +TARGET = libcan.a + +include $(MAKETOPDIR)/defaults.mk + +ifeq ($(CAN_SUPPORT),y) + SRC = can.c + SRC += borg_can.c + SRC += lap.c + SRC += spi.c +endif + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/can/borg_can.c b/src/can/borg_can.c similarity index 100% rename from can/borg_can.c rename to src/can/borg_can.c diff --git a/can/borg_can.h b/src/can/borg_can.h similarity index 100% rename from can/borg_can.h rename to src/can/borg_can.h diff --git a/can/can.c b/src/can/can.c similarity index 100% rename from can/can.c rename to src/can/can.c diff --git a/can/can.h b/src/can/can.h similarity index 100% rename from can/can.h rename to src/can/can.h diff --git a/can/config.in b/src/can/config.in similarity index 100% rename from can/config.in rename to src/can/config.in diff --git a/can/lap.c b/src/can/lap.c similarity index 100% rename from can/lap.c rename to src/can/lap.c diff --git a/can/lap.h b/src/can/lap.h similarity index 100% rename from can/lap.h rename to src/can/lap.h diff --git a/can/spi.c b/src/can/spi.c similarity index 100% rename from can/spi.c rename to src/can/spi.c diff --git a/can/spi.h b/src/can/spi.h similarity index 100% rename from can/spi.h rename to src/can/spi.h diff --git a/compat/eeprom.h b/src/compat/eeprom.h similarity index 100% rename from compat/eeprom.h rename to src/compat/eeprom.h diff --git a/compat/interrupt.h b/src/compat/interrupt.h similarity index 100% rename from compat/interrupt.h rename to src/compat/interrupt.h diff --git a/compat/pgmspace.h b/src/compat/pgmspace.h similarity index 100% rename from compat/pgmspace.h rename to src/compat/pgmspace.h diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/display_loop.c b/src/display_loop.c similarity index 100% rename from display_loop.c rename to src/display_loop.c diff --git a/display_loop.h b/src/display_loop.h similarity index 100% rename from display_loop.h rename to src/display_loop.h diff --git a/eeprom_reserve.c b/src/eeprom_reserve.c similarity index 100% rename from eeprom_reserve.c rename to src/eeprom_reserve.c diff --git a/src/games/breakout/Makefile b/src/games/breakout/Makefile new file mode 100644 index 0000000..498a826 --- /dev/null +++ b/src/games/breakout/Makefile @@ -0,0 +1,13 @@ +MAKETOPDIR = ../../.. + +TARGET = + +include $(MAKETOPDIR)/defaults.mk + +ifeq ($(GAME_BREAKOUT),y) + SRC = breakout.c playfield.c rebound.c score.c level.c ball.c messages.c +endif + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/games/breakout/ball.c b/src/games/breakout/ball.c similarity index 100% rename from games/breakout/ball.c rename to src/games/breakout/ball.c diff --git a/games/breakout/ball.h b/src/games/breakout/ball.h similarity index 100% rename from games/breakout/ball.h rename to src/games/breakout/ball.h diff --git a/games/breakout/breakout.c b/src/games/breakout/breakout.c similarity index 100% rename from games/breakout/breakout.c rename to src/games/breakout/breakout.c diff --git a/games/breakout/breakout.h b/src/games/breakout/breakout.h similarity index 100% rename from games/breakout/breakout.h rename to src/games/breakout/breakout.h diff --git a/games/breakout/common.h b/src/games/breakout/common.h similarity index 100% rename from games/breakout/common.h rename to src/games/breakout/common.h diff --git a/games/breakout/config.h b/src/games/breakout/config.h similarity index 100% rename from games/breakout/config.h rename to src/games/breakout/config.h diff --git a/games/breakout/level.c b/src/games/breakout/level.c similarity index 100% rename from games/breakout/level.c rename to src/games/breakout/level.c diff --git a/games/breakout/level.h b/src/games/breakout/level.h similarity index 100% rename from games/breakout/level.h rename to src/games/breakout/level.h diff --git a/games/breakout/messages.c b/src/games/breakout/messages.c similarity index 100% rename from games/breakout/messages.c rename to src/games/breakout/messages.c diff --git a/games/breakout/messages.h b/src/games/breakout/messages.h similarity index 100% rename from games/breakout/messages.h rename to src/games/breakout/messages.h diff --git a/games/breakout/playfield.c b/src/games/breakout/playfield.c similarity index 100% rename from games/breakout/playfield.c rename to src/games/breakout/playfield.c diff --git a/games/breakout/playfield.h b/src/games/breakout/playfield.h similarity index 100% rename from games/breakout/playfield.h rename to src/games/breakout/playfield.h diff --git a/games/breakout/rebound.c b/src/games/breakout/rebound.c similarity index 100% rename from games/breakout/rebound.c rename to src/games/breakout/rebound.c diff --git a/games/breakout/rebound.h b/src/games/breakout/rebound.h similarity index 100% rename from games/breakout/rebound.h rename to src/games/breakout/rebound.h diff --git a/games/breakout/score.c b/src/games/breakout/score.c similarity index 100% rename from games/breakout/score.c rename to src/games/breakout/score.c diff --git a/games/breakout/score.h b/src/games/breakout/score.h similarity index 100% rename from games/breakout/score.h rename to src/games/breakout/score.h diff --git a/games/config.in b/src/games/config.in similarity index 100% rename from games/config.in rename to src/games/config.in diff --git a/src/games/games.mk b/src/games/games.mk new file mode 100644 index 0000000..8cf3e5e --- /dev/null +++ b/src/games/games.mk @@ -0,0 +1,22 @@ + +ifeq ($(GAME_TETRIS_CORE),y) + SUBDIRS += $(TOPDIR)/games/tetris +endif + +ifeq ($(GAME_SPACE_INVADERS),y) + SUBDIRS += $(TOPDIR)/games/space_invaders +endif + +ifeq ($(GAME_SNAKE),y) + SUBDIRS += $(TOPDIR)/games/snake +endif + +ifeq ($(ANIMATION_SNAKE),y) + ifneq ($(GAME_SNAKE),y) + SUBDIRS += $(TOPDIR)/games/snake + endif +endif + +ifeq ($(GAME_BREAKOUT),y) + SUBDIRS += $(TOPDIR)/games/breakout +endif diff --git a/src/games/snake/Makefile b/src/games/snake/Makefile new file mode 100644 index 0000000..95e4037 --- /dev/null +++ b/src/games/snake/Makefile @@ -0,0 +1,11 @@ +MAKETOPDIR = ../../.. + +TARGET = + +include $(MAKETOPDIR)/defaults.mk + +SRC = snake_game.c + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/games/snake/snake_game.c b/src/games/snake/snake_game.c similarity index 100% rename from games/snake/snake_game.c rename to src/games/snake/snake_game.c diff --git a/games/snake/snake_game.h b/src/games/snake/snake_game.h similarity index 100% rename from games/snake/snake_game.h rename to src/games/snake/snake_game.h diff --git a/src/games/space_invaders/Makefile b/src/games/space_invaders/Makefile new file mode 100644 index 0000000..0680ce7 --- /dev/null +++ b/src/games/space_invaders/Makefile @@ -0,0 +1,11 @@ +MAKETOPDIR = ../../.. + +TARGET = + +include $(MAKETOPDIR)/defaults.mk + +SRC = invader_init.c invader_draw.c invader_proc.c invaders2.c + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/games/space_invaders/invader_draw.c b/src/games/space_invaders/invader_draw.c similarity index 100% rename from games/space_invaders/invader_draw.c rename to src/games/space_invaders/invader_draw.c diff --git a/games/space_invaders/invader_init.c b/src/games/space_invaders/invader_init.c similarity index 100% rename from games/space_invaders/invader_init.c rename to src/games/space_invaders/invader_init.c diff --git a/games/space_invaders/invader_proc.c b/src/games/space_invaders/invader_proc.c similarity index 100% rename from games/space_invaders/invader_proc.c rename to src/games/space_invaders/invader_proc.c diff --git a/games/space_invaders/invaders2.c b/src/games/space_invaders/invaders2.c similarity index 100% rename from games/space_invaders/invaders2.c rename to src/games/space_invaders/invaders2.c diff --git a/games/space_invaders/invaders2.h b/src/games/space_invaders/invaders2.h similarity index 100% rename from games/space_invaders/invaders2.h rename to src/games/space_invaders/invaders2.h diff --git a/games/tetris/COPYING b/src/games/tetris/COPYING similarity index 100% rename from games/tetris/COPYING rename to src/games/tetris/COPYING diff --git a/games/tetris/LICENSE b/src/games/tetris/LICENSE similarity index 100% rename from games/tetris/LICENSE rename to src/games/tetris/LICENSE diff --git a/games/tetris/Makefile b/src/games/tetris/Makefile similarity index 71% rename from games/tetris/Makefile rename to src/games/tetris/Makefile index 78ca3bd..3d737f2 100644 --- a/games/tetris/Makefile +++ b/src/games/tetris/Makefile @@ -1,7 +1,8 @@ -TARGET = -TOPDIR = ../.. +MAKETOPDIR = ../../.. -include $(TOPDIR)/defaults.mk +TARGET = + +include $(MAKETOPDIR)/defaults.mk SRC = tetris_main.c piece.c bucket.c view.c input.c highscore.c @@ -20,4 +21,6 @@ ifeq ($(GAME_TETRIS_FP),y) SRC += variant_fp.c endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/games/tetris/bearing.h b/src/games/tetris/bearing.h similarity index 100% rename from games/tetris/bearing.h rename to src/games/tetris/bearing.h diff --git a/games/tetris/bucket.c b/src/games/tetris/bucket.c similarity index 100% rename from games/tetris/bucket.c rename to src/games/tetris/bucket.c diff --git a/games/tetris/bucket.h b/src/games/tetris/bucket.h similarity index 100% rename from games/tetris/bucket.h rename to src/games/tetris/bucket.h diff --git a/games/tetris/highscore.c b/src/games/tetris/highscore.c similarity index 100% rename from games/tetris/highscore.c rename to src/games/tetris/highscore.c diff --git a/games/tetris/highscore.h b/src/games/tetris/highscore.h similarity index 100% rename from games/tetris/highscore.h rename to src/games/tetris/highscore.h diff --git a/games/tetris/input.c b/src/games/tetris/input.c similarity index 100% rename from games/tetris/input.c rename to src/games/tetris/input.c diff --git a/games/tetris/input.h b/src/games/tetris/input.h similarity index 100% rename from games/tetris/input.h rename to src/games/tetris/input.h diff --git a/games/tetris/piece.c b/src/games/tetris/piece.c similarity index 100% rename from games/tetris/piece.c rename to src/games/tetris/piece.c diff --git a/games/tetris/piece.h b/src/games/tetris/piece.h similarity index 100% rename from games/tetris/piece.h rename to src/games/tetris/piece.h diff --git a/games/tetris/tetris_main.c b/src/games/tetris/tetris_main.c similarity index 100% rename from games/tetris/tetris_main.c rename to src/games/tetris/tetris_main.c diff --git a/games/tetris/tetris_main.h b/src/games/tetris/tetris_main.h similarity index 100% rename from games/tetris/tetris_main.h rename to src/games/tetris/tetris_main.h diff --git a/games/tetris/variant_bastet.c b/src/games/tetris/variant_bastet.c similarity index 100% rename from games/tetris/variant_bastet.c rename to src/games/tetris/variant_bastet.c diff --git a/games/tetris/variant_bastet.h b/src/games/tetris/variant_bastet.h similarity index 100% rename from games/tetris/variant_bastet.h rename to src/games/tetris/variant_bastet.h diff --git a/games/tetris/variant_fp.c b/src/games/tetris/variant_fp.c similarity index 100% rename from games/tetris/variant_fp.c rename to src/games/tetris/variant_fp.c diff --git a/games/tetris/variant_fp.h b/src/games/tetris/variant_fp.h similarity index 100% rename from games/tetris/variant_fp.h rename to src/games/tetris/variant_fp.h diff --git a/games/tetris/variant_std.c b/src/games/tetris/variant_std.c similarity index 100% rename from games/tetris/variant_std.c rename to src/games/tetris/variant_std.c diff --git a/games/tetris/variant_std.h b/src/games/tetris/variant_std.h similarity index 100% rename from games/tetris/variant_std.h rename to src/games/tetris/variant_std.h diff --git a/games/tetris/variants.h b/src/games/tetris/variants.h similarity index 100% rename from games/tetris/variants.h rename to src/games/tetris/variants.h diff --git a/games/tetris/view.c b/src/games/tetris/view.c similarity index 100% rename from games/tetris/view.c rename to src/games/tetris/view.c diff --git a/games/tetris/view.h b/src/games/tetris/view.h similarity index 100% rename from games/tetris/view.h rename to src/games/tetris/view.h diff --git a/ioport.h b/src/ioport.h similarity index 100% rename from ioport.h rename to src/ioport.h diff --git a/joystick/Makefile b/src/joystick/Makefile similarity index 70% rename from joystick/Makefile rename to src/joystick/Makefile index f3fba7b..ff1c5f7 100644 --- a/joystick/Makefile +++ b/src/joystick/Makefile @@ -1,7 +1,8 @@ -TARGET = -TOPDIR = .. +MAKETOPDIR = ../.. -include $(TOPDIR)/defaults.mk +TARGET = + +include $(MAKETOPDIR)/defaults.mk SRC_SIM = @@ -18,4 +19,6 @@ ifeq ($(HC165_JOYSTICK_SUPPORT), y) SRC = hc165_joystick.c endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/joystick/config.in b/src/joystick/config.in similarity index 100% rename from joystick/config.in rename to src/joystick/config.in diff --git a/joystick/hc165_joystick.c b/src/joystick/hc165_joystick.c similarity index 100% rename from joystick/hc165_joystick.c rename to src/joystick/hc165_joystick.c diff --git a/joystick/joystick.c b/src/joystick/joystick.c similarity index 100% rename from joystick/joystick.c rename to src/joystick/joystick.c diff --git a/joystick/joystick.h b/src/joystick/joystick.h similarity index 100% rename from joystick/joystick.h rename to src/joystick/joystick.h diff --git a/joystick/nes_pad.c b/src/joystick/nes_pad.c similarity index 100% rename from joystick/nes_pad.c rename to src/joystick/nes_pad.c diff --git a/joystick/rfm12_joystick.c b/src/joystick/rfm12_joystick.c similarity index 100% rename from joystick/rfm12_joystick.c rename to src/joystick/rfm12_joystick.c diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/makros.h b/src/makros.h similarity index 100% rename from makros.h rename to src/makros.h diff --git a/mcuf/mcuf.c b/src/mcuf/mcuf.c similarity index 100% rename from mcuf/mcuf.c rename to src/mcuf/mcuf.c diff --git a/mcuf/mcuf.h b/src/mcuf/mcuf.h similarity index 100% rename from mcuf/mcuf.h rename to src/mcuf/mcuf.h diff --git a/src/menu/Makefile b/src/menu/Makefile new file mode 100644 index 0000000..7416d0a --- /dev/null +++ b/src/menu/Makefile @@ -0,0 +1,11 @@ +MAKETOPDIR = ../.. + +TARGET = libanimations.a + +include $(MAKETOPDIR)/defaults.mk + +SRC = menu.c + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/menu/menu.c b/src/menu/menu.c similarity index 100% rename from menu/menu.c rename to src/menu/menu.c diff --git a/menu/menu.h b/src/menu/menu.h similarity index 100% rename from menu/menu.h rename to src/menu/menu.h diff --git a/pixel.c b/src/pixel.c similarity index 100% rename from pixel.c rename to src/pixel.c diff --git a/pixel.h b/src/pixel.h similarity index 100% rename from pixel.h rename to src/pixel.h diff --git a/random/Makefile b/src/random/Makefile similarity index 60% rename from random/Makefile rename to src/random/Makefile index ff5859d..725498e 100644 --- a/random/Makefile +++ b/src/random/Makefile @@ -1,7 +1,8 @@ -TARGET = objects_avr -TOPDIR = .. +MAKETOPDIR = ../.. -include $(TOPDIR)/defaults.mk +TARGET = objects_avr + +include $(MAKETOPDIR)/defaults.mk #for AVR SRC = prng.c persistentCounter.c @@ -10,7 +11,6 @@ ASRC = noekeon_asm.S memxor.S #for simulator SRC_SIM = prng.c persistentCounter.c noekeon.c memxor_c.c +include $(MAKETOPDIR)/rules.mk - - -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/depend.mk diff --git a/random/memxor.S b/src/random/memxor.S similarity index 100% rename from random/memxor.S rename to src/random/memxor.S diff --git a/random/memxor.h b/src/random/memxor.h similarity index 100% rename from random/memxor.h rename to src/random/memxor.h diff --git a/random/memxor_c.c b/src/random/memxor_c.c similarity index 100% rename from random/memxor_c.c rename to src/random/memxor_c.c diff --git a/random/noekeon.c b/src/random/noekeon.c similarity index 100% rename from random/noekeon.c rename to src/random/noekeon.c diff --git a/random/noekeon.h b/src/random/noekeon.h similarity index 100% rename from random/noekeon.h rename to src/random/noekeon.h diff --git a/random/noekeon_asm.S b/src/random/noekeon_asm.S similarity index 100% rename from random/noekeon_asm.S rename to src/random/noekeon_asm.S diff --git a/random/persistentCounter.c b/src/random/persistentCounter.c similarity index 100% rename from random/persistentCounter.c rename to src/random/persistentCounter.c diff --git a/random/persistentCounter.h b/src/random/persistentCounter.h similarity index 100% rename from random/persistentCounter.h rename to src/random/persistentCounter.h diff --git a/random/prng.c b/src/random/prng.c similarity index 100% rename from random/prng.c rename to src/random/prng.c diff --git a/random/prng.h b/src/random/prng.h similarity index 100% rename from random/prng.h rename to src/random/prng.h diff --git a/src/rfm12/Makefile b/src/rfm12/Makefile new file mode 100644 index 0000000..e4bd20e --- /dev/null +++ b/src/rfm12/Makefile @@ -0,0 +1,11 @@ +MAKETOPDIR = ../.. + +TARGET = objects + +include $(MAKETOPDIR)/defaults.mk + +SRC = rfm12.c borg_rfm12.c + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/rfm12/borg_rfm12.c b/src/rfm12/borg_rfm12.c similarity index 100% rename from rfm12/borg_rfm12.c rename to src/rfm12/borg_rfm12.c diff --git a/rfm12/borg_rfm12.h b/src/rfm12/borg_rfm12.h similarity index 100% rename from rfm12/borg_rfm12.h rename to src/rfm12/borg_rfm12.h diff --git a/rfm12/config.in b/src/rfm12/config.in similarity index 100% rename from rfm12/config.in rename to src/rfm12/config.in diff --git a/rfm12/rfm12.c b/src/rfm12/rfm12.c similarity index 100% rename from rfm12/rfm12.c rename to src/rfm12/rfm12.c diff --git a/rfm12/rfm12.h b/src/rfm12/rfm12.h similarity index 100% rename from rfm12/rfm12.h rename to src/rfm12/rfm12.h diff --git a/rfm12/rfm12_config.h b/src/rfm12/rfm12_config.h similarity index 100% rename from rfm12/rfm12_config.h rename to src/rfm12/rfm12_config.h diff --git a/src/scrolltext/Makefile b/src/scrolltext/Makefile new file mode 100644 index 0000000..40ac8ce --- /dev/null +++ b/src/scrolltext/Makefile @@ -0,0 +1,12 @@ +MAKETOPDIR = ../.. + +TARGET = objects + +include $(MAKETOPDIR)/defaults.mk + +SRC = scrolltext3.c +SRC += $(shell echo $(SCROLLTEXT_FONT) | tr A-Z a-z).c + +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/scrolltext/config.in b/src/scrolltext/config.in similarity index 100% rename from scrolltext/config.in rename to src/scrolltext/config.in diff --git a/scrolltext/font.h b/src/scrolltext/font.h similarity index 100% rename from scrolltext/font.h rename to src/scrolltext/font.h diff --git a/scrolltext/font_arial8.c b/src/scrolltext/font_arial8.c similarity index 100% rename from scrolltext/font_arial8.c rename to src/scrolltext/font_arial8.c diff --git a/scrolltext/font_arial8.h b/src/scrolltext/font_arial8.h similarity index 100% rename from scrolltext/font_arial8.h rename to src/scrolltext/font_arial8.h diff --git a/scrolltext/font_c64.c b/src/scrolltext/font_c64.c similarity index 100% rename from scrolltext/font_c64.c rename to src/scrolltext/font_c64.c diff --git a/scrolltext/font_c64.h b/src/scrolltext/font_c64.h similarity index 100% rename from scrolltext/font_c64.h rename to src/scrolltext/font_c64.h diff --git a/scrolltext/font_small6.c b/src/scrolltext/font_small6.c similarity index 100% rename from scrolltext/font_small6.c rename to src/scrolltext/font_small6.c diff --git a/scrolltext/font_small6.h b/src/scrolltext/font_small6.h similarity index 100% rename from scrolltext/font_small6.h rename to src/scrolltext/font_small6.h diff --git a/scrolltext/font_uni53.c b/src/scrolltext/font_uni53.c similarity index 100% rename from scrolltext/font_uni53.c rename to src/scrolltext/font_uni53.c diff --git a/scrolltext/font_uni53.h b/src/scrolltext/font_uni53.h similarity index 100% rename from scrolltext/font_uni53.h rename to src/scrolltext/font_uni53.h diff --git a/scrolltext/scrolltext.h b/src/scrolltext/scrolltext.h similarity index 100% rename from scrolltext/scrolltext.h rename to src/scrolltext/scrolltext.h diff --git a/scrolltext/scrolltext3.c b/src/scrolltext/scrolltext3.c similarity index 100% rename from scrolltext/scrolltext3.c rename to src/scrolltext/scrolltext3.c diff --git a/simulator/Makefile b/src/simulator/Makefile similarity index 56% rename from simulator/Makefile rename to src/simulator/Makefile index e6c98c5..683e1fa 100644 --- a/simulator/Makefile +++ b/src/simulator/Makefile @@ -1,7 +1,8 @@ -TARGET = libanimations.a -TOPDIR = .. +MAKETOPDIR = ../.. -include $(TOPDIR)/defaults.mk +TARGET = libanimations.a + +include $(MAKETOPDIR)/defaults.mk ifeq ($(findstring CYGWIN,$(OSTYPE)),CYGWIN) SRC_SIM = winmain.c eeprom.c @@ -9,4 +10,6 @@ else SRC_SIM = main.c trackball.c eeprom.c endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/simulator/Makefile.osx b/src/simulator/Makefile.osx similarity index 100% rename from simulator/Makefile.osx rename to src/simulator/Makefile.osx diff --git a/simulator/eeprom.c b/src/simulator/eeprom.c similarity index 100% rename from simulator/eeprom.c rename to src/simulator/eeprom.c diff --git a/simulator/main.c b/src/simulator/main.c similarity index 100% rename from simulator/main.c rename to src/simulator/main.c diff --git a/simulator/trackball.c b/src/simulator/trackball.c similarity index 100% rename from simulator/trackball.c rename to src/simulator/trackball.c diff --git a/simulator/trackball.h b/src/simulator/trackball.h similarity index 100% rename from simulator/trackball.h rename to src/simulator/trackball.h diff --git a/simulator/winmain.c b/src/simulator/winmain.c similarity index 100% rename from simulator/winmain.c rename to src/simulator/winmain.c diff --git a/smallani/Makefile b/src/smallani/Makefile similarity index 70% rename from smallani/Makefile rename to src/smallani/Makefile index a7f5c00..eb3c91c 100644 --- a/smallani/Makefile +++ b/src/smallani/Makefile @@ -1,7 +1,8 @@ -TARGET = libsmallanimations.a -TOPDIR = .. +MAKETOPDIR = ../.. -include $(TOPDIR)/defaults.mk +TARGET = libsmallanimations.a + +include $(MAKETOPDIR)/defaults.mk ifeq ($(SMALLANIMATION_ROWWALK),y) SRC += rowwalk.c @@ -19,4 +20,6 @@ ifeq ($(SMALLANIMATION_COLBOUNCE),y) endif -include $(TOPDIR)/rules.mk +include $(MAKETOPDIR)/rules.mk + +include $(MAKETOPDIR)/depend.mk diff --git a/smallani/colbounce.c b/src/smallani/colbounce.c similarity index 100% rename from smallani/colbounce.c rename to src/smallani/colbounce.c diff --git a/smallani/colbounce.h b/src/smallani/colbounce.h similarity index 100% rename from smallani/colbounce.h rename to src/smallani/colbounce.h diff --git a/smallani/colwalk.c b/src/smallani/colwalk.c similarity index 100% rename from smallani/colwalk.c rename to src/smallani/colwalk.c diff --git a/smallani/colwalk.h b/src/smallani/colwalk.h similarity index 100% rename from smallani/colwalk.h rename to src/smallani/colwalk.h diff --git a/smallani/config.in b/src/smallani/config.in similarity index 100% rename from smallani/config.in rename to src/smallani/config.in diff --git a/smallani/rowbounce.c b/src/smallani/rowbounce.c similarity index 100% rename from smallani/rowbounce.c rename to src/smallani/rowbounce.c diff --git a/smallani/rowbounce.h b/src/smallani/rowbounce.h similarity index 100% rename from smallani/rowbounce.h rename to src/smallani/rowbounce.h diff --git a/smallani/rowwalk.c b/src/smallani/rowwalk.c similarity index 100% rename from smallani/rowwalk.c rename to src/smallani/rowwalk.c diff --git a/smallani/rowwalk.h b/src/smallani/rowwalk.h similarity index 100% rename from smallani/rowwalk.h rename to src/smallani/rowwalk.h diff --git a/uart/uart.c b/src/uart/uart.c similarity index 100% rename from uart/uart.c rename to src/uart/uart.c diff --git a/uart/uart.h b/src/uart/uart.h similarity index 100% rename from uart/uart.h rename to src/uart/uart.h diff --git a/util.c b/src/util.c similarity index 100% rename from util.c rename to src/util.c diff --git a/util.h b/src/util.h similarity index 100% rename from util.h rename to src/util.h