Applied the same sorting to hard disk controllers, network adapters, SCSI controllers, and sound cards as well.

This commit is contained in:
OBattler
2025-06-25 20:24:30 +02:00
parent 1916a60d6c
commit cd6a3ee48f
4 changed files with 81 additions and 57 deletions

View File

@@ -56,35 +56,40 @@ static const struct {
// clang-format off
{ &device_none },
{ &device_internal },
{ &st506_xt_xebec_device },
{ &st506_xt_wdxt_gen_device },
/* ISA */
{ &xtide_acculogic_device },
{ &st506_xt_dtc5150x_device },
{ &st506_xt_xebec_device },
{ &xtide_device },
{ &st506_xt_st11_m_device },
{ &st506_xt_wd1002a_wx1_device },
{ &st506_xt_wd1004a_wx1_device },
{ &st506_at_wd1003_device },
{ &st506_xt_st11_r_device },
{ &st506_xt_victor_v86p_device },
{ &st506_xt_wd1002a_27x_device },
{ &st506_xt_wd1002a_wx1_device },
{ &st506_xt_wd1004_27x_device },
{ &st506_xt_wd1004a_27x_device },
{ &st506_xt_victor_v86p_device },
{ &esdi_at_wd1007vse1_device },
{ &st506_xt_wd1004a_wx1_device },
{ &xta_wdxt150_device },
{ &st506_xt_wdxt_gen_device },
/* ISA16 */
{ &ide_isa_device },
{ &ide_isa_2ch_device },
{ &xtide_at_device },
{ &xtide_at_2ch_device },
{ &xtide_at_ps2_device },
{ &xtide_at_ps2_2ch_device },
{ &xta_wdxt150_device },
{ &xtide_acculogic_device },
{ &xtide_device },
{ &st506_at_wd1003_device },
{ &esdi_at_wd1007vse1_device },
/* MCA */
{ &esdi_ps2_device },
{ &esdi_integrated_device },
{ &ide_pci_device },
{ &ide_pci_2ch_device },
{ &mcide_device },
/* VLB */
{ &ide_vlb_device },
{ &ide_vlb_2ch_device },
{ &mcide_device },
/* PCI */
{ &ide_pci_device },
{ &ide_pci_2ch_device },
{ NULL }
// clang-format on
};

View File

@@ -85,36 +85,43 @@ static const NETWORK_CARD net_cards[] = {
// clang-format off
{ &device_none },
{ &device_internal },
/* ISA */
{ &threec501_device },
{ &threec503_device },
{ &pcnet_am79c960_device },
{ &pcnet_am79c961_device },
{ &de220p_device },
{ &ne1000_compat_device },
{ &ne2000_compat_device },
{ &ne2000_compat_8bit_device },
{ &ne1000_device },
{ &ne2000_device },
{ &pcnet_am79c960_eb_device },
{ &rtl8019as_pnp_device },
{ &wd8003e_device },
{ &wd8003eb_device },
{ &wd8013ebt_device },
/* COM */
{ &modem_device },
/* LPT */
{ &plip_device },
/* ISA16 */
{ &pcnet_am79c960_device },
{ &pcnet_am79c961_device },
{ &de220p_device },
{ &ne2000_compat_device },
{ &ne2000_device },
{ &pcnet_am79c960_eb_device },
{ &rtl8019as_pnp_device },
/* MCA */
{ &ethernext_mc_device },
{ &wd8003eta_device },
{ &wd8003ea_device },
{ &wd8013epa_device },
/* VLB */
{ &pcnet_am79c960_vlb_device },
/* PCI */
{ &pcnet_am79c973_device },
{ &pcnet_am79c970a_device },
{ &dec_tulip_21140_device },
{ &dec_tulip_21040_device },
{ &dec_tulip_device },
{ &dec_tulip_21140_vpc_device },
{ &rtl8029as_device },
{ &rtl8139c_plus_device },
{ &dec_tulip_21140_device },
{ &dec_tulip_21140_vpc_device },
{ &dec_tulip_21040_device },
{ &pcnet_am79c960_vlb_device },
{ &modem_device },
{ NULL }
// clang-format on
};

View File

@@ -54,6 +54,14 @@ typedef const struct {
static SCSI_CARD scsi_cards[] = {
// clang-format off
{ &device_none, },
/* ISA/Sidecar */
{ &scsi_ls2000_device, },
/* ISA */
{ &scsi_lcs6821n_device, },
{ &scsi_rt1000b_device, },
{ &scsi_t128_device, },
{ &scsi_t130b_device, },
/* ISA16 */
{ &aha154xa_device, },
{ &aha154xb_device, },
{ &aha154xc_device, },
@@ -63,18 +71,19 @@ static SCSI_CARD scsi_cards[] = {
{ &buslogic_542bh_device, },
{ &buslogic_545s_device, },
{ &buslogic_545c_device, },
{ &scsi_ls2000_device, },
{ &scsi_lcs6821n_device, },
{ &scsi_rt1000b_device, },
{ &scsi_rt1000mc_device, },
{ &scsi_t128_device, },
{ &scsi_t228_device, },
{ &scsi_t130b_device, },
/* MCA */
{ &aha1640_device, },
{ &buslogic_640a_device, },
{ &ncr53c90a_mca_device, },
{ &spock_device, },
{ &tribble_device, },
{ &ncr53c90a_mca_device, },
{ &scsi_rt1000mc_device, },
{ &scsi_t228_device, },
/* VLB */
{ &buslogic_445s_device, },
{ &buslogic_445c_device, },
/* PCI */
{ &am53c974_pci_device, },
{ &buslogic_958d_pci_device, },
{ &ncr53c810_pci_device, },
{ &ncr53c815_pci_device, },
@@ -82,10 +91,7 @@ static SCSI_CARD scsi_cards[] = {
{ &ncr53c825a_pci_device, },
{ &ncr53c860_pci_device, },
{ &ncr53c875_pci_device, },
{ &am53c974_pci_device, },
{ &dc390_pci_device, },
{ &buslogic_445s_device, },
{ &buslogic_445c_device, },
{ NULL, },
// clang-format on
};

View File

@@ -100,31 +100,45 @@ static const SOUND_CARD sound_cards[] = {
// clang-format off
{ &device_none },
{ &device_internal },
{ &acermagic_s20_device },
{ &mirosound_pcm10_device },
{ &adlib_device },
/* ISA */
{ &adgold_device },
{ &azt2316a_device },
{ &azt1605_device },
{ &cms_device },
{ &cs4235_device },
{ &cs4236b_device },
{ &ess_688_device },
{ &ess_ess0100_pnp_device },
{ &ess_1688_device },
{ &ess_ess0102_pnp_device },
{ &ess_ess0968_pnp_device },
{ &gus_device },
{ &gus_max_device },
{ &ssi2001_device },
{ &mmb_device },
{ &pasplus_device },
{ &sb_1_device },
{ &sb_15_device },
{ &sb_2_device },
{ &sb_pro_v1_device },
{ &sb_pro_v2_device },
{ &entertainer_device },
{ &pssj_isa_device },
{ &tndy_device },
#ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
{ &opl2board_device },
#endif
/* ISA/Sidecar */
{ &adlib_device },
/* ISA16 */
{ &acermagic_s20_device },
{ &azt2316a_device },
{ &azt1605_device },
{ &sb_goldfinch_device },
{ &cs4235_device },
{ &cs4236b_device },
{ &gus_device },
{ &gus_max_device },
{ &mirosound_pcm10_device },
{ &pas16_device },
{ &pas16d_device },
{ &sb_16_device },
{ &sb_16_pnp_device },
{ &sb_16_pnp_ide_device },
{ &sb_goldfinch_device },
{ &sb_32_pnp_device },
{ &sb_awe32_device },
{ &sb_awe32_pnp_device },
@@ -136,15 +150,8 @@ static const SOUND_CARD sound_cards[] = {
{ &sb_vibra16cl_device },
{ &sb_vibra16s_device },
{ &sb_vibra16xv_device },
{ &ssi2001_device },
{ &entertainer_device },
{ &mmb_device },
{ &pasplus_device },
{ &pas16_device },
{ &pas16d_device },
{ &pssj_isa_device },
{ &tndy_device },
{ &wss_device },
/* MCA */
{ &adlib_mca_device },
{ &ess_chipchat_16_mca_device },
{ &ncr_business_audio_device },
@@ -153,17 +160,16 @@ static const SOUND_CARD sound_cards[] = {
{ &sb_16_reply_mca_device },
{ &ess_soundpiper_16_mca_device },
{ &ess_soundpiper_32_mca_device },
/* PCI */
{ &cmi8338_device },
{ &cmi8738_device },
{ &es1370_device },
{ &es1371_device },
{ &es1373_device },
{ &ct5880_device },
/* AC97 */
{ &ad1881_device },
{ &cs4297a_device },
#ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
{ &opl2board_device },
#endif
{ NULL }
// clang-format on
};