From c47d806c0cc7008415cb30808605c99fbd75f765 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Fri, 27 Sep 2024 10:10:54 +0200 Subject: [PATCH] move ui4x_* under src/ui4x/ --- Makefile | 14 +++++++------- src/{ => _archive}/___x11.c | 0 src/{ => _archive}/___x11.h | 0 src/{ => _archive}/___x11_lcd.c | 0 src/{ => _archive}/___x11_lcd.h | 0 src/{ => _archive}/___x11_main.c | 0 src/config.h | 2 +- src/main.c | 6 +++--- .../bitmaps_big_font.h} | 0 src/{ui4x_bitmaps_misc.h => ui4x/bitmaps_misc.h} | 0 .../bitmaps_small_font.h} | 0 src/{ui4x_common.c => ui4x/common.c} | 8 ++++---- src/{ui4x_common.h => ui4x/common.h} | 2 +- src/{ui4x_config.c => ui4x/config.c} | 2 +- src/{ui4x_config.h => ui4x/config.h} | 0 src/{ui4x_emulator.c => ui4x/emulator.c} | 12 ++++++------ src/{ui4x_emulator.h => ui4x/emulator.h} | 2 +- src/{ui4x_inner.h => ui4x/inner.h} | 8 ++++---- src/{ui4x_ncurses.c => ui4x/ncurses.c} | 8 ++++---- src/{ui4x_ncurses.h => ui4x/ncurses.h} | 0 src/{ui4x_sdl2.c => ui4x/sdl2.c} | 10 +++++----- src/{ui4x_sdl2.h => ui4x/sdl2.h} | 0 22 files changed, 37 insertions(+), 37 deletions(-) rename src/{ => _archive}/___x11.c (100%) rename src/{ => _archive}/___x11.h (100%) rename src/{ => _archive}/___x11_lcd.c (100%) rename src/{ => _archive}/___x11_lcd.h (100%) rename src/{ => _archive}/___x11_main.c (100%) rename src/{ui4x_bitmaps_big_font.h => ui4x/bitmaps_big_font.h} (100%) rename src/{ui4x_bitmaps_misc.h => ui4x/bitmaps_misc.h} (100%) rename src/{ui4x_bitmaps_small_font.h => ui4x/bitmaps_small_font.h} (100%) rename src/{ui4x_common.c => ui4x/common.c} (99%) rename src/{ui4x_common.h => ui4x/common.h} (95%) rename src/{ui4x_config.c => ui4x/config.c} (99%) rename src/{ui4x_config.h => ui4x/config.h} (100%) rename src/{ui4x_emulator.c => ui4x/emulator.c} (96%) rename src/{ui4x_emulator.h => ui4x/emulator.h} (98%) rename src/{ui4x_inner.h => ui4x/inner.h} (94%) rename src/{ui4x_ncurses.c => ui4x/ncurses.c} (99%) rename src/{ui4x_ncurses.h => ui4x/ncurses.h} (100%) rename src/{ui4x_sdl2.c => ui4x/sdl2.c} (99%) rename src/{ui4x_sdl2.h => ui4x/sdl2.h} (100%) diff --git a/Makefile b/Makefile index d46e21a..f609098 100644 --- a/Makefile +++ b/Makefile @@ -52,15 +52,15 @@ DOTOS = src/cpu.o \ src/romram49.o \ src/serial.o \ src/x_func.o \ - src/chf_messages.o - -DOTOS_UI4x = src/ui4x_config.o \ - src/ui4x_common.o \ - src/ui4x_sdl2.o \ - src/ui4x_ncurses.o \ - src/ui4x_emulator.o \ + src/chf_messages.o \ src/main.o +DOTOS_UI4x = src/ui4x/config.o \ + src/ui4x/common.o \ + src/ui4x/sdl2.o \ + src/ui4x/ncurses.o \ + src/ui4x/emulator.o + MAKEFLAGS +=-j$(NUM_CORES) -l$(NUM_CORES) cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null > /dev/null 2>&1; \ diff --git a/src/___x11.c b/src/_archive/___x11.c similarity index 100% rename from src/___x11.c rename to src/_archive/___x11.c diff --git a/src/___x11.h b/src/_archive/___x11.h similarity index 100% rename from src/___x11.h rename to src/_archive/___x11.h diff --git a/src/___x11_lcd.c b/src/_archive/___x11_lcd.c similarity index 100% rename from src/___x11_lcd.c rename to src/_archive/___x11_lcd.c diff --git a/src/___x11_lcd.h b/src/_archive/___x11_lcd.h similarity index 100% rename from src/___x11_lcd.h rename to src/_archive/___x11_lcd.h diff --git a/src/___x11_main.c b/src/_archive/___x11_main.c similarity index 100% rename from src/___x11_main.c rename to src/_archive/___x11_main.c diff --git a/src/config.h b/src/config.h index 8e27743..c674068 100644 --- a/src/config.h +++ b/src/config.h @@ -126,7 +126,7 @@ #include -#include "ui4x_config.h" +#include "ui4x/config.h" /* CHF_EXTENDED_INFO: Define this symbol if extended information is desired during condition diff --git a/src/main.c b/src/main.c index 839cfd5..82c4a3c 100644 --- a/src/main.c +++ b/src/main.c @@ -4,9 +4,9 @@ #include #include -#include "ui4x_config.h" -#include "ui4x_emulator.h" -#include "ui4x_common.h" +#include "ui4x/config.h" +#include "ui4x/emulator.h" +#include "ui4x/common.h" #include "config.h" #include "cpu.h" diff --git a/src/ui4x_bitmaps_big_font.h b/src/ui4x/bitmaps_big_font.h similarity index 100% rename from src/ui4x_bitmaps_big_font.h rename to src/ui4x/bitmaps_big_font.h diff --git a/src/ui4x_bitmaps_misc.h b/src/ui4x/bitmaps_misc.h similarity index 100% rename from src/ui4x_bitmaps_misc.h rename to src/ui4x/bitmaps_misc.h diff --git a/src/ui4x_bitmaps_small_font.h b/src/ui4x/bitmaps_small_font.h similarity index 100% rename from src/ui4x_bitmaps_small_font.h rename to src/ui4x/bitmaps_small_font.h diff --git a/src/ui4x_common.c b/src/ui4x/common.c similarity index 99% rename from src/ui4x_common.c rename to src/ui4x/common.c index 4d27741..dce9b59 100644 --- a/src/ui4x_common.c +++ b/src/ui4x/common.c @@ -1,9 +1,9 @@ #include -#include "ui4x_common.h" -#include "ui4x_inner.h" -#include "ui4x_sdl2.h" -#include "ui4x_ncurses.h" +#include "common.h" +#include "inner.h" +#include "sdl2.h" +#include "ncurses.h" letter_t small_font[ 128 ] = { {0, 0, 0 }, diff --git a/src/ui4x_common.h b/src/ui4x/common.h similarity index 95% rename from src/ui4x_common.h rename to src/ui4x/common.h index 84beb50..cfd6b71 100644 --- a/src/ui4x_common.h +++ b/src/ui4x/common.h @@ -1,7 +1,7 @@ #ifndef _UI4x_COMMON_H #define _UI4x_COMMON_H 1 -#include "ui4x_config.h" +#include "config.h" /*************************************************/ /* public API: if it's there it's used elsewhere */ diff --git a/src/ui4x_config.c b/src/ui4x/config.c similarity index 99% rename from src/ui4x_config.c rename to src/ui4x/config.c index 10cbc2e..6bc2334 100644 --- a/src/ui4x_config.c +++ b/src/ui4x/config.c @@ -10,7 +10,7 @@ #include -#include "ui4x_config.h" +#include "config.h" static config_t config = { .progname = ( char* )"ui4x", diff --git a/src/ui4x_config.h b/src/ui4x/config.h similarity index 100% rename from src/ui4x_config.h rename to src/ui4x/config.h diff --git a/src/ui4x_emulator.c b/src/ui4x/emulator.c similarity index 96% rename from src/ui4x_emulator.c rename to src/ui4x/emulator.c index 7093164..f630be0 100644 --- a/src/ui4x_emulator.c +++ b/src/ui4x/emulator.c @@ -2,13 +2,13 @@ #include #include -#include "ui4x_config.h" -#include "ui4x_emulator.h" - #include "config.h" -#include "keyb.h" -#include "modules.h" -#include "serial.h" +#include "emulator.h" + +#include "../config.h" +#include "../keyb.h" +#include "../modules.h" +#include "../serial.h" config_t config; diff --git a/src/ui4x_emulator.h b/src/ui4x/emulator.h similarity index 98% rename from src/ui4x_emulator.h rename to src/ui4x/emulator.h index ea3711f..bdf679a 100644 --- a/src/ui4x_emulator.h +++ b/src/ui4x/emulator.h @@ -3,7 +3,7 @@ #include -#include "ui4x_config.h" +#include "config.h" // Keys #define HPKEY_A 0 diff --git a/src/ui4x_inner.h b/src/ui4x/inner.h similarity index 94% rename from src/ui4x_inner.h rename to src/ui4x/inner.h index 03d0e90..1afaa18 100644 --- a/src/ui4x_inner.h +++ b/src/ui4x/inner.h @@ -1,11 +1,11 @@ #ifndef _UI4x_INNER_H #define _UI4x_INNER_H 1 -#include "ui4x_emulator.h" +#include "emulator.h" -#include "ui4x_bitmaps_misc.h" -#include "ui4x_bitmaps_small_font.h" -#include "ui4x_bitmaps_big_font.h" +#include "bitmaps_misc.h" +#include "bitmaps_small_font.h" +#include "bitmaps_big_font.h" // Colors /* 48SX 48GX 49g */ diff --git a/src/ui4x_ncurses.c b/src/ui4x/ncurses.c similarity index 99% rename from src/ui4x_ncurses.c rename to src/ui4x/ncurses.c index 6acddca..6d202db 100644 --- a/src/ui4x_ncurses.c +++ b/src/ui4x/ncurses.c @@ -14,10 +14,10 @@ #include -#include "ui4x_config.h" -#include "ui4x_emulator.h" -#include "ui4x_common.h" -#include "ui4x_inner.h" +#include "config.h" +#include "emulator.h" +#include "common.h" +#include "inner.h" #define COLORS ( config.model == MODEL_48GX ? colors_48gx : colors_48sx ) #define BUTTONS ( config.model == MODEL_48GX ? buttons_48gx : buttons_48sx ) diff --git a/src/ui4x_ncurses.h b/src/ui4x/ncurses.h similarity index 100% rename from src/ui4x_ncurses.h rename to src/ui4x/ncurses.h diff --git a/src/ui4x_sdl2.c b/src/ui4x/sdl2.c similarity index 99% rename from src/ui4x_sdl2.c rename to src/ui4x/sdl2.c index 4618416..bd04daa 100644 --- a/src/ui4x_sdl2.c +++ b/src/ui4x/sdl2.c @@ -2,12 +2,12 @@ #include -#include "config.h" +#include "../config.h" -#include "ui4x_config.h" -#include "ui4x_emulator.h" -#include "ui4x_common.h" -#include "ui4x_inner.h" +#include "config.h" +#include "emulator.h" +#include "common.h" +#include "inner.h" #define COLORS ( config.model == MODEL_48GX ? colors_48gx : ( config.model == MODEL_49G ? colors_49g : colors_48sx ) ) #define BUTTONS ( config.model == MODEL_48GX ? buttons_48gx : ( config.model == MODEL_49G ? buttons_49g : buttons_48sx ) ) diff --git a/src/ui4x_sdl2.h b/src/ui4x/sdl2.h similarity index 100% rename from src/ui4x_sdl2.h rename to src/ui4x/sdl2.h