diff --git a/src/devices/sound/gb.cpp b/src/devices/sound/gb.cpp index e2e28e4d1d3..88eb4d2e788 100644 --- a/src/devices/sound/gb.cpp +++ b/src/devices/sound/gb.cpp @@ -476,6 +476,7 @@ void cgb04_apu_device::update_wave_channel(struct SOUND &snd, uint64_t cycles) return; cycles = (snd.cycles_left >> 1); + snd.cycles_left &= 1; uint16_t distance = 0x800 - snd.frequency_counter; const uint8_t level = snd.level & 3; if (cycles >= distance) @@ -512,32 +513,15 @@ void agb_apu_device::update_wave_channel(struct SOUND &snd, uint64_t cycles) { constexpr uint8_t level_table[8] = { 0, 4, 2, 1, 3, 3, 3, 3 }; - // compensate for leftover cycles - if (snd.cycles_left > 0) - { - if (cycles <= snd.cycles_left) - { - // Emit samples - snd.cycles_left -= cycles; - cycles = 0; - } - else - { - // Emit samples - cycles -= snd.cycles_left; - snd.cycles_left = 0; - } - } + // compensate for left over cycles + snd.cycles_left += cycles; + if (snd.cycles_left <= 0) + return; - if (cycles & 1) - { - snd.cycles_left = 1; - } - cycles >>= 1; - uint16_t distance = 0x800 - snd.frequency_counter; - const uint8_t level = level_table[snd.level]; + cycles = (snd.cycles_left >> 1); snd.cycles_left &= 1; - + uint16_t distance = 0x800 - snd.frequency_counter; + const uint8_t level = level_table[snd.level]; if (cycles >= distance) { cycles -= distance; @@ -719,6 +703,9 @@ u8 agb_apu_device::wave_r(offs_t offset) u8 gameboy_sound_device::sound_r(offs_t offset) { + if ((offset >= AUD3W0) && (offset <= AUD3WF)) + return wave_r(offset - AUD3W0); + static const uint8_t read_mask[0x40] = { 0x80,0x3f,0x00,0xff,0xbf,0xff,0x3f,0x00,0xff,0xbf,0x7f,0xff,0x9f,0xff,0xbf,0xff, diff --git a/src/mame/misc/globalvr.cpp b/src/mame/misc/globalvr.cpp index 14a14e88a22..d9c20969636 100644 --- a/src/mame/misc/globalvr.cpp +++ b/src/mame/misc/globalvr.cpp @@ -1,10 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Scott Stone + /* Global VR - PC-Based Hardware Skeleton only at this time holding info regarding Install Disks for Games/Operating System for Global VR produced games. -Specific hardware outlays are unknown per game at this time. +Specific hardware outlays are different per game, and a particular game can have +different motherboard setups: https://service.globalvr.com/reference/default.htm The install disks contains PowerQuest DeployCenter 5.0 images. Those aren't El Torito compliant so they expect at very least a @@ -37,54 +39,226 @@ The nfsgt is a Windows XP HDD image, containing: TODO: - nfsgt hard disk crashes MAME with uncaught exception in both pcipc and shutms11 -Game List Year----------------------------------------------------- -Aliens: Extermination 2006 -America's Army 2007 -Beach Head 2000 2000 -Beach Head 2002 2002 -Beach Head 2003 Desert War 2003 -Big Red Button 2006 -Blazing Angels 2008 -Desert Gunner 2006 -EA Sports Madden NFL Football 2004 -EA Sports Madden NFL Season 2 2006 -EA Sports NASCAR Racing 2007 -EA Sports PGA Tour Golf 2003 -EA Sports PGA Tour Golf Challenge Edition 2005 -EA Sports PGA Tour Golf Challenge Edition II 200? -EA Sports PGA Tour Golf Challenge Edition III 200? -EA Sports PGA Tour Golf Team Challenge 2006 -EA Sports Tiger Woods PGA Tour 2002 2002 -Fast Draw Showdown 2002 -Feeding Frenzy 2006 -FrightFearLand 2011 -Global Arcade Classics 2007 -Gone Bowling 2006 -Gone Fishing 2006 -Heavy Gear 1999 -Heavy Gear II 1999 -Incoming 200? -Invasion Earth 2003 -Justice League Heroes United 2009 -Kick-It Pro 2006 -Last Bounty Hunter 2002 -Mad Dog McCree 2002 -Mad Dog McCree 2 2002 -NASCAR Team Racing 2010 -Need For Speed 2003 -Need For Speed Carbon 2008 -Need For Speed GT 2004 -Need For Speed Underground 2005 -Operation Blockade 200? -Paradise Lost 2007 -Puck Off 2007 -Redline Rampage Gas Guzzlers 2014 -Sin 1999 -Sky Bandits 2008 -Split The Uprights 200? -The Swarm 2013 -Twisted - Nitro Stunt Racing 2009 -UltraPin 2006 + +GlobalVR games on this hardware setups: + +Game | Year | I/O PCB | Compatible MBs | Compatible recovery disks +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Aliens: Extermination | 2006 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | | | 050-0227-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0220-01 or later + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0190-01 or 050-0198-01* or 050-0208-01* + | | | Intel DG41TX | + | | | | + | | +--------------------------+---------------------------- + | | | Intel DQ45CB | 050-0190-0 + | | +--------------------------+---------------------------- + | | | GA-945GM-S2 | 050-0166-01 or 050-0208-01* + | | +--------------------------+---------------------------- + | | | ASUS P5KPL-CM | 050-0166-01 + | | | 915GAG | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +America's Army | 2007 | usb2gun | GA-945GCMX-S2 | 050-0138-01 + | | | GA-945GM-S2 | + | | | GA-G31MX-S2 | + | | | Intel 915GAG | + | | | MSI K9NGM3 | + | | | MSI K9NGM4 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Beach Head 2000 | 2000 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Beach Head 2002 | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Beach Head 2003 Desert War | 2003 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Big Red Button | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Blazing Angels | 2008 | GVRI/O Mini | MSI H61M-P32 | 050-0239-01 + | | | | 050-0229-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0222-01 or 050-0229-01 + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0189-01 or 050-0202-01* + | | | Intel DG41TX | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Desert Gunner | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports Madden NFL Football | 2004 | Nytric USBI/O Extreme | PS35-BL | 050-0094-01 (Season 2) + | | GVRI/O Mini | | 050-0057-01 (Version 1) +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports Madden NFL Season 2 | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports NASCAR Racing | 2007 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports PGA Tour Golf | 2003 | Nytric USBI/O | NB-32 | 50-0024-01 REV B (Version 1) + | | | PS35-BL | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports PGA Tour Golf Challenge Edition | 2005 | Nytric USBI/O | NB-32 | 050-0072-01 + | | | PS35-BL | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports PGA Tour Golf Championship II Edition | 200? | Nytric USBI/O | NB-32 | unknown + | | | PS35-BL | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports PGA Tour Golf Championship III Edition | 200? | Nytric USBI/O | NB-32 | 050-0055-01 +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports PGA Tour Golf Team Challenge | 2006 | USBI/O Extreme or | NB-32 | 050-0097-01 + | | GVRI/O Mini | PS35-BL | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +EA Sports Tiger Woods PGA Tour 2002 | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Fast Draw Showdown | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Feeding Frenzy | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Frightfearland | 2011 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | | | 050-0227-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0220-01 or later + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0198-01 or 050-0208-01* + | | | Intel DG41TX | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Global Arcade Classics | 2007 | USBlinx II | Asus P5PE-VM | 050-0158-01 + | | | GA-945GCMX-S2 | + | | | Intel 915GAG | + | | | Gigabyte 81865GME-775-RH | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Gone Bowling | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Gone Fishing | 2006 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Heavy Gear | 1999 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Heavy Gear II | 1999 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Incoming | 200? | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Invasion Earth | 2003 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Justice League Heroes United | 2009 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | +--------------------------+---------------------------- + | | | ASUS P5KPL-CM | 050-0174-01 + | | | P5N-MX | + | | | GA-G31MX-S2 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Kick-It Pro | 2006 | unknown | D810E2CB | Not Applicable +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Last Bounty Hunter | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Mad Dog McCree | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Mad Dog McCree 2 | 2002 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +NASCAR Racing | 2010 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | | | 050-0227-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0220-01 or later + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0198-01* or 050-0208-01* plus Digital Vibrance Patch Disk 050-0207-01 + | | | Intel DG41TX | + | | +--------------------------+---------------------------- + | | | GA-G31MX-S2 | 050-0157-01 (Ver. 1.5) + | | | GA-945GM-S2 | 050-0137-01 (Ver. 1) +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +NASCAR Team Racing | 2010 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | | | 050-0227-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0220-01 or later + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0185-01 + | | | Intel DG41TX | + | | | Intel DQ45CB | + | | | Intel DG31PR | + | | | GA-G31MX-S2 | + | | | GA-945GM-S2 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Need For Speed | 2003 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Need For Carbon | 2008 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | Nytric USBI/O +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0210-01 + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0225-01 or 050-0184-01 Plus Digital Vibrance Patch: 050-0183-01 + | | | Intel DG41TX | + | | | Intel DQ45CB | + | | +--------------------------+---------------------------- + | | | P5N-MX | 050-0152-01 + | | | GA-G31MX-S2 | + | | | Intel DG31PR | + | | +--------------------------+---------------------------- + | | | PS35-BL | 050-0149-01 +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Need For Speed GT | 2004 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Need For Speed Underground | 2005 | Nytric USBI/O | MSI H61M-P32 (750 Video) | 050-0240-01 + | | GVRI/O Mini +--------------------------+---------------------------- + | | | PS35-BL | 050-0070-01 +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Operation Blockade | 200? | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Paradise Lost | 2007 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0223-01 + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0192-01 + | | | Intel DG41TX | + | | | Intel DQ45CB | + | | +--------------------------+---------------------------- + | | | ASUS P5KPL-CM (Intel G31)| 050-0126-01 + | | | GA-G31MX-S2 | + | | | 915GAG | + | | | Gigabyte GA-945GME-DS2 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Puck Off | 2007 | GFX I/O | GA-945GCMX-S2 | 050-0131-01 + | | | GA-G31MX-S2 | + | | | Gigabyte GA-945GM-S2 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Redline Rampage Gas Guzzlers | 2014 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Six-Gun Select | ??? | N/A | CS35TL | 050-0009-01 REV D +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Sin | 1999 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Sky Bandits | 2008 | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Split The Uprights | 200? | unknown | unknown | unknown +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +The Swarm | 2013 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | | | 050-0227-01 + | | +--------------------------+---------------------------- + | | | DFI EL339-b | 050-0220-01 or later + | | | Intel DH61CR | + | | +--------------------------+---------------------------- + | | | Intel DG41TX | 050-0218-01 +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Twisted - Nitro Stunt Racing | 2009 | GVRI/O Mini | MSI H61M-P32 | 050-0233-01 + | | +--------------------------+---------------------------- + | | | Intel DH61CR | 050-0221-01 + | | +--------------------------+---------------------------- + | | | Intel DG41TY | 050-0179-01 or 050-0203-01* plus Digital Vibrance Patch Disk 050-0206-01 + | | | Intel DG41TX | + | | | Intel DQ45CB | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +UltraPin | 2006 | uShock I/O | GA-945GM-S2 | 050-0114-01 + | | | Gigabyte GA-945GME-DS2 | +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- +Vortek V3 & gvrSX | ??? | HAPP UGCI | Intel DG41TY | 050-0171-01 & patch disc 050-0191-01 + | | | Intel DQ45CB | + | | +--------------------------+---------------------------- + | | | CS35TL | 050-0162-01 + | | | DFI GIC68-D | + | | +--------------------------+---------------------------- + | | | Graphite | 050-0019-01 REV A +-------------------------------------------------+------+-----------------------+--------------------------+---------------------------- + * Later recovery discs contain drivers for newer video cards. */ @@ -127,7 +301,7 @@ void globalvr_state::globalvr(machine_config &config) // Logs inside gvrxpsys claims that it expects a "GenuineIntel" // with CPU features 0x0383f9ff (no SSE2, MMX, SSE, no Procesor Serial Number) // Socket 370 Celeron/Pentium 3? - PENTIUM3(config, m_maincpu, 100'000'000); /* ? MHz */ + PENTIUM3(config, m_maincpu, 100'000'000); // ? MHz m_maincpu->set_addrmap(AS_PROGRAM, &globalvr_state::globalvr_map); m_maincpu->set_disable(); @@ -148,7 +322,7 @@ ROM_START( hyperv2a ) ROM_REGION32_LE(0x80000, "bios", 0) ROM_LOAD("mb.bios", 0x00000, 0x80000, NO_DUMP ) - ROM_REGION( 0x168000, "bootdisk", 0 ) /* Win98/DOS bootdisk from folder made into .IMA with WinImage */ + ROM_REGION( 0x168000, "bootdisk", 0 ) // Win98/DOS bootdisk from folder made into .IMA with WinImage // "not-bootable system disk", but contains autoexec.bat / config.sys ... ROM_LOAD( "hyperv2_pqi_9-30-01.ima", 0x000000, 0x168000, BAD_DUMP CRC(964d8e00) SHA1(efefcfcca85328df8445a4ba482cd7d5b584ae05) ) diff --git a/src/mame/taito/taito_o.cpp b/src/mame/taito/taito_o.cpp index d03db193850..25d621e6fc2 100644 --- a/src/mame/taito/taito_o.cpp +++ b/src/mame/taito/taito_o.cpp @@ -23,8 +23,8 @@ Battery Games : -Parent Jack (おやジャック ) (C) 1989 Taito. -Eibise (C) 1990 Taito. +Parent Jack (ペアレントジャック) (C) 1989 Taito. +Eibise (エイビス) (C) 1990 Taito. TODO: