diff --git a/src/mame/apple/macii.cpp b/src/mame/apple/macii.cpp index 987306e743c..ffc385543f5 100644 --- a/src/mame/apple/macii.cpp +++ b/src/mame/apple/macii.cpp @@ -984,7 +984,7 @@ void macii_state::macii(machine_config &config) m_scsihelp->cpu_halt_callback().set_inputline(m_maincpu, INPUT_LINE_HALT); m_scsihelp->timeout_error_callback().set(FUNC(macii_state::scsi_berr_w)); - SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd"); + SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd").set_filter("MC68020"); SOFTWARE_LIST(config, "cd_list").set_original("mac_cdrom").set_filter("MC68020"); nubus_device &nubus(NUBUS(config, "nubus", 0)); @@ -1033,9 +1033,9 @@ void macii_state::macii(machine_config &config) // This was fixed for the II FDHD/IIx/IIcx/SE30 ROM. m_ram->set_extra_options("1M,4M,5M,8M"); - SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig"); - SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked"); - SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop"); + SOFTWARE_LIST(config, "flop_mac35_orig").set_original("mac_flop_orig").set_filter("MC68020"); + SOFTWARE_LIST(config, "flop_mac35_clean").set_original("mac_flop_clcracked").set_filter("MC68020"); + SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop").set_filter("MC68020"); } void macii_state::maciihmu(machine_config &config) @@ -1060,7 +1060,7 @@ void macii_state::maciihd(machine_config &config) applefdintf_device::add_35_hd(config, m_floppy[0]); applefdintf_device::add_35_hd(config, m_floppy[1]); - SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop"); + SOFTWARE_LIST(config, "flop35hd_list").set_original("mac_hdflop").set_filter("MC68020"); // The table of valid RAM sizes is at 0x4080366E in the 97221136 ROM (II FDHD, IIx, IIcx, SE/30). // Shift each byte left by 20 bits to get the size in bytes. 0x01 => 0x00100000 (1 MiB) and so on. @@ -1078,7 +1078,11 @@ void macii_state::maciix(machine_config &config) m_via2->readpb_handler().set(FUNC(macii_state::iix_via2_in_b)); - SOFTWARE_LIST(config.replace(), "cd_list").set_original("mac_cdrom").set_filter("MC68030"); + subdevice("hdd_list")->set_filter("MC68030"); + subdevice("cd_list")->set_filter("MC68030"); + subdevice("flop_mac35_orig")->set_filter("MC68030"); + subdevice("flop_mac35_clean")->set_filter("MC68030"); + subdevice("flop35_list")->set_filter("MC68030"); } void macii_state::maciicx(machine_config &config) diff --git a/src/mame/nintendo/nes_vt369_vtunknown.cpp b/src/mame/nintendo/nes_vt369_vtunknown.cpp index 25811e35b57..ba44d1955fe 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown.cpp +++ b/src/mame/nintendo/nes_vt369_vtunknown.cpp @@ -1039,15 +1039,15 @@ CONS( 2017, rtvgc300fz,0, 0, nes_vt369_vtunknown_cy_bigger, nes_vt369_vtunknow (Handheld units, but different form factor to Compact Cyber Arcade, charged via USB, different menus) Lexibook Console Colour - Barbie - (Handheld units, charged via USB-C, more educational focused, contain bootleg NES Pinball game in games section) - Power Console - Gabby's Dollhouse - Power Console - Disney Princess - Power Console - Stitch - Power Console - Frozen - Power Console - Generic EN/FR model - Power Console - Generic EN/ES model - Power Console - Generic EN/DE model - Power Console - Paw Patrol + (Handheld units, charged via USB-C, more educational focused, contain bootleg NES Pinball game in games section) + Power Console - Gabby's Dollhouse + Power Console - Disney Princess + Power Console - Stitch + Power Console - Frozen + Power Console - Generic EN/FR model + Power Console - Generic EN/ES model + Power Console - Generic EN/DE model + Power Console - Paw Patrol (units for use with TV) Lexibook Retro TV Game Console (300 Games) - Cars diff --git a/src/mame/sega/megadriv_rad.cpp b/src/mame/sega/megadriv_rad.cpp index 6e5584a7f48..8d48bab353a 100644 --- a/src/mame/sega/megadriv_rad.cpp +++ b/src/mame/sega/megadriv_rad.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:David Haywood /* diff --git a/src/mame/sega/model2_v.cpp b/src/mame/sega/model2_v.cpp index 833335fa605..be446430a2d 100644 --- a/src/mame/sega/model2_v.cpp +++ b/src/mame/sega/model2_v.cpp @@ -42,9 +42,9 @@ - The system allows for Z-Sort override, by means of specifying whether a polygon will use the same Z value ordinal as the previous polygon, or the calculated minimum or maximum from it's points. This allows for a full object to be in front of another, even though the first object might have some z coordinates that are bigger than the second object's z coordinates. - - Polygons from later windows will always be rendered on top of polygons from earlier windows, regardless of z value. This - can be seen in the name entry screen in Sega Rally for example, where letters meant to be behind the car are rendered in an - earlier window and letters in front of the car are rendered in a later window. + - Polygons from later windows will always be rendered on top of polygons from earlier windows, regardless of z value. This + can be seen in the name entry screen in Sega Rally for example, where letters meant to be behind the car are rendered in an + earlier window and letters in front of the car are rendered in a later window. - The current implementation takes the effective computed z value for the polygon and converts it into a 4.12 fixed point representation, used as an index into an array of linked polygons. Every polygon with the same z value is linked with any previous polygon that had that same z value: @@ -63,9 +63,9 @@ Clip Notes and Known Bugs: - - Four clipping planes representing the viewing frustum are used to clip polygons prior to projection. In the rare event - that a polygon intersects with the origin exactly, it will produce a clipped vertex at (0.0, 0.0, 0,0) which would result - in NaNs being generated during projection; a tiny value is added to z to prevent this. + - Four clipping planes representing the viewing frustum are used to clip polygons prior to projection. In the rare event + that a polygon intersects with the origin exactly, it will produce a clipped vertex at (0.0, 0.0, 0,0) which would result + in NaNs being generated during projection; a tiny value is added to z to prevent this. - A small offset need to be added horizontally and vertically to the viewport and center variables for certain games (like the original Model 2 games). The coordinate system has been worked out from the 2B specifications, but the older games need a slight adjustment. diff --git a/src/mame/skeleton/cle68k.cpp b/src/mame/skeleton/cle68k.cpp index 30d3ddfb882..eb3a65487a7 100644 --- a/src/mame/skeleton/cle68k.cpp +++ b/src/mame/skeleton/cle68k.cpp @@ -138,7 +138,7 @@ void cle68k_state::program_map(address_map &map) map(0x1e0013, 0x1e0013).w(m_ramdac[1], FUNC(ramdac_device::pal_w)); map(0x1e0014, 0x1e0014).w(m_ramdac[0], FUNC(ramdac_device::mask_w)); map(0x1e0015, 0x1e0015).w(m_ramdac[1], FUNC(ramdac_device::mask_w)); -// map(0x1e0020, 0x1e0023) 8-bit address/data pair for a device (MCU or RAMDAC) +// map(0x1e0020, 0x1e0023) 8-bit address/data pair for a device (MCU or RAMDAC) map(0x1e0030, 0x1e0031).portr("IN1").nopw(); // TODO: video reg? outputs? map(0x1e0032, 0x1e0033).portr("DSW1"); map(0x1e0034, 0x1e0035).portr("DSW2"); diff --git a/src/mame/skeleton/huangyeh_m68k.cpp b/src/mame/skeleton/huangyeh_m68k.cpp index 415ad86e1f1..54b094f921c 100644 --- a/src/mame/skeleton/huangyeh_m68k.cpp +++ b/src/mame/skeleton/huangyeh_m68k.cpp @@ -135,7 +135,7 @@ void huangyeh_m68k_state::audio_program_map(address_map &map) map(0xf880, 0xf881).w("ymsnd", FUNC(ym3812_device::write)); map(0xf8a0, 0xf8a0).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); map(0xf8d0, 0xf8d0).r(m_soundlatch, FUNC(generic_latch_8_device::read)); -// map(0xf8e0, 0xf8e0).w soundlatch acknowledge or NMI ack +// map(0xf8e0, 0xf8e0).w soundlatch acknowledge or NMI ack map(0xf8e0, 0xf8e0).lw8(NAME([this] (offs_t offset, u8 data) { m_soundlatch->acknowledge_w(); })); } diff --git a/src/mame/skeleton/omdisv22.cpp b/src/mame/skeleton/omdisv22.cpp index c47b8883516..356787eeaca 100644 --- a/src/mame/skeleton/omdisv22.cpp +++ b/src/mame/skeleton/omdisv22.cpp @@ -1,17 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Devin Acker /* - Skeleton driver for the uPD78C14-based "Driver Information System" used by - the circa-1990 Oldsmobile 98 and other models. + Skeleton driver for the uPD78C14-based "Driver Information System" used by + the circa-1990 Oldsmobile 98 and other models. - Press 6, then Test/Reset, then enter a distance of 8192 to show a debug display - with information about the current ADC readings. After that, press any button - to display the ROM version. + Press 6, then Test/Reset, then enter a distance of 8192 to show a debug display + with information about the current ADC readings. After that, press any button + to display the ROM version. - TODO: - - identify/hook up the display hardware - - properly hook up or at least figure out other inputs (port B, SCK/RX, CI, most ADCs, etc) - The function at 09D5 handles reading the ADC values. + TODO: + - identify/hook up the display hardware + - properly hook up or at least figure out other inputs (port B, SCK/RX, CI, most ADCs, etc) + The function at 09D5 handles reading the ADC values. */ #include "emu.h" @@ -78,7 +78,7 @@ static INPUT_PORTS_START(omdisv22) PORT_BIT( 0x2, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("5 / FUEL") PORT_CODE(KEYCODE_5_PAD); PORT_BIT( 0x4, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("6 / DEST") PORT_CODE(KEYCODE_6_PAD); PORT_BIT( 0x8, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("7 / ETA") PORT_CODE(KEYCODE_7_PAD); - + PORT_START("IN2") PORT_BIT( 0x1, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("8 / E/T") PORT_CODE(KEYCODE_8_PAD); PORT_BIT( 0x2, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("9 / SPEED") PORT_CODE(KEYCODE_9_PAD); diff --git a/src/mame/tvgames/generalplus_gp327902.cpp b/src/mame/tvgames/generalplus_gp327902.cpp index 8123191c7b1..6b142d7c26a 100644 --- a/src/mame/tvgames/generalplus_gp327902.cpp +++ b/src/mame/tvgames/generalplus_gp327902.cpp @@ -81,7 +81,7 @@ void generalplus_gp327902_game_state::c0060000_unk_w(uint32_t data) void generalplus_gp327902_game_state::arm_map(address_map &map) { map(0x00000000, 0x001fffff).ram(); // 16M-bit internal SDRAM - + map(0xc0020070, 0xc0020073).r(FUNC(generalplus_gp327902_game_state::c0020070_unk_r)); map(0xc0060000, 0xc0060003).w(FUNC(generalplus_gp327902_game_state::c0060000_unk_w)); map(0xc008000c, 0xc008000f).r(FUNC(generalplus_gp327902_game_state::c008000c_unk_r)); @@ -189,7 +189,7 @@ CONS( 2019, sanxpet, 0, 0, gp327902, gp327902, generalplus_g // 2020 version is a cloud shaped device - Sumikko Gurashi - Sumikko Catch (すみっコぐらし すみっコキャッチ) // or Sumikko Gurashi - Sumikko Catch DX (すみっコぐらし すみっコキャッチDX) = Sumikko Catch with pouch and strap - + // 2021 version is a square device with a tiny 'mole' figure on top - すみっコぐらし すみっコみっけDX // or Sumikko Gurashi - Sumikko Mikke (すみっコぐらし すみっコみっけ) CONS( 2021, sanxpeta, 0, 0, gp327902, gp327902, generalplus_gp327902_game_state, init_spi, "San-X / Tomy", "Sumikko Gurashi - Sumikko Mikke DX (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING) diff --git a/src/mame/tvgames/generalplus_gpm453x_nand.cpp b/src/mame/tvgames/generalplus_gpm453x_nand.cpp index c7a8c127289..124e4825bda 100644 --- a/src/mame/tvgames/generalplus_gpm453x_nand.cpp +++ b/src/mame/tvgames/generalplus_gpm453x_nand.cpp @@ -6,15 +6,15 @@ ARM Cortex M4F based GPM453x series chips - all game data is stored on a NAND + all game data is stored on a NAND - both games here are on HDMI sticks + both games here are on HDMI sticks - These likely boot from an internal ROM so will need bootstrapping without - a dump of it + These likely boot from an internal ROM so will need bootstrapping without + a dump of it - LeapLand Adventures - GPM4530A - Paw Patrol - GPM4532C + LeapLand Adventures - GPM4530A + Paw Patrol - GPM4532C *****************************************************************************/ diff --git a/src/mame/tvgames/spg2xx.cpp b/src/mame/tvgames/spg2xx.cpp index afb4b093c64..40a5df2d2f9 100644 --- a/src/mame/tvgames/spg2xx.cpp +++ b/src/mame/tvgames/spg2xx.cpp @@ -2580,7 +2580,7 @@ ROM_START( wordlnch ) // patch loop on leapfrog logo ROM_FILL( 0x95bc8, 1, 0x44 ) - ROM_FILL( 0x95bc9, 1, 0x40 ) + ROM_FILL( 0x95bc9, 1, 0x40 ) ROM_END diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index b89018bf710..48f09f4150b 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -54,7 +54,7 @@ 2005 Let's!TVプレイ ドラゴンボ－ルＺ バトル体感かめはめ波～ おめぇとフュージョン / バンダイ / 日本 Let's! TV Play Dragon Ball Z Battle Taikan Kamehameha~ Omee to Fusion / Bandai / Japan dumped: either here, xavix_2000.cpp, or xavix_2002.cpp - スーパーテレビパソコンLink / エポック社 / 日本 Super TV PC Link / Epoch / Japan + スーパーテレビパソコンLink / エポック社 / 日本 Super TV PC Link / Epoch / Japan Let's!TVプレイ なりきりファイト ウルトラマン 撃て！必殺光線！！ / タカラトミー / 日本 Let's!TV Play Narikiri Fight Ultraman Shoot! Deadly ray! ! / Takara Tomy / Japan Hello Kitty TV computer /EPOCH/Japan - - - - - - - Popira Korea version /SONOKONG/Korea - - - - - - - diff --git a/src/mame/tvgames/xavix_2002.cpp b/src/mame/tvgames/xavix_2002.cpp index 6aca38d0b34..5d99d8501a4 100644 --- a/src/mame/tvgames/xavix_2002.cpp +++ b/src/mame/tvgames/xavix_2002.cpp @@ -198,10 +198,10 @@ static INPUT_PORTS_START( maxheart ) PORT_MODIFY("IN0") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY + PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY INPUT_PORTS_END static INPUT_PORTS_START( epo_tfit )