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

corrected compile errors, removed garbage

Browse Source
This commit is contained in:
Akamaki
2025-02-15 12:08:50 +09:00
parent aa7d5d2dc2
commit 16fc5e7902
4 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk/hdc_esdi_mca.c
View File

@@ -1514,7 +1514,7 @@ esdi_integrated_device = {
.init = esdi_init, .init = esdi_init,
.close = esdi_close, .close = esdi_close,
.reset = esdi_reset, .reset = esdi_reset,
{.available = NULL }, .available = esdi_available,
.speed_changed = NULL, .speed_changed = NULL,
.force_redraw = NULL, .force_redraw = NULL,
.config = esdi_integrated_config .config = esdi_integrated_config

21
src/floppy/fdc.c
View File

@@ -722,7 +722,7 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
if ((val & 4) && !(fdc->dor & 4)) if ((val & 4) && !(fdc->dor & 4))
fdc_soft_reset(fdc); fdc_soft_reset(fdc);
/* We can now simplify this since each motor now spins separately. */ /* We can now simplify this since each motor now spins separately. */
for (i = 0; i < FDD_NUM; i++) { for (int i = 0; i < FDD_NUM; i++) {
drive_num = real_drive(fdc, i); drive_num = real_drive(fdc, i);
if ((!fdd_get_flags(drive_num)) || (drive_num >= FDD_NUM)) if ((!fdd_get_flags(drive_num)) || (drive_num >= FDD_NUM))
val &= ~(0x10 << drive_num); val &= ~(0x10 << drive_num);
@@ -1284,25 +1284,6 @@ fdc_read(uint16_t addr, void *priv)
if (fdc->fintr || fdc->reset_stat) /* INTR */ if (fdc->fintr || fdc->reset_stat) /* INTR */
ret |= 0x80; ret |= 0x80;
} }
else if (fdc->flags & FDC_FLAG_PS2) {
/* Status Register A (PS/2, PS/55) */
/* | INT PEND | nDRV2 | STEP | nTRK0 | HDSEL | nIDX | nWP | DIR | */
ret = 0x04;
if (!fdc->seek_dir) /* DIRECTION */
ret |= 0x01;
if (!writeprot[drive]) /* nWRITEPROT */
ret |= 0x02;
if (fdd_get_head(drive)) /* HDSEL */
ret |= 0x08;
if (!fdd_track0(drive)) /* nTRK0 */
ret |= 0x10;
if (fdc->step) /* STEP */
ret |= 0x20;
if (!fdd_get_type(1)) /* -Drive 2 Installed */
ret |= 0x40;
if (fdc->fintr || fdc->reset_stat) /* INTR */
ret |= 0x80;
}
else else
ret = 0xff; ret = 0xff;
break; break;

6
src/machine/m_ps2_mca.c
View File

@@ -780,13 +780,13 @@ ps55_model_50tv_write(uint16_t port, uint8_t val)
switch ((val >> 5) & 3) switch ((val >> 5) & 3)
{ {
case 0: case 0:
lpt1_init(LPT_MDA_ADDR); lpt1_setup(LPT_MDA_ADDR);
break; break;
case 1: case 1:
lpt1_init(LPT1_ADDR); lpt1_setup(LPT1_ADDR);
break; break;
case 2: case 2:
lpt1_init(LPT2_ADDR); lpt1_setup(LPT2_ADDR);
break; break;
default: default:
break; break;

2
src/video/vid_ps55da2.c
View File

@@ -3205,7 +3205,7 @@ const device_t ps55da2_device = {
.init = da2_init, .init = da2_init,
.close = da2_close, .close = da2_close,
.reset = da2_reset, .reset = da2_reset,
{ .available = da2_available }, .available = da2_available,
.speed_changed = da2_speed_changed, .speed_changed = da2_speed_changed,
.force_redraw = da2_force_redraw, .force_redraw = da2_force_redraw,
.config = da2_configuration .config = da2_configuration