80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

More FDC commands now correctly set FDC head;

Browse Source 
Fixed a big in 86F read/write find sector state handler.
This commit is contained in:
OBattler
2016-09-06 23:52:08 +02:00
parent ad9966f27f
commit b90c7d2a68
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/disc_86f.c
View File

@@ -447,8 +447,8 @@ void d86f_seek(int drive, int track)
for (side = 0; side < d86f_get_sides(drive); side++) for (side = 0; side < d86f_get_sides(drive); side++)
{ {
memset(d86f[drive].track_layout[side], BYTE_GAP4, full_size); memset(d86f[drive].track_layout[side], BYTE_GAP4, 50000);
memset(d86f[drive].track_data[side], 0xFF, full_size); memset(d86f[drive].track_data[side], 0xFF, 50000);
} }
d86f[drive].cur_track = track; d86f[drive].cur_track = track;
@@ -791,13 +791,6 @@ static void index_pulse(int drive)
if (d86f[drive].state != STATE_IDLE) fdc_indexpulse(); if (d86f[drive].state != STATE_IDLE) fdc_indexpulse();
} }
int d86f_match(int drive)
{
int temp;
temp = (d86f[drive].req_sector.dword == d86f[drive].last_sector.dword);
return temp;
}
uint32_t d86f_get_data_len(int drive) uint32_t d86f_get_data_len(int drive)
{ {
if (d86f[drive].req_sector.id.n) if (d86f[drive].req_sector.id.n)
@@ -1089,7 +1082,7 @@ void d86f_poll_find_nf(int drive, int side)
d86f[drive].calc_crc.word = fdc_is_mfm() ? 0xcdb4 : 0xffff; d86f[drive].calc_crc.word = fdc_is_mfm() ? 0xcdb4 : 0xffff;
// pclog("CRC reset: %02X\n", d86f[drive].track_byte); // pclog("CRC reset: %02X\n", d86f[drive].track_byte);
if ((d86f[drive].state &= STATE_WRITE_FIND_SECTOR) && d86f_match(drive) && d86f_can_read_address(drive)) if ((d86f[drive].state == STATE_WRITE_FIND_SECTOR) && (d86f[drive].req_sector.dword == d86f[drive].last_sector.dword) && d86f_can_read_address(drive))
{ {
d86f[drive].track_data[side][d86f[drive].track_pos] = 0xFB; d86f[drive].track_data[side][d86f[drive].track_pos] = 0xFB;
} }
@@ -1119,7 +1112,7 @@ void d86f_poll_find_nf(int drive, int side)
case BYTE_GAP2: case BYTE_GAP2:
if (d86f_can_read_address(drive)) if (d86f_can_read_address(drive))
{ {
if (d86f_match(drive) || (d86f[drive].state == STATE_READ_FIND_ADDRESS)) if ((d86f[drive].req_sector.dword == d86f[drive].last_sector.dword) || (d86f[drive].state == STATE_READ_FIND_ADDRESS))
{ {
if (d86f[drive].track_crc.word != d86f[drive].calc_crc.word) if (d86f[drive].track_crc.word != d86f[drive].calc_crc.word)
{ {
@@ -1150,7 +1143,7 @@ void d86f_poll_find_nf(int drive, int side)
{ {
case STATE_READ_FIND_SECTOR: case STATE_READ_FIND_SECTOR:
case STATE_WRITE_FIND_SECTOR: case STATE_WRITE_FIND_SECTOR:
if (d86f_match(drive) && d86f_can_read_address(drive)) if ((d86f[drive].req_sector.dword == d86f[drive].last_sector.dword) && d86f_can_read_address(drive))
{ {
d86f[drive].state++; d86f[drive].state++;
} }

4
src/fdc.c
View File

@@ -708,6 +708,10 @@ bad_command:
disctime = 0; disctime = 0;
break; break;
case 4:
fdd_set_head(fdc.drive, (fdc.params[0] & 4) ? 1 : 0);
break;
case 5: /*Write data*/ case 5: /*Write data*/
fdc_rate(fdc.drive); fdc_rate(fdc.drive);
fdc.head=fdc.params[2]; fdc.head=fdc.params[2];