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

Removed the Riva driver from the source tree.

Browse Source
This commit is contained in:
waltje
2018-02-22 17:43:48 -05:00
parent 74815e643e
commit b024b7e76e
6 changed files with 4 additions and 3652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.local
View File

@@ -10,7 +10,7 @@
# settings, so we can avoid changing the main one for all of
# our local setups.
#
# Version: @(#)Makefile.local 1.0.1 2018/02/14
# Version: @(#)Makefile.local 1.0.2 2018/02/22
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -100,7 +100,6 @@ VNC := n
RDP := n
DEV_BUILD := n
DEV_BRANCH := n
NV_RIVA := n
OPENAL := y
FLUIDSYNTH := y
MUNT := y

3575
src/video/vid_nv_riva128.c
View File

File diff suppressed because it is too large Load Diff

48
src/video/vid_nv_riva128.h
View File

@@ -1,48 +0,0 @@
/*
* VARCem Virtual Archaelogical Computer EMulator.
* An emulator of (mostly) x86-based PC systems and devices,
* using the ISA,EISA,VLB,MCA and PCI system buses, roughly
* spanning the era between 1981 and 1995.
*
* This file is part of the VARCem Project.
*
* Definitions for the nVidia Riva driver.
*
* Version: @(#)vid_nv_riva128.h 1.0.1 2018/02/14
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
*
* Copyright 2017,2018 Fred N. van Kempen.
* Copyright 2016-2018 Miran Grca.
* Copyright 2008-2018 Sarah Walker.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the:
*
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307
* USA.
*/
#ifndef VIDEO_NV_RIVA128_H
# define VIDEO_NV_RIVA128_H
extern device_t riva128_device;
extern device_t rivatnt_device;
extern device_t rivatnt2_device;
#endif /*VIDEO_NV_RIVA128_H*/

12
src/video/vid_table.c
View File

@@ -8,7 +8,7 @@
*
* Define all known video cards.
*
* Version: @(#)vid_table.c 1.0.1 2018/02/14
* Version: @(#)vid_table.c 1.0.2 2018/02/22
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -64,11 +64,6 @@
#include "vid_incolor.h"
#include "vid_colorplus.h"
#include "vid_mda.h"
#ifdef DEV_BRANCH
# ifdef USE_RIVA
# include "vid_nv_riva128.h"
# endif
#endif
#include "vid_oti067.h"
#include "vid_paradise.h"
#include "vid_s3.h"
@@ -141,11 +136,6 @@ video_cards[] = {
{"[PCI] Diamond Stealth 3D 2000 (S3 ViRGE)", "stealth3d_2000_pci", &s3_virge_pci_device, GFX_VIRGE_PCI, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}},
{"[PCI] Diamond Stealth 3D 3000 (S3 ViRGE/VX)", "stealth3d_3000_pci", &s3_virge_988_pci_device, GFX_VIRGEVX_PCI, {VIDEO_BUS, 2, 2, 4, 26, 26, 42}},
{"[PCI] Diamond Stealth 64 DRAM (S3 Trio64)", "stealth64d_pci", &s3_diamond_stealth64_pci_device, GFX_STEALTH64_PCI, {VIDEO_BUS, 2, 2, 4, 26, 26, 42}},
#if defined(DEV_BRANCH) && defined(USE_RIVA)
{"[PCI] nVidia RIVA 128", "riva128", &riva128_device, GFX_RIVA128, {VIDEO_BUS, 2, 2, 3, 24, 24, 36}},
{"[PCI] nVidia RIVA TNT", "rivatnt", &rivatnt_device, GFX_RIVATNT, {VIDEO_BUS, 2, 2, 3, 24, 24, 36}},
{"[PCI] nVidia RIVA TNT2", "rivatnt2", &rivatnt2_device, GFX_RIVATNT2, {VIDEO_BUS, 2, 2, 3, 24, 24, 36}},
#endif
{"[PCI] Number Nine 9FX (S3 Trio64)", "n9_9fx_pci", &s3_9fx_pci_device, GFX_N9_9FX_PCI, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}},
{"[PCI] Paradise Bahamas 64 (S3 Vision864)", "bahamas64_pci", &s3_bahamas64_pci_device, GFX_BAHAMAS64_PCI, {VIDEO_BUS, 4, 4, 5, 20, 20, 35}},
{"[PCI] Phoenix S3 Vision864", "px_vision864_pci", &s3_phoenix_vision864_pci_device, GFX_PHOENIX_VISION864_PCI, {VIDEO_BUS, 4, 4, 5, 20, 20, 35}},

7
src/video/video.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the video controller module.
*
* Version: @(#)video.h 1.0.1 2018/02/14
* Version: @(#)video.h 1.0.2 2018/02/22
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -90,11 +90,6 @@ enum {
GFX_MACH64VT2, /* ATI Mach64 VT2 */
GFX_CL_GD5428, /* Diamond SpeedStar PRO (Cirrus Logic CL-GD 5428) */
GFX_CL_GD5429, /* Cirrus Logic CL-GD 5429 */
#if defined(DEV_BRANCH) && defined(USE_RIVA)
GFX_RIVATNT, /* nVidia Riva TNT */
GFX_RIVATNT2, /* nVidia Riva TNT2 */
GFX_RIVA128, /* nVidia Riva 128 */
#endif
GFX_OTI067, /* Oak OTI-067 */
GFX_OTI077, /* Oak OTI-077 */
GFX_PVGA1A, /* Paradise PVGA1A Standalone */

11
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.2 2018/02/22
# Version: @(#)Makefile.mingw 1.0.3 2018/02/22
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -104,9 +104,6 @@ ifndef AMD_K
AMD_K := n
endif
endif
ifndef NV_RIVA
NV_RIVA := n
endif
ifndef OPENAL
OPENAL := y
endif
@@ -153,7 +150,6 @@ GREENB := y
PORTABLE3 := y
LASERXT := y
PAS16 := y
NV_RIVA := y
STEALTH32 := y
XL24 := y
endif
@@ -366,11 +362,6 @@ OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o
endif
ifeq ($(NV_RIVA), y)
OPTS += -DUSE_RIVA
DEVBROBJ += vid_nv_riva128.o
endif
ifeq ($(STEALTH32), y)
OPTS += -DUSE_STEALTH32
DEVBROBJ += vid_icd2061.o