From dfcdca6794e1c676a984bbc0744c368ead8d68e0 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Tue, 9 Dec 2014 19:34:25 +0100 Subject: lindbergh: Match card and video bios [O. Galibert] --- src/emu/video/gf6800gt.c | 31 ------------------------------- src/emu/video/gf6800gt.h | 25 ------------------------- src/emu/video/gf7600gs.c | 31 +++++++++++++++++++++++++++++++ src/emu/video/gf7600gs.h | 25 +++++++++++++++++++++++++ src/emu/video/video.mak | 6 +++--- src/mame/drivers/lindbergh.c | 4 ++-- src/mame/mame.mak | 2 +- 7 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 src/emu/video/gf6800gt.c delete mode 100644 src/emu/video/gf6800gt.h create mode 100644 src/emu/video/gf7600gs.c create mode 100644 src/emu/video/gf7600gs.h diff --git a/src/emu/video/gf6800gt.c b/src/emu/video/gf6800gt.c deleted file mode 100644 index d933bc51083..00000000000 --- a/src/emu/video/gf6800gt.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "gf6800gt.h" - -const device_type GEFORCE_6800GT = &device_creator; - -DEVICE_ADDRESS_MAP_START(map1, 32, geforce_6800gt_device) -ADDRESS_MAP_END - -DEVICE_ADDRESS_MAP_START(map2, 32, geforce_6800gt_device) -ADDRESS_MAP_END - -DEVICE_ADDRESS_MAP_START(map3, 32, geforce_6800gt_device) -ADDRESS_MAP_END - -geforce_6800gt_device::geforce_6800gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : pci_device(mconfig, GEFORCE_6800GT, "NVidia GeForce 6800GT", tag, owner, clock, "geforce_6800gt", __FILE__) -{ -} - -void geforce_6800gt_device::device_start() -{ - pci_device::device_start(); - add_map( 16*1024*1024, M_MEM, FUNC(geforce_6800gt_device::map1)); - add_map(256*1024*1024, M_MEM, FUNC(geforce_6800gt_device::map2)); - add_map( 16*1024*1024, M_MEM, FUNC(geforce_6800gt_device::map3)); - add_rom_from_region(); -} - -void geforce_6800gt_device::device_reset() -{ - pci_device::device_reset(); -} diff --git a/src/emu/video/gf6800gt.h b/src/emu/video/gf6800gt.h deleted file mode 100644 index cdd6a3bc184..00000000000 --- a/src/emu/video/gf6800gt.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef GF6800GT_H -#define GF6800GT_H - -#include "machine/pci.h" - -#define MCFG_GEFORCE_6800GT_ADD(_tag, _subdevice_id) \ - MCFG_AGP_DEVICE_ADD(_tag, GEFORCE_6800GT, 0x10de00f9, 0xa1, _subdevice_id) - -class geforce_6800gt_device : public pci_device { -public: - geforce_6800gt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - -protected: - virtual void device_start(); - virtual void device_reset(); - -private: - DECLARE_ADDRESS_MAP(map1, 32); - DECLARE_ADDRESS_MAP(map2, 32); - DECLARE_ADDRESS_MAP(map3, 32); -}; - -extern const device_type GEFORCE_6800GT; - -#endif diff --git a/src/emu/video/gf7600gs.c b/src/emu/video/gf7600gs.c new file mode 100644 index 00000000000..9c4cb44f1ee --- /dev/null +++ b/src/emu/video/gf7600gs.c @@ -0,0 +1,31 @@ +#include "gf7600gs.h" + +const device_type GEFORCE_7600GS = &device_creator; + +DEVICE_ADDRESS_MAP_START(map1, 32, geforce_7600gs_device) +ADDRESS_MAP_END + +DEVICE_ADDRESS_MAP_START(map2, 32, geforce_7600gs_device) +ADDRESS_MAP_END + +DEVICE_ADDRESS_MAP_START(map3, 32, geforce_7600gs_device) +ADDRESS_MAP_END + +geforce_7600gs_device::geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) + : pci_device(mconfig, GEFORCE_7600GS, "NVidia GeForce 7600GS", tag, owner, clock, "geforce_7600gs", __FILE__) +{ +} + +void geforce_7600gs_device::device_start() +{ + pci_device::device_start(); + add_map( 16*1024*1024, M_MEM, FUNC(geforce_7600gs_device::map1)); + add_map(256*1024*1024, M_MEM, FUNC(geforce_7600gs_device::map2)); + add_map( 16*1024*1024, M_MEM, FUNC(geforce_7600gs_device::map3)); + add_rom_from_region(); +} + +void geforce_7600gs_device::device_reset() +{ + pci_device::device_reset(); +} diff --git a/src/emu/video/gf7600gs.h b/src/emu/video/gf7600gs.h new file mode 100644 index 00000000000..6338c0926c4 --- /dev/null +++ b/src/emu/video/gf7600gs.h @@ -0,0 +1,25 @@ +#ifndef GF7600GS_H +#define GF7600GS_H + +#include "machine/pci.h" + +#define MCFG_GEFORCE_7600GS_ADD(_tag, _subdevice_id) \ + MCFG_AGP_DEVICE_ADD(_tag, GEFORCE_7600GS, 0x10de02e1, 0xa1, _subdevice_id) + +class geforce_7600gs_device : public pci_device { +public: + geforce_7600gs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + +protected: + virtual void device_start(); + virtual void device_reset(); + +private: + DECLARE_ADDRESS_MAP(map1, 32); + DECLARE_ADDRESS_MAP(map2, 32); + DECLARE_ADDRESS_MAP(map3, 32); +}; + +extern const device_type GEFORCE_7600GS; + +#endif diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak index 67cef5683bf..72ce5eb341f 100644 --- a/src/emu/video/video.mak +++ b/src/emu/video/video.mak @@ -174,11 +174,11 @@ endif #------------------------------------------------- # -#@src/emu/video/gf6800gt.h,VIDEOS += GF6800GT +#@src/emu/video/gf7600gs.h,VIDEOS += GF7600GS #------------------------------------------------- -ifneq ($(filter GF6800GT,$(VIDEOS)),) -VIDEOOBJS+= $(VIDEOOBJ)/gf6800gt.o +ifneq ($(filter GF7600GS,$(VIDEOS)),) +VIDEOOBJS+= $(VIDEOOBJ)/gf7600gs.o endif #------------------------------------------------- diff --git a/src/mame/drivers/lindbergh.c b/src/mame/drivers/lindbergh.c index ce485235cd8..617a4bf6606 100644 --- a/src/mame/drivers/lindbergh.c +++ b/src/mame/drivers/lindbergh.c @@ -323,7 +323,7 @@ Sega 2005 #include "machine/segabb.h" #include "sound/pci-ac97.h" #include "sound/sb0400.h" -#include "video/gf6800gt.h" +#include "video/gf7600gs.h" class lindbergh_state : public driver_device { @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START(lindbergh, lindbergh_state) MCFG_PCI_ROOT_ADD( ":pci") MCFG_I82875P_HOST_ADD( ":pci:00.0", 0x103382c0, ":maincpu", 512*1024*1024) MCFG_I82875P_AGP_ADD( ":pci:01.0") - MCFG_GEFORCE_6800GT_ADD( ":pci:01.0:00.0", 0x10de0204) + MCFG_GEFORCE_7600GS_ADD( ":pci:01.0:00.0", 0x10de02e1) MCFG_PCI_BRIDGE_ADD( ":pci:1c.0", 0x808625ae, 0x02) MCFG_I82541PI_ADD( ":pci:1c.0:00.0", 0x103382c0) MCFG_USB_UHCI_ADD( ":pci:1d.0", 0x808625a9, 0x02, 0x103382c0) diff --git a/src/mame/mame.mak b/src/mame/mame.mak index ddb9180e57a..cd7c79ff109 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -292,7 +292,7 @@ VIDEOS += DM9368 #VIDEOS += EF9340_1 #VIDEOS += EF9345 #VIDEOS += GF4500 -VIDEOS += GF6800GT +VIDEOS += GF7600GS VIDEOS += EPIC12 VIDEOS += FIXFREQ VIDEOS += H63484 -- cgit v1.2.3