move ui4x_* under src/ui4x/

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; \

src/config.h

@@ -126,7 +126,7 @@
 
 #include <stdbool.h>
 
-#include "ui4x_config.h"
+#include "ui4x/config.h"
 
 /* CHF_EXTENDED_INFO:
    Define this symbol if extended information is desired during condition

src/main.c

@@ -4,9 +4,9 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#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"

src/ui4x/common.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 
-#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                },

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 */

src/ui4x/config.c

@@ -10,7 +10,7 @@
 
 #include <getopt.h>
 
-#include "ui4x_config.h"
+#include "config.h"
 
 static config_t config = {
     .progname = ( char* )"ui4x",

src/ui4x/emulator.c

@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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;
 

src/ui4x/emulator.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "ui4x_config.h"
+#include "config.h"
 
 // Keys
 #define HPKEY_A 0

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    */

src/ui4x/ncurses.c

@@ -14,10 +14,10 @@
 
 #include <curses.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 : colors_48sx )
 #define BUTTONS ( config.model == MODEL_48GX ? buttons_48gx : buttons_48sx )

src/ui4x/sdl2.c

@@ -2,12 +2,12 @@
 
 #include <SDL2/SDL.h>
 
-#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 ) )