Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix timer usage in AT MFM controller. Fixes OS/2 v1.0 installation.

Browse source
This commit is contained in:
SarahW 2017-12-10 12:25:23 +00:00
commit 45b627dfcd
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/mfm_at.c
View file

@ -215,7 +215,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
// pclog("Restore\n"); // pclog("Restore\n");
mfm->command &= ~0x0f; /*Mask off step rate*/ mfm->command &= ~0x0f; /*Mask off step rate*/
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200*IDE_TIME; mfm->callback = 200*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -224,7 +224,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
// pclog("Seek to cylinder %i\n", mfm->cylinder); // pclog("Seek to cylinder %i\n", mfm->cylinder);
mfm->command &= ~0x0f; /*Mask off step rate*/ mfm->command &= ~0x0f; /*Mask off step rate*/
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200*IDE_TIME; mfm->callback = 200*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -239,7 +239,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
if (val & 2) if (val & 2)
fatal("Read with ECC\n"); fatal("Read with ECC\n");
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200*IDE_TIME; mfm->callback = 200*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -258,7 +258,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
// pclog("Read verify %i sectors from sector %i cylinder %i head %i\n",mfm->secount,mfm->sector,mfm->cylinder,mfm->head); // pclog("Read verify %i sectors from sector %i cylinder %i head %i\n",mfm->secount,mfm->sector,mfm->cylinder,mfm->head);
mfm->command &= ~1; mfm->command &= ~1;
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200 * IDE_TIME; mfm->callback = 200 * IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -271,14 +271,14 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
case CMD_SET_PARAMETERS: /* Initialize Drive Parameters */ case CMD_SET_PARAMETERS: /* Initialize Drive Parameters */
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 30*IDE_TIME; mfm->callback = 30*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
case CMD_DIAGNOSE: /* Execute Drive Diagnostics */ case CMD_DIAGNOSE: /* Execute Drive Diagnostics */
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200*IDE_TIME; mfm->callback = 200*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -286,7 +286,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
default: default:
pclog("Bad MFM command %02X\n", val); pclog("Bad MFM command %02X\n", val);
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 200*IDE_TIME; mfm->callback = 200*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
break; break;
@ -297,7 +297,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
case 0x3F6: /* Device control */ case 0x3F6: /* Device control */
if ((mfm->fdisk & 4) && !(val & 4)) if ((mfm->fdisk & 4) && !(val & 4))
{ {
timer_process(); timer_clock();
mfm->callback = 500*IDE_TIME; mfm->callback = 500*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
mfm->reset = 1; mfm->reset = 1;
@ -307,7 +307,7 @@ void mfm_write(uint16_t port, uint8_t val, void *p)
if (val & 4) if (val & 4)
{ {
/*Drive held in reset*/ /*Drive held in reset*/
timer_process(); timer_clock();
mfm->callback = 0; mfm->callback = 0;
timer_update_outstanding(); timer_update_outstanding();
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
@ -331,7 +331,7 @@ void mfm_writew(uint16_t port, uint16_t val, void *p)
{ {
mfm->pos = 0; mfm->pos = 0;
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 6*IDE_TIME; mfm->callback = 6*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
} }
@ -402,7 +402,7 @@ uint16_t mfm_readw(uint16_t port, void *p)
{ {
mfm_next_sector(mfm); mfm_next_sector(mfm);
mfm->status = STAT_BUSY; mfm->status = STAT_BUSY;
timer_process(); timer_clock();
mfm->callback = 6*IDE_TIME; mfm->callback = 6*IDE_TIME;
timer_update_outstanding(); timer_update_outstanding();
} }