claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fixed the last bugs revealed by GCC 7.1.0;

Browse Source 
Applied the mainline PCem HDD controller reorder commit.
This commit is contained in:
OBattler
2017-07-17 13:34:27 +02:00
parent ea60b150b6
commit e7c0312abd
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fdc.c
View File

@@ -1491,7 +1491,7 @@ void fdc_callback(void *priv)
case -1: /*Reset*/ case -1: /*Reset*/
fdc_int(); fdc_int();
fdc.fintr = 0; fdc.fintr = 0;
memset(fdc.pcn, 0, 4); memset(fdc.pcn, 0, 4 * sizeof(int));
fdc_reset_stat = 4; fdc_reset_stat = 4;
return; return;
case 1: /*Mode*/ case 1: /*Mode*/

18
src/hdd.c
View File

@@ -27,15 +27,15 @@ static struct
} hdd_controllers[] = } hdd_controllers[] =
{ {
{"None", "none", &null_hdd_device, 0}, {"None", "none", &null_hdd_device, 0},
{"AT Fixed Disk Adapter", "mfm_at", &mfm_at_device, 1}, {"[MFM] AT Fixed Disk Adapter", "mfm_at", &mfm_at_device, 1},
{"DTC 5150X", "dtc5150x", &dtc_5150x_device, 1}, {"[MFM] DTC 5150X", "dtc5150x", &dtc_5150x_device, 1},
{"Fixed Disk Adapter (Xebec)", "mfm_xebec", &mfm_xebec_device, 1}, {"[MFM] Fixed Disk Adapter (Xebec)", "mfm_xebec", &mfm_xebec_device, 1},
{"IBM ESDI Fixed Disk Adapter (MCA)", "esdi_mca", &hdd_esdi_device, 1}, {"[ESDI] IBM ESDI Fixed Disk Adapter", "esdi_mca", &hdd_esdi_device, 1},
{"Western Digital WD1007V-SE1 (ESDI)","wd1007vse1", &wd1007vse1_device, 0}, {"[ESDI] Western Digital WD1007V-SE1", "wd1007vse1", &wd1007vse1_device, 0},
{"XTIDE", "xtide", &xtide_device, 0}, {"[IDE] XTIDE", "xtide", &xtide_device, 0},
{"XTIDE (AT)", "xtide_at", &xtide_at_device, 0}, {"[IDE] XTIDE (Acculogic)", "xtide_ps2", &xtide_ps2_device, 0},
{"XTIDE (Acculogic)", "xtide_ps2",&xtide_ps2_device,0}, {"[IDE] XTIDE (AT)", "xtide_at", &xtide_at_device, 0},
{"XTIDE (AT) (1.1.5)", "xtide_at_ps2",&xtide_at_ps2_device,0}, {"[IDE] XTIDE (AT) (1.1.5)", "xtide_at_ps2", &xtide_at_ps2_device, 0},
{"", "", NULL, 0} {"", "", NULL, 0}
}; };

2
src/keyboard.c
View File

@@ -422,7 +422,7 @@ static int scorder[272] = {0x38, 0xB8, 0x1D, 0x9D, 0xFF, 0x2A, 0x36,0x103, 0x00,
0xFE,0x100,0x101,0x102,0x104,0x105,0x106,0x107,0x108,0x109,0x10A,0x10B,0x10C,0x10D,0x10E,0x10F}; 0xFE,0x100,0x101,0x102,0x104,0x105,0x106,0x107,0x108,0x109,0x10A,0x10B,0x10C,0x10D,0x10E,0x10F};
/* bit 0 = repeat, bit 1 = makes break code? */ /* bit 0 = repeat, bit 1 = makes break code? */
int set3_flags[272]; uint8_t set3_flags[272];
uint8_t set3_all_repeat = 0; uint8_t set3_all_repeat = 0;
uint8_t set3_all_break = 0; uint8_t set3_all_break = 0;

2
src/keyboard.h
View File

@@ -24,6 +24,6 @@ extern int pcem_key[272];
extern uint8_t mode; extern uint8_t mode;
void keyboard_process(); void keyboard_process();
extern int set3_flags[272]; extern uint8_t set3_flags[272];
extern uint8_t set3_all_repeat; extern uint8_t set3_all_repeat;
extern uint8_t set3_all_break; extern uint8_t set3_all_break;