From 6557009df967114f9b85d80835cdfa72dcb55ca2 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com> Date: Wed, 10 Apr 2024 14:34:45 +0200 Subject: [PATCH] make init_serial() an emulator_inner function --- src/emu_init.c | 4 ++++ src/emulator.h | 5 ----- src/emulator_inner.h | 1 + src/main.c | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/emu_init.c b/src/emu_init.c index b5e08fd..dc61335 100644 --- a/src/emu_init.c +++ b/src/emu_init.c @@ -1013,6 +1013,10 @@ int init_emulator( void ) if ( !read_rom( normalized_rom_path ) ) exit( 1 ); /* can't read ROM */ + init_serial(); + + /* init_display(); */ + return 0; } diff --git a/src/emulator.h b/src/emulator.h index 70a226e..9123647 100644 --- a/src/emulator.h +++ b/src/emulator.h @@ -338,11 +338,6 @@ extern void press_key( int hpkey ); /* used in ui_*.c */ extern void release_key( int hpkey ); /* used in ui_*.c */ extern void release_all_keys( void ); /* used in ui_*.c */ -/****************/ -/* emu_serial.c */ -/****************/ -extern int init_serial( void ); /* used in main.c */ - /*****************/ /* emu_emulate.c */ /*****************/ diff --git a/src/emulator_inner.h b/src/emulator_inner.h index a94ca9a..6137567 100644 --- a/src/emulator_inner.h +++ b/src/emulator_inner.h @@ -77,5 +77,6 @@ extern int is_greater_or_equal_register( unsigned char* r1, unsigned char* r2, i extern void serial_baud( int baud ); extern void transmit_char( void ); extern void receive_char( void ); +extern int init_serial( void ); #endif /* _EMULATOR_INNER_H */ diff --git a/src/main.c b/src/main.c index 0c6291a..9e39d1c 100644 --- a/src/main.c +++ b/src/main.c @@ -101,7 +101,6 @@ int main( int argc, char** argv ) /* Emulator */ init_emulator(); - init_serial(); init_display(); /* (G)UI */