Skip to content

Commit ac6dcb9

Browse files
gwenhael-le-moinegwenhael-le-moine
committed
naming config
1 parent 56d1f70 commit ac6dcb9

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ DOTOS = src/emu_serial.o \
4141
src/emu_register.o \
4242
src/emu_timer.o \
4343
src/debugger.o \
44-
src/runtime_options.o \
44+
src/config.o \
4545
src/romio.o \
4646
src/ui_text.o \
4747
src/ui.o \

‎src/runtime_options.c renamed to ‎src/config.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <lua.h>
1414
#include <lauxlib.h>
1515

16-
#include "runtime_options.h"
16+
#include "config.h"
1717

1818
config_t config = {
1919
.progname = "x48ng",
@@ -220,7 +220,7 @@ static inline void normalize_filenames( void )
220220
normalize_filename( port2FileName, normalized_port2_path );
221221
}
222222

223-
int parse_args_and_read_config( int argc, char* argv[] )
223+
int config_init( int argc, char* argv[] )
224224
{
225225
int option_index;
226226
int c = '?';

‎src/runtime_options.h renamed to ‎src/config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _OPTIONS_H
2-
#define _OPTIONS_H 1
1+
#ifndef _CONFIG_H
2+
#define _CONFIG_H 1
33

44
#include <stdbool.h>
55

@@ -62,6 +62,6 @@ extern char normalized_port2_path[ MAX_LENGTH_FILENAME ];
6262
/*************/
6363
/* functions */
6464
/*************/
65-
extern int parse_args_and_read_config( int argc, char* argv[] );
65+
extern int config_init( int argc, char* argv[] );
6666

67-
#endif /* !_OPTIONS_H */
67+
#endif /* !_CONFIG_H */

‎src/debugger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <readline/history.h>
88
#include <readline/readline.h>
99

10-
#include "runtime_options.h"
10+
#include "config.h"
1111
#include "emulator.h"
1212
#include "emulator_for_debugger.h"
1313
#include "romio.h"

‎src/emu_emulate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */
77
#include "emulator.h"
88
#include "emulator_inner.h"
9-
#include "runtime_options.h" /* throttle */
10-
#include "ui.h" /* ui_get_event(); ui_adjust_contrast(); ui_update_LCD(); ui_draw_annunc(); */
9+
#include "config.h" /* throttle */
10+
#include "ui.h" /* ui_get_event(); ui_adjust_contrast(); ui_update_LCD(); ui_draw_annunc(); */
1111

1212
#include "debugger.h" /* in_debugger, enter_debugger */
1313

‎src/emu_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "emulator.h"
1111
#include "emulator_inner.h"
1212
#include "romio.h"
13-
#include "runtime_options.h"
13+
#include "config.h"
1414

1515
#define X48_MAGIC 0x48503438
1616
#define NB_CONFIG 8

‎src/emu_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "emulator.h"
88
#include "emulator_inner.h"
99
#include "romio.h"
10-
#include "runtime_options.h"
10+
#include "config.h"
1111
#include "ui.h" /* ui_disp_draw_nibble(); ui_menu_draw_nibble(); */
1212

1313
#define MCTL_MMIO_SX 0

‎src/emu_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "emulator.h"
1111
#include "emulator_inner.h"
12-
#include "runtime_options.h"
12+
#include "config.h"
1313

1414
static int wire_fd;
1515
static int ir_fd;

‎src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "debugger.h"
1313
#include "emulator.h"
14-
#include "runtime_options.h"
14+
#include "config.h"
1515
#include "ui.h" /* setup_frontend(); init_ui(); */
1616

1717
void signal_handler( int sig )
@@ -97,7 +97,7 @@ int main( int argc, char** argv )
9797
/********************/
9898
/* initialize stuff */
9999
/********************/
100-
parse_args_and_read_config( argc, argv );
100+
config_init( argc, argv );
101101

102102
/* Emulator */
103103
start_emulator();

‎src/ui.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <stdlib.h>
33
#include <string.h>
44

5-
#include "runtime_options.h"
5+
#include "config.h"
66
#include "ui.h"
77
#include "ui_inner.h"
88

‎src/ui_sdl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <SDL/SDL_gfxPrimitives.h> /* lineColor(); pixelColor(); rectangleColor();stringColor(); */
1414

1515
#include "romio.h" /* opt_gx */
16-
#include "runtime_options.h"
16+
#include "config.h"
1717
#include "ui.h"
1818
#include "ui_inner.h"
1919

‎src/ui_text.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include <ncursesw/curses.h>
1616

17-
#include "runtime_options.h" /* mono, gray, small, tiny, progname */
18-
#include "ui.h" /* last_annunc_state, lcd_nibbles_buffer, DISP_ROWS */
17+
#include "config.h" /* mono, gray, small, tiny, progname */
18+
#include "ui.h" /* last_annunc_state, lcd_nibbles_buffer, DISP_ROWS */
1919
#include "ui_inner.h"
2020

2121
#define LCD_WIDTH 131

‎src/ui_x11.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <X11/keysym.h>
2020

2121
#include "romio.h" /* opt_gx */
22-
#include "runtime_options.h"
22+
#include "config.h"
2323
#include "ui.h"
2424
#include "ui_inner.h"
2525

0 commit comments

Comments
 (0)