naming config

Makefile

@@ -41,7 +41,7 @@ DOTOS = src/emu_serial.o \
 	src/emu_register.o \
 	src/emu_timer.o \
 	src/debugger.o \
-	src/runtime_options.o \
+	src/config.o \
 	src/romio.o \
 	src/ui_text.o \
 	src/ui.o \

src/config.c

@@ -13,7 +13,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-#include "runtime_options.h"
+#include "config.h"
 
 config_t config = {
     .progname = "x48ng",
@@ -220,7 +220,7 @@ static inline void normalize_filenames( void )
     normalize_filename( port2FileName, normalized_port2_path );
 }
 
-int parse_args_and_read_config( int argc, char* argv[] )
+int config_init( int argc, char* argv[] )
 {
     int option_index;
     int c = '?';

src/config.h

@@ -1,5 +1,5 @@
-#ifndef _OPTIONS_H
-#define _OPTIONS_H 1
+#ifndef _CONFIG_H
+#define _CONFIG_H 1
 
 #include <stdbool.h>
 
@@ -62,6 +62,6 @@ extern char normalized_port2_path[ MAX_LENGTH_FILENAME ];
 /*************/
 /* functions */
 /*************/
-extern int parse_args_and_read_config( int argc, char* argv[] );
+extern int config_init( int argc, char* argv[] );
 
-#endif /* !_OPTIONS_H */
+#endif /* !_CONFIG_H */

src/debugger.c

@@ -7,7 +7,7 @@
 #include <readline/history.h>
 #include <readline/readline.h>
 
-#include "runtime_options.h"
+#include "config.h"
 #include "emulator.h"
 #include "emulator_for_debugger.h"
 #include "romio.h"

src/emu_emulate.c

@@ -6,8 +6,8 @@
 #include "debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */
 #include "emulator.h"
 #include "emulator_inner.h"
-#include "runtime_options.h" /* throttle */
-#include "ui.h"              /* ui_get_event(); ui_adjust_contrast(); ui_update_LCD(); ui_draw_annunc(); */
+#include "config.h" /* throttle */
+#include "ui.h"     /* ui_get_event(); ui_adjust_contrast(); ui_update_LCD(); ui_draw_annunc(); */
 
 #include "debugger.h" /* in_debugger, enter_debugger */
 

src/emu_init.c

@@ -10,7 +10,7 @@
 #include "emulator.h"
 #include "emulator_inner.h"
 #include "romio.h"
-#include "runtime_options.h"
+#include "config.h"
 
 #define X48_MAGIC 0x48503438
 #define NB_CONFIG 8

src/emu_memory.c

@@ -7,7 +7,7 @@
 #include "emulator.h"
 #include "emulator_inner.h"
 #include "romio.h"
-#include "runtime_options.h"
+#include "config.h"
 #include "ui.h" /* ui_disp_draw_nibble(); ui_menu_draw_nibble(); */
 
 #define MCTL_MMIO_SX 0

src/emu_serial.c

@@ -9,7 +9,7 @@
 
 #include "emulator.h"
 #include "emulator_inner.h"
-#include "runtime_options.h"
+#include "config.h"
 
 static int wire_fd;
 static int ir_fd;

src/main.c

@@ -11,7 +11,7 @@
 
 #include "debugger.h"
 #include "emulator.h"
-#include "runtime_options.h"
+#include "config.h"
 #include "ui.h" /* setup_frontend(); init_ui(); */
 
 void signal_handler( int sig )
@@ -97,7 +97,7 @@ int main( int argc, char** argv )
     /********************/
     /* initialize stuff */
     /********************/
-    parse_args_and_read_config( argc, argv );
+    config_init( argc, argv );
 
     /* Emulator */
     start_emulator();

src/ui.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "runtime_options.h"
+#include "config.h"
 #include "ui.h"
 #include "ui_inner.h"
 

src/ui_sdl.c

@@ -13,7 +13,7 @@
 #include <SDL/SDL_gfxPrimitives.h> /* lineColor(); pixelColor(); rectangleColor();stringColor(); */
 
 #include "romio.h" /* opt_gx */
-#include "runtime_options.h"
+#include "config.h"
 #include "ui.h"
 #include "ui_inner.h"
 

src/ui_text.c

@@ -14,8 +14,8 @@
 
 #include <ncursesw/curses.h>
 
-#include "runtime_options.h" /* mono, gray, small, tiny, progname */
-#include "ui.h"              /* last_annunc_state, lcd_nibbles_buffer, DISP_ROWS */
+#include "config.h" /* mono, gray, small, tiny, progname */
+#include "ui.h"     /* last_annunc_state, lcd_nibbles_buffer, DISP_ROWS */
 #include "ui_inner.h"
 
 #define LCD_WIDTH 131

src/ui_x11.c

@@ -19,7 +19,7 @@
 #include <X11/keysym.h>
 
 #include "romio.h" /* opt_gx */
-#include "runtime_options.h"
+#include "config.h"
 #include "ui.h"
 #include "ui_inner.h"