diff --git a/src/include/86box/video.h b/src/include/86box/video.h index 4bd81c906..9315c3fdd 100644 --- a/src/include/86box/video.h +++ b/src/include/86box/video.h @@ -529,6 +529,7 @@ extern const device_t voodoo_3_3000_device; extern const device_t voodoo_3_3000_agp_device; extern const device_t voodoo_3_3500_agp_ntsc_device; extern const device_t voodoo_3_3500_agp_pal_device; +extern const device_t compaq_voodoo_3_3500_agp_device; extern const device_t velocity_100_agp_device; extern const device_t velocity_200_agp_device; diff --git a/src/video/vid_table.c b/src/video/vid_table.c index b36cb1889..0b54596cb 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -257,6 +257,7 @@ video_cards[] = { { &voodoo_3_3000_agp_device }, { &voodoo_3_3500_agp_ntsc_device }, { &voodoo_3_3500_agp_pal_device }, + { &compaq_voodoo_3_3500_agp_device }, { NULL } }; // clang-format on diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index 21f6f578d..935fc5760 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -46,15 +46,16 @@ #include <86box/vid_voodoo_regs.h> #include <86box/vid_voodoo_render.h> -#define ROM_BANSHEE "roms/video/voodoo/Pci_sg.rom" -#define ROM_CREATIVE_BANSHEE "roms/video/voodoo/BlasterPCI.rom" -#define ROM_VOODOO3_1000 "roms/video/voodoo/1k11sg.rom" -#define ROM_VOODOO3_2000 "roms/video/voodoo/2k11sd.rom" -#define ROM_VOODOO3_3000 "roms/video/voodoo/3k12sd.rom" -#define ROM_VOODOO3_3500_AGP_NTSC "roms/video/voodoo/35k05n.rom" -#define ROM_VOODOO3_3500_AGP_PAL "roms/video/voodoo/35k05p.rom" -#define ROM_VELOCITY_100 "roms/video/voodoo/Velocity100.VBI" -#define ROM_VELOCITY_200 "roms/video/voodoo/Velocity200sg.rom" +#define ROM_BANSHEE "roms/video/voodoo/Pci_sg.rom" +#define ROM_CREATIVE_BANSHEE "roms/video/voodoo/BlasterPCI.rom" +#define ROM_VOODOO3_1000 "roms/video/voodoo/1k11sg.rom" +#define ROM_VOODOO3_2000 "roms/video/voodoo/2k11sd.rom" +#define ROM_VOODOO3_3000 "roms/video/voodoo/3k12sd.rom" +#define ROM_VOODOO3_3500_AGP_NTSC "roms/video/voodoo/35k05n.rom" +#define ROM_VOODOO3_3500_AGP_PAL "roms/video/voodoo/35k05p.rom" +#define ROM_VOODOO3_3500_AGP_COMPAQ "roms/video/voodoo/V3_3500_AGP_SD_2.15.05_Compaq.rom" +#define ROM_VELOCITY_100 "roms/video/voodoo/Velocity100.VBI" +#define ROM_VELOCITY_200 "roms/video/voodoo/Velocity200sg.rom" static video_timings_t timing_banshee = { .type = VIDEO_PCI, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 }; static video_timings_t timing_banshee_agp = { .type = VIDEO_AGP, .write_b = 2, .write_w = 2, .write_l = 1, .read_b = 20, .read_w = 20, .read_l = 21 }; @@ -75,6 +76,7 @@ enum { TYPE_V3_2000, TYPE_V3_3000, TYPE_V3_3500, + TYPE_V3_3500_COMPAQ, TYPE_VELOCITY100, TYPE_VELOCITY200 }; @@ -3051,6 +3053,13 @@ banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int banshee->pci_regs[0x2f] = 0x00; break; + case TYPE_V3_3500_COMPAQ: + banshee->pci_regs[0x2c] = 0x1a; + banshee->pci_regs[0x2d] = 0x12; + banshee->pci_regs[0x2e] = 0x4f; + banshee->pci_regs[0x2f] = 0x12; + break; + case TYPE_VELOCITY100: banshee->pci_regs[0x2c] = 0x1a; banshee->pci_regs[0x2d] = 0x12; @@ -3137,6 +3146,12 @@ v3_3500_agp_pal_init(const device_t *info) return banshee_init_common(info, ROM_VOODOO3_3500_AGP_PAL, 0, TYPE_V3_3500, VOODOO_3, 1); } +static void * +compaq_v3_3500_agp_init(const device_t *info) +{ + return banshee_init_common(info, ROM_VOODOO3_3500_AGP_COMPAQ, 0, TYPE_V3_3500_COMPAQ, VOODOO_3, 1); +} + static void * velocity_100_agp_init(const device_t *info) { @@ -3194,6 +3209,12 @@ v3_3500_agp_pal_available(void) return rom_present(ROM_VOODOO3_3500_AGP_PAL); } +static int +compaq_v3_3500_agp_available(void) +{ + return rom_present(ROM_VOODOO3_3500_AGP_COMPAQ); +} + static int velocity_100_available(void) { @@ -3390,6 +3411,20 @@ const device_t voodoo_3_3500_agp_pal_device = { banshee_sdram_config }; +const device_t compaq_voodoo_3_3500_agp_device = { + .name = "Compaq Voodoo3 3500 TV", + .internal_name = "compaq_voodoo3_3500_agp", + .flags = DEVICE_AGP, + .local = 0, + .init = compaq_v3_3500_agp_init, + .close = banshee_close, + .reset = NULL, + { .available = compaq_v3_3500_agp_available }, + .speed_changed = banshee_speed_changed, + .force_redraw = banshee_force_redraw, + banshee_sdram_config +}; + const device_t velocity_100_agp_device = { .name = "3dfx Velocity 100", .internal_name = "velocity100_agp",