mirror of
https://github.com/ARMSX2/ARMSX1.git
synced 2026-08-24 16:53:35 -07:00
Refactor screen controller handling and improve SDL initialization
This commit is contained in:
moonpower
+22
-14
@@ -1,17 +1,25 @@
|
||||
#ifndef COMMON_H
|
||||
#define COMMON_H
|
||||
|
||||
#ifndef OS_INFO
|
||||
#define OS_INFO unknown
|
||||
#endif
|
||||
#ifndef REP_VERSION
|
||||
#define REP_VERSION latest
|
||||
#endif
|
||||
#ifndef REP_COMMIT_HASH
|
||||
#define REP_COMMIT_HASH latest
|
||||
#endif
|
||||
|
||||
#define STR1(m) #m
|
||||
#define STR(m) STR1(m)
|
||||
|
||||
#endif
|
||||
#ifndef OS_INFO
|
||||
#define OS_INFO unknown
|
||||
#endif
|
||||
#ifndef REP_VERSION
|
||||
#define REP_VERSION latest
|
||||
#endif
|
||||
#ifndef REP_COMMIT_HASH
|
||||
#define REP_COMMIT_HASH latest
|
||||
#endif
|
||||
|
||||
#if defined(__DLL_BUILD) && defined(_WIN32)
|
||||
#define PSXE_API __declspec(dllexport)
|
||||
#elif defined(__DLL_BUILD)
|
||||
#define PSXE_API __attribute__((visibility("default")))
|
||||
#else
|
||||
#define PSXE_API
|
||||
#endif
|
||||
|
||||
#define STR1(m) #m
|
||||
#define STR(m) STR1(m)
|
||||
|
||||
#endif
|
||||
|
||||
+137
-118
@@ -1,42 +1,42 @@
|
||||
#include "../psx/psx.h"
|
||||
#include "../psx/input/sda.h"
|
||||
#include "../psx/input/guncon.h"
|
||||
#include "../psx/dev/cdrom/cdrom.h"
|
||||
|
||||
#include "screen.h"
|
||||
#include "config.h"
|
||||
|
||||
#undef main
|
||||
|
||||
void audio_update(void* ud, uint8_t* buf, int size) {
|
||||
psx_cdrom_t* cdrom = ((psx_t*)ud)->cdrom;
|
||||
psx_spu_t* spu = ((psx_t*)ud)->spu;
|
||||
|
||||
memset(buf, 0, size);
|
||||
|
||||
psx_cdrom_get_audio_samples(cdrom, buf, size);
|
||||
psx_spu_update_cdda_buffer(spu, cdrom->cdda_buf);
|
||||
|
||||
for (int i = 0; i < (size >> 2); i++) {
|
||||
uint32_t sample = psx_spu_get_sample(spu);
|
||||
|
||||
int16_t left = (int16_t)(sample & 0xffff);
|
||||
int16_t right = (int16_t)(sample >> 16);
|
||||
|
||||
*(int16_t*)(&buf[(i << 2) + 0]) += left;
|
||||
*(int16_t*)(&buf[(i << 2) + 2]) += right;
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, const char* argv[]) {
|
||||
psxe_config_t* cfg = psxe_cfg_create();
|
||||
|
||||
psxe_cfg_init(cfg);
|
||||
psxe_cfg_load_defaults(cfg);
|
||||
psxe_cfg_load(cfg, argc, argv);
|
||||
|
||||
log_set_level(cfg->log_level);
|
||||
#include "../psx/psx.h"
|
||||
#include "../psx/input/sda.h"
|
||||
#include "../psx/input/guncon.h"
|
||||
#include "../psx/dev/cdrom/cdrom.h"
|
||||
|
||||
#include "screen.h"
|
||||
#include "config.h"
|
||||
|
||||
#undef main
|
||||
|
||||
void audio_update(void* ud, uint8_t* buf, int size) {
|
||||
psx_cdrom_t* cdrom = ((psx_t*)ud)->cdrom;
|
||||
psx_spu_t* spu = ((psx_t*)ud)->spu;
|
||||
|
||||
memset(buf, 0, size);
|
||||
|
||||
psx_cdrom_get_audio_samples(cdrom, buf, size);
|
||||
psx_spu_update_cdda_buffer(spu, cdrom->cdda_buf);
|
||||
|
||||
for (int i = 0; i < (size >> 2); i++) {
|
||||
uint32_t sample = psx_spu_get_sample(spu);
|
||||
|
||||
int16_t left = (int16_t)(sample & 0xffff);
|
||||
int16_t right = (int16_t)(sample >> 16);
|
||||
|
||||
*(int16_t*)(&buf[(i << 2) + 0]) += left;
|
||||
*(int16_t*)(&buf[(i << 2) + 2]) += right;
|
||||
}
|
||||
}
|
||||
|
||||
static int psxe_run(int argc, const char* argv[], void* external_window) {
|
||||
psxe_config_t* cfg = psxe_cfg_create();
|
||||
|
||||
psxe_cfg_init(cfg);
|
||||
psxe_cfg_load_defaults(cfg);
|
||||
psxe_cfg_load(cfg, argc, argv);
|
||||
|
||||
log_set_level(cfg->log_level);
|
||||
|
||||
psx_t* psx = psx_create();
|
||||
int init_result = psx_init(psx, cfg->bios, cfg->exp_path);
|
||||
|
||||
@@ -44,91 +44,110 @@ int main(int argc, const char* argv[]) {
|
||||
log_fatal("Failed to initialize PSX (code %d). Check BIOS/expansion paths and settings.", init_result);
|
||||
return 1;
|
||||
}
|
||||
|
||||
psx_cdrom_t* cdrom = psx_get_cdrom(psx);
|
||||
|
||||
// To-do: Set CDROM firmware version and region based
|
||||
// on CLI options
|
||||
|
||||
|
||||
psx_cdrom_t* cdrom = psx_get_cdrom(psx);
|
||||
|
||||
// To-do: Set CDROM firmware version and region based
|
||||
// on CLI options
|
||||
|
||||
if (cfg->cd_path)
|
||||
psx_cdrom_open(cdrom, cfg->cd_path);
|
||||
|
||||
psxe_screen_t* screen = psxe_screen_create();
|
||||
psxe_screen_init(screen, psx, cfg);
|
||||
|
||||
#ifdef __DLL_BUILD
|
||||
if (!external_window) {
|
||||
log_fatal("DLL build requires host-provided SDL window handle");
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (external_window)
|
||||
psxe_screen_set_window_handle(screen, external_window);
|
||||
|
||||
psxe_screen_set_scale(screen, cfg->scale);
|
||||
psxe_screen_reload(screen);
|
||||
|
||||
SDL_Init(SDL_INIT_AUDIO);
|
||||
|
||||
SDL_AudioDeviceID dev;
|
||||
SDL_AudioSpec obtained, desired;
|
||||
|
||||
desired.freq = 44100;
|
||||
desired.format = AUDIO_S16SYS;
|
||||
desired.channels = 2;
|
||||
desired.samples = CD_SECTOR_SIZE >> 2;
|
||||
desired.callback = &audio_update;
|
||||
desired.userdata = psx;
|
||||
|
||||
dev = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
|
||||
|
||||
if (dev)
|
||||
SDL_PauseAudioDevice(dev, 0);
|
||||
|
||||
psx_gpu_t* gpu = psx_get_gpu(psx);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_DMODE, psxe_gpu_dmode_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_VBLANK, psxe_gpu_vblank_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_HBLANK, psxe_gpu_hblank_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_VBLANK_END, psxe_gpu_vblank_end_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_HBLANK_END, psxe_gpu_hblank_end_event_cb);
|
||||
psx_gpu_set_udata(gpu, 0, screen);
|
||||
psx_gpu_set_udata(gpu, 1, psx->timer);
|
||||
|
||||
psx_input_t* input = psx_input_create();
|
||||
psx_input_init(input);
|
||||
|
||||
// psxi_guncon_t* controller = psxi_guncon_create();
|
||||
// psxi_guncon_init(controller);
|
||||
// psxi_guncon_init_input(controller, input);
|
||||
psxi_sda_t* controller = psxi_sda_create();
|
||||
psxi_sda_init(controller, SDA_MODEL_DIGITAL);
|
||||
psxi_sda_init_input(controller, input);
|
||||
|
||||
psx_pad_attach_joy(psx->pad, 0, input);
|
||||
psx_pad_attach_mcd(psx->pad, 0, "slot1.mcd");
|
||||
psx_pad_attach_mcd(psx->pad, 1, "slot2.mcd");
|
||||
|
||||
if (cfg->exe) {
|
||||
while (psx->cpu->pc != 0x80030000)
|
||||
psx_update(psx);
|
||||
|
||||
psx_load_exe(psx, cfg->exe);
|
||||
}
|
||||
|
||||
psxe_cfg_destroy(cfg);
|
||||
|
||||
while (psxe_screen_is_open(screen))
|
||||
psx_update(psx);
|
||||
|
||||
SDL_PauseAudioDevice(dev, 1);
|
||||
|
||||
psx_cpu_t* cpu = psx_get_cpu(psx);
|
||||
|
||||
log_set_quiet(0);
|
||||
|
||||
log_fatal("r0=%08x at=%08x v0=%08x v1=%08x", cpu->r[0] , cpu->r[1] , cpu->r[2] , cpu->r[3] );
|
||||
log_fatal("a0=%08x a1=%08x a2=%08x a3=%08x", cpu->r[4] , cpu->r[5] , cpu->r[6] , cpu->r[7] );
|
||||
log_fatal("t0=%08x t1=%08x t2=%08x t3=%08x", cpu->r[8] , cpu->r[9] , cpu->r[10], cpu->r[11]);
|
||||
log_fatal("t4=%08x t5=%08x t6=%08x t7=%08x", cpu->r[12], cpu->r[13], cpu->r[14], cpu->r[15]);
|
||||
log_fatal("s0=%08x s1=%08x s2=%08x s3=%08x", cpu->r[16], cpu->r[17], cpu->r[18], cpu->r[19]);
|
||||
log_fatal("s4=%08x s5=%08x s6=%08x s7=%08x", cpu->r[20], cpu->r[21], cpu->r[22], cpu->r[23]);
|
||||
log_fatal("t8=%08x t9=%08x k0=%08x k1=%08x", cpu->r[24], cpu->r[25], cpu->r[26], cpu->r[27]);
|
||||
log_fatal("gp=%08x sp=%08x fp=%08x ra=%08x", cpu->r[28], cpu->r[29], cpu->r[30], cpu->r[31]);
|
||||
log_fatal("pc=%08x hi=%08x lo=%08x ep=%08x", cpu->pc, cpu->hi, cpu->lo, cpu->cop0_r[COP0_EPC]);
|
||||
|
||||
psx_pad_detach_joy(psx->pad, 0);
|
||||
psx_destroy(psx);
|
||||
psxe_screen_destroy(screen);
|
||||
|
||||
return 0;
|
||||
|
||||
SDL_Init(SDL_INIT_AUDIO);
|
||||
|
||||
SDL_AudioDeviceID dev;
|
||||
SDL_AudioSpec obtained, desired;
|
||||
|
||||
desired.freq = 44100;
|
||||
desired.format = AUDIO_S16SYS;
|
||||
desired.channels = 2;
|
||||
desired.samples = CD_SECTOR_SIZE >> 2;
|
||||
desired.callback = &audio_update;
|
||||
desired.userdata = psx;
|
||||
|
||||
dev = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
|
||||
|
||||
if (dev)
|
||||
SDL_PauseAudioDevice(dev, 0);
|
||||
|
||||
psx_gpu_t* gpu = psx_get_gpu(psx);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_DMODE, psxe_gpu_dmode_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_VBLANK, psxe_gpu_vblank_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_HBLANK, psxe_gpu_hblank_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_VBLANK_END, psxe_gpu_vblank_end_event_cb);
|
||||
psx_gpu_set_event_callback(gpu, GPU_EVENT_HBLANK_END, psxe_gpu_hblank_end_event_cb);
|
||||
psx_gpu_set_udata(gpu, 0, screen);
|
||||
psx_gpu_set_udata(gpu, 1, psx->timer);
|
||||
|
||||
psx_input_t* input = psx_input_create();
|
||||
psx_input_init(input);
|
||||
|
||||
// psxi_guncon_t* controller = psxi_guncon_create();
|
||||
// psxi_guncon_init(controller);
|
||||
// psxi_guncon_init_input(controller, input);
|
||||
psxi_sda_t* controller = psxi_sda_create();
|
||||
psxi_sda_init(controller, SDA_MODEL_DIGITAL);
|
||||
psxi_sda_init_input(controller, input);
|
||||
|
||||
psx_pad_attach_joy(psx->pad, 0, input);
|
||||
psx_pad_attach_mcd(psx->pad, 0, "slot1.mcd");
|
||||
psx_pad_attach_mcd(psx->pad, 1, "slot2.mcd");
|
||||
|
||||
if (cfg->exe) {
|
||||
while (psx->cpu->pc != 0x80030000)
|
||||
psx_update(psx);
|
||||
|
||||
psx_load_exe(psx, cfg->exe);
|
||||
}
|
||||
|
||||
psxe_cfg_destroy(cfg);
|
||||
|
||||
while (psxe_screen_is_open(screen))
|
||||
psx_update(psx);
|
||||
|
||||
SDL_PauseAudioDevice(dev, 1);
|
||||
|
||||
psx_cpu_t* cpu = psx_get_cpu(psx);
|
||||
|
||||
log_set_quiet(0);
|
||||
|
||||
log_fatal("r0=%08x at=%08x v0=%08x v1=%08x", cpu->r[0] , cpu->r[1] , cpu->r[2] , cpu->r[3] );
|
||||
log_fatal("a0=%08x a1=%08x a2=%08x a3=%08x", cpu->r[4] , cpu->r[5] , cpu->r[6] , cpu->r[7] );
|
||||
log_fatal("t0=%08x t1=%08x t2=%08x t3=%08x", cpu->r[8] , cpu->r[9] , cpu->r[10], cpu->r[11]);
|
||||
log_fatal("t4=%08x t5=%08x t6=%08x t7=%08x", cpu->r[12], cpu->r[13], cpu->r[14], cpu->r[15]);
|
||||
log_fatal("s0=%08x s1=%08x s2=%08x s3=%08x", cpu->r[16], cpu->r[17], cpu->r[18], cpu->r[19]);
|
||||
log_fatal("s4=%08x s5=%08x s6=%08x s7=%08x", cpu->r[20], cpu->r[21], cpu->r[22], cpu->r[23]);
|
||||
log_fatal("t8=%08x t9=%08x k0=%08x k1=%08x", cpu->r[24], cpu->r[25], cpu->r[26], cpu->r[27]);
|
||||
log_fatal("gp=%08x sp=%08x fp=%08x ra=%08x", cpu->r[28], cpu->r[29], cpu->r[30], cpu->r[31]);
|
||||
log_fatal("pc=%08x hi=%08x lo=%08x ep=%08x", cpu->pc, cpu->hi, cpu->lo, cpu->cop0_r[COP0_EPC]);
|
||||
|
||||
psx_pad_detach_joy(psx->pad, 0);
|
||||
psx_destroy(psx);
|
||||
psxe_screen_destroy(screen);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
PSXE_API int external_main(int argc, const char* argv[], void* external_window) {
|
||||
return psxe_run(argc, argv, external_window);
|
||||
}
|
||||
|
||||
int main(int argc, const char* argv[]) {
|
||||
return psxe_run(argc, argv, NULL);
|
||||
}
|
||||
|
||||
+20
-15
@@ -47,13 +47,14 @@ uint32_t screen_get_button_joystick(uint8_t b) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
SDL_GameController* screen_find_controller(void) {
|
||||
for (int i = 0; i < SDL_NumJoysticks(); i++)
|
||||
if (SDL_IsGameController(i))
|
||||
return SDL_GameControllerOpen(i);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
SDL_GameController* screen_find_controller(void) {
|
||||
for (int i = 0; i < SDL_NumJoysticks(); i++) {
|
||||
if (SDL_IsGameController(i))
|
||||
return SDL_GameControllerOpen(i);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int screen_get_base_width(psxe_screen_t* screen) {
|
||||
int width = psx_get_dmode_width(screen->psx);
|
||||
@@ -107,13 +108,17 @@ void psxe_screen_init(psxe_screen_t* screen, psx_t* psx, const psxe_config_t* cf
|
||||
screen->texture_width = PSX_GPU_FB_WIDTH;
|
||||
screen->texture_height = PSX_GPU_FB_HEIGHT;
|
||||
|
||||
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER);
|
||||
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER);
|
||||
SDL_GameControllerEventState(SDL_ENABLE);
|
||||
SDL_SetRenderDrawColor(screen->renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
|
||||
|
||||
screen->controller = screen_find_controller();
|
||||
|
||||
if (!screen->controller)
|
||||
log_warn("No game controller detected; Xbox pad input will be unavailable until connected");
|
||||
}
|
||||
|
||||
void psxe_screen_set_window_handle(psxe_screen_t* screen, void* native_handle) {
|
||||
PSXE_API void psxe_screen_set_window_handle(psxe_screen_t* screen, void* native_handle) {
|
||||
screen->external_window = native_handle;
|
||||
}
|
||||
|
||||
@@ -159,12 +164,12 @@ void psxe_screen_reload(psxe_screen_t* screen) {
|
||||
}
|
||||
#endif
|
||||
|
||||
screen->renderer = SDL_CreateRenderer(
|
||||
screen->window,
|
||||
-1,
|
||||
SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC
|
||||
);
|
||||
|
||||
screen->renderer = SDL_CreateRenderer(
|
||||
screen->window,
|
||||
-1,
|
||||
SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC
|
||||
);
|
||||
|
||||
screen->texture = SDL_CreateTexture(
|
||||
screen->renderer,
|
||||
screen->format,
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ int psxe_screen_is_open(psxe_screen_t*);
|
||||
void psxe_screen_update(psxe_screen_t*);
|
||||
void psxe_screen_destroy(psxe_screen_t*);
|
||||
void psxe_screen_set_scale(psxe_screen_t*, unsigned int);
|
||||
void psxe_screen_set_window_handle(psxe_screen_t*, void* native_handle);
|
||||
PSXE_API void psxe_screen_set_window_handle(psxe_screen_t*, void* native_handle);
|
||||
void psxe_screen_toggle_debug_mode(psxe_screen_t*);
|
||||
|
||||
// GPU event handlers
|
||||
|
||||
Reference in New Issue
Block a user