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

refactored device_t and all declarations

Browse Source
This commit is contained in:
Jess Lovelace
2022-01-13 21:06:11 -05:00
parent 8bb18ef598
commit f18615ae87
219 changed files with 707 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/video/vid_s3.c
View File

@@ -7731,6 +7731,7 @@ static const device_config_t s3_968_config[] =
const device_t s3_orchid_86c911_isa_device =
{
"S3 86c911 ISA (Orchid Fahrenheit 1280)",
"s3_orchid_86c911_isa",
DEVICE_AT | DEVICE_ISA,
S3_ORCHID_86C911,
s3_init,
@@ -7745,6 +7746,7 @@ const device_t s3_orchid_86c911_isa_device =
const device_t s3_diamond_stealth_vram_isa_device =
{
"S3 86c911 ISA (Diamond Stealth VRAM)",
"s3_diamond_stealth_vram_isa",
DEVICE_AT | DEVICE_ISA,
S3_DIAMOND_STEALTH_VRAM,
s3_init,
@@ -7759,6 +7761,7 @@ const device_t s3_diamond_stealth_vram_isa_device =
const device_t s3_ami_86c924_isa_device =
{
"S3 86c924 ISA (AMI)",
"s3_ami_86c924_isa",
DEVICE_AT | DEVICE_ISA,
S3_AMI_86C924,
s3_init,
@@ -7773,6 +7776,7 @@ const device_t s3_ami_86c924_isa_device =
const device_t s3_spea_mirage_86c801_isa_device =
{
"S3 86c801 ISA (SPEA Mirage ISA)",
"s3_spea_mirage_86c801_isa",
DEVICE_AT | DEVICE_ISA,
S3_SPEA_MIRAGE_86C801,
s3_init,
@@ -7787,6 +7791,7 @@ const device_t s3_spea_mirage_86c801_isa_device =
const device_t s3_spea_mirage_86c805_vlb_device =
{
"S3 86c805 VLB (SPEA Mirage VL)",
"s3_spea_mirage_86c805_vlb",
DEVICE_VLB,
S3_SPEA_MIRAGE_86C805,
s3_init,
@@ -7801,6 +7806,7 @@ const device_t s3_spea_mirage_86c805_vlb_device =
const device_t s3_mirocrystal_8s_805_vlb_device =
{
"S3 86c805 VLB (MiroCRYSTAL 8S)",
"s3_mirocrystal_8s_805_vlb",
DEVICE_VLB,
S3_MIROCRYSTAL8S_805,
s3_init,
@@ -7816,6 +7822,7 @@ const device_t s3_mirocrystal_8s_805_vlb_device =
const device_t s3_mirocrystal_10sd_805_vlb_device =
{
"S3 86c805 VLB (MiroCRYSTAL 10SD)",
"s3_mirocrystal_10sd_805_vlb",
DEVICE_VLB,
S3_MIROCRYSTAL10SD_805,
s3_init,
@@ -7830,6 +7837,7 @@ const device_t s3_mirocrystal_10sd_805_vlb_device =
const device_t s3_phoenix_86c801_isa_device =
{
"S3 86c801 ISA (Phoenix)",
"s3_phoenix_86c801_isa",
DEVICE_AT | DEVICE_ISA,
S3_PHOENIX_86C801,
s3_init,
@@ -7844,6 +7852,7 @@ const device_t s3_phoenix_86c801_isa_device =
const device_t s3_phoenix_86c805_vlb_device =
{
"S3 86c805 VLB (Phoenix)",
"s3_phoenix_86c805_vlb",
DEVICE_VLB,
S3_PHOENIX_86C805,
s3_init,
@@ -7858,6 +7867,7 @@ const device_t s3_phoenix_86c805_vlb_device =
const device_t s3_metheus_86c928_isa_device =
{
"S3 86c928 ISA (Metheus Premier 928)",
"s3_metheus_86c928_isa",
DEVICE_AT | DEVICE_ISA,
S3_METHEUS_86C928,
s3_init,
@@ -7872,6 +7882,7 @@ const device_t s3_metheus_86c928_isa_device =
const device_t s3_metheus_86c928_vlb_device =
{
"S3 86c928 VLB (Metheus Premier 928)",
"s3_metheus_86c928_vlb",
DEVICE_VLB,
S3_METHEUS_86C928,
s3_init,
@@ -7900,6 +7911,7 @@ const device_t s3_spea_mercury_lite_86c928_pci_device =
const device_t s3_mirocrystal_20sd_864_vlb_device =
{
"S3 Vision864 VLB (MiroCRYSTAL 20SD)",
"s3_mirocrystal_20sd_864_vlb",
DEVICE_VLB,
S3_MIROCRYSTAL20SD_864,
s3_init,
@@ -7914,6 +7926,7 @@ const device_t s3_mirocrystal_20sd_864_vlb_device =
const device_t s3_bahamas64_vlb_device =
{
"S3 Vision864 VLB (Paradise Bahamas 64)",
"s3_bahamas64_vlb",
DEVICE_VLB,
S3_PARADISE_BAHAMAS64,
s3_init,
@@ -7928,6 +7941,7 @@ const device_t s3_bahamas64_vlb_device =
const device_t s3_bahamas64_pci_device =
{
"S3 Vision864 PCI (Paradise Bahamas 64)",
"s3_bahamas64_pci",
DEVICE_PCI,
S3_PARADISE_BAHAMAS64,
s3_init,
@@ -7942,6 +7956,7 @@ const device_t s3_bahamas64_pci_device =
const device_t s3_mirocrystal_20sv_964_vlb_device =
{
"S3 Vision964 VLB (MiroCRYSTAL 20SV)",
"s3_mirocrystal_20sv_964_vlb",
DEVICE_VLB,
S3_MIROCRYSTAL20SV_964,
s3_init,
@@ -7956,6 +7971,7 @@ const device_t s3_mirocrystal_20sv_964_vlb_device =
const device_t s3_mirocrystal_20sv_964_pci_device =
{
"S3 Vision964 PCI (MiroCRYSTAL 20SV)",
"s3_mirocrystal_20sv_964_pci",
DEVICE_PCI,
S3_MIROCRYSTAL20SV_964,
s3_init,
@@ -7971,6 +7987,7 @@ const device_t s3_mirocrystal_20sv_964_pci_device =
const device_t s3_diamond_stealth64_964_vlb_device =
{
"S3 Vision964 VLB (Diamond Stealth64 VRAM)",
"s3_diamond_stealth64_964_vlb",
DEVICE_VLB,
S3_DIAMOND_STEALTH64_964,
s3_init,
@@ -7985,6 +8002,7 @@ const device_t s3_diamond_stealth64_964_vlb_device =
const device_t s3_diamond_stealth64_964_pci_device =
{
"S3 Vision964 PCI (Diamond Stealth64 VRAM)",
"s3_diamond_stealth64_964_pci",
DEVICE_PCI,
S3_DIAMOND_STEALTH64_964,
s3_init,
@@ -7999,6 +8017,7 @@ const device_t s3_diamond_stealth64_964_pci_device =
const device_t s3_9fx_771_pci_device =
{
"S3 Vision968 PCI (Number 9 9FX 771)",
"s3_9fx_771_pci",
DEVICE_PCI,
S3_NUMBER9_9FX_771,
s3_init,
@@ -8013,6 +8032,7 @@ const device_t s3_9fx_771_pci_device =
const device_t s3_phoenix_vision968_pci_device =
{
"S3 Vision968 PCI (Phoenix)",
"s3_phoenix_vision968_pci",
DEVICE_PCI,
S3_PHOENIX_VISION968,
s3_init,
@@ -8027,6 +8047,7 @@ const device_t s3_phoenix_vision968_pci_device =
const device_t s3_phoenix_vision968_vlb_device =
{
"S3 Vision968 VLB (Phoenix)",
"s3_phoenix_vision968_vlb",
DEVICE_VLB,
S3_PHOENIX_VISION968,
s3_init,
@@ -8041,6 +8062,7 @@ const device_t s3_phoenix_vision968_vlb_device =
const device_t s3_mirovideo_40sv_ergo_968_pci_device =
{
"S3 Vision968 PCI (MiroVIDEO 40SV Ergo)",
"s3_mirovideo_40sv_ergo_968_pci",
DEVICE_PCI,
S3_MIROVIDEO40SV_ERGO_968,
s3_init,
@@ -8055,6 +8077,7 @@ const device_t s3_mirovideo_40sv_ergo_968_pci_device =
const device_t s3_spea_mercury_p64v_pci_device =
{
"S3 Vision968 PCI (SPEA Mercury P64V)",
"s3_spea_mercury_p64v_pci",
DEVICE_PCI,
S3_SPEA_MERCURY_P64V,
s3_init,
@@ -8069,6 +8092,7 @@ const device_t s3_spea_mercury_p64v_pci_device =
const device_t s3_9fx_vlb_device =
{
"S3 Trio64 VLB (Number 9 9FX 330)",
"s3_9fx_vlb",
DEVICE_VLB,
S3_NUMBER9_9FX,
s3_init,
@@ -8083,6 +8107,7 @@ const device_t s3_9fx_vlb_device =
const device_t s3_9fx_pci_device =
{
"S3 Trio64 PCI (Number 9 9FX 330)",
"s3_9fx_pci",
DEVICE_PCI,
S3_NUMBER9_9FX,
s3_init,
@@ -8097,6 +8122,7 @@ const device_t s3_9fx_pci_device =
const device_t s3_phoenix_trio32_vlb_device =
{
"S3 Trio32 VLB (Phoenix)",
"s3_phoenix_trio32_vlb",
DEVICE_VLB,
S3_PHOENIX_TRIO32,
s3_init,
@@ -8111,6 +8137,7 @@ const device_t s3_phoenix_trio32_vlb_device =
const device_t s3_phoenix_trio32_pci_device =
{
"S3 Trio32 PCI (Phoenix)",
"s3_phoenix_trio32_pci",
DEVICE_PCI,
S3_PHOENIX_TRIO32,
s3_init,
@@ -8125,6 +8152,7 @@ const device_t s3_phoenix_trio32_pci_device =
const device_t s3_diamond_stealth_se_vlb_device =
{
"S3 Trio32 VLB (Diamond Stealth SE)",
"s3_diamond_stealth_se_vlb",
DEVICE_VLB,
S3_DIAMOND_STEALTH_SE,
s3_init,
@@ -8139,6 +8167,7 @@ const device_t s3_diamond_stealth_se_vlb_device =
const device_t s3_diamond_stealth_se_pci_device =
{
"S3 Trio32 PCI (Diamond Stealth SE)",
"s3_diamond_stealth_se_pci",
DEVICE_PCI,
S3_DIAMOND_STEALTH_SE,
s3_init,
@@ -8154,6 +8183,7 @@ const device_t s3_diamond_stealth_se_pci_device =
const device_t s3_phoenix_trio64_vlb_device =
{
"S3 Trio64 VLB (Phoenix)",
"s3_phoenix_trio64_vlb",
DEVICE_VLB,
S3_PHOENIX_TRIO64,
s3_init,
@@ -8168,6 +8198,7 @@ const device_t s3_phoenix_trio64_vlb_device =
const device_t s3_phoenix_trio64_onboard_pci_device =
{
"S3 Trio64 PCI On-Board (Phoenix)",
"s3_phoenix_trio64_onboard_pci",
DEVICE_PCI,
S3_PHOENIX_TRIO64_ONBOARD,
s3_init,
@@ -8182,6 +8213,7 @@ const device_t s3_phoenix_trio64_onboard_pci_device =
const device_t s3_phoenix_trio64_pci_device =
{
"S3 Trio64 PCI (Phoenix)",
"s3_phoenix_trio64_pci",
DEVICE_PCI,
S3_PHOENIX_TRIO64,
s3_init,
@@ -8196,6 +8228,7 @@ const device_t s3_phoenix_trio64_pci_device =
const device_t s3_phoenix_trio64vplus_onboard_pci_device =
{
"S3 Trio64V+ PCI On-Board (Phoenix)",
"s3_phoenix_trio64vplus_onboard_pci",
DEVICE_PCI,
S3_PHOENIX_TRIO64VPLUS_ONBOARD,
s3_init,
@@ -8210,6 +8243,7 @@ const device_t s3_phoenix_trio64vplus_onboard_pci_device =
const device_t s3_phoenix_trio64vplus_pci_device =
{
"S3 Trio64V+ PCI (Phoenix)",
"s3_phoenix_trio64vplus_pci",
DEVICE_PCI,
S3_PHOENIX_TRIO64VPLUS,
s3_init,
@@ -8224,6 +8258,7 @@ const device_t s3_phoenix_trio64vplus_pci_device =
const device_t s3_phoenix_vision864_vlb_device =
{
"S3 Vision864 VLB (Phoenix)",
"s3_phoenix_vision864_vlb",
DEVICE_VLB,
S3_PHOENIX_VISION864,
s3_init,
@@ -8238,6 +8273,7 @@ const device_t s3_phoenix_vision864_vlb_device =
const device_t s3_phoenix_vision864_pci_device =
{
"S3 Vision864 PCI (Phoenix)",
"s3_phoenix_vision864_pci",
DEVICE_PCI,
S3_PHOENIX_VISION864,
s3_init,
@@ -8252,6 +8288,7 @@ const device_t s3_phoenix_vision864_pci_device =
const device_t s3_9fx_531_pci_device =
{
"S3 Vision868 PCI (Number 9 9FX 531)",
"s3_9fx_531_pci",
DEVICE_PCI,
S3_NUMBER9_9FX_531,
s3_init,
@@ -8266,6 +8303,7 @@ const device_t s3_9fx_531_pci_device =
const device_t s3_phoenix_vision868_vlb_device =
{
"S3 Vision868 VLB (Phoenix)",
"s3_phoenix_vision868_vlb",
DEVICE_VLB,
S3_PHOENIX_VISION868,
s3_init,
@@ -8280,6 +8318,7 @@ const device_t s3_phoenix_vision868_vlb_device =
const device_t s3_phoenix_vision868_pci_device =
{
"S3 Vision868 PCI (Phoenix)",
"s3_phoenix_vision868_pci",
DEVICE_PCI,
S3_PHOENIX_VISION868,
s3_init,
@@ -8294,6 +8333,7 @@ const device_t s3_phoenix_vision868_pci_device =
const device_t s3_diamond_stealth64_vlb_device =
{
"S3 Trio64 VLB (Diamond Stealth64 DRAM)",
"s3_diamond_stealth64_vlb",
DEVICE_VLB,
S3_DIAMOND_STEALTH64_764,
s3_init,
@@ -8308,6 +8348,7 @@ const device_t s3_diamond_stealth64_vlb_device =
const device_t s3_diamond_stealth64_pci_device =
{
"S3 Trio64 PCI (Diamond Stealth64 DRAM)",
"s3_diamond_stealth64_pci",
DEVICE_PCI,
S3_DIAMOND_STEALTH64_764,
s3_init,
@@ -8322,6 +8363,7 @@ const device_t s3_diamond_stealth64_pci_device =
const device_t s3_spea_mirage_p64_vlb_device =
{
"S3 Trio64 VLB (SPEA Mirage P64)",
"s3_spea_mirage_p64_vlb",
DEVICE_VLB,
S3_SPEA_MIRAGE_P64,
s3_init,
@@ -8336,6 +8378,7 @@ const device_t s3_spea_mirage_p64_vlb_device =
const device_t s3_elsa_winner2000_pro_x_964_pci_device =
{
"S3 Vision964 PCI (ELSA Winner 2000 Pro/X)",
"s3_elsa_winner2000_pro_x_964_pci",
DEVICE_PCI,
S3_ELSAWIN2KPROX_964,
s3_init,
@@ -8350,6 +8393,7 @@ const device_t s3_elsa_winner2000_pro_x_964_pci_device =
const device_t s3_elsa_winner2000_pro_x_pci_device =
{
"S3 Vision968 PCI (ELSA Winner 2000 Pro/X)",
"s3_elsa_winner2000_pro_x_pci",
DEVICE_PCI,
S3_ELSAWIN2KPROX,
s3_init,
@@ -8364,6 +8408,7 @@ const device_t s3_elsa_winner2000_pro_x_pci_device =
const device_t s3_trio64v2_dx_pci_device =
{
"S3 Trio64V2/DX PCI",
"s3_trio64v2_dx_pci",
DEVICE_PCI,
S3_TRIO64V2_DX,
s3_init,
@@ -8379,6 +8424,7 @@ const device_t s3_trio64v2_dx_pci_device =
const device_t s3_trio64v2_dx_onboard_pci_device =
{
"S3 Trio64V2/DX On-Board PCI",
"s3_trio64v2_dx_onboard_pci",
DEVICE_PCI,
S3_TRIO64V2_DX_ONBOARD,
s3_init,