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

All devices now have the bus marked in their name;

Browse Source 
The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.
This commit is contained in:
OBattler
2017-10-10 00:14:15 +02:00
parent efc129eb22
commit 253ad40376
55 changed files with 852 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/disk/hdc.c
View File

@@ -82,41 +82,41 @@ static struct {
{ "Internal Controller", "internal",
&inthdc_device, 0 },
{ "[MFM] IBM PC Fixed Disk Adapter", "mfm_xebec",
{ "[ISA] [MFM] IBM PC Fixed Disk Adapter", "mfm_xebec",
&mfm_xt_xebec_device, 1 },
{ "[MFM] DTC-5150X Fixed Disk Adapter", "mfm_dtc5150x",
{ "[ISA] [MFM] DTC-5150X Fixed Disk Adapter", "mfm_dtc5150x",
&mfm_xt_dtc5150x_device, 1 },
{ "[MFM] IBM PC/AT Fixed Disk Adapter", "mfm_at",
{ "[ISA] [MFM] IBM PC/AT Fixed Disk Adapter", "mfm_at",
&mfm_at_wd1003_device, 1 },
{ "[ESDI] PC/AT ESDI Fixed Disk Adapter", "esdi_wd1007vse1",
{ "[ISA] [ESDI] PC/AT ESDI Fixed Disk Adapter", "esdi_wd1007vse1",
&esdi_at_wd1007vse1_device, 0 },
{ "[ESDI] IBM PS/2 ESDI Fixed Disk Adapter","esdi_mca",
&esdi_ps2_device, 1 },
#if 0
{ "[IDE] PC/AT IDE Adapter", "ide_isa",
{ "[ISA] [IDE] PC/AT IDE Adapter", "ide_isa",
&ide_isa_device, 0 },
{ "[IDE] PCI IDE Adapter", "ide_pci",
{ "[PCI] [IDE] PCI IDE Adapter", "ide_pci",
&ide_pci_device, 0 },
#endif
{ "[IDE] PC/XT XTIDE", "xtide",
{ "[ISA] [IDE] PC/XT XTIDE", "xtide",
&xtide_device , 0 },
{ "[IDE] PC/AT XTIDE", "xtide_at",
{ "[ISA] [IDE] PC/AT XTIDE", "xtide_at",
&xtide_at_device, 0 },
{ "[IDE] PS/2 XTIDE (Acculogic)", "xtide_ps2",
{ "[ISA] [IDE] PS/2 XTIDE (Acculogic)", "xtide_ps2",
&xtide_ps2_device, 0 },
{ "[IDE] PS/2 AT XTIDE (1.1.5)", "xtide_at_ps2",
{ "[ISA] [IDE] PS/2 AT XTIDE (1.1.5)", "xtide_at_ps2",
&xtide_at_ps2_device, 0 },
{ "[MCA] [ESDI] IBM PS/2 ESDI Fixed Disk Adapter","esdi_mca",
&esdi_ps2_device, 1 },
{ "", "", NULL, 0 }
};
@@ -165,6 +165,13 @@ hdc_get_internal_name(int hdc)
}
device_t *
hdc_get_device(int hdc)
{
return(controllers[hdc].device);
}
int
hdc_get_flags(int hdc)
{

1
src/disk/hdc.h
View File

@@ -49,6 +49,7 @@ extern void hdc_reset(void);
extern char *hdc_get_name(int hdc);
extern char *hdc_get_internal_name(int hdc);
extern device_t *hdc_get_device(int hdc);
extern int hdc_get_flags(int hdc);
extern int hdc_available(int hdc);
extern int hdc_current_is_mfm(void);

2
src/disk/hdc_esdi_at.c
View File

@@ -842,7 +842,7 @@ wd1007vse1_available(void)
device_t esdi_at_wd1007vse1_device = {
"Western Digital WD1007V-SE1 (ESDI)",
DEVICE_AT,
DEVICE_ISA | DEVICE_AT,
0,
wd1007vse1_init,
wd1007vse1_close,

2
src/disk/hdc_mfm_at.c
View File

@@ -760,7 +760,7 @@ mfm_close(void *priv)
device_t mfm_at_wd1003_device = {
"WD1003 AT MFM/RLL Controller",
DEVICE_AT, 0,
DEVICE_ISA | DEVICE_AT, 0,
mfm_init, mfm_close, NULL,
NULL, NULL, NULL, NULL, NULL
};

2
src/disk/hdc_mfm_xt.c
View File

@@ -908,7 +908,7 @@ dtc5150x_available(void)
device_t mfm_xt_dtc5150x_device = {
"DTC 5150X",
0, 0,
DEVICE_ISA, 0,
dtc5150x_init, mfm_close, NULL,
dtc5150x_available, NULL, NULL, NULL,
NULL

8
src/disk/hdc_xtide.c
View File

@@ -236,7 +236,7 @@ xtide_close(void *priv)
device_t xtide_device = {
"XTIDE",
0,
DEVICE_ISA,
0,
xtide_init, xtide_close, NULL,
xtide_available, NULL, NULL, NULL,
@@ -245,7 +245,7 @@ device_t xtide_device = {
device_t xtide_at_device = {
"XTIDE (AT)",
DEVICE_AT,
DEVICE_ISA | DEVICE_AT,
0,
xtide_at_init, xtide_close, NULL,
xtide_at_available, NULL, NULL, NULL,
@@ -254,7 +254,7 @@ device_t xtide_at_device = {
device_t xtide_ps2_device = {
"XTIDE (Acculogic)",
0,
DEVICE_ISA,
0,
xtide_ps2_init, xtide_close, NULL,
xtide_ps2_available, NULL, NULL, NULL,
@@ -263,7 +263,7 @@ device_t xtide_ps2_device = {
device_t xtide_at_ps2_device = {
"XTIDE (AT) (1.1.5)",
DEVICE_PS2,
DEVICE_ISA | DEVICE_PS2,
0,
xtide_at_ps2_init, xtide_close, NULL,
xtide_at_ps2_available, NULL, NULL, NULL,