Mercurial > repos > blastem
diff system.h @ 1692:5dacaef602a7 segacd
Merge from default
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Sat, 05 Jan 2019 00:58:08 -0800 |
| parents | d2d637dbacfb 6909c5d0bbb5 |
| children | 3414a4423de1 |
line wrap: on
line diff
--- a/system.h Tue Dec 19 00:49:13 2017 -0800 +++ b/system.h Sat Jan 05 00:58:08 2019 -0800 @@ -22,8 +22,12 @@ typedef uint16_t (*system_fun_r16)(system_header *); typedef void (*system_str_fun)(system_header *, char *); typedef uint8_t (*system_str_fun_r8)(system_header *, char *); -typedef void (*speed_system_fun)(system_header *, uint32_t); +typedef void (*system_u32_fun)(system_header *, uint32_t); +typedef void (*system_u8_fun)(system_header *, uint8_t); typedef uint8_t (*system_u8_fun_r8)(system_header *, uint8_t); +typedef void (*system_u8_u8_fun)(system_header *, uint8_t, uint8_t); +typedef void (*system_mabs_fun)(system_header *, uint8_t, uint16_t, uint16_t); +typedef void (*system_mrel_fun)(system_header *, uint8_t, int32_t, int32_t); #include "arena.h" #include "romdb.h" @@ -39,15 +43,26 @@ system_fun soft_reset; system_fun free_context; system_fun_r16 get_open_bus_value; - speed_system_fun set_speed_percent; + system_u32_fun set_speed_percent; system_fun inc_debug_mode; - system_fun inc_debug_pal; + system_u8_u8_fun gamepad_down; + system_u8_u8_fun gamepad_up; + system_u8_u8_fun mouse_down; + system_u8_u8_fun mouse_up; + system_mabs_fun mouse_motion_absolute; + system_mrel_fun mouse_motion_relative; + system_u8_fun keyboard_down; + system_u8_fun keyboard_up; + system_fun config_updated; + rom_info info; arena *arena; char *next_rom; char *save_dir; uint8_t enter_debugger; uint8_t should_exit; uint8_t save_state; + uint8_t delayed_load_slot; + uint8_t has_keyboard; debugger_type debugger_type; system_type type; }; @@ -70,6 +85,6 @@ #define OPT_ADDRESS_LOG (1U << 31U) system_type detect_system_type(system_media *media); -system_header *alloc_config_system(system_type stype, system_media *media, uint32_t opts, uint8_t force_region, rom_info *info_out); +system_header *alloc_config_system(system_type stype, system_media *media, uint32_t opts, uint8_t force_region); #endif //SYSTEM_H_