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

Gdbstub, Minitrace and more (#2653)

Browse Source 
* Fix gdbstub compilation

* Fix minitrace compilation

* Fix many warnings on Linux Builds

* Support DirectInput for Joysticks in QT UI too
This commit is contained in:
Jasmine Iwanek
2022-08-31 17:35:32 -04:00
committed by GitHub
parent 65fbe568ec
commit 5e0c1ac209
24 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scsi/scsi_aha154x.c
View File

@@ -758,11 +758,11 @@ aha_setbios(x54x_t *dev)
/* Load first chunk of BIOS (which is the main BIOS, aka ROM1.) */
dev->rom1 = malloc(ROM_SIZE);
(void)fread(dev->rom1, ROM_SIZE, 1, f);
(void) !fread(dev->rom1, ROM_SIZE, 1, f);
temp -= ROM_SIZE;
if (temp > 0) {
dev->rom2 = malloc(ROM_SIZE);
(void)fread(dev->rom2, ROM_SIZE, 1, f);
(void) !fread(dev->rom2, ROM_SIZE, 1, f);
temp -= ROM_SIZE;
} else {
dev->rom2 = NULL;
@@ -875,10 +875,10 @@ aha_setmcode(x54x_t *dev)
}
aha1542cp_pnp_rom = (uint8_t *) malloc(dev->pnp_len + 7);
fseek(f, dev->pnp_offset, SEEK_SET);
(void)fread(aha1542cp_pnp_rom, dev->pnp_len, 1, f);
(void) !fread(aha1542cp_pnp_rom, dev->pnp_len, 1, f);
memset(&(aha1542cp_pnp_rom[4]), 0x00, 5);
fseek(f, dev->pnp_offset + 4, SEEK_SET);
(void)fread(&(aha1542cp_pnp_rom[9]), dev->pnp_len - 4, 1, f);
(void) !fread(&(aha1542cp_pnp_rom[9]), dev->pnp_len - 4, 1, f);
/* Even the real AHA-1542CP microcode seem to be flipping bit
4 to not erroneously indicate there is a range length. */
aha1542cp_pnp_rom[0x87] |= 0x04;
@@ -889,7 +889,7 @@ aha_setmcode(x54x_t *dev)
/* Load the SCSISelect decompression code. */
fseek(f, dev->cmd_33_offset, SEEK_SET);
(void)fread(dev->cmd_33_buf, dev->cmd_33_len, 1, f);
(void) !fread(dev->cmd_33_buf, dev->cmd_33_len, 1, f);
(void)fclose(f);
}

4
src/scsi/scsi_buslogic.c
View File

@@ -1747,7 +1747,7 @@ buslogic_init(const device_t *info)
if (has_autoscsi_rom) {
f = rom_fopen(autoscsi_rom_name, "rb");
if (f) {
fread(bl->AutoSCSIROM, 1, autoscsi_rom_size, f);
(void) !fread(bl->AutoSCSIROM, 1, autoscsi_rom_size, f);
fclose(f);
f = NULL;
}
@@ -1756,7 +1756,7 @@ buslogic_init(const device_t *info)
if (has_scam_rom) {
f = rom_fopen(scam_rom_name, "rb");
if (f) {
fread(bl->SCAMData, 1, scam_rom_size, f);
(void) !fread(bl->SCAMData, 1, scam_rom_size, f);
fclose(f);
f = NULL;
}

2
src/scsi/scsi_ncr53c8xx.c
View File

@@ -1464,7 +1464,7 @@ ncr53c8xx_eeprom(ncr53c8xx_t *dev, uint8_t save)
if (save)
fwrite(&dev->nvram, sizeof(dev->nvram), 1, f);
else
fread(&dev->nvram, sizeof(dev->nvram), 1, f);
(void) !fread(&dev->nvram, sizeof(dev->nvram), 1, f);
fclose(f);
}
}