fatal_exit(); was part of x11 code

Makefile

@@ -28,9 +28,8 @@ DOTOS = src/emu_serial.o \
 	src/emu_memory.o \
 	src/emu_register.o \
 	src/emu_timer.o \
-	src/options.o \
+	src/runtime_options.o \
 	src/romio.o \
-	src/error_handling.o \
 	src/ui_sdl.o \
 	src/main.o
 

src/debugger.c

@@ -7,7 +7,7 @@
 #include <readline/history.h>
 #include <readline/readline.h>
 
-#include "options.h"
+#include "runtime_options.h"
 #include "emulator.h"
 #include "romio.h"
 #include "ui.h" /* ui__init_LCD(); ui__update_LCD(); */

src/emu_emulate.c

@@ -3,7 +3,7 @@
 
 #include <sys/time.h>
 
-#include "options.h" /* throttle */
+#include "runtime_options.h" /* throttle */
 #include "emulator.h" /* word_20; register_to_address(); exchange_reg(); add_address(); store(); recall(); store_n(); recall_n(); */
 #include "ui.h" /* ui__get_event(); ui__adjust_contrast(); ui__update_LCD(); ui__draw_annunc(); */
 #include "debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */

src/emu_init.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "options.h"
+#include "runtime_options.h"
 #include "emulator.h"
 #include "romio.h"
 

src/emu_memory.c

@@ -7,7 +7,7 @@
 #include "emulator.h"
 #include "romio.h"
 #include "ui.h" /* disp; ui__disp_draw_nibble(); ui__menu_draw_nibble(); */
-#include "options.h"
+#include "runtime_options.h"
 
 #define MCTL_MMIO_SX 0
 #define MCTL_SysRAM_SX 1

src/emu_serial.c

@@ -7,7 +7,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "options.h"
+#include "runtime_options.h"
 #include "emulator.h"
 
 static int wire_fd;

src/error_handling.c

@@ -1,14 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-void fatal_exit( char* error, char* advice ) {
-    fprintf( stderr, "FATAL ERROR, exit.\n" );
-
-    if ( error[ 0 ] != '\0' )
-        fprintf( stderr, "  - %s\n", error );
-
-    if ( advice[ 0 ] != '\0' )
-        fprintf( stderr, "  - %s\n", advice );
-
-    exit( 1 );
-}

src/error_handling.h

@@ -1,6 +0,0 @@
-#ifndef _ERRORS_H
-#define _ERRORS_H
-
-extern void fatal_exit( char* error, char* advice );
-
-#endif /* !_ERRORS_H */

src/main.c

@@ -9,7 +9,7 @@
 #include <langinfo.h>
 #include <locale.h>
 
-#include "options.h"
+#include "runtime_options.h"
 #include "emulator.h"
 #include "debugger.h"
 #include "ui.h" /* ui__init(); */

src/runtime_options.c

@@ -3,7 +3,7 @@
 
 #include <getopt.h>
 
-#include "options.h"
+#include "runtime_options.h"
 
 char* progname = "x48ng";
 

src/ui_sdl.c

@@ -12,8 +12,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_gfxPrimitives.h> /* lineColor(); pixelColor(); rectangleColor();stringColor(); */
 
-#include "options.h"
-#include "error_handling.h"
+#include "runtime_options.h"
 #include "emulator.h"
 #include "romio.h"
 #include "ui.h"