claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Having fun with Travis - as usual.

Browse Source 
Updated S3 driver to add onboard 801 and 805.
This commit is contained in:
waltje
2019-06-06 22:56:47 -05:00
parent a2f3c1d2a4
commit cdd4d853fb
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/devices/video/vid_s3.c
View File

@@ -10,7 +10,7 @@
* *
* NOTE: ROM images need more/better organization per chipset. * NOTE: ROM images need more/better organization per chipset.
* *
* Version: @(#)vid_s3.c 1.0.19 2019/05/17 * Version: @(#)vid_s3.c 1.0.20 2019/06/05
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -2879,15 +2879,23 @@ s3_init(const device_t *info, UNUSED(void *parent))
memset(s3, 0x00, sizeof(s3_t)); memset(s3, 0x00, sizeof(s3_t));
svga = &s3->svga; svga = &s3->svga;
vram = device_get_config_int("memory");
switch(info->local) { switch(info->local) {
case S3_V7MIRAGE_86C801: case S3_V7MIRAGE_86C801:
chip = S3_86C801; chip = S3_86C801;
video_inform(DEVICE_VIDEO_GET(info->flags), &timing_s3_86c801); if (info->path != NULL)
video_inform(DEVICE_VIDEO_GET(info->flags), &timing_s3_86c801);
else
vram = 512;
break; break;
case S3_PHOENIX_86C805: case S3_PHOENIX_86C805:
chip = S3_86C805; chip = S3_86C805;
video_inform(DEVICE_VIDEO_GET(info->flags), &timing_s3_86c805); if (info->path != NULL)
video_inform(DEVICE_VIDEO_GET(info->flags), &timing_s3_86c805);
else
vram = 1024;
break; break;
case S3_PARADISE_BAHAMAS64: case S3_PARADISE_BAHAMAS64:
@@ -2935,8 +2943,6 @@ s3_init(const device_t *info, UNUSED(void *parent))
return NULL; return NULL;
} }
vram = device_get_config_int("memory");
if (vram) if (vram)
vram_size = vram << 20; vram_size = vram << 20;
else else
@@ -3259,6 +3265,19 @@ const device_t s3_v7mirage_86c801_isa_device = {
s3_9fx_config s3_9fx_config
}; };
const device_t s3_onboard_86c801_isa_device = {
"Onboard S3 86c801 ISA",
DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_AT | DEVICE_ISA,
S3_V7MIRAGE_86C801,
NULL,
s3_init, s3_close, NULL,
NULL,
s3_speed_changed,
s3_force_redraw,
NULL,
NULL
};
const device_t s3_phoenix_86c805_vlb_device = { const device_t s3_phoenix_86c805_vlb_device = {
"Phoenix S3 86c805 VLB", "Phoenix S3 86c805 VLB",
DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_VLB, DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_VLB,
@@ -3272,6 +3291,19 @@ const device_t s3_phoenix_86c805_vlb_device = {
s3_9fx_config s3_9fx_config
}; };
const device_t s3_onboard_86c805_vlb_device = {
"Onboard S3 86c805 VLB",
DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_VLB,
S3_PHOENIX_86C805,
NULL,
s3_init, s3_close, NULL,
NULL,
s3_speed_changed,
s3_force_redraw,
NULL,
NULL
};
const device_t s3_bahamas64_vlb_device = { const device_t s3_bahamas64_vlb_device = {
"Paradise Bahamas 64 (S3 Vision864)", "Paradise Bahamas 64 (S3 Vision864)",
DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_VLB, DEVICE_VIDEO(VID_TYPE_SPEC) | DEVICE_VLB,

4
src/devices/video/video.h
View File

@@ -8,7 +8,7 @@
* *
* Definitions for the video controller module. * Definitions for the video controller module.
* *
* Version: @(#)video.h 1.0.36 2019/05/17 * Version: @(#)video.h 1.0.37 2019/06/05
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -272,7 +272,9 @@ extern const device_t ht216_32_pb410a_device;
/* S3, Inc standard series cards. */ /* S3, Inc standard series cards. */
extern const device_t s3_v7mirage_86c801_isa_device; extern const device_t s3_v7mirage_86c801_isa_device;
extern const device_t s3_onboard_86c801_isa_device;
extern const device_t s3_phoenix_86c805_vlb_device; extern const device_t s3_phoenix_86c805_vlb_device;
extern const device_t s3_onboard_86c805_vlb_device;
extern const device_t s3_bahamas64_vlb_device; extern const device_t s3_bahamas64_vlb_device;
extern const device_t s3_bahamas64_pci_device; extern const device_t s3_bahamas64_pci_device;
extern const device_t s3_9fx_vlb_device; extern const device_t s3_9fx_vlb_device;