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

Two minor bugfixes in the NCR 53C810 code;

Browse Source 
Slightly changed the FDC's timer usage;
Added an #include to cdrom.c that should be there.
This commit is contained in:
OBattler
2017-12-10 19:36:41 +01:00
parent ee27aec06c
commit 19c5e93a3c
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cdrom/cdrom.c
View File

@@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h" #include "../86box.h"
#include "../config.h" #include "../config.h"
#include "../timer.h" #include "../timer.h"

26
src/floppy/fdc.c
View File

@@ -714,7 +714,7 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
} }
if ((val&4) && !(fdc.dor&4)) if ((val&4) && !(fdc.dor&4))
{ {
timer_process(); timer_clock();
floppytime = 128LL * (1LL << TIMER_SHIFT); floppytime = 128LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
floppyint=-1; floppyint=-1;
@@ -727,8 +727,6 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
fdc_reset(); fdc_reset();
} }
timer_process();
timer_update_outstanding();
/* 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 (i = 0; i < FDD_NUM; i++)
{ {
@@ -757,7 +755,7 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
case 4: case 4:
if (val & 0x80) if (val & 0x80)
{ {
timer_process(); timer_clock();
floppytime = 128LL * (1LL << TIMER_SHIFT); floppytime = 128LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
floppyint=-1; floppyint=-1;
@@ -938,7 +936,7 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
bad_command: bad_command:
fdc.stat |= 0x10; fdc.stat |= 0x10;
floppyint=0xfc; floppyint=0xfc;
timer_process(); timer_clock();
floppytime = 200LL * (1LL << TIMER_SHIFT); floppytime = 200LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
break; break;
@@ -964,7 +962,7 @@ bad_command:
{ {
fdc_log("Got all params %02X\n", fdc.command); fdc_log("Got all params %02X\n", fdc.command);
floppyint=fdc.command&0x1F; floppyint=fdc.command&0x1F;
timer_process(); timer_clock();
floppytime = 1024LL * (1LL << TIMER_SHIFT); floppytime = 1024LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
fdc_reset_stat = 0; fdc_reset_stat = 0;
@@ -1142,7 +1140,7 @@ bad_command:
fdc.pcn[fdc.params[0] & 3] = 0; fdc.pcn[fdc.params[0] & 3] = 0;
floppytime = 0LL; floppytime = 0LL;
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
break; break;
@@ -1199,7 +1197,7 @@ bad_command:
} }
floppytime = 0LL; floppytime = 0LL;
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
break; break;
@@ -1230,7 +1228,7 @@ bad_command:
fdc.st0 = 0x20 | (fdc.params[0] & 7); fdc.st0 = 0x20 | (fdc.params[0] & 7);
floppytime = 0LL; floppytime = 0LL;
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
break; break;
@@ -1246,7 +1244,7 @@ bad_command:
fdc.st0 = 0x20 | (fdc.params[0] & 7); fdc.st0 = 0x20 | (fdc.params[0] & 7);
floppytime = 0LL; floppytime = 0LL;
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
break; break;
@@ -1404,7 +1402,7 @@ uint8_t fdc_read(uint16_t addr, void *priv)
/* What the heck is this even doing?! */ /* What the heck is this even doing?! */
/* if (floppyint==0xA) /* if (floppyint==0xA)
{ {
timer_process(); timer_clock();
floppytime = 1024LL * (1LL << TIMER_SHIFT); floppytime = 1024LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
} */ } */
@@ -1742,7 +1740,7 @@ void fdc_callback(void *priv)
fdc.st0 |= 0x50; fdc.st0 |= 0x50;
} }
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
fdc.stat = 0x80 | (1 << fdc.drive); fdc.stat = 0x80 | (1 << fdc.drive);
@@ -1788,7 +1786,7 @@ void fdc_callback(void *priv)
if (fdc.format_state == 1) if (fdc.format_state == 1)
{ {
fdc.format_state = 2; fdc.format_state = 2;
timer_process(); timer_clock();
floppytime = 128LL * (1LL << TIMER_SHIFT); floppytime = 128LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
} }
@@ -1819,7 +1817,7 @@ void fdc_callback(void *priv)
drive_num = real_drive(fdc.rw_drive); drive_num = real_drive(fdc.rw_drive);
fdc.st0 = 0x20 | (fdc.params[0] & 7); fdc.st0 = 0x20 | (fdc.params[0] & 7);
floppyint=-3; floppyint=-3;
timer_process(); timer_clock();
floppytime = 2048LL * (1LL << TIMER_SHIFT); floppytime = 2048LL * (1LL << TIMER_SHIFT);
timer_update_outstanding(); timer_update_outstanding();
fdc.stat = 0x80 | (1 << fdc.drive); fdc.stat = 0x80 | (1 << fdc.drive);

4
src/scsi/scsi_ncr53c810.c
View File

@@ -727,7 +727,7 @@ static void lsi_do_command(LSIState *s, uint8_t id)
uint8_t buf[12]; uint8_t buf[12];
memset(buf, 0, 12); memset(buf, 0, 12);
lsi_read(s, s->dnad, (char *)buf, MIN(12, s->dbc)); DMAPageRead(s->dnad, (char *)buf, MIN(12, s->dbc));
if (s->dbc > 12) { if (s->dbc > 12) {
DPRINTF("(ID=%02i LUN=%02i) SCSI Command 0x%02x: CDB length %i too big\n", id, s->current_lun, buf[0], s->dbc); DPRINTF("(ID=%02i LUN=%02i) SCSI Command 0x%02x: CDB length %i too big\n", id, s->current_lun, buf[0], s->dbc);
s->dbc = 12; s->dbc = 12;
@@ -830,7 +830,7 @@ static void lsi_do_msgin(LSIState *s)
static uint8_t lsi_get_msgbyte(LSIState *s) static uint8_t lsi_get_msgbyte(LSIState *s)
{ {
uint8_t data; uint8_t data;
lsi_read(s, s->dnad, (char *)&data, 1); DMAPageRead(s->dnad, (char *)&data, 1);
s->dnad++; s->dnad++;
s->dbc--; s->dbc--;
return data; return data;