RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rearrange globals

Browse source 
scripted find/replace
gives slightly better code on ARM, less unnecessary asm,
~400 bytes saved
This commit is contained in:
notaz 2017-10-19 02:38:20 +03:00
parent 759c9d3846
commit 93f9619ed8
47 changed files with 532 additions and 573 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pico/media.c
View file

@ -209,11 +209,11 @@ enum media_type_e PicoLoadMedia(const char *filename,
if (media_type == PM_BAD_DETECT)
goto out;
if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
if ((PicoIn.AHW & PAHW_MCD) && Pico_mcd != NULL)
cdd_unload();
PicoCartUnload();
PicoAHW = 0;
PicoQuirks = 0;
PicoIn.AHW = 0;
PicoIn.quirks = 0;
if (media_type == PM_CD)
{
@ -230,7 +230,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
goto out;
}
PicoAHW |= PAHW_MCD;
PicoIn.AHW |= PAHW_MCD;
}
else {
media_type = PM_BAD_CD;
@ -239,7 +239,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
}
else if (media_type == PM_MARK3) {
lprintf("detected SMS ROM\n");
PicoAHW = PAHW_SMS;
PicoIn.AHW = PAHW_SMS;
}
rom = pm_open(rom_fname);
@ -249,7 +249,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
goto out;
}
ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoIn.AHW & PAHW_SMS) ? 1 : 0);
pm_close(rom);
if (ret != 0) {
if (ret == 2) lprintf("Out of memory\n");
@ -266,7 +266,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
goto out;
}
if (!(PicoAHW & PAHW_SMS)) {
if (!(PicoIn.AHW & PAHW_SMS)) {
unsigned short *d = (unsigned short *)(rom_data + 4);
if ((((d[0] << 16) | d[1]) & 0xffffff) >= (int)rom_size) {
lprintf("bad reset vector\n");
@ -276,7 +276,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
}
// load config for this ROM (do this before insert to get correct region)
if (!(PicoAHW & PAHW_MCD)) {
if (!(PicoIn.AHW & PAHW_MCD)) {
memcpy(media_id_header, rom_data + 0x100, sizeof(media_id_header));
if (do_region_override != NULL)
do_region_override(filename);
@ -300,7 +300,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
Pico.m.ncart_in = 1;
}
if (PicoQuirks & PQUIRK_FORCE_6BTN)
if (PicoIn.quirks & PQUIRK_FORCE_6BTN)
PicoSetInputDevice(0, PICO_INPUT_PAD_6BTN);
out: