Vastly overhauled the UI, there's now a completely new Settings dialog as well as a status bar with disk activity icons and removable drive menus;
Thoroughly clean up the code to vastly reduce the number of compiler warnings and found and fixed several bugs in the process; Applied all mainline PCem commits; Added SCSI hard disk emulation; Commented out all unfinished machines and graphics cards; Added the AOpen AP53 and ASUS P/I-P55T2 machines as well as another Tyan 440FX machine, all three with AMI WinBIOS (patch from TheCollector1995); Added the Diamond Stealth 3D 3000 (S3 ViRGE/VX) graphics card (patch from TheCollector1995); Added the PS/2 XT IDE (AccuLogic) HDD Controller (patch from TheCollector1995); Added Microsoft/Logitech Bus Mouse emulation (patch from waltje); Overhauled the makefiles (patch from waltje); Added the Adaptec AHA-1542CF SCSI controller (patch from waltje); Added preliminary (but still unfinished) Adaptec AHA-154x SCSI controller BIOS support (patch from waltje); Added an ISABugger debugging device (patch from waltje); Added sanity checks to the Direct3D code.
This commit is contained in:
OBattler
114
src/fdd.c
114
src/fdd.c
@@ -18,85 +18,116 @@ static struct
|
||||
} fdd[FDD_NUM];
|
||||
|
||||
/* Flags:
|
||||
Bit 0: 300 rpm supported;
|
||||
Bit 1: 360 rpm supported;
|
||||
Bit 2: size (0 = 3.5", 1 = 5.25");
|
||||
Bit 3: double density supported;
|
||||
Bit 4: high density supported;
|
||||
Bit 5: extended density supported;
|
||||
Bit 6: double step for 40-track media;
|
||||
Bit 7: invert DENSEL polarity;
|
||||
Bit 8: ignore DENSEL;
|
||||
Bit 9: drive is a PS/2 drive;
|
||||
Bit 0: 300 rpm supported;
|
||||
Bit 1: 360 rpm supported;
|
||||
Bit 2: size (0 = 3.5", 1 = 5.25");
|
||||
Bit 3: sides (0 = 1, 1 = 2);
|
||||
Bit 4: double density supported;
|
||||
Bit 5: high density supported;
|
||||
Bit 6: extended density supported;
|
||||
Bit 7: double step for 40-track media;
|
||||
Bit 8: invert DENSEL polarity;
|
||||
Bit 9: ignore DENSEL;
|
||||
Bit 10: drive is a PS/2 drive;
|
||||
*/
|
||||
#define FLAG_RPM_300 1
|
||||
#define FLAG_RPM_360 2
|
||||
#define FLAG_525 4
|
||||
#define FLAG_HOLE0 8
|
||||
#define FLAG_HOLE1 16
|
||||
#define FLAG_HOLE2 32
|
||||
#define FLAG_DOUBLE_STEP 64
|
||||
#define FLAG_INVERT_DENSEL 128
|
||||
#define FLAG_IGNORE_DENSEL 256
|
||||
#define FLAG_PS2 512
|
||||
#define FLAG_525 4
|
||||
#define FLAG_DS 8
|
||||
#define FLAG_HOLE0 16
|
||||
#define FLAG_HOLE1 32
|
||||
#define FLAG_HOLE2 64
|
||||
#define FLAG_DOUBLE_STEP 128
|
||||
#define FLAG_INVERT_DENSEL 256
|
||||
#define FLAG_IGNORE_DENSEL 512
|
||||
#define FLAG_PS2 1024
|
||||
|
||||
static struct
|
||||
{
|
||||
int max_track;
|
||||
int flags;
|
||||
char name[64];
|
||||
char internal_name[24];
|
||||
} drive_types[] =
|
||||
{
|
||||
{ /*None*/
|
||||
.max_track = 0,
|
||||
.flags = 0
|
||||
0, 0, "None", "none"
|
||||
},
|
||||
{ /*5.25" 1DD*/
|
||||
43, FLAG_RPM_300 | FLAG_525 | FLAG_HOLE0, "5.25\" 180k", "525_1dd"
|
||||
},
|
||||
{ /*5.25" DD*/
|
||||
.max_track = 43,
|
||||
.flags = FLAG_RPM_300 | FLAG_525 | FLAG_HOLE0
|
||||
43, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0, "5.25\" 360k", "525_2dd"
|
||||
},
|
||||
{ /*5.25" QD*/
|
||||
86, FLAG_RPM_300 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "5.25\" 720k", "525_2qd"
|
||||
},
|
||||
{ /*5.25" HD PS/2*/
|
||||
86, FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL | FLAG_PS2, "5.25\" 1.2M PS/2", "525_2hd_ps2"
|
||||
},
|
||||
{ /*5.25" HD*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_360 | FLAG_525 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "5.25\" 1.2M", "525_2hd"
|
||||
},
|
||||
{ /*5.25" HD Dual RPM*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_RPM_360 | FLAG_525 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_525 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "5.25\" 1.2M 300/360 RPM", "525_2hd_dualrpm"
|
||||
},
|
||||
{ /*3.5" 1DD*/
|
||||
86, FLAG_RPM_300 | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 360k", "35_1dd"
|
||||
},
|
||||
{ /*3.5" DD*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_DOUBLE_STEP, "3.5\" 720k", "35_2dd"
|
||||
},
|
||||
{ /*3.5" HD PS/2*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL | FLAG_PS2
|
||||
86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL | FLAG_PS2, "3.5\" 1.44M PS/2", "35_2hd_ps2"
|
||||
},
|
||||
{ /*3.5" HD*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.44M", "35_2hd"
|
||||
},
|
||||
{ /*3.5" HD PC-98*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_RPM_360 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL
|
||||
86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP | FLAG_INVERT_DENSEL, "3.5\" 1.25M PC-98", "35_2hd_nec"
|
||||
},
|
||||
{ /*3.5" HD 3-Mode*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_RPM_360 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_300 | FLAG_RPM_360 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_DOUBLE_STEP, "3.5\" 1.44M 300/360 RPM", "35_2hd_3mode"
|
||||
},
|
||||
{ /*3.5" ED*/
|
||||
.max_track = 86,
|
||||
.flags = FLAG_RPM_300 | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2 | FLAG_DOUBLE_STEP
|
||||
86, FLAG_RPM_300 | FLAG_DS | FLAG_HOLE0 | FLAG_HOLE1 | FLAG_HOLE2 | FLAG_DOUBLE_STEP, "3.5\" 2.88M", "35_2ed"
|
||||
},
|
||||
{ /*End of list*/
|
||||
-1, -1, "", ""
|
||||
}
|
||||
};
|
||||
|
||||
int fdd_swap = 0;
|
||||
|
||||
char *fdd_getname(int type)
|
||||
{
|
||||
return drive_types[type].name;
|
||||
}
|
||||
|
||||
char *fdd_get_internal_name(int type)
|
||||
{
|
||||
return drive_types[type].internal_name;
|
||||
}
|
||||
|
||||
int fdd_get_from_internal_name(char *s)
|
||||
{
|
||||
int c = 0;
|
||||
|
||||
while (strlen(drive_types[c].internal_name))
|
||||
{
|
||||
if (!strcmp(drive_types[c].internal_name, s))
|
||||
return c;
|
||||
c++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void fdd_forced_seek(int drive, int track_diff)
|
||||
{
|
||||
drive = real_drive(drive);
|
||||
|
||||
fdd[drive].track += track_diff;
|
||||
|
||||
// pclog("Seeking %i tracks...\n", track_diff);
|
||||
|
||||
if (fdd[drive].track < 0)
|
||||
fdd[drive].track = 0;
|
||||
@@ -120,8 +151,6 @@ void fdd_seek(int drive, int track_diff)
|
||||
|
||||
fdd[drive].track += track_diff;
|
||||
|
||||
// pclog("Seeking %i tracks...\n", track_diff);
|
||||
|
||||
if (fdd[drive].track < 0)
|
||||
fdd[drive].track = 0;
|
||||
|
||||
@@ -209,7 +238,6 @@ int fdd_can_read_medium(int drive)
|
||||
|
||||
hole = 1 << (hole + 3);
|
||||
|
||||
// pclog("Drive %02X, type %02X, hole flag %02X, flags %02X, result %02X\n", drive, fdd[drive].type, hole, drive_types[fdd[drive].type].flags, drive_types[fdd[drive].type].flags & hole);
|
||||
return (drive_types[fdd[drive].type].flags & hole) ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user