move declarations out of emulator.h

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
gwenhael-le-moine · Apr 11, 2024 · c31b6c0 · c31b6c0
1 parent 645abec
commit c31b6c0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/src/emu_timer.c b/src/emu_timer.c
@@ -296,7 +296,6 @@ t1_t2_ticks get_t1_t2( void )
     int i;
 
     gettimeofday( &tv, &tz );
-
     tv.tv_sec -= systime_offset;
 
     if ( timers[ T1_TIMER ].run ) {

diff --git a/src/emulator.h b/src/emulator.h
@@ -296,25 +296,13 @@ typedef struct saturn_t {
 
 extern bool sigalarm_triggered;
 
-extern int set_t1;
-
-extern long sched_adjtime;
-extern long schedule_event;
-
 extern char* wire_name;
 extern char* ir_name;
 
-extern device_t device;
 extern display_t display;
 
 extern saturn_t saturn;
 
-extern bool device_check;
-extern bool port1_is_ram;
-extern long port1_mask;
-extern bool port2_is_ram;
-extern long port2_mask;
-
 extern hpkey_t keyboard[ NB_KEYS ];
 
 extern int annunciators_bits[ NB_ANNUNCIATORS ];

diff --git a/src/emulator_for_debugger.h b/src/emulator_for_debugger.h
@@ -3,6 +3,13 @@
 
 #include "emulator.h"
 
+extern device_t device;
+
+extern int set_t1;
+
+extern long sched_adjtime;
+extern long schedule_event;
+
 /**************/
 /* emu_init.c */
 /**************/

diff --git a/src/emulator_inner.h b/src/emulator_inner.h
@@ -8,6 +8,19 @@
 #define T1_TIMER 0
 /* #define T2_TIMER 1 /\* unused? *\/ */
 
+extern device_t device;
+
+extern int set_t1;
+
+extern long sched_adjtime;
+extern long schedule_event;
+
+extern bool device_check;
+extern bool port1_is_ram;
+extern long port1_mask;
+extern bool port2_is_ram;
+extern long port2_mask;
+
 extern bool adj_time_pending;
 
 extern int start_fields[ 19 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -296,7 +296,6 @@ t1_t2_ticks get_t1_t2( void ) @@
         int i;
         gettimeofday( &tv, &tz );
         tv.tv_sec -= systime_offset;
         if ( timers[ T1_TIMER ].run ) {
@@ Expand Down @@