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

Timer counters now 64-bit;

Browse Source 
Cleaned up floppy code a lot and reverted to single poller;
Fixed segment present bit and limit checking at read/write within segment;
The ASUS boards now have memregs too;
RTC code improved based on suggestion by Sarah Walker;
Fixed SVGA odd/even emulation and added chain odd/even support;
Removed non-existent CPU's.
This commit is contained in:
OBattler
2016-07-19 02:44:32 +02:00
parent c667780aa6
commit b78b2fecaa
64 changed files with 937 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/fdd.c
View File

@@ -2,7 +2,6 @@
#include "disc.h"
#include "fdc.h"
#include "fdd.h"
#include "timer.h"
static struct
{
@@ -48,152 +47,37 @@ static struct
.flags = 0
},
{ /*5.25" DD*/
#ifdef MAINLINE
.max_track = 41,
#else
.max_track = 43,
#endif
.flags = FLAG_RPM_300 | FLAG_525 | FLAG_HOLE0
},
{ /*5.25" HD*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_360 | FLAG_525 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
},
{ /*5.25" HD Dual RPM*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_300 | FLAG_RPM_360 | FLAG_525 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
},
{ /*3.5" DD*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_300 | FLAG_HOLE0
},
{ /*3.5" HD*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_HOLE1
},
{ /*3.5" HD 3-Mode*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_300 | FLAG_RPM_360 | FLAG_HOLE0 | FLAG_HOLE1
},
{ /*3.5" ED*/
#ifdef MAINLINE
.max_track = 82,
#else
.max_track = 86,
#endif
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2
}
};
int fdd_swap = 0;
int fdd_stepping_motor_on[2] = {0, 0};
int fdd_track_diff[2] = {0, 0};
int fdd_track_direction[2] = {0, 0};
int fdd_old_track[2] = {0, 0};
int fdd_poll_time[2] = {0, 0};
void fdd_seek_poll(int poll_drive)
{
if (!fdd_track_diff[poll_drive])
{
fdd_stepping_motor_on[poll_drive] = 0;
return;
}
/* 80-track drive takes 6 <20>s per step, 40-track drive takes 10 <20>s. */
// fdd_poll_time[poll_drive] += (drive_types[fdd[poll_drive].type].max_track <= 43) ? (10 * TIMER_USEC) : (6 * TIMER_USEC);
fdd_poll_time[poll_drive] += (drive_types[fdd[poll_drive].type].max_track <= 43) ? (5 * TIMER_USEC) : (3 * TIMER_USEC);
if (fdd_track_direction[poll_drive])
{
fdd[poll_drive].track++;
if (fdd[poll_drive].track > drive_types[fdd[poll_drive].type].max_track)
fdd[poll_drive].track = drive_types[fdd[poll_drive].type].max_track;
}
else
{
fdd[poll_drive].track--;
if (fdd[poll_drive].track < 0)
fdd[poll_drive].track = 0;
}
fdd_track_diff[poll_drive]--;
if (!fdd_track_diff[poll_drive])
{
fdc_discchange_clear(poll_drive);
disc_seek(poll_drive, fdd[poll_drive].track);
fdd_stepping_motor_on[poll_drive] = 0;
}
}
void fdd_seek_poll_0()
{
fdd_seek_poll(0);
}
void fdd_seek_poll_1()
{
fdd_seek_poll(1);
}
#if 0
void fdd_seek(int drive, int track_diff)
{
drive ^= fdd_swap;
fdd_old_track[drive] = fdd[drive].track;
if (!track_diff)
{
/* Do not turn on motor if there are no pulses to be sent. */
fdc_discchange_clear(drive);
return;
}
fdd_stepping_motor_on[drive] = (track_diff == 0) ? 0 : 1;
if (fdd_stepping_motor_on[drive]) pclog("fdd_seek(): Stepping motor now on\n");
if (track_diff < 0)
{
fdd_track_diff[drive] = -track_diff;
fdd_track_direction[drive] = 0;
}
else
{
fdd_track_diff[drive] = track_diff;
fdd_track_direction[drive] = 1;
}
fdd_old_track[drive] = fdd[drive].track;
}
#endif
void fdd_seek(int drive, int track_diff)
{
int old_track;
@@ -210,13 +94,9 @@ void fdd_seek(int drive, int track_diff)
if (fdd[drive].track > drive_types[fdd[drive].type].max_track)
fdd[drive].track = drive_types[fdd[drive].type].max_track;
// pclog("fdd_seek: drive=%i track_diff=%i old_track=%i track=%i\n", drive, track_diff, old_track, fdd[drive].track);
// if (fdd[drive].track != old_track)
// fdc_discchange_clear(drive);
fdc_discchange_clear(drive);
disc_seek(drive, fdd[drive].track);
// disctime = 5000;
disctime = 50;
disctime = 5000;
}
int fdd_track0(int drive)
@@ -317,9 +197,4 @@ int fdd_get_head(int drive)
void fdd_init()
{
fdd_stepping_motor_on[0] = fdd_stepping_motor_on[1] = 0;
fdd_track_diff[0] = fdd_track_diff[1] = 0;
timer_add(fdd_seek_poll_0, &(fdd_poll_time[0]), &(fdd_stepping_motor_on[0]), NULL);
timer_add(fdd_seek_poll_1, &(fdd_poll_time[1]), &(fdd_stepping_motor_on[1]), NULL);
}