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

Merge pull request #1686 from 86Box/tc1995

Browse Source 
S3 changes part 3:
This commit is contained in:
Miran Grča
2021-09-11 22:20:13 +02:00
committed by GitHub
parent 84db99f4ef 04e48a071e
commit bc3e24dac0
3 changed files with 544 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/86box/video.h
View File

@@ -349,6 +349,7 @@ extern const device_t s3_phoenix_trio64vplus_pci_device;
extern const device_t s3_phoenix_trio64vplus_onboard_pci_device; extern const device_t s3_phoenix_trio64vplus_onboard_pci_device;
extern const device_t s3_mirocrystal_20sv_964_vlb_device; extern const device_t s3_mirocrystal_20sv_964_vlb_device;
extern const device_t s3_mirocrystal_20sv_964_pci_device; extern const device_t s3_mirocrystal_20sv_964_pci_device;
extern const device_t s3_mirocrystal_20sd_864_vlb_device;
extern const device_t s3_phoenix_vision864_pci_device; extern const device_t s3_phoenix_vision864_pci_device;
extern const device_t s3_phoenix_vision864_vlb_device; extern const device_t s3_phoenix_vision864_vlb_device;
extern const device_t s3_phoenix_vision868_pci_device; extern const device_t s3_phoenix_vision868_pci_device;
@@ -357,8 +358,9 @@ extern const device_t s3_diamond_stealth64_pci_device;
extern const device_t s3_diamond_stealth64_vlb_device; extern const device_t s3_diamond_stealth64_vlb_device;
extern const device_t s3_diamond_stealth64_964_pci_device; extern const device_t s3_diamond_stealth64_964_pci_device;
extern const device_t s3_diamond_stealth64_964_vlb_device; extern const device_t s3_diamond_stealth64_964_vlb_device;
extern const device_t s3_mirovideo_40sv_968_pci_device; extern const device_t s3_mirovideo_40sv_ergo_968_pci_device;
extern const device_t s3_mirovideo_40sv_968_vlb_device; extern const device_t s3_phoenix_vision968_pci_device;
extern const device_t s3_phoenix_vision968_vlb_device;
extern const device_t s3_spea_mercury_p64v_pci_device; extern const device_t s3_spea_mercury_p64v_pci_device;
extern const device_t s3_elsa_winner2000_pro_x_964_pci_device; extern const device_t s3_elsa_winner2000_pro_x_964_pci_device;
extern const device_t s3_elsa_winner2000_pro_x_pci_device; extern const device_t s3_elsa_winner2000_pro_x_pci_device;

622
src/video/vid_s3.c
View File

File diff suppressed because it is too large Load Diff

5
src/video/vid_table.c
View File

@@ -145,7 +145,8 @@ video_cards[] = {
{ "n9_9fx_pci", &s3_9fx_pci_device }, { "n9_9fx_pci", &s3_9fx_pci_device },
{ "px_trio64_pci", &s3_phoenix_trio64_pci_device }, { "px_trio64_pci", &s3_phoenix_trio64_pci_device },
{ "elsawin2kprox_pci", &s3_elsa_winner2000_pro_x_pci_device }, { "elsawin2kprox_pci", &s3_elsa_winner2000_pro_x_pci_device },
{ "mirovideo40sv_pci", &s3_mirovideo_40sv_968_pci_device }, { "mirovideo40sv_pci", &s3_mirovideo_40sv_ergo_968_pci_device },
{ "px_vision968_pci", &s3_phoenix_vision968_pci_device },
{ "spea_mercury64p_pci", &s3_spea_mercury_p64v_pci_device }, { "spea_mercury64p_pci", &s3_spea_mercury_p64v_pci_device },
{ "px_vision868_pci", &s3_phoenix_vision868_pci_device }, { "px_vision868_pci", &s3_phoenix_vision868_pci_device },
{ "px_trio64vplus_pci", &s3_phoenix_trio64vplus_pci_device }, { "px_trio64vplus_pci", &s3_phoenix_trio64vplus_pci_device },
@@ -189,6 +190,7 @@ video_cards[] = {
{ "px_s3_v7_805_vlb", &s3_spea_mirage_86c805_vlb_device }, { "px_s3_v7_805_vlb", &s3_spea_mirage_86c805_vlb_device },
{ "stealth64v_vlb", &s3_diamond_stealth64_964_vlb_device }, { "stealth64v_vlb", &s3_diamond_stealth64_964_vlb_device },
{ "mirocrystal20sv_vlb", &s3_mirocrystal_20sv_964_vlb_device }, { "mirocrystal20sv_vlb", &s3_mirocrystal_20sv_964_vlb_device },
{ "mirocrystal20sd_vlb", &s3_mirocrystal_20sd_864_vlb_device },
{ "bahamas64_vlb", &s3_bahamas64_vlb_device }, { "bahamas64_vlb", &s3_bahamas64_vlb_device },
{ "px_vision864_vlb", &s3_phoenix_vision864_vlb_device }, { "px_vision864_vlb", &s3_phoenix_vision864_vlb_device },
{ "stealthse_vlb", &s3_diamond_stealth_se_vlb_device }, { "stealthse_vlb", &s3_diamond_stealth_se_vlb_device },
@@ -197,6 +199,7 @@ video_cards[] = {
{ "n9_9fx_vlb", &s3_9fx_vlb_device }, { "n9_9fx_vlb", &s3_9fx_vlb_device },
{ "px_trio64_vlb", &s3_phoenix_trio64_vlb_device }, { "px_trio64_vlb", &s3_phoenix_trio64_vlb_device },
{ "spea_miragep64_vlb", &s3_spea_mirage_p64_vlb_device }, { "spea_miragep64_vlb", &s3_spea_mirage_p64_vlb_device },
{ "px_vision968_vlb", &s3_phoenix_vision968_vlb_device },
{ "px_vision868_vlb", &s3_phoenix_vision868_vlb_device }, { "px_vision868_vlb", &s3_phoenix_vision868_vlb_device },
{ "ht216_32", &ht216_32_standalone_device }, { "ht216_32", &ht216_32_standalone_device },
{ "virge325_vlb", &s3_virge_325_vlb_device }, { "virge325_vlb", &s3_virge_325_vlb_device },