summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--3rdparty/googletest/googletest/src/gtest-all.cc3
-rw-r--r--3rdparty/portaudio/src/common/pa_front.c10
-rw-r--r--src/mame/drivers/queen.c103
-rw-r--r--src/mess/drivers/apple2.c2
4 files changed, 15 insertions, 103 deletions
diff --git a/3rdparty/googletest/googletest/src/gtest-all.cc b/3rdparty/googletest/googletest/src/gtest-all.cc
index 2859cf5aff4..0a9cee52233 100644
--- a/3rdparty/googletest/googletest/src/gtest-all.cc
+++ b/3rdparty/googletest/googletest/src/gtest-all.cc
@@ -1,5 +1,4 @@
-#define _VARIADIC_MAX 10
- // Copyright 2008, Google Inc.
+// Copyright 2008, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
diff --git a/3rdparty/portaudio/src/common/pa_front.c b/3rdparty/portaudio/src/common/pa_front.c
index 62785265f02..fad91926887 100644
--- a/3rdparty/portaudio/src/common/pa_front.c
+++ b/3rdparty/portaudio/src/common/pa_front.c
@@ -123,11 +123,11 @@ const char* Pa_GetVersionText( void )
}
static PaVersionInfo versionInfo_ = {
- paVersionMajor,
- paVersionMinor,
- paVersionSubMinor,
- TOSTRING(PA_SVN_REVISION),
- PA_VERSION_TEXT_
+ .versionMajor = paVersionMajor,
+ .versionMinor = paVersionMinor,
+ .versionSubMinor = paVersionSubMinor,
+ .versionControlRevision = TOSTRING(PA_SVN_REVISION),
+ .versionText = PA_VERSION_TEXT_
};
const PaVersionInfo* Pa_GetVersionInfo()
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index 95280d02c28..d6899a3d04d 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -32,26 +32,21 @@ processor speed is 533MHz <- likely to be a Celeron or a Pentium III class CPU -
#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
#include "machine/idectrl.h"
-#include "bus/isa/trident.h"
+#include "video/pc_vga.h"
class queen_state : public pcat_base_state
{
public:
queen_state(const machine_config &mconfig, device_type type, const char *tag)
- : pcat_base_state(mconfig, type, tag),
- m_vga(*this, "vga")
+ : pcat_base_state(mconfig, type, tag)
{
}
UINT32 *m_bios_ram;
UINT32 *m_bios_ext_ram;
-
- required_device<trident_vga_device> m_vga;
-
UINT8 m_mtxc_config_reg[256];
UINT8 m_piix4_config_reg[4][256];
- UINT8 m_pci_vga_reg[256];
DECLARE_WRITE32_MEMBER( bios_ext_ram_w );
@@ -59,7 +54,6 @@ public:
virtual void machine_start();
virtual void machine_reset();
void intel82439tx_init();
- void pci_vga_init();
};
@@ -76,7 +70,7 @@ static UINT8 mtxc_config_r(device_t *busdevice, device_t *device, int function,
static void mtxc_config_w(device_t *busdevice, device_t *device, int function, int reg, UINT8 data)
{
queen_state *state = busdevice->machine().driver_data<queen_state>();
-// osd_printf_debug("MXTC: write %d, %02X, %02X\n", function, reg, data);
+ printf("MTXC: write %d, %02X, %02X\n", function, reg, data);
/*
memory banking with North Bridge:
@@ -105,12 +99,6 @@ static void mtxc_config_w(device_t *busdevice, device_t *device, int function, i
void queen_state::intel82439tx_init()
{
- m_mtxc_config_reg[0] = 0x86;
- m_mtxc_config_reg[1] = 0x80; // Vendor ID, Intel
- m_mtxc_config_reg[3] = 0x70; // Device ID, MXTC
-
- m_mtxc_config_reg[0x0b] = 0x06; // PCI Class Bridge
-
m_mtxc_config_reg[0x60] = 0x02;
m_mtxc_config_reg[0x61] = 0x02;
m_mtxc_config_reg[0x62] = 0x02;
@@ -224,78 +212,6 @@ static void intel82371ab_pci_w(device_t *busdevice, device_t *device, int functi
}
}
-void queen_state::pci_vga_init()
-{
- m_pci_vga_reg[0x00] = 0x23;
- m_pci_vga_reg[0x01] = 0x10;
- m_pci_vga_reg[0x02] = 0x50;
- m_pci_vga_reg[0x03] = 0x97; // Trident 3DImage 9750 (seems must be that or the Blade 3D)
- m_pci_vga_reg[0x04] = 0x01; // PCI_CMD_IO_ENABLE
- m_pci_vga_reg[0x0b] = 0x03; // PCI class display
-}
-
-static UINT8 pci_vga_config_r(device_t *busdevice, device_t *device, int function, int reg)
-{
- queen_state *state = busdevice->machine().driver_data<queen_state>();
-// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine.describe_context(), function, reg, data);
- return state->m_pci_vga_reg[reg];
-}
-
-static UINT32 pci_vga_r(device_t *busdevice, device_t *device, int function, int reg, UINT32 mem_mask)
-{
- UINT32 r = 0;
- if (ACCESSING_BITS_24_31)
- {
- r |= pci_vga_config_r(busdevice, device, function, reg + 3) << 24;
- }
- if (ACCESSING_BITS_16_23)
- {
- r |= pci_vga_config_r(busdevice, device, function, reg + 2) << 16;
- }
- if (ACCESSING_BITS_8_15)
- {
- r |= pci_vga_config_r(busdevice, device, function, reg + 1) << 8;
- }
- if (ACCESSING_BITS_0_7)
- {
- r |= pci_vga_config_r(busdevice, device, function, reg + 0) << 0;
- }
- return r;
-}
-
-
-static void pci_vga_config_w(device_t *busdevice, device_t *device, int function, int reg, UINT8 data)
-{
- queen_state *state = busdevice->machine().driver_data<queen_state>();
-// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine.describe_context(), function, reg, data);
- state->m_pci_vga_reg[reg] = data;
-}
-
-static void pci_vga_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
-{
-osd_printf_warning("PCI write: %x %x\n", reg, data);
- if (ACCESSING_BITS_24_31)
- {
- pci_vga_config_w(busdevice, device, function, reg + 3, (data >> 24) & 0xff);
- }
- if (ACCESSING_BITS_16_23)
- {
- pci_vga_config_w(busdevice, device, function, reg + 2, (data >> 16) & 0xff);
- }
- if (ACCESSING_BITS_8_15)
- {
- pci_vga_config_w(busdevice, device, function, reg + 1, (data >> 8) & 0xff);
- }
- if (ACCESSING_BITS_0_7)
- {
- if (reg == 4)
- {
- data |= 1; // PCI_CMD_IO_ENABLE
- }
-
- pci_vga_config_w(busdevice, device, function, reg + 0, (data >> 0) & 0xff);
- }
-}
WRITE32_MEMBER(queen_state::bios_ext_ram_w)
{
@@ -317,10 +233,9 @@ WRITE32_MEMBER(queen_state::bios_ram_w)
static ADDRESS_MAP_START( queen_map, AS_PROGRAM, 32, queen_state )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff)
- AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0)
AM_RANGE(0x000e0000, 0x000effff) AM_ROMBANK("bios_ext") AM_WRITE(bios_ext_ram_w)
AM_RANGE(0x000f0000, 0x000fffff) AM_ROMBANK("bios_bank") AM_WRITE(bios_ram_w)
- AM_RANGE(0x00100000, 0x07ffffff) AM_RAM // 128MB RAM
+ AM_RANGE(0x00100000, 0x01ffffff) AM_RAM
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("bios", 0) /* System BIOS */
ADDRESS_MAP_END
@@ -345,7 +260,6 @@ void queen_state::machine_start()
m_bios_ext_ram = auto_alloc_array(machine(), UINT32, 0x10000/4);
intel82439tx_init();
- pci_vga_init();
}
void queen_state::machine_reset()
@@ -367,7 +281,6 @@ static MACHINE_CONFIG_START( queen, queen_state )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
- MCFG_PCI_BUS_LEGACY_DEVICE(9, NULL, pci_vga_r, pci_vga_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", NULL, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
@@ -376,7 +289,7 @@ static MACHINE_CONFIG_START( queen, queen_state )
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir7_w))
/* video hardware */
- MCFG_FRAGMENT_ADD( pcvideo_trident_vga )
+ MCFG_FRAGMENT_ADD( pcvideo_vga )
MACHINE_CONFIG_END
@@ -386,9 +299,9 @@ ROM_START( queen )
ROM_REGION( 0x40000, "bios", 0 )
ROM_LOAD( "bios-original.bin", 0x00000, 0x40000, CRC(feb542d4) SHA1(3cc5d8aeb0e3b7d9ed33248a4f3dc507d29debd9) )
- ROM_REGION( 0x8000, "video_bios", 0 )
- ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) )
- ROM_CONTINUE( 0x0001, 0x4000 )
+ ROM_REGION( 0x8000, "video_bios", ROMREGION_ERASEFF ) // TODO: no VGA card is hooked up, to be removed
+// ROM_LOAD16_BYTE( "trident_tgui9680_bios.bin", 0x0000, 0x4000, BAD_DUMP CRC(1eebde64) SHA1(67896a854d43a575037613b3506aea6dae5d6a19) )
+// ROM_CONTINUE( 0x0001, 0x4000 )
DISK_REGION( "ide:0:hdd:image" )
DISK_IMAGE( "pqiidediskonmodule", 0,SHA1(a56efcc711b1c5a2e63160b3088001a8c4fb56c2) )
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 8cf74588ffc..2af02056577 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -743,7 +743,7 @@ UINT8 napple2_state::read_floatingbus()
// machine state switches
//
- Hires = (m_video->m_hires && m_video->m_graphics) ? 1 : 0;
+ Hires = m_video->m_hires ? 1 : 0;
Mixed = m_video->m_mix ? 1 : 0;
Page2 = m_page2 ? 1 : 0;
_80Store = 0;