All devices now have the bus marked in their name;
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:
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user