From a7fec751edac3808f3b64986c2409be4240c7eb9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 26 Jan 2020 12:36:51 +1100 Subject: srcclean, manual adjustments (nw) --- hash/a800_cass.xml | 76 +++--- hash/apple2_flop_clcracked.xml | 6 +- hash/apple2_flop_orig.xml | 14 +- hash/bkrankp_cart.xml | 4 +- hash/gameking.xml | 6 +- hash/ibm5170.xml | 4 +- hash/iqunlim_cart.xml | 2 +- hash/snes.xml | 2 +- hash/telestory_cart.xml | 4 +- hash/vbaby_cart.xml | 2 +- plugins/cheat/cheat_xml.lua | 4 +- scripts/src/netlist.lua | 4 +- src/devices/bus/a2gameio/paddles.cpp | 0 src/devices/bus/a2gameio/paddles.h | 0 src/devices/bus/abcbus/lux4105.cpp | 384 +++++++++++++-------------- src/devices/bus/bbc/modem/scsiaiv.cpp | 10 +- src/devices/bus/bbc/modem/scsiaiv.h | 8 +- src/devices/bus/isa/s3virge.cpp | 44 +-- src/devices/bus/isa/s3virge.h | 84 +++--- src/devices/bus/lpci/cirrus.cpp | 2 +- src/devices/bus/lpci/cirrus.h | 2 +- src/devices/cpu/arm7/arm7.cpp | 18 +- src/devices/cpu/arm7/arm7ops.cpp | 4 +- src/devices/cpu/gigatron/gigatron.cpp | 10 +- src/devices/cpu/sh/sh3comn.cpp | 2 +- src/devices/cpu/unsp/unsp_extended.cpp | 6 +- src/devices/cpu/we32000/we32100d.cpp | 2 +- src/devices/machine/microtch.cpp | 2 +- src/devices/machine/netlist.cpp | 4 +- src/devices/machine/netlist.h | 2 +- src/devices/machine/s3c24xx.hxx | 70 ++--- src/devices/machine/spg2xx_video.cpp | 2 +- src/devices/machine/sunplus_gcm394.cpp | 44 +-- src/devices/machine/sunplus_gcm394.h | 4 +- src/devices/machine/sunplus_gcm394_video.cpp | 12 +- src/devices/machine/sunplus_gcm394_video.h | 4 +- src/devices/sound/c6280.cpp | 80 +++--- src/devices/sound/huc6230.cpp | 2 +- src/devices/sound/vrender0.cpp | 86 +++--- src/devices/sound/vrender0.h | 2 +- src/devices/video/fixfreq.cpp | 10 +- src/devices/video/huc6272.cpp | 2 +- src/mame/drivers/actions_atj2279b.cpp | 24 +- src/mame/drivers/alpha68k.cpp | 4 +- src/mame/drivers/atetris.cpp | 8 +- src/mame/drivers/bandai_design_master.cpp | 4 +- src/mame/drivers/elan_eu3a05.cpp | 2 +- src/mame/drivers/fmtowns.cpp | 10 +- src/mame/drivers/gaelco2.cpp | 4 +- src/mame/drivers/generalplus_gpl32612.cpp | 18 +- src/mame/drivers/gigatron.cpp | 2 +- src/mame/drivers/gunsmoke.cpp | 2 +- src/mame/drivers/hapyfish.cpp | 114 ++++---- src/mame/drivers/homedata.cpp | 2 +- src/mame/drivers/kaneko16.cpp | 2 +- src/mame/drivers/konamigs.cpp | 76 +++--- src/mame/drivers/konmedal.cpp | 28 +- src/mame/drivers/legionna.cpp | 4 +- src/mame/drivers/ms32.cpp | 2 +- src/mame/drivers/namcona1.cpp | 4 +- src/mame/drivers/nes_boot.cpp | 20 +- src/mame/drivers/nes_vt.cpp | 6 +- src/mame/drivers/nmk16.cpp | 20 +- src/mame/drivers/psion5.cpp | 68 ++--- src/mame/drivers/pubint_storyreader.cpp | 122 ++++----- src/mame/drivers/segasp.cpp | 2 +- src/mame/drivers/skopro.cpp | 2 +- src/mame/drivers/snesb.cpp | 2 +- src/mame/drivers/spg110.cpp | 4 +- src/mame/drivers/spg2xx.cpp | 8 +- src/mame/drivers/spg2xx_lexibook.cpp | 4 +- src/mame/drivers/spg2xx_pdc.cpp | 2 +- src/mame/drivers/spg2xx_playvision.cpp | 2 +- src/mame/drivers/spg2xx_senario.cpp | 20 +- src/mame/drivers/spg2xx_senario_poker.cpp | 4 +- src/mame/drivers/spg2xx_shredmjr.cpp | 2 +- src/mame/drivers/spg2xx_telestory.cpp | 6 +- src/mame/drivers/spg2xx_zone_32bit.cpp | 38 +-- src/mame/drivers/storio.cpp | 4 +- src/mame/drivers/sunplus_gcm394.cpp | 78 +++--- src/mame/drivers/toki_ms.cpp | 76 +++--- src/mame/drivers/trkfldch.cpp | 10 +- src/mame/drivers/twins.cpp | 26 +- src/mame/drivers/vsmile.cpp | 2 +- src/mame/drivers/vsmileb.cpp | 2 +- src/mame/drivers/vt1682.cpp | 20 +- src/mame/drivers/xavix.cpp | 2 +- src/mame/includes/psion5.h | 34 +-- src/mame/includes/xavix.h | 4 +- src/mame/machine/etna.cpp | 46 ++-- src/mame/machine/etna.h | 2 +- src/mame/machine/naomigd.cpp | 2 +- src/mame/machine/naomigd.h | 28 +- src/mame/mame.lst | 2 +- src/tools/floptool.cpp | 2 +- 95 files changed, 1006 insertions(+), 1006 deletions(-) mode change 100755 => 100644 src/devices/bus/a2gameio/paddles.cpp mode change 100755 => 100644 src/devices/bus/a2gameio/paddles.h mode change 100755 => 100644 src/mame/drivers/snesb.cpp diff --git a/hash/a800_cass.xml b/hash/a800_cass.xml index fc447447ec7..16bb3c0f046 100644 --- a/hash/a800_cass.xml +++ b/hash/a800_cass.xml @@ -3,44 +3,44 @@ - - Serpentine - 1982 - Broderbund - - - - - - - - - - - + + Serpentine + 1982 + Broderbund + + + + + + + + + + + - - Zaxxon (set 1) - 1983 - Datasoft - - - - - - - + + Zaxxon (set 1) + 1983 + Datasoft + + + + + + + - - Zaxxon (set 2) - 1984 - US Gold - - - - - - - + + Zaxxon (set 2) + 1984 + US Gold + + + + + + + - \ No newline at end of file + diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index cba44a2bb1a..0b2a385c879 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -35774,9 +35774,9 @@ diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 3a1ba415cc4..882cfb21578 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -9518,7 +9518,7 @@ - + @@ -9818,8 +9818,8 @@ Automated Simulations - @@ -9835,8 +9835,8 @@ Automated Simulations - @@ -9909,8 +9909,8 @@ - diff --git a/hash/bkrankp_cart.xml b/hash/bkrankp_cart.xml index c5583cf1431..577348b77dc 100644 --- a/hash/bkrankp_cart.xml +++ b/hash/bkrankp_cart.xml @@ -33,7 +33,7 @@ Known carts: - + J-Pop Rose 20?? Bandai @@ -45,7 +45,7 @@ Known carts: - + Vocaloid 20?? Bandai diff --git a/hash/gameking.xml b/hash/gameking.xml index e2728b7f14d..caeed8150e9 100644 --- a/hash/gameking.xml +++ b/hash/gameking.xml @@ -327,7 +327,7 @@ S1: is on some carts directly connected to VCC - + 4 in 1 - SeaGuard + Whirlybird + Spectask + Captain (set 2) 200? @@ -337,7 +337,7 @@ S1: is on some carts directly connected to VCC - + 4 in 1 - Three Battles + Light Sword + Risker + Metal Deform (512KB cartridge) @@ -416,7 +416,7 @@ S1: is on some carts directly connected to VCC - + 4 in 1 Vol. 11 - Explorer + Magician + AirHero + HappyGarden diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml index 6370254bb60..40e5e3ea9ba 100644 --- a/hash/ibm5170.xml +++ b/hash/ibm5170.xml @@ -10298,7 +10298,7 @@ - + Freddy Pharkas, Frontier Pharmacist 1993 @@ -10398,7 +10398,7 @@ - + Gobliiins (US - VGA release) diff --git a/hash/iqunlim_cart.xml b/hash/iqunlim_cart.xml index 95093cc08ad..cf203d231ff 100644 --- a/hash/iqunlim_cart.xml +++ b/hash/iqunlim_cart.xml @@ -57,7 +57,7 @@ Cartridge pinout - + Englisch für Anfänger 200? VTech diff --git a/hash/snes.xml b/hash/snes.xml index 73ab4a9921e..cfefc339a0f 100644 --- a/hash/snes.xml +++ b/hash/snes.xml @@ -1717,7 +1717,7 @@ Beyond that last category are the roms waiting to be classified. 1997 Atari - + diff --git a/hash/telestory_cart.xml b/hash/telestory_cart.xml index a38eb5722d0..a9a4c773286 100644 --- a/hash/telestory_cart.xml +++ b/hash/telestory_cart.xml @@ -61,7 +61,7 @@ Undumped carts: - + Winnie the Pooh - Salta, Tigger, Salta / Winnie the Pooh - Bounce, Tigger, Bounce (Spain) 2006 @@ -83,5 +83,5 @@ Undumped carts: - + diff --git a/hash/vbaby_cart.xml b/hash/vbaby_cart.xml index 4d42f597052..00cdf997530 100644 --- a/hash/vbaby_cart.xml +++ b/hash/vbaby_cart.xml @@ -26,7 +26,7 @@ Cart 52-107122-022(SP) "Aventuras en el Zoo" is a ROMless cart that unlocks the - + El Jardín de los Sueños... (Spain) 2007 VTech diff --git a/plugins/cheat/cheat_xml.lua b/plugins/cheat/cheat_xml.lua index 7f66eb4125b..d5cee8ac2a2 100644 --- a/plugins/cheat/cheat_xml.lua +++ b/plugins/cheat/cheat_xml.lua @@ -110,12 +110,12 @@ function xml.conv_cheat(data) elseif width == "q" then width = "u64" end - + local prefix = cpu:sub(1,1) if prefix == ":" then cpu = cpu:sub(2,cpu:len()) end - + local cpuname = cpu:gsub(":", "_") if space == "m" then regions[cpuname .. space] = ":" .. cpu diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index f18085cb895..3bc6cb34645 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -120,8 +120,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_2716.h", MAME_DIR .. "src/lib/netlist/devices/nld_tms4800.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_tms4800.h", - MAME_DIR .. "src/lib/netlist/devices/nld_4006.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_4006.h", + MAME_DIR .. "src/lib/netlist/devices/nld_4006.cpp", + MAME_DIR .. "src/lib/netlist/devices/nld_4006.h", MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4020.h", MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp", diff --git a/src/devices/bus/a2gameio/paddles.cpp b/src/devices/bus/a2gameio/paddles.cpp old mode 100755 new mode 100644 diff --git a/src/devices/bus/a2gameio/paddles.h b/src/devices/bus/a2gameio/paddles.h old mode 100755 new mode 100644 diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 16f8fe3759f..fbcf1dec72c 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -14,15 +14,15 @@ PCB Layout DATABOARD 4105-10 |-------------------------------------------| -|- LS367 LS74 LS32 LS00 LS38 LED| +|- LS367 LS74 LS32 LS00 LS38 LED| || -| -|| LS367 LS06 LS38 LS14 || +|| LS367 LS06 LS38 LS14 || |C C| -|N ALS08 LS08 81LS96 N| +|N ALS08 LS08 81LS96 N| |1 2| -|| 81LS95 74S373 LS273 74S240 || +|| 81LS95 74S373 LS273 74S240 || || -| -|- SW1 DM8131 LS175 SW2 | +|- SW1 DM8131 LS175 SW2 | |-------------------------------------------| Notes: @@ -30,10 +30,10 @@ Notes: DM8131 - National Semiconductor DM8131N 6-Bit Unified Bus Comparator LED - Power LED - SW1 - Drive settings - SW2 - Card address + SW1 - Drive settings + SW2 - Card address CN1 - 2x32 PCB header, ABC 1600 bus - CN2 - 2x25 PCB header, Xebec S1410 + CN2 - 2x25 PCB header, Xebec S1410 */ @@ -61,41 +61,41 @@ DEFINE_DEVICE_TYPE(LUXOR_4105, luxor_4105_device, "lux4105", "Luxor 4105") WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) { - m_sasi_bsy = state; + m_sasi_bsy = state; - if (m_sasi_bsy) - { - m_sasibus->write_sel(0); - } + if (m_sasi_bsy) + { + m_sasibus->write_sel(0); + } } WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_io ) { - m_sasi_io = state; + m_sasi_io = state; - if (!m_sasi_io) - { - m_sasi_data_out->write(m_data); - } + if (!m_sasi_io) + { + m_sasi_data_out->write(m_data); + } - update_trrq_int(); + update_trrq_int(); } WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) { - m_sasi_req = state; + m_sasi_req = state; - if (m_sasi_req) - { - m_sasibus->write_ack(0); - } + if (m_sasi_req) + { + m_sasibus->write_ack(0); + } - update_trrq_int(); + update_trrq_int(); } WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd ) { - m_sasi_cd = state; + m_sasi_cd = state; } @@ -105,18 +105,18 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd ) void luxor_4105_device::device_add_mconfig(machine_config &config) { - SCSI_PORT(config, m_sasibus); - m_sasibus->set_data_input_buffer(m_sasi_data_in); - m_sasibus->bsy_handler().set(FUNC(luxor_4105_device::write_sasi_bsy)); - m_sasibus->req_handler().set(FUNC(luxor_4105_device::write_sasi_req)); - m_sasibus->cd_handler().set(FUNC(luxor_4105_device::write_sasi_cd)); - m_sasibus->io_handler().set(FUNC(luxor_4105_device::write_sasi_io)); - m_sasibus->set_slot_device(1, "harddisk", S1410, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_0)); - - OUTPUT_LATCH(config, m_sasi_data_out); - m_sasibus->set_output_latch(*m_sasi_data_out); - - INPUT_BUFFER(config, m_sasi_data_in); + SCSI_PORT(config, m_sasibus); + m_sasibus->set_data_input_buffer(m_sasi_data_in); + m_sasibus->bsy_handler().set(FUNC(luxor_4105_device::write_sasi_bsy)); + m_sasibus->req_handler().set(FUNC(luxor_4105_device::write_sasi_req)); + m_sasibus->cd_handler().set(FUNC(luxor_4105_device::write_sasi_cd)); + m_sasibus->io_handler().set(FUNC(luxor_4105_device::write_sasi_io)); + m_sasibus->set_slot_device(1, "harddisk", S1410, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_0)); + + OUTPUT_LATCH(config, m_sasi_data_out); + m_sasibus->set_output_latch(*m_sasi_data_out); + + INPUT_BUFFER(config, m_sasi_data_in); } @@ -125,27 +125,27 @@ void luxor_4105_device::device_add_mconfig(machine_config &config) //------------------------------------------------- INPUT_PORTS_START( luxor_4105 ) - PORT_START("1E") - PORT_DIPNAME( 0x03, 0x00, "Stepping" ) PORT_DIPLOCATION("1E:1,2") - PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) - PORT_DIPSETTING( 0x01, "Half (Seagate/Texas)" ) - PORT_DIPSETTING( 0x02, "Half (Tandon)" ) - PORT_DIPSETTING( 0x03, "Buffered" ) - PORT_DIPNAME( 0x0c, 0x00, "Heads" ) PORT_DIPLOCATION("1E:3,4") - PORT_DIPSETTING( 0x00, "2" ) - PORT_DIPSETTING( 0x04, "4" ) - PORT_DIPSETTING( 0x08, "6" ) - PORT_DIPSETTING( 0x0c, "8" ) - PORT_DIPNAME( 0xf0, 0x00, "Drive Type" ) PORT_DIPLOCATION("1E:5,6,7,8") - PORT_DIPSETTING( 0x00, "Seagate ST506" ) - PORT_DIPSETTING( 0x10, "Rodime RO100" ) - PORT_DIPSETTING( 0x20, "Shugart SA600" ) - PORT_DIPSETTING( 0x30, "Seagate ST412" ) - - PORT_START("5E") - PORT_DIPNAME( 0x7f, 0x25, "Card Address" ) PORT_DIPLOCATION("5E:1,2,3,4,5,6,7") - PORT_DIPSETTING( 0x25, "37" ) - PORT_DIPSETTING( 0x2d, "45" ) + PORT_START("1E") + PORT_DIPNAME( 0x03, 0x00, "Stepping" ) PORT_DIPLOCATION("1E:1,2") + PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) + PORT_DIPSETTING( 0x01, "Half (Seagate/Texas)" ) + PORT_DIPSETTING( 0x02, "Half (Tandon)" ) + PORT_DIPSETTING( 0x03, "Buffered" ) + PORT_DIPNAME( 0x0c, 0x00, "Heads" ) PORT_DIPLOCATION("1E:3,4") + PORT_DIPSETTING( 0x00, "2" ) + PORT_DIPSETTING( 0x04, "4" ) + PORT_DIPSETTING( 0x08, "6" ) + PORT_DIPSETTING( 0x0c, "8" ) + PORT_DIPNAME( 0xf0, 0x00, "Drive Type" ) PORT_DIPLOCATION("1E:5,6,7,8") + PORT_DIPSETTING( 0x00, "Seagate ST506" ) + PORT_DIPSETTING( 0x10, "Rodime RO100" ) + PORT_DIPSETTING( 0x20, "Shugart SA600" ) + PORT_DIPSETTING( 0x30, "Seagate ST412" ) + + PORT_START("5E") + PORT_DIPNAME( 0x7f, 0x25, "Card Address" ) PORT_DIPLOCATION("5E:1,2,3,4,5,6,7") + PORT_DIPSETTING( 0x25, "37" ) + PORT_DIPSETTING( 0x2d, "45" ) INPUT_PORTS_END @@ -155,7 +155,7 @@ INPUT_PORTS_END ioport_constructor luxor_4105_device::device_input_ports() const { - return INPUT_PORTS_NAME( luxor_4105 ); + return INPUT_PORTS_NAME( luxor_4105 ); } @@ -165,27 +165,27 @@ ioport_constructor luxor_4105_device::device_input_ports() const inline void luxor_4105_device::update_trrq_int() { - bool cd = !m_sasi_cd; - bool req = !m_sasi_req; - int trrq = (cd & !req) ? 0 : 1; - - if (BIT(m_dma, 5)) - { - m_slot->irq_w(trrq ? CLEAR_LINE : ASSERT_LINE); - } - else - { - m_slot->irq_w(CLEAR_LINE); - } - - if (BIT(m_dma, 6)) - { - m_slot->trrq_w(trrq); - } - else - { - m_slot->trrq_w(1); - } + bool cd = !m_sasi_cd; + bool req = !m_sasi_req; + int trrq = (cd & !req) ? 0 : 1; + + if (BIT(m_dma, 5)) + { + m_slot->irq_w(trrq ? CLEAR_LINE : ASSERT_LINE); + } + else + { + m_slot->irq_w(CLEAR_LINE); + } + + if (BIT(m_dma, 6)) + { + m_slot->trrq_w(trrq); + } + else + { + m_slot->trrq_w(1); + } } @@ -199,20 +199,20 @@ inline void luxor_4105_device::update_trrq_int() //------------------------------------------------- luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, LUXOR_4105, tag, owner, clock), - device_abcbus_card_interface(mconfig, *this), - m_sasibus(*this, SASIBUS_TAG), - m_sasi_data_out(*this, "sasi_data_out"), - m_sasi_data_in(*this, "sasi_data_in"), - m_1e(*this, "1E"), - m_5e(*this, "5E"), - m_cs(false), - m_data(0), - m_dma(0), - m_sasi_bsy(false), - m_sasi_req(false), - m_sasi_cd(false), - m_sasi_io(false) + device_t(mconfig, LUXOR_4105, tag, owner, clock), + device_abcbus_card_interface(mconfig, *this), + m_sasibus(*this, SASIBUS_TAG), + m_sasi_data_out(*this, "sasi_data_out"), + m_sasi_data_in(*this, "sasi_data_in"), + m_1e(*this, "1E"), + m_5e(*this, "5E"), + m_cs(false), + m_data(0), + m_dma(0), + m_sasi_bsy(false), + m_sasi_req(false), + m_sasi_cd(false), + m_sasi_io(false) { } @@ -223,10 +223,10 @@ luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char * void luxor_4105_device::device_start() { - // state saving - save_item(NAME(m_cs)); - save_item(NAME(m_data)); - save_item(NAME(m_dma)); + // state saving + save_item(NAME(m_cs)); + save_item(NAME(m_data)); + save_item(NAME(m_dma)); } @@ -236,14 +236,14 @@ void luxor_4105_device::device_start() void luxor_4105_device::device_reset() { - m_cs = false; - m_data = 0; - m_dma = 0; + m_cs = false; + m_data = 0; + m_dma = 0; - m_sasibus->write_rst(1); - m_sasibus->write_rst(0); + m_sasibus->write_rst(1); + m_sasibus->write_rst(0); - m_slot->trrq_w(1); + m_slot->trrq_w(1); } @@ -253,7 +253,7 @@ void luxor_4105_device::device_reset() void luxor_4105_device::abcbus_cs(uint8_t data) { - m_cs = (data == m_5e->read()); + m_cs = (data == m_5e->read()); } @@ -263,7 +263,7 @@ void luxor_4105_device::abcbus_cs(uint8_t data) int luxor_4105_device::abcbus_csb() { - return !m_cs; + return !m_cs; } @@ -273,32 +273,32 @@ int luxor_4105_device::abcbus_csb() uint8_t luxor_4105_device::abcbus_stat() { - uint8_t data = 0xff; + uint8_t data = 0xff; - if (m_cs) - { - /* + if (m_cs) + { + /* - bit description + bit description - 0 ? - 1 ? - 2 ? - 3 ? - 4 - 5 - 6 ? (tested at 014D9A, after command 08 sent and 1 byte read from SASI, should be 1) - 7 + 0 ? + 1 ? + 2 ? + 3 ? + 4 + 5 + 6 ? (tested at 014D9A, after command 08 sent and 1 byte read from SASI, should be 1) + 7 - */ + */ - data = m_sasi_bsy ? 0 : (1 << 0); - data |= m_sasi_req ? 0 : (1 << 2); - data |= m_sasi_cd ? 0 : (1 << 3); - data |= m_sasi_io ? 0 : (1 << 6); - } + data = m_sasi_bsy ? 0 : (1 << 0); + data |= m_sasi_req ? 0 : (1 << 2); + data |= m_sasi_cd ? 0 : (1 << 3); + data |= m_sasi_io ? 0 : (1 << 6); + } - return data; + return data; } @@ -308,29 +308,29 @@ uint8_t luxor_4105_device::abcbus_stat() uint8_t luxor_4105_device::abcbus_inp() { - uint8_t data = 0xff; - - if (m_cs) - { - if (!m_sasi_bsy) - { - data = m_1e->read(); - } - else - { - if (m_sasi_io) - { - data = m_sasi_data_in->read(); - - if (m_sasi_req) - { - m_sasibus->write_ack(1); - } - } - } - } - - return data; + uint8_t data = 0xff; + + if (m_cs) + { + if (!m_sasi_bsy) + { + data = m_1e->read(); + } + else + { + if (m_sasi_io) + { + data = m_sasi_data_in->read(); + + if (m_sasi_req) + { + m_sasibus->write_ack(1); + } + } + } + } + + return data; } @@ -340,20 +340,20 @@ uint8_t luxor_4105_device::abcbus_inp() void luxor_4105_device::abcbus_out(uint8_t data) { - if (m_cs) - { - m_data = data; - - if (!m_sasi_io) - { - m_sasi_data_out->write(m_data); - - if (m_sasi_req) - { - m_sasibus->write_ack(1); - } - } - } + if (m_cs) + { + m_data = data; + + if (!m_sasi_io) + { + m_sasi_data_out->write(m_data); + + if (m_sasi_req) + { + m_sasibus->write_ack(1); + } + } + } } @@ -363,10 +363,10 @@ void luxor_4105_device::abcbus_out(uint8_t data) void luxor_4105_device::abcbus_c1(uint8_t data) { - if (m_cs) - { - m_sasibus->write_sel(1); - } + if (m_cs) + { + m_sasibus->write_sel(1); + } } @@ -376,14 +376,14 @@ void luxor_4105_device::abcbus_c1(uint8_t data) void luxor_4105_device::abcbus_c3(uint8_t data) { - if (m_cs) - { - m_data = 0; - m_dma = 0; - - m_sasibus->write_rst(1); - m_sasibus->write_rst(0); - } + if (m_cs) + { + m_data = 0; + m_dma = 0; + + m_sasibus->write_rst(1); + m_sasibus->write_rst(0); + } } @@ -393,25 +393,25 @@ void luxor_4105_device::abcbus_c3(uint8_t data) void luxor_4105_device::abcbus_c4(uint8_t data) { - if (m_cs) - { - /* + if (m_cs) + { + /* - bit description + bit description - 0 - 1 - 2 - 3 - 4 - 5 byte interrupt enable? - 6 DMA/CPU mode (1=DMA, 0=CPU)? - 7 error interrupt enable? + 0 + 1 + 2 + 3 + 4 + 5 byte interrupt enable? + 6 DMA/CPU mode (1=DMA, 0=CPU)? + 7 error interrupt enable? - */ + */ - m_dma = data; + m_dma = data; - update_trrq_int(); - } + update_trrq_int(); + } } diff --git a/src/devices/bus/bbc/modem/scsiaiv.cpp b/src/devices/bus/bbc/modem/scsiaiv.cpp index f3e1ed19f27..603b36c9a8a 100644 --- a/src/devices/bus/bbc/modem/scsiaiv.cpp +++ b/src/devices/bus/bbc/modem/scsiaiv.cpp @@ -38,11 +38,11 @@ void bbc_scsiaiv_device::device_add_mconfig(machine_config& config) //void bbc_vp415_device::device_add_mconfig(machine_config& config) //{ -// bbc_scsiaiv_device::device_add_mconfig(config); +// bbc_scsiaiv_device::device_add_mconfig(config); // -// /* Philips VP415 */ -// subdevice("scsi:0")->set_default_option("vp415"); -// subdevice("scsi:0")->set_fixed(true); +// /* Philips VP415 */ +// subdevice("scsi:0")->set_default_option("vp415"); +// subdevice("scsi:0")->set_fixed(true); //} @@ -67,7 +67,7 @@ bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, const char } //bbc_vp415_device::bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) -// : bbc_scsiaiv_device(mconfig, BBC_VP415, tag, owner, clock) +// : bbc_scsiaiv_device(mconfig, BBC_VP415, tag, owner, clock) //{ //} diff --git a/src/devices/bus/bbc/modem/scsiaiv.h b/src/devices/bus/bbc/modem/scsiaiv.h index d8f241acd91..0b244bb71e3 100644 --- a/src/devices/bus/bbc/modem/scsiaiv.h +++ b/src/devices/bus/bbc/modem/scsiaiv.h @@ -54,12 +54,12 @@ private: //class bbc_vp415_device : public bbc_scsiaiv_device //{ //public: -// // construction/destruction -// bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); +// // construction/destruction +// bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); // //protected: -// // optional information overrides -// virtual void device_add_mconfig(machine_config& config) override; +// // optional information overrides +// virtual void device_add_mconfig(machine_config& config) override; //}; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 7730f4e1d12..d24e0893fb0 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -906,7 +906,7 @@ void s3virge_vga_device::command_start() { // start next command in FIFO int cmd_type = s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].op_type; - + switch(cmd_type) { case OP_BITBLT: @@ -931,7 +931,7 @@ void s3virge_vga_device::command_start() if(!(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000080)) m_draw_timer->adjust(attotime::from_nsec(250),0,attotime::from_nsec(250)); s3virge.s3d.bitblt_step_count = 0; - s3virge.s3d.bitblt_mono_pattern = + s3virge.s3d.bitblt_mono_pattern = s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_MONO_PAT_0] | (uint64_t)(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_MONO_PAT_1]) << 32; s3virge.s3d.bitblt_current_pixel = 0; s3virge.s3d.bitblt_pixel_pos = 0; @@ -952,7 +952,7 @@ void s3virge_vga_device::command_finish() if(s3virge.s3d.cmd_fifo_slots_free > 16) s3virge.s3d.cmd_fifo_slots_free = 16; m_draw_timer->adjust(attotime::never); - + // check if there is another command in the FIFO if(s3virge.s3d.cmd_fifo_slots_free < 16) command_start(); @@ -965,7 +965,7 @@ void s3virge_vga_device::command_finish() uint32_t s3virge_vga_device::GetROP(uint8_t rop, uint32_t src, uint32_t dst, uint32_t pat) { uint32_t ret = 0; - + switch(rop) { case 0x00: // 0 @@ -985,7 +985,7 @@ uint32_t s3virge_vga_device::GetROP(uint8_t rop, uint32_t src, uint32_t dst, uin break; case 0xb8: // PSDPxax ret = ((dst ^ pat) & src) ^ pat; -// machine().debug_break(); +// machine().debug_break(); break; case 0xcc: ret = src; @@ -999,14 +999,14 @@ uint32_t s3virge_vga_device::GetROP(uint8_t rop, uint32_t src, uint32_t dst, uin default: popmessage("Unimplemented ROP 0x%02x",rop); } - + return ret; } bool s3virge_vga_device::advance_pixel() { bool xpos, ypos; - int16_t top, left, right, bottom; + int16_t top, left, right, bottom; // advance src/dst and pattern location xpos = s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x02000000; // X Positive ypos = s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x04000000; // Y Positive @@ -1025,7 +1025,7 @@ bool s3virge_vga_device::advance_pixel() s3virge.s3d.bitblt_x_current--; s3virge.s3d.bitblt_x_src_current--; s3virge.s3d.bitblt_pat_x--; -// machine().debug_break(); +// machine().debug_break(); } if(ypos) { @@ -1089,7 +1089,7 @@ void s3virge_vga_device::bitblt_colour_step() int align = (s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x000000c00) >> 10; int x; bool done = false; - + switch(pixel_size) { case 0: // 8bpp @@ -1148,7 +1148,7 @@ void s3virge_vga_device::bitblt_colour_step() command_finish(); break; } - if((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) && s3virge.s3d.bitblt_x_current == s3virge.s3d.bitblt_x_dst && align == 2) + if((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) && s3virge.s3d.bitblt_x_current == s3virge.s3d.bitblt_x_dst && align == 2) break; // if a new line of an image transfer, and is dword aligned, stop here if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) src = s3virge.s3d.image_xfer >> 16; @@ -1225,7 +1225,7 @@ void s3virge_vga_device::bitblt_colour_step() command_finish(); break; } - + s3virge.s3d.bitblt_step_count++; } @@ -1249,7 +1249,7 @@ void s3virge_vga_device::bitblt_monosrc_step() for(x=31;x>=0;x--) { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) - src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); + src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); else src = read_pixel8(src_base,s3virge.s3d.bitblt_x_src_current,s3virge.s3d.bitblt_y_src_current); dst = read_pixel8(dst_base,s3virge.s3d.bitblt_x_current,s3virge.s3d.bitblt_y_current); @@ -1286,7 +1286,7 @@ void s3virge_vga_device::bitblt_monosrc_step() for(x=31;x>=0;x--) { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) - src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); + src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); else src = read_pixel16(src_base,s3virge.s3d.bitblt_x_src_current,s3virge.s3d.bitblt_y_src_current); dst = read_pixel16(dst_base,s3virge.s3d.bitblt_x_current,s3virge.s3d.bitblt_y_current); @@ -1323,7 +1323,7 @@ void s3virge_vga_device::bitblt_monosrc_step() for(x=31;x>=0;x--) { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x80) - src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); + src = bitswap<32>(s3virge.s3d.image_xfer,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); else src = read_pixel24(src_base,s3virge.s3d.bitblt_x_src_current,s3virge.s3d.bitblt_y_src_current); dst = read_pixel24(dst_base,s3virge.s3d.bitblt_x_current,s3virge.s3d.bitblt_y_current); @@ -1357,7 +1357,7 @@ void s3virge_vga_device::bitblt_monosrc_step() } break; } - + s3virge.s3d.bitblt_step_count++; } @@ -1400,14 +1400,14 @@ void s3virge_vga_device::device_timer(emu_timer &timer, device_timer_id id, int READ32_MEMBER(s3virge_vga_device::s3d_sub_status_r) { uint32_t res = 0x00000000; - + if(!s3virge.s3d.busy) res |= 0x00002000; // S3d engine is idle - + //res |= (s3virge.s3d.cmd_fifo_slots_free << 8); if(s3virge.s3d.cmd_fifo_slots_free == 16) res |= 0x1f00; - + return res; } @@ -1421,7 +1421,7 @@ WRITE32_MEMBER(s3virge_vga_device::s3d_sub_control_w) READ32_MEMBER(s3virge_vga_device::s3d_func_ctrl_r) { uint32_t ret = 0; - + ret |= (s3virge.s3d.cmd_fifo_slots_free << 6); return ret; } @@ -1436,14 +1436,14 @@ READ32_MEMBER(s3virge_vga_device::s3d_register_r) return 0; if(offset >= 0x1c0/4 && offset < 0x400/4) return 0; - + // handle BitBLT pattern registers if((offset >= 0x100/4) && (offset < 0x1c0/4)) return s3virge.s3d.pattern[offset - (0x100/4)]; res = s3virge.s3d.reg[op_type][((offset*4) & 0x03ff) / 4]; LOGMMIO("MM%04X returning %08x\n", (offset*4)+0xa000, res); - + return res; } @@ -1467,7 +1467,7 @@ WRITE32_MEMBER(s3virge_vga_device::s3d_register_w) s3virge.s3d.pattern[((offset - 0x100/4)*4)] = (data & 0x000000ff); return; } - + s3virge.s3d.reg[op_type][((offset*4) & 0x03ff) / 4] = data; LOGMMIO("MM%04X = %08x\n", (offset*4)+0xa000, data); switch(offset) diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index 9b9716b88f2..997377fcd38 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -40,11 +40,11 @@ public: DECLARE_READ32_MEMBER(s3d_register_r); DECLARE_WRITE32_MEMBER(s3d_register_w); - DECLARE_WRITE32_MEMBER(image_xfer) - { -// if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000080) + DECLARE_WRITE32_MEMBER(image_xfer) + { +// if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000080) { -// logerror("IMG Xfer:(%u):%08x X:%u(%u) Y:%u(%u)\n",s3virge.s3d.bitblt_step_count,data,s3virge.s3d.bitblt_x_current,s3virge.s3d.bitblt_width,s3virge.s3d.bitblt_y_current,s3virge.s3d.bitblt_height); +// logerror("IMG Xfer:(%u):%08x X:%u(%u) Y:%u(%u)\n",s3virge.s3d.bitblt_step_count,data,s3virge.s3d.bitblt_x_current,s3virge.s3d.bitblt_width,s3virge.s3d.bitblt_y_current,s3virge.s3d.bitblt_height); s3virge.s3d.image_xfer = data; bitblt_step(); } @@ -58,14 +58,14 @@ public: bool is_new_mmio_active() { return s3.cr53 & 0x08; } uint16_t dest_stride() { -// if((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x0000001c) == 0x08) -// { -// popmessage("Stride=%08x",(((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8) / 3) -// + ((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8)); -// return (((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8) / 3) -// + ((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8); -// } -// else +// if((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x0000001c) == 0x08) +// { +// popmessage("Stride=%08x",(((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8) / 3) +// + ((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8)); +// return (((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8) / 3) +// + ((s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8); +// } +// else return (s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_DEST_SRC_STR] >> 16) & 0xfff8; } @@ -75,8 +75,8 @@ public: { TIMER_DRAW_STEP = 10 }; - - + + protected: s3virge_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -84,7 +84,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual uint16_t offset() override; - + enum { LAW_64K = 0, @@ -112,7 +112,7 @@ protected: S3D_STATE_3DLINE, S3D_STATE_3DPOLY }; - + enum { S3D_REG_SRC_BASE = 0xd4/4, @@ -152,10 +152,10 @@ protected: int cmd_fifo_next_ptr; // command added here in FIFO int cmd_fifo_current_ptr; // command currently being processed in FIFO int cmd_fifo_slots_free; - + uint8_t pattern[0xc0]; uint32_t reg[5][256]; - + // BitBLT command state uint16_t bitblt_x_src; uint16_t bitblt_y_src; @@ -182,56 +182,56 @@ protected: } s3virge; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - void write_pixel32(uint32_t base, uint16_t x, uint16_t y, uint32_t val) - { + void write_pixel32(uint32_t base, uint16_t x, uint16_t y, uint32_t val) + { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000002) if(x < s3virge.s3d.clip_l || x > s3virge.s3d.clip_r || y < s3virge.s3d.clip_t || y > s3virge.s3d.clip_b) return; - vga.memory[(base + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; + vga.memory[(base + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; vga.memory[(base + 1 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 8) & 0xff; vga.memory[(base + 2 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 16) & 0xff; vga.memory[(base + 3 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 24) & 0xff; } - void write_pixel24(uint32_t base, uint16_t x, uint16_t y, uint32_t val) - { + void write_pixel24(uint32_t base, uint16_t x, uint16_t y, uint32_t val) + { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000002) if(x < s3virge.s3d.clip_l || x > s3virge.s3d.clip_r || y < s3virge.s3d.clip_t || y > s3virge.s3d.clip_b) return; - vga.memory[(base + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; + vga.memory[(base + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; vga.memory[(base + 1 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 8) & 0xff; vga.memory[(base + 2 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 16) & 0xff; } - void write_pixel16(uint32_t base, uint16_t x, uint16_t y, uint16_t val) - { + void write_pixel16(uint32_t base, uint16_t x, uint16_t y, uint16_t val) + { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000002) if(x < s3virge.s3d.clip_l || x > s3virge.s3d.clip_r || y < s3virge.s3d.clip_t || y > s3virge.s3d.clip_b) return; - vga.memory[(base + (x*2) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; + vga.memory[(base + (x*2) + (y*dest_stride())) % vga.svga_intf.vram_size] = val & 0xff; vga.memory[(base + 1 + (x*2) + (y*dest_stride())) % vga.svga_intf.vram_size] = (val >> 8) & 0xff; } - void write_pixel8(uint32_t base, uint16_t x, uint16_t y, uint8_t val) + void write_pixel8(uint32_t base, uint16_t x, uint16_t y, uint8_t val) { if(s3virge.s3d.cmd_fifo[s3virge.s3d.cmd_fifo_current_ptr].reg[S3D_REG_COMMAND] & 0x00000002) if(x < s3virge.s3d.clip_l || x > s3virge.s3d.clip_r || y < s3virge.s3d.clip_t || y > s3virge.s3d.clip_b) return; vga.memory[(base + x + (y*dest_stride())) % vga.svga_intf.vram_size] = val; } - uint32_t read_pixel32(uint32_t base, uint16_t x, uint16_t y) - { - return (vga.memory[(base + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 24) | (vga.memory[(base + 1 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16) - | (vga.memory[(base + 2 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | vga.memory[(base + 3 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size]; + uint32_t read_pixel32(uint32_t base, uint16_t x, uint16_t y) + { + return (vga.memory[(base + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 24) | (vga.memory[(base + 1 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16) + | (vga.memory[(base + 2 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) | vga.memory[(base + 3 + (x*4) + (y*dest_stride())) % vga.svga_intf.vram_size]; } - uint32_t read_pixel24(uint32_t base, uint16_t x, uint16_t y) - { - return (vga.memory[(base + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size]) | (vga.memory[(base + 1 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) - | (vga.memory[(base + 2 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16); + uint32_t read_pixel24(uint32_t base, uint16_t x, uint16_t y) + { + return (vga.memory[(base + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size]) | (vga.memory[(base + 1 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8) + | (vga.memory[(base + 2 + (x*3) + (y*dest_stride())) % vga.svga_intf.vram_size] << 16); } - uint16_t read_pixel16(uint32_t base, uint16_t x, uint16_t y) - { - return (vga.memory[(base + (x*2) + (y*dest_stride()) % vga.svga_intf.vram_size)]) | (vga.memory[(base + 1 + (x*2) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8); + uint16_t read_pixel16(uint32_t base, uint16_t x, uint16_t y) + { + return (vga.memory[(base + (x*2) + (y*dest_stride()) % vga.svga_intf.vram_size)]) | (vga.memory[(base + 1 + (x*2) + (y*dest_stride())) % vga.svga_intf.vram_size] << 8); } - uint8_t read_pixel8(uint32_t base, uint16_t x, uint16_t y) - { + uint8_t read_pixel8(uint32_t base, uint16_t x, uint16_t y) + { return vga.memory[(base + x + (y*dest_stride())) % vga.svga_intf.vram_size]; } uint32_t GetROP(uint8_t rop, uint32_t src, uint32_t dst, uint32_t pat); @@ -244,7 +244,7 @@ private: void add_command(int cmd_type); void command_start(); void command_finish(); - + virtual uint8_t s3_crtc_reg_read(uint8_t index); virtual void s3_define_video_mode(void); virtual void s3_crtc_reg_write(uint8_t index, uint8_t data); diff --git a/src/devices/bus/lpci/cirrus.cpp b/src/devices/bus/lpci/cirrus.cpp index 727fc99701f..ad0e32149a0 100644 --- a/src/devices/bus/lpci/cirrus.cpp +++ b/src/devices/bus/lpci/cirrus.cpp @@ -86,7 +86,7 @@ DEFINE_DEVICE_TYPE(PCI_CIRRUS_SVGA, pci_cirrus_svga_device, "pci_cirrus_svga", " pci_cirrus_svga_device::pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, PCI_CIRRUS_SVGA, tag, owner, clock) , pci_device_interface(mconfig, *this) - , m_vga(*this, "vga") + , m_vga(*this, "vga") { } diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index 2fc20b65546..91e512c3023 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -23,7 +23,7 @@ public: // construction/destruction pci_cirrus_svga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); template - void set_vga(T &&tag) { m_vga.set_tag(std::forward(tag)); } + void set_vga(T &&tag) { m_vga.set_tag(std::forward(tag)); } virtual uint32_t pci_read(pci_bus_device *pcibus, int function, int offset, uint32_t mem_mask) override; virtual void pci_write(pci_bus_device *pcibus, int function, int offset, uint32_t data, uint32_t mem_mask) override; diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 19f83cf5038..76eefbb44d3 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -35,17 +35,17 @@ TODO: #include "arm7core.h" //include arm7 core #include "arm7help.h" -#define LOG_MMU (1 << 0) -#define LOG_DSP (1 << 1) -#define LOG_COPRO_READS (1 << 2) -#define LOG_COPRO_WRITES (1 << 3) -#define LOG_COPRO_UNKNOWN (1 << 4) -#define LOG_COPRO_RESERVED (1 << 5) - -#define VERBOSE (0) +#define LOG_MMU (1 << 0) +#define LOG_DSP (1 << 1) +#define LOG_COPRO_READS (1 << 2) +#define LOG_COPRO_WRITES (1 << 3) +#define LOG_COPRO_UNKNOWN (1 << 4) +#define LOG_COPRO_RESERVED (1 << 5) + +#define VERBOSE (0) #include "logmacro.h" -#define PRINT_HAPYFSH2 (0) +#define PRINT_HAPYFSH2 (0) /* prototypes of coprocessor functions */ void arm7_dt_r_callback(arm_state *arm, uint32_t insn, uint32_t *prn, uint32_t (*read32)(arm_state *arm, uint32_t addr)); diff --git a/src/devices/cpu/arm7/arm7ops.cpp b/src/devices/cpu/arm7/arm7ops.cpp index c5e4d7e362f..5bea4bbe5bd 100644 --- a/src/devices/cpu/arm7/arm7ops.cpp +++ b/src/devices/cpu/arm7/arm7ops.cpp @@ -5,9 +5,9 @@ #include "arm7core.h" #include "arm7help.h" -#define LOG_OPS (1 << 0) +#define LOG_OPS (1 << 0) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" int64_t arm7_cpu_device::saturate_qbit_overflow(int64_t res) diff --git a/src/devices/cpu/gigatron/gigatron.cpp b/src/devices/cpu/gigatron/gigatron.cpp index 42d77716ab0..3e687baa930 100644 --- a/src/devices/cpu/gigatron/gigatron.cpp +++ b/src/devices/cpu/gigatron/gigatron.cpp @@ -154,7 +154,7 @@ void gigatron_cpu_device::branchOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_ c = true; break; } - + if (c) { uint8_t b = offset(bus, d); m_npc = base | b; @@ -215,7 +215,7 @@ void gigatron_cpu_device::aluOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t d m_outx = m_ac; } break; - + } } @@ -250,7 +250,7 @@ uint8_t gigatron_cpu_device::offset(uint8_t bus, uint8_t d) return gigatron_readmem8(d); case 2: return m_ac; - case 3: + case 3: return m_inReg; } return 0; @@ -270,13 +270,13 @@ void gigatron_cpu_device::storeOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t b = m_inReg; break; } - + u16 address = addr(mode, d); if (bus == 1) logerror("%04x: ctrl = 0x%04x\n", m_ppc, address); else gigatron_writemem8(address & m_ramMask, b); - + switch (mode) { case 4: m_x = b; diff --git a/src/devices/cpu/sh/sh3comn.cpp b/src/devices/cpu/sh/sh3comn.cpp index 36c951840d4..77f4b079414 100644 --- a/src/devices/cpu/sh/sh3comn.cpp +++ b/src/devices/cpu/sh/sh3comn.cpp @@ -125,7 +125,7 @@ READ32_MEMBER( sh3_base_device::sh3_internal_high_r ) case SH3_INTEVT_ADDR: //logerror("'%s' (%08x): unmapped internal read from %08x mask %08x (SH3 INTEVT - %08x)\n",tag(), m_sh2_state->pc & SH34_AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, m_sh3internal_upper[offset]); return m_sh3internal_upper[offset]; - + case SH3_SCSSR_ADDR: // hack until SCI is not implemented return 0x84<<24; diff --git a/src/devices/cpu/unsp/unsp_extended.cpp b/src/devices/cpu/unsp/unsp_extended.cpp index df5711e8b7b..44f2a2d263d 100644 --- a/src/devices/cpu/unsp/unsp_extended.cpp +++ b/src/devices/cpu/unsp/unsp_extended.cpp @@ -169,7 +169,7 @@ void unsp_20_device::execute_extended_group(uint16_t op) uint16_t b = m_core->m_r[rb]; uint16_t c = read16(imm16_2); - uint32_t storeaddr = imm16_2; // dest address for STORE + uint32_t storeaddr = imm16_2; // dest address for STORE uint32_t lres; bool write = do_basic_alu_ops(aluop, lres, b, c, storeaddr, (ra != 7)); @@ -258,7 +258,7 @@ void unsp_20_device::execute_extended_group(uint16_t op) uint16_t b = m_core->m_r[rx + 8]; uint16_t c = imm6; - uint32_t storeaddr = 0; // dest address for STORE + uint32_t storeaddr = 0; // dest address for STORE uint32_t lres; if (aluop == 0xd) @@ -293,7 +293,7 @@ void unsp_20_device::execute_extended_group(uint16_t op) uint16_t b = m_core->m_r[rx + 8]; uint16_t c = read16(addr); - uint32_t storeaddr = addr; // dest address for STORE + uint32_t storeaddr = addr; // dest address for STORE uint32_t lres; bool write = do_basic_alu_ops(aluop, lres, b, c, storeaddr, true); diff --git a/src/devices/cpu/we32000/we32100d.cpp b/src/devices/cpu/we32000/we32100d.cpp index c90528c6fc0..f2453d33ac9 100644 --- a/src/devices/cpu/we32000/we32100d.cpp +++ b/src/devices/cpu/we32000/we32100d.cpp @@ -293,7 +293,7 @@ offs_t we32100_disassembler::dasm_30xx(std::ostream &stream, offs_t &pc, const w u8 op = opcodes.r8(pc++); switch (op) - { case 0x09: + { case 0x09: stream << "MVERNO"; break; diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp index 2dc2cb30963..c9d60a4b932 100644 --- a/src/devices/machine/microtch.cpp +++ b/src/devices/machine/microtch.cpp @@ -394,6 +394,6 @@ void microtouch_device::tra_complete() const tiny_rom_entry *microtouch_device::device_rom_region() const { - return ROM_NAME(microtouch); + return ROM_NAME(microtouch); } diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index 9c7cdc03f72..01aa2170dff 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -545,7 +545,7 @@ protected: // FIXME: The logic has a rounding issue because time resolution divided // by 48,000 is not a natural number. The fractional part // adds up to one samples every 13 seconds for 100 ps resolution. - // Fixing this is possible but complicated and expensive. + // Fixing this is possible but complicated and expensive. } m_pos++; @@ -1497,7 +1497,7 @@ void netlist_mame_sound_device::sound_stream_update(sound_stream &stream, stream } auto cur(netlist().exec().time()); - const auto delta(nltime_ext_from_clocks(samples)); + const auto delta(nltime_ext_from_clocks(samples)); netlist().exec().process_queue(delta); cur += delta; diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index bef8a524645..9b11b1b5549 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -118,7 +118,7 @@ private: void common_dev_start(netlist::netlist_state_t *lnetlist) const; - netlist::netlist_time_ext m_div; + netlist::netlist_time_ext m_div; netlist::netlist_time_ext m_rem; netlist::netlist_time_ext m_old; diff --git a/src/devices/machine/s3c24xx.hxx b/src/devices/machine/s3c24xx.hxx index de158c9d8e2..70500b7d30c 100644 --- a/src/devices/machine/s3c24xx.hxx +++ b/src/devices/machine/s3c24xx.hxx @@ -77,45 +77,45 @@ #endif -#define LOG_RESET (1 << 0) -#define LOG_ADC (1 << 1) -#define LOG_LCD_DMA (1 << 2) -#define LOG_LCD_TIMER (1 << 3) -#define LOG_LCD_REGS (1 << 4) -#define LOG_SPI (1 << 5) -#define LOG_LCD_CFG (1 << 6) -#define LOG_LCD_TFT (1 << 7) -#define LOG_LCD_STN (1 << 8) -#define LOG_CLKPOW (1 << 9) -#define LOG_MMC (1 << 10) -#define LOG_IRQS (1 << 11) -#define LOG_IRQ_REGS (1 << 12) -#define LOG_FLASH (1 << 13) -#define LOG_PWM (1 << 14) -#define LOG_PWM_REGS (1 << 15) -#define LOG_CAM (1 << 16) -#define LOG_DMA (1 << 17) -#define LOG_DMA_REQS (1 << 18) -#define LOG_DMA_REGS (1 << 19) -#define LOG_AC97 (1 << 20) -#define LOG_DMA_TIMERS (1 << 21) -#define LOG_GPIO (1 << 22) -#define LOG_MEMCON (1 << 23) -#define LOG_USBHOST (1 << 24) -#define LOG_UART (1 << 25) -#define LOG_USB (1 << 26) -#define LOG_WDT (1 << 27) -#define LOG_I2C (1 << 28) -#define LOG_I2S (1 << 29) -#define LOG_RTC (1 << 30) -#define LOG_SDI (1 << 31) - -#define LOG_ALL (LOG_RESET | LOG_ADC | LOG_LCD_DMA | LOG_LCD_TIMER | LOG_LCD_REGS | LOG_SPI | LOG_LCD_CFG | LOG_LCD_TFT | LOG_LCD_STN \ +#define LOG_RESET (1 << 0) +#define LOG_ADC (1 << 1) +#define LOG_LCD_DMA (1 << 2) +#define LOG_LCD_TIMER (1 << 3) +#define LOG_LCD_REGS (1 << 4) +#define LOG_SPI (1 << 5) +#define LOG_LCD_CFG (1 << 6) +#define LOG_LCD_TFT (1 << 7) +#define LOG_LCD_STN (1 << 8) +#define LOG_CLKPOW (1 << 9) +#define LOG_MMC (1 << 10) +#define LOG_IRQS (1 << 11) +#define LOG_IRQ_REGS (1 << 12) +#define LOG_FLASH (1 << 13) +#define LOG_PWM (1 << 14) +#define LOG_PWM_REGS (1 << 15) +#define LOG_CAM (1 << 16) +#define LOG_DMA (1 << 17) +#define LOG_DMA_REQS (1 << 18) +#define LOG_DMA_REGS (1 << 19) +#define LOG_AC97 (1 << 20) +#define LOG_DMA_TIMERS (1 << 21) +#define LOG_GPIO (1 << 22) +#define LOG_MEMCON (1 << 23) +#define LOG_USBHOST (1 << 24) +#define LOG_UART (1 << 25) +#define LOG_USB (1 << 26) +#define LOG_WDT (1 << 27) +#define LOG_I2C (1 << 28) +#define LOG_I2S (1 << 29) +#define LOG_RTC (1 << 30) +#define LOG_SDI (1 << 31) + +#define LOG_ALL (LOG_RESET | LOG_ADC | LOG_LCD_DMA | LOG_LCD_TIMER | LOG_LCD_REGS | LOG_SPI | LOG_LCD_CFG | LOG_LCD_TFT | LOG_LCD_STN \ | LOG_CLKPOW | LOG_MMC | LOG_IRQS | LOG_IRQ_REGS | LOG_FLASH | LOG_PWM | LOG_PWM_REGS | LOG_CAM | LOG_DMA | LOG_DMA_REQS \ | LOG_DMA_REGS | LOG_AC97 | LOG_DMA_TIMERS | LOG_GPIO | LOG_MEMCON | LOG_USBHOST | LOG_UART | LOG_USB \ | LOG_WDT | LOG_I2C | LOG_I2S | LOG_RTC | LOG_SDI) -#define VERBOSE (LOG_ALL & ~(LOG_FLASH | LOG_UART)) +#define VERBOSE (LOG_ALL & ~(LOG_FLASH | LOG_UART)) #include "logmacro.h" /*************************************************************************** diff --git a/src/devices/machine/spg2xx_video.cpp b/src/devices/machine/spg2xx_video.cpp index 614a87cd49c..89739adcb00 100644 --- a/src/devices/machine/spg2xx_video.cpp +++ b/src/devices/machine/spg2xx_video.cpp @@ -229,7 +229,7 @@ void spg2xx_video_device::draw_bitmap(const rectangle& cliprect, uint32_t scanli uint16_t palette = 0; //if (!tile) - // continue; + // continue; palette = space.read_word(palette_map + realline / 2); if (scanline & 1) diff --git a/src/devices/machine/sunplus_gcm394.cpp b/src/devices/machine/sunplus_gcm394.cpp index 353b2f4a9e1..b67a20550a4 100644 --- a/src/devices/machine/sunplus_gcm394.cpp +++ b/src/devices/machine/sunplus_gcm394.cpp @@ -151,14 +151,14 @@ void sunplus_gcm394_base_device::trigger_systemm_dma(address_space &space, int c mem.write_word(0x3f368, 0x4841); // cars 2 IRQ? wait hack //if (mem.read_word(0x4368c) == 0x4846) - // mem.write_word(0x4368c, 0x4840); // cars 2 force service mode + // mem.write_word(0x4368c, 0x4840); // cars 2 force service mode if (mem.read_word(0x4d8d4) == 0x4840) mem.write_word(0x4d8d4, 0x4841); // golden tee IRQ? wait hack //if (mem.read_word(0x34410) == 0x4846) - // mem.write_word(0x34410, 0x4840); // golden tee force service mode - + // mem.write_word(0x34410, 0x4840); // golden tee force service mode + } else if ((mode == 0x0089) || (mode == 0x0009) || (mode == 0x4009)) { @@ -169,7 +169,7 @@ void sunplus_gcm394_base_device::trigger_systemm_dma(address_space &space, int c write_space(dest , val); dest += 1; - + if ((mode&0x3fff) == 0x0009) source += 1; } @@ -199,7 +199,7 @@ WRITE16_MEMBER(sunplus_gcm394_base_device::system_dma_trigger_w) READ16_MEMBER(sunplus_gcm394_base_device::system_dma_memtype_r) { LOGMASKED(LOG_GCM394, "%s:sunplus_gcm394_base_device::system_dma_memtype_r\n", machine().describe_context()); - return m_system_dma_memtype; + return m_system_dma_memtype; } WRITE16_MEMBER(sunplus_gcm394_base_device::system_dma_memtype_w) @@ -279,17 +279,17 @@ WRITE16_MEMBER(sunplus_gcm394_base_device::waitmode_enter_780c_w) READ16_MEMBER(sunplus_gcm394_base_device::membankswitch_7810_r) { -// LOGMASKED(LOG_GCM394, "%s:sunplus_gcm394_base_device::membankswitch_7810_r\n", machine().describe_context()); +// LOGMASKED(LOG_GCM394, "%s:sunplus_gcm394_base_device::membankswitch_7810_r\n", machine().describe_context()); return m_membankswitch_7810; } WRITE16_MEMBER(sunplus_gcm394_base_device::membankswitch_7810_w) { -// if (m_membankswitch_7810 != data) -// LOGMASKED(LOG_GCM394,"%s:sunplus_gcm394_base_device::membankswitch_7810_w %04x\n", machine().describe_context(), data); +// if (m_membankswitch_7810 != data) +// LOGMASKED(LOG_GCM394,"%s:sunplus_gcm394_base_device::membankswitch_7810_w %04x\n", machine().describe_context(), data); -// if (m_membankswitch_7810 != data) -// popmessage("bankswitch %04x -> %04x", m_membankswitch_7810, data); +// if (m_membankswitch_7810 != data) +// popmessage("bankswitch %04x -> %04x", m_membankswitch_7810, data); m_membankswitch_7810 = data; } @@ -683,12 +683,12 @@ void sunplus_gcm394_base_device::base_internal_map(address_map &map) // ###################################################################################################################################################################################### // 782x region = memory config / control // ###################################################################################################################################################################################### - // wrlshunt | smartfp + // wrlshunt | smartfp map(0x007820, 0x007824).w(FUNC(sunplus_gcm394_base_device::chipselect_csx_memory_device_control_w)); // 7f8a (7f8a before DMA from ROM to RAM, 008a after DMA from ROM to RAM) | 3f04 7820 Chip Select (CS0) Memory Device Control (P_MC50_Ctrl) - // 7f47 | 0044 7821 Chip Select (CS1) Memory Device Control (P_MC51_Ctrl) - // 0047 | 1f44 7822 Chip Select (CS2) Memory Device Control (P_MC52_Ctrl) - // 0047 | 0044 7823 Chip Select (CS3) Memory Device Control (P_MC53_Ctrl) - // 0047 | 0044 7824 Chip Select (CS4) Memory Device Control (P_MC54_Ctrl) + // 7f47 | 0044 7821 Chip Select (CS1) Memory Device Control (P_MC51_Ctrl) + // 0047 | 1f44 7822 Chip Select (CS2) Memory Device Control (P_MC52_Ctrl) + // 0047 | 0044 7823 Chip Select (CS3) Memory Device Control (P_MC53_Ctrl) + // 0047 | 0044 7824 Chip Select (CS4) Memory Device Control (P_MC54_Ctrl) map(0x00782d, 0x00782d).rw(FUNC(sunplus_gcm394_base_device::unkarea_782d_r), FUNC(sunplus_gcm394_base_device::unkarea_782d_w)); // on startup // 782f @@ -707,10 +707,10 @@ void sunplus_gcm394_base_device::base_internal_map(address_map &map) // 786x - 787x - IO related? // ###################################################################################################################################################################################### - map(0x007860, 0x007860).rw(FUNC(sunplus_gcm394_base_device::ioarea_7860_porta_r), FUNC(sunplus_gcm394_base_device::ioarea_7860_porta_w)); // 7860 I/O PortA Data Register + map(0x007860, 0x007860).rw(FUNC(sunplus_gcm394_base_device::ioarea_7860_porta_r), FUNC(sunplus_gcm394_base_device::ioarea_7860_porta_w)); // 7860 I/O PortA Data Register map(0x007861, 0x007861).r(FUNC(sunplus_gcm394_base_device::ioarea_7861_porta_buffer_r)); // 7861 I/O PortA Buffer Register map(0x007862, 0x007862).rw(FUNC(sunplus_gcm394_base_device::ioarea_7862_porta_direction_r), FUNC(sunplus_gcm394_base_device::ioarea_7862_porta_direction_w)); // 7862 I/O PortA Direction Register - map(0x007863, 0x007863).rw(FUNC(sunplus_gcm394_base_device::ioarea_7863_porta_attribute_r), FUNC(sunplus_gcm394_base_device::ioarea_7863_porta_attribute_w)); // 7863 I/O PortA Attribute Register + map(0x007863, 0x007863).rw(FUNC(sunplus_gcm394_base_device::ioarea_7863_porta_attribute_r), FUNC(sunplus_gcm394_base_device::ioarea_7863_porta_attribute_w)); // 7863 I/O PortA Attribute Register map(0x007868, 0x007868).rw(FUNC(sunplus_gcm394_base_device::ioarea_7868_portb_r), FUNC(sunplus_gcm394_base_device::ioarea_7868_portb_w)); // on startup // 7868 I/O PortB Data Register map(0x007869, 0x007869).r(FUNC(sunplus_gcm394_base_device::ioarea_7869_portb_buffer_r)); // 7869 I/O PortB Buffer Register // jak_s500 @@ -750,7 +750,7 @@ void sunplus_gcm394_base_device::base_internal_map(address_map &map) map(0x0078a5, 0x0078a5).w(FUNC(sunplus_gcm394_base_device::unkarea_78a5_w)); map(0x0078a6, 0x0078a6).w(FUNC(sunplus_gcm394_base_device::unkarea_78a6_w)); - map(0x0078a8, 0x0078a8).w(FUNC(sunplus_gcm394_base_device::unkarea_78a8_w)); + map(0x0078a8, 0x0078a8).w(FUNC(sunplus_gcm394_base_device::unkarea_78a8_w)); // ###################################################################################################################################################################################### // 78bx - timer control? @@ -824,7 +824,7 @@ void sunplus_gcm394_base_device::gcm394_internal_map(address_map& map) // no internal ROM on this model? map(0x08000, 0x0ffff).r(FUNC(sunplus_gcm394_base_device::internalrom_lower32_r)).nopw(); - + map(0x10000, 0x01ffff).nopr(); map(0x020000, 0x1fffff).rw(FUNC(sunplus_gcm394_base_device::cs_space_r), FUNC(sunplus_gcm394_base_device::cs_space_w)); @@ -890,7 +890,7 @@ READ16_MEMBER(sunplus_gcm394_base_device::internalrom_lower32_r) } -// GPR27P512A = C2 76 +// GPR27P512A = C2 76 // HY27UF081G2A = AD F1 80 1D // H27U518S2C = AD 76 @@ -1164,7 +1164,7 @@ void generalplus_gpac800_device::gpac800_internal_map(address_map& map) map(0x10000, 0x27fff).rom().region("internal", 0x10000); // upper 96kwords of internal ROM is always visible map(0x28000, 0x2ffff).noprw(); // reserved // 0x30000+ is CS access - + map(0x030000, 0x1fffff).rw(FUNC(generalplus_gpac800_device::cs_space_r), FUNC(generalplus_gpac800_device::cs_space_w)); map(0x200000, 0x3fffff).rw(FUNC(generalplus_gpac800_device::cs_bank_space_r), FUNC(generalplus_gpac800_device::cs_bank_space_w)); } @@ -1181,7 +1181,7 @@ void generalplus_gpspispi_device::gpspispi_internal_map(address_map& map) map(0x007943, 0x007943).r(FUNC(generalplus_gpspispi_device::spi_unk_7943_r)); - map(0x008000, 0x00ffff).rom().region("internal", 0); + map(0x008000, 0x00ffff).rom().region("internal", 0); } diff --git a/src/devices/machine/sunplus_gcm394.h b/src/devices/machine/sunplus_gcm394.h index 932646e2609..ad29b7b1208 100644 --- a/src/devices/machine/sunplus_gcm394.h +++ b/src/devices/machine/sunplus_gcm394.h @@ -72,7 +72,7 @@ public: void default_cs_callback(uint16_t cs0, uint16_t cs1, uint16_t cs2, uint16_t cs3, uint16_t cs4 ); void set_cs_space(address_space* csspace) { m_cs_space = csspace; } - + void set_paldisplaybank_high_hack(int pal_displaybank_high) { m_spg_video->set_paldisplaybank_high(pal_displaybank_high); } void set_alt_tile_addressing_hack(int alt_tile_addressing) { m_spg_video->set_alt_tile_addressing(alt_tile_addressing); } void set_romtype(int romtype) { m_romtype = romtype; } @@ -186,7 +186,7 @@ private: DECLARE_READ16_MEMBER(unk_r); DECLARE_WRITE16_MEMBER(unk_w); - + void write_dma_params(int channel, int offset, uint16_t data); uint16_t read_dma_params(int channel, int offset); void trigger_systemm_dma(address_space &space, int channel, uint16_t data); diff --git a/src/devices/machine/sunplus_gcm394_video.cpp b/src/devices/machine/sunplus_gcm394_video.cpp index 338d8fd5668..babd6998391 100644 --- a/src/devices/machine/sunplus_gcm394_video.cpp +++ b/src/devices/machine/sunplus_gcm394_video.cpp @@ -371,7 +371,7 @@ void gcm394_base_video_device::draw(const rectangle &cliprect, uint32_t line, ui int yy = (yoff + y);// &0x1ff; //if (yy >= 0x01c0) - // yy -= 0x0200; + // yy -= 0x0200; if (yy > cliprect.max_y || yy < 0) return; @@ -409,7 +409,7 @@ void gcm394_base_video_device::draw(const rectangle &cliprect, uint32_t line, ui else if (nc_bpp < 8) { // 6bpp - // current_palette_offset |= 0x0800; + // current_palette_offset |= 0x0800; } else @@ -426,7 +426,7 @@ void gcm394_base_video_device::draw(const rectangle &cliprect, uint32_t line, ui //xx &= 0x01ff; //if (xx >= 0x01c0) - // xx -= 0x0200; + // xx -= 0x0200; if (xx >= 0 && xx <= cliprect.max_x) { @@ -511,7 +511,7 @@ void gcm394_base_video_device::draw_page(const rectangle &cliprect, uint32_t sca if ((scanline >= 0) && (scanline < 480)) { xx = i * 2; - + pal = (pix & 0xff) | 0x100; if (xx >= 0 && xx <= cliprect.max_x) @@ -555,12 +555,12 @@ void gcm394_base_video_device::draw_page(const rectangle &cliprect, uint32_t sca if ((attr_reg >> 14) & 0x2) { total_width = 1024; - // use_alt_drawmode = 1; // probably doesn't control this + // use_alt_drawmode = 1; // probably doesn't control this } else { total_width = 512; - // use_alt_drawmode = 0; // probably doesn't control this + // use_alt_drawmode = 0; // probably doesn't control this } uint32_t tile_count_x = total_width / tile_w; diff --git a/src/devices/machine/sunplus_gcm394_video.h b/src/devices/machine/sunplus_gcm394_video.h index 40a99cebd96..e0f5ccc6a2f 100644 --- a/src/devices/machine/sunplus_gcm394_video.h +++ b/src/devices/machine/sunplus_gcm394_video.h @@ -60,7 +60,7 @@ public: DECLARE_READ16_MEMBER(tmap3_tilebase_msb_r); DECLARE_WRITE16_MEMBER(tmap3_tilebase_lsb_w); DECLARE_WRITE16_MEMBER(tmap3_tilebase_msb_w); - + DECLARE_READ16_MEMBER(sprite_7022_gfxbase_lsb_r); DECLARE_READ16_MEMBER(sprite_702d_gfxbase_msb_r); @@ -249,7 +249,7 @@ protected: required_device m_palette; required_device m_gfxdecode; devcb_read16 m_space_read_cb; - + required_shared_ptr m_rowscroll; required_shared_ptr m_rowzoom; diff --git a/src/devices/sound/c6280.cpp b/src/devices/sound/c6280.cpp index 8081f7da1d7..8b0c4322e79 100644 --- a/src/devices/sound/c6280.cpp +++ b/src/devices/sound/c6280.cpp @@ -171,46 +171,46 @@ void c6280_device::sound_stream_update(sound_stream &stream, stream_sample_t **i /* Write Register Layout - 76543210 - 00 -----xxx Channel Select - -----000 Channel 0 - -----001 Channel 1 - -----010 Channel 2 - -----011 Channel 3 - -----100 Channel 4 - -----101 Channel 5 - - 01 xxxx---- Overall Left Volume - ----xxxx Overall Right Volume - - 02 xxxxxxxx Frequency (Low 8 bits) - - 03 ----xxxx Frequency (High 4 bits) - - 04 x------- Channel Enable - -x------ Direct D/A - 00------ Write Data - 01------ Reset Counter - 10------ Mixing (Sound Output) - 11------ Direct D/A - ---xxxxx Channel Master Volume - - 05 xxxx---- Channel Left Volume - ----xxxx Channel Right Volume - - 06 ---xxxxx Waveform Data - - 07 x------- Noise Enable (channel 5, 6 only) - ---xxxxx Noise Frequency ^ 0x1f - - 08 xxxxxxxx LFO Frequency - - 09 x------- LFO Reset - ------xx LFO Control - ------00 LFO off - ------01 Direct Addition - ------10 2 bit Shift Addition - ------11 4 bit Shift Addition + 76543210 + 00 -----xxx Channel Select + -----000 Channel 0 + -----001 Channel 1 + -----010 Channel 2 + -----011 Channel 3 + -----100 Channel 4 + -----101 Channel 5 + + 01 xxxx---- Overall Left Volume + ----xxxx Overall Right Volume + + 02 xxxxxxxx Frequency (Low 8 bits) + + 03 ----xxxx Frequency (High 4 bits) + + 04 x------- Channel Enable + -x------ Direct D/A + 00------ Write Data + 01------ Reset Counter + 10------ Mixing (Sound Output) + 11------ Direct D/A + ---xxxxx Channel Master Volume + + 05 xxxx---- Channel Left Volume + ----xxxx Channel Right Volume + + 06 ---xxxxx Waveform Data + + 07 x------- Noise Enable (channel 5, 6 only) + ---xxxxx Noise Frequency ^ 0x1f + + 08 xxxxxxxx LFO Frequency + + 09 x------- LFO Reset + ------xx LFO Control + ------00 LFO off + ------01 Direct Addition + ------10 2 bit Shift Addition + ------11 4 bit Shift Addition */ WRITE8_MEMBER( c6280_device::c6280_w ) diff --git a/src/devices/sound/huc6230.cpp b/src/devices/sound/huc6230.cpp index 7969e1c3ae0..5537f3ffea6 100644 --- a/src/devices/sound/huc6230.cpp +++ b/src/devices/sound/huc6230.cpp @@ -12,7 +12,7 @@ Related patent: - https://patents.google.com/patent/US5692099 - https://patents.google.com/patent/US6453286 - - https://patents.google.com/patent/US5548655A + - https://patents.google.com/patent/US5548655A */ #include "emu.h" diff --git a/src/devices/sound/vrender0.cpp b/src/devices/sound/vrender0.cpp index c302905c76a..833acdc46bb 100644 --- a/src/devices/sound/vrender0.cpp +++ b/src/devices/sound/vrender0.cpp @@ -7,11 +7,11 @@ VRENDER ZERO AUDIO EMULATION - TODO - - Envelope, Interrupt functions aren't verified from real hardware behavior. - - Reverb, Pingpong/Reversed loop, Most of Channel/Overall control registers - are Not implemented - - Sample Rate is unverified + TODO + - Envelope, Interrupt functions aren't verified from real hardware behavior. + - Reverb, Pingpong/Reversed loop, Most of Channel/Overall control registers + are Not implemented + - Sample Rate is unverified *************************************************************************************/ static inline s32 sign_ext(s32 val, s32 bit) @@ -91,10 +91,10 @@ void vr0sound_device::sound_map(address_map &map) -------- xxxxxxxx ChnClkNum (Clock Number per Channel) 602 x------- -------- RS (Run Sound) -------- --x----- TM (Texture Memory) - -------- ---x---- RE (Reverb Enable) - -------- -----x-- CW (32bit Adder Wait) - -------- ------x- AW (16bit Adder Wait) - -------- -------x MW (Multipler Wait) + -------- ---x---- RE (Reverb Enable) + -------- -----x-- CW (32bit Adder Wait) + -------- ------x- AW (16bit Adder Wait) + -------- -------x MW (Multipler Wait) */ map(0x404, 0x407).rw(FUNC(vr0sound_device::status_r), FUNC(vr0sound_device::status_w)); @@ -281,12 +281,12 @@ void vr0sound_device::revfactor_w(offs_t offset, u16 data, u16 mem_mask) } /* - Buffer Address - 1 0 - fedcba9876543210 fedcba9876543210 - ----------0xxxxx x--------------- BufferSAddr - ---------------- -xxx------------ Buffer Select - ---------------- ----xxxxxxxxxxxx Buffer Pointer + Buffer Address + 1 0 + fedcba9876543210 fedcba9876543210 + ----------0xxxxx x--------------- BufferSAddr + ---------------- -xxx------------ Buffer Select + ---------------- ----xxxxxxxxxxxx Buffer Pointer */ u16 vr0sound_device::buffersaddr_r(offs_t offset) @@ -362,39 +362,39 @@ void vr0sound_device::ctrl_w(offs_t offset, u16 data, u16 mem_mask) /* Channel Parameter Register (32 bytes for each channels) - fedcba98 76543210 -00 xxxxxxxx xxxxxxxx CurSAddr (15:0) -02 xxxxxxxx xxxxxxxx CurSAddr (31:16) -04 xxxxxxxx xxxxxxxx EnvVol (15:0) -06 -11x---- -------- Loop Direction(LD) - -11-xxxx -------- EnvStage - -------- xxxxxxxx EnvVol (23:16) -08 xxxxxxxx xxxxxxxx DSAddr (15:0) -0a -xxxxxxx -------- Modes -0c xxxxxxxx xxxxxxxx LoopBegin (15:0) -0e -xxxxxxx -------- LChnVol - -------- --xxxxxx LoopBegin (21:16) -10 xxxxxxxx xxxxxxxx LoopEnd (15:0) -12 -xxxxxxx -------- RChnVol - -------- --xxxxxx LoopEnd (21:16) -14 xxxxxxxx xxxxxxxx EnvRate0 (15:0) -16 xxxxxxxx xxxxxxxx EnvRate1 (15:0) -18 xxxxxxxx xxxxxxxx EnvRate2 (15:0) -1a xxxxxxxx xxxxxxxx EnvRate3 (15:0) -1c x------- -------- EnvRate1 (16) - -xxxxxxx -------- EnvTarget1 - -------- x------- EnvRate0 (16) - -------- -xxxxxxx EnvTarget0 -1e x------- -------- EnvRate3 (16) - -xxxxxxx -------- EnvTarget3 - -------- x------- EnvRate2 (16) - -------- -xxxxxxx EnvTarget2 + fedcba98 76543210 +00 xxxxxxxx xxxxxxxx CurSAddr (15:0) +02 xxxxxxxx xxxxxxxx CurSAddr (31:16) +04 xxxxxxxx xxxxxxxx EnvVol (15:0) +06 -11x---- -------- Loop Direction(LD) + -11-xxxx -------- EnvStage + -------- xxxxxxxx EnvVol (23:16) +08 xxxxxxxx xxxxxxxx DSAddr (15:0) +0a -xxxxxxx -------- Modes +0c xxxxxxxx xxxxxxxx LoopBegin (15:0) +0e -xxxxxxx -------- LChnVol + -------- --xxxxxx LoopBegin (21:16) +10 xxxxxxxx xxxxxxxx LoopEnd (15:0) +12 -xxxxxxx -------- RChnVol + -------- --xxxxxx LoopEnd (21:16) +14 xxxxxxxx xxxxxxxx EnvRate0 (15:0) +16 xxxxxxxx xxxxxxxx EnvRate1 (15:0) +18 xxxxxxxx xxxxxxxx EnvRate2 (15:0) +1a xxxxxxxx xxxxxxxx EnvRate3 (15:0) +1c x------- -------- EnvRate1 (16) + -xxxxxxx -------- EnvTarget1 + -------- x------- EnvRate0 (16) + -------- -xxxxxxx EnvTarget0 +1e x------- -------- EnvRate3 (16) + -xxxxxxx -------- EnvTarget3 + -------- x------- EnvRate2 (16) + -------- -xxxxxxx EnvTarget2 */ u16 vr0sound_device::channel_t::read(offs_t offset) { u16 ret = 0; - + switch (offset) { case 0x00/2: diff --git a/src/devices/sound/vrender0.h b/src/devices/sound/vrender0.h index f14567840de..89432d4303b 100644 --- a/src/devices/sound/vrender0.h +++ b/src/devices/sound/vrender0.h @@ -142,7 +142,7 @@ private: // Registers u32 m_Status = 0; // Status (0 Idle, 1 Busy) - u32 m_NoteOn = 0; // Note On (0 Off, 1 On) (Not Implemented) + u32 m_NoteOn = 0; // Note On (0 Off, 1 On) (Not Implemented) u8 m_RevFactor = 0; // Reverb Factor (Not Implemented) u32 m_BufferAddr = 0; // 21bit Reverb Buffer Start Address (Not Implemented) u16 m_BufferSize[4] = {0, 0, 0, 0}; // Reverb Buffer Size (Not Implemented) diff --git a/src/devices/video/fixfreq.cpp b/src/devices/video/fixfreq.cpp index 08839cf9232..5e333d9eec5 100644 --- a/src/devices/video/fixfreq.cpp +++ b/src/devices/video/fixfreq.cpp @@ -112,7 +112,7 @@ void fixedfreq_monitor_state::update_sync_channel(const time_type &time, const d m_line_time = time + 1.0 / m_desc.hsync_filter_timeconst(); } //if (!m_sig_vsync && (m_last_x < m_desc.m_hscale * 100)) - // printf("HSYNC up %d %f\n", m_last_y, m_last_x); + // printf("HSYNC up %d %f\n", m_last_y, m_last_x); } else if (last_comp && !m_sig_composite) { @@ -131,7 +131,7 @@ void fixedfreq_monitor_state::update_bm(const time_type &time) //uint32_t col(0xffff0000); // Mark sync areas //if (m_last_sync >= m_desc.m_sync_threshold) - // col = m_col; + // col = m_col; if (!m_sig_vsync && !m_sig_composite) { @@ -373,14 +373,14 @@ uint32_t fixedfreq_device::screen_update(screen_device &screen, bitmap_rgb32 &bi screen.container().add_line( x0+w, y0, x1-w, y0, m_scanline_height*yscale, nom_col(f.col), -// (0xff << 24) | (f.col & 0xffffff), +// (0xff << 24) | (f.col & 0xffffff), flags); #elif 1 const float y1((f.y + m_scanline_height - yoffs) * yscale); screen.container().add_rect( x0, y0, x1, y1, nom_col(col), -// (0xaf << 24) | (f.col & 0xffffff), +// (0xaf << 24) | (f.col & 0xffffff), flags); #else const float y1((f.y + m_scanline_height - yoffs) * yscale); @@ -388,7 +388,7 @@ uint32_t fixedfreq_device::screen_update(screen_device &screen, bitmap_rgb32 &bi screen.container().add_quad( x0, y0, x1, y1, rgb_t(nom_col(f.col)), -// (0xaf << 24) | (f.col & 0xffffff), +// (0xaf << 24) | (f.col & 0xffffff), m_texture, flags); #endif diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index d1fca5708ce..88d71542d55 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -11,7 +11,7 @@ ADPCM related patents: - https://patents.google.com/patent/US5692099 - https://patents.google.com/patent/US6453286 - - https://patents.google.com/patent/US5548655A + - https://patents.google.com/patent/US5548655A ***************************************************************************/ diff --git a/src/mame/drivers/actions_atj2279b.cpp b/src/mame/drivers/actions_atj2279b.cpp index 8c6fd8eb87a..fa28e4d122a 100644 --- a/src/mame/drivers/actions_atj2279b.cpp +++ b/src/mame/drivers/actions_atj2279b.cpp @@ -1,21 +1,21 @@ // license:BSD-3-Clause -// copyright-holders:David Haywood +// copyright-holders:David Haywood /****************************************************************************** - System is fairly barebones - Main PCB has the SoC, RAM, ROM - connects to other PCBs with various types of slots (USB, SD etc.) - (ADD FULL DETAILS) - - TODO: everything - emulate the SoC + System is fairly barebones + Main PCB has the SoC, RAM, ROM + connects to other PCBs with various types of slots (USB, SD etc.) + (ADD FULL DETAILS) - Presumably has an internal bootstrap (at least) to boot from the NAND + TODO: everything - emulate the SoC - -- + Presumably has an internal bootstrap (at least) to boot from the NAND - reviews for this device were less than favourable with many comments - about how the SNES and Arcade games often did not run at full speed - and how the overall quality of emulation was unremarkable + -- + + reviews for this device were less than favourable with many comments + about how the SNES and Arcade games often did not run at full speed + and how the overall quality of emulation was unremarkable *******************************************************************************/ diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 1cd4b380cc7..7114e815d52 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -33,9 +33,9 @@ TODO: - Sky Adventure, probably others: sprite drawing is off-sync, cfr. notes in video file; - Gold Medalist: attract mode has missing finger on button 1, may be btanb; - Gold Medalist: incorrect blank effect on shooting pistol for dash events (cfr. alpha68k_palette_device); -- Gold Medalist: dash events timers relies on MCU irq timings. +- Gold Medalist: dash events timers relies on MCU irq timings. Previous emulation of 180 Hz was making it way too hard, and the timer was updating at 0.03 secs (-> 30 Hz refresh rate). - Using a timer of 100 Hz seems a better approximation compared to a stopwatch, of course fine tuning + Using a timer of 100 Hz seems a better approximation compared to a stopwatch, of course fine tuning this approximation needs HW probing and/or a MCU decap. - Gold Medalist: MCU irq routine has an event driven path that is never taken into account, what is it for? - Super Champion Baseball: enables opacity bit on fix layer, those are transparent on SNK Arcade Classics 0 diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index c2ff8751479..9d758e5cabb 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -597,8 +597,8 @@ ROM_START( atetb3482 ) /* Notes (3584 bits, which matches the datasheet's 512 7-bit notes). Raw dump from visual decap, needs further analysis. */ ROM_LOAD( "um3482araw.bin", 0x0000, 0x01c0, BAD_DUMP CRC(5871d564) SHA1(4203b6513ad08ece26177778e5defeb862d1a81d) ) - - /* 16 entry by 9-bit ROM + + /* 16 entry by 9-bit ROM Song starting locations? Chip has 16 songs max, 512 total notes. All 16 entries have data, but only 12 songs on chip. Dump from visual decap with values padded to 16 bits, needs further analysis. */ @@ -607,9 +607,9 @@ ROM_START( atetb3482 ) /* 16 entry by 7-bit ROM. Tempo for each song? All 16 entries have data, but only 12 songs on chip. - Dump from visual decap with values padded to 8 bits, needs further analysis. */ + Dump from visual decap with values padded to 8 bits, needs further analysis. */ ROM_LOAD( "tempos.bin", 0x0000, 0x0010, BAD_DUMP CRC(c3a37f74) SHA1(67eac8c6530c202760d492f3e52c44f9cd183b46) ) - + /* Not dumped, unused */ ROM_REGION( 0x71c, "plds", 0 ) ROM_LOAD( "pal16r4.1n" , 0x000, 0x104, NO_DUMP ) diff --git a/src/mame/drivers/bandai_design_master.cpp b/src/mame/drivers/bandai_design_master.cpp index 12e1ab87f23..0a1b7590a10 100644 --- a/src/mame/drivers/bandai_design_master.cpp +++ b/src/mame/drivers/bandai_design_master.cpp @@ -4,7 +4,7 @@ __________________________________IR___ | ____ RX/TX | - | _____ ________ | | __ | + | _____ ________ | | __ | | | | | | | | | || | |IC3 | | IC2 | | |CN2->_|| | | | | | | | | @@ -20,7 +20,7 @@ | | | SW2 | |______________________________________| - + IC1 = Hitachi H8/328 (24K-byte internal ROM + 1K-byte RAM) IC2 = Hitachi HG62G010R21FBN Gate Array (low gatecount and low I/O-count packages) IC3 = Hitachi HM62256LFP-10T 256kbit CMOS SRAM diff --git a/src/mame/drivers/elan_eu3a05.cpp b/src/mame/drivers/elan_eu3a05.cpp index fb5e6e4a0b6..c1db29341f0 100644 --- a/src/mame/drivers/elan_eu3a05.cpp +++ b/src/mame/drivers/elan_eu3a05.cpp @@ -48,7 +48,7 @@ In Space Invaders the UFO can sometimes glitch for a frame when appearing, and wraps around at the edges (even if the hardware supports having higher priority tiles to prevent this, as used by Lunar Rescue, it isn't used here) - + Colony 7 has a typo in the instructions The fake 'colour band' effect does not apply to the thruster (and several other elements) in Lunar Rescue diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp index 991aaf45322..318a15e8cc8 100644 --- a/src/mame/drivers/fmtowns.cpp +++ b/src/mame/drivers/fmtowns.cpp @@ -2844,11 +2844,11 @@ void towns_state::towns_base(machine_config &config) fm.add_route(1, "rspeaker", 1.00); /* - // Later model uses YMF276 for FM - ymf276_device &fm(YMF276(config, "fm", 16000000 / 2)); // actual clock speed unknown - fm.irq_handler().set(FUNC(towns_state::towns_fm_irq)); - fm.add_route(0, "lspeaker", 1.00); - fm.add_route(1, "rspeaker", 1.00); + // Later model uses YMF276 for FM + ymf276_device &fm(YMF276(config, "fm", 16000000 / 2)); // actual clock speed unknown + fm.irq_handler().set(FUNC(towns_state::towns_fm_irq)); + fm.add_route(0, "lspeaker", 1.00); + fm.add_route(1, "rspeaker", 1.00); */ rf5c68_device &pcm(RF5C68(config, "pcm", 16000000 / 2)); // actual clock speed unknown diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index d8bb6def0ae..b7d317d7c1b 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -843,7 +843,7 @@ void gaelco2_state::play2000(machine_config &config) GAELCO_DS5002FP(config, "gaelco_ds5002fp", XTAL(32'000'000) / 2).set_addrmap(0, &gaelco2_state::mcu_hostmem_map); /* 16 MHz */ config.set_perfect_quantum("gaelco_ds5002fp:mcu"); - + /* video hardware */ BUFFERED_SPRITERAM16(config, m_spriteram); @@ -2132,7 +2132,7 @@ void wrally2_state::wrally2(machine_config &config) GAELCO_DS5002FP(config, "gaelco_ds5002fp", XTAL(26'000'000) / 2).set_addrmap(0, &wrally2_state::mcu_hostmem_map); /* 13 MHz */ config.set_perfect_quantum("gaelco_ds5002fp:mcu"); - + LS259(config, m_mainlatch); // IC6 m_mainlatch->q_out_cb<0>().set(FUNC(gaelco2_state::coin1_counter_w)); m_mainlatch->q_out_cb<1>().set(FUNC(gaelco2_state::coin2_counter_w)); diff --git a/src/mame/drivers/generalplus_gpl32612.cpp b/src/mame/drivers/generalplus_gpl32612.cpp index 41028fbe00f..4913326aa39 100644 --- a/src/mame/drivers/generalplus_gpl32612.cpp +++ b/src/mame/drivers/generalplus_gpl32612.cpp @@ -7,15 +7,15 @@ unlike earlier SunPlus / GeneralPlus based SoCs this one is ARM based - NAND types - - MX30LF1G08AA - ID = C2F1 - Capacity = (2048+64) x 64 x 512 - - Star Wars Blaster - MX30LF1G08AA - TMNT Hero Portal - MX30LF1G08AA - DC Hero Portal - MX30LF1G08AA + NAND types + + MX30LF1G08AA + ID = C2F1 + Capacity = (2048+64) x 64 x 512 + + Star Wars Blaster - MX30LF1G08AA + TMNT Hero Portal - MX30LF1G08AA + DC Hero Portal - MX30LF1G08AA *****************************************************************************/ diff --git a/src/mame/drivers/gigatron.cpp b/src/mame/drivers/gigatron.cpp index 66780228ec3..19b5cd459bc 100644 --- a/src/mame/drivers/gigatron.cpp +++ b/src/mame/drivers/gigatron.cpp @@ -38,7 +38,7 @@ private: void prog_map(address_map &map); void data_map(address_map &map); - + DECLARE_READ8_MEMBER(gigatron_random) { return machine().rand() & 0xff; diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp index a4be627ec94..167b3878013 100644 --- a/src/mame/drivers/gunsmoke.cpp +++ b/src/mame/drivers/gunsmoke.cpp @@ -368,7 +368,7 @@ ROM_START( gunsmoke ) ROM_LOAD( "gs12.05c", 0x08000, 0x8000, CRC(d997b78c) SHA1(3b4a9b6f9e57ecfb4ab9734379bd0ee765fd6daa) ) ROM_LOAD( "gs11.04c", 0x10000, 0x8000, CRC(125ba58e) SHA1(cf6931653cebd051564bed8121ab8713a55095c5) ) ROM_LOAD( "gs10.02c", 0x18000, 0x8000, CRC(f469c13c) SHA1(54eda52d6fce58771c0adfe2c88292a41d5a9b99) ) - + ROM_LOAD( "gs09.06a", 0x20000, 0x8000, CRC(539f182d) SHA1(4190c0adbecc57b92f4d002e121acb77e8c5d8d8) ) /* 32x32 tiles planes 0-1 */ ROM_LOAD( "gs08.05a", 0x28000, 0x8000, CRC(e87e526d) SHA1(d10068addf30322424a85bbc6382cb762ae3fbe2) ) ROM_LOAD( "gs07.04a", 0x30000, 0x8000, CRC(4382c0d2) SHA1(8615e62bc57b40d082f6ca211d64f22185bed1fd) ) diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp index c4f5683523f..f43bf2f2728 100644 --- a/src/mame/drivers/hapyfish.cpp +++ b/src/mame/drivers/hapyfish.cpp @@ -10,42 +10,42 @@ To see bootloader messages, uncomment the UART_PRINTF define in s3c24xx.hxx. - The primary blocker at this point is a lack of a viable workaround for the - FameG FS8806 I2C/SPI authentication key chip. - - The FS8806 provides 96 bytes of on-board EEPROM as well as a 24-byte key, - with which it can perform either hashing or Triple DES. The expected - response bytes are not yet known, and the key-check routine is hundreds - of instructions' worth of assorted bitwise operations. - - To work around the FS8806 initialization and initial challenge/response - tests, run MAME with its debugger enabled, and do the following: - - 1. bp C002D788 [Enter] - 2. bp C002D84C [Enter] - 3. Close the debugger window. - 4. The debugger will reappear when the first breakpoint is hit. - 5a. R0=1 [Enter] - 5b. This will force the FS8806 init function to report success. - 6. Close the debugger window. - 7. The debugger will reappear when the second breakpoint is hit. - 8a. R4=1 [Enter] - 8b. This will force the first challenge/response test to report success. - - The system will begin its startup sequence, displaying a red fish logo. - - After some time checking the filesystem, it will then boot into the main - menu. Currently, inputs are not hooked up. - - It will then watchdog at around 52 seconds remaining on the timer, for - reasons not yet known, though the following kernel messages might provide - a clue: - - <3>dma2: IRQ with no loaded buffer? - <3>dma2: IRQ with no loaded buffer? - <0>Restarting system. - . - arch_reset: attempting watchdog reset + The primary blocker at this point is a lack of a viable workaround for the + FameG FS8806 I2C/SPI authentication key chip. + + The FS8806 provides 96 bytes of on-board EEPROM as well as a 24-byte key, + with which it can perform either hashing or Triple DES. The expected + response bytes are not yet known, and the key-check routine is hundreds + of instructions' worth of assorted bitwise operations. + + To work around the FS8806 initialization and initial challenge/response + tests, run MAME with its debugger enabled, and do the following: + + 1. bp C002D788 [Enter] + 2. bp C002D84C [Enter] + 3. Close the debugger window. + 4. The debugger will reappear when the first breakpoint is hit. + 5a. R0=1 [Enter] + 5b. This will force the FS8806 init function to report success. + 6. Close the debugger window. + 7. The debugger will reappear when the second breakpoint is hit. + 8a. R4=1 [Enter] + 8b. This will force the first challenge/response test to report success. + + The system will begin its startup sequence, displaying a red fish logo. + + After some time checking the filesystem, it will then boot into the main + menu. Currently, inputs are not hooked up. + + It will then watchdog at around 52 seconds remaining on the timer, for + reasons not yet known, though the following kernel messages might provide + a clue: + + <3>dma2: IRQ with no loaded buffer? + <3>dma2: IRQ with no loaded buffer? + <0>Restarting system. + . + arch_reset: attempting watchdog reset *******************************************************************************/ @@ -60,12 +60,12 @@ #include -#define LOG_GPIO (1 << 0) -#define LOG_ADC (1 << 1) -#define LOG_I2C (1 << 2) -#define LOG_INPUTS (1 << 3) +#define LOG_GPIO (1 << 0) +#define LOG_ADC (1 << 1) +#define LOG_I2C (1 << 2) +#define LOG_INPUTS (1 << 3) -#define VERBOSE (LOG_GPIO | LOG_ADC | LOG_I2C | LOG_INPUTS) +#define VERBOSE (LOG_GPIO | LOG_ADC | LOG_I2C | LOG_INPUTS) #include "logmacro.h" class hapyfish_state : public driver_device @@ -558,24 +558,24 @@ void hapyfish_state::hapyfish(machine_config &config) static INPUT_PORTS_START( hapyfish ) PORT_START("INPUT0") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(1) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_PLAYER(1) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(1) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(1) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_PLAYER(1) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(1) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_PLAYER(1) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_PLAYER(1) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(1) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(1) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(1) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_PLAYER(1) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(1) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_PLAYER(1) PORT_START("INPUT1") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(2) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_PLAYER(2) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(2) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(2) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_PLAYER(2) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(2) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_PLAYER(2) + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP) PORT_PLAYER(2) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_PLAYER(2) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_PLAYER(2) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_PLAYER(2) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_PLAYER(2) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_PLAYER(2) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_PLAYER(2) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON4) PORT_PLAYER(2) PORT_START("INPUT2") PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_UNUSED) diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index 987e245ff54..ba9779c3e59 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -1767,7 +1767,7 @@ ROM_START( lastapos ) ROM_LOAD( "x82a09.d5", 0x000000, 0x80000, CRC(c496b187) SHA1(8ec4e09469c9f425681671f5ddb2d2d8768af42b) ) ROM_LOAD( "x82a10.d4", 0x080000, 0x80000, CRC(4243fe28) SHA1(01260543a6f61f46ba56840c1b96ecedf637451c) ) ROM_LOAD16_BYTE( "e82a12.f4", 0x100000, 0x20000, CRC(0e2cdd40) SHA1(254b4f1f986ad5fd9437a5c8bbaf6683d9edf02b) ) - ROM_LOAD16_BYTE( "e82a11.f5", 0x100001, 0x20000, CRC(141ced2e) SHA1(90b5be2e488ad2793750225ab20c1649d709b578) ) + ROM_LOAD16_BYTE( "e82a11.f5", 0x100001, 0x20000, CRC(141ced2e) SHA1(90b5be2e488ad2793750225ab20c1649d709b578) ) ROM_REGION( 0x80000, "gfx3", 0 ) ROM_LOAD( "x82a08.d6", 0x000000, 0x80000, CRC(51cfd790) SHA1(208f00b1ccf420fe891dd30684481bf871c1aa63) ) diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 3c420532105..75a4b126455 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -60,7 +60,7 @@ To Do: [gtmr2] - Finish the Inputs (different wheels and pedals); - Implement LAN comms; -- Selecting Italian in the service mode settings causes no voice samples being played +- Selecting Italian in the service mode settings causes no voice samples being played (with lots of OKI invalid samples in logerror), sound bank bug or btanb? [brapboys / shogwarr] diff --git a/src/mame/drivers/konamigs.cpp b/src/mame/drivers/konamigs.cpp index 30b238ecace..c4a9c7cc375 100644 --- a/src/mame/drivers/konamigs.cpp +++ b/src/mame/drivers/konamigs.cpp @@ -2,36 +2,36 @@ // copyright-holders:MetalliC /************************************************************************* - Konami GSAN1 hardware - (c) 2000 - - CPU: Hitachi HD6417709 SH-3 - GPU: Hitachi HD64413AF 'Q2SD' Quick 2D Graphics Renderer with Synchronous DRAM Interface - SPU: Yamaha YMZ280B-F - Misc: - Altera Max EPM3256ATC144-10 - Altera Max EPM3064ATC100-10 - Epson RTC-4553 - - Known games (preliminary, some of listed below might not belong to this hardware): - *Dance Dance Revolution Kids - Muscle Ranking Football Masters - Muscle Ranking Kick Target - *Muscle Ranking Spray Hitter - Muscle Ranking Struck Out - Neratte Don Don - Pikkari Chance - Run Run Puppy - Soreike! Hanapuu - - * denotes these games are archived - - TODO: - - currently implemented very basic set of Q2SD GPU features, required/used by dumped games, should be improved if more games will be found. - - hook IRQs from GPU and SPU (not used by dumped games) - - Notes: - - hold Test + Service while booting to initialise RTC NVRAM + Konami GSAN1 hardware + (c) 2000 + + CPU: Hitachi HD6417709 SH-3 + GPU: Hitachi HD64413AF 'Q2SD' Quick 2D Graphics Renderer with Synchronous DRAM Interface + SPU: Yamaha YMZ280B-F + Misc: + Altera Max EPM3256ATC144-10 + Altera Max EPM3064ATC100-10 + Epson RTC-4553 + + Known games (preliminary, some of listed below might not belong to this hardware): + *Dance Dance Revolution Kids + Muscle Ranking Football Masters + Muscle Ranking Kick Target + *Muscle Ranking Spray Hitter + Muscle Ranking Struck Out + Neratte Don Don + Pikkari Chance + Run Run Puppy + Soreike! Hanapuu + + * denotes these games are archived + + TODO: + - currently implemented very basic set of Q2SD GPU features, required/used by dumped games, should be improved if more games will be found. + - hook IRQs from GPU and SPU (not used by dumped games) + + Notes: + - hold Test + Service while booting to initialise RTC NVRAM **************************************************************************/ @@ -352,10 +352,10 @@ WRITE16_MEMBER(gsan_state::gpu_w) break; // R/O registers case 0x002 / 2: // Status - case 0x03e / 2: case 0x040 / 2: - case 0x080 / 2: case 0x082 / 2: - case 0x084 / 2: case 0x086 / 2: - case 0x088 / 2: case 0x08a / 2: case 0x08c / 2: case 0x08e / 2: + case 0x03e / 2: case 0x040 / 2: + case 0x080 / 2: case 0x082 / 2: + case 0x084 / 2: case 0x086 / 2: + case 0x088 / 2: case 0x08a / 2: case 0x08c / 2: case 0x08e / 2: case 0x090 / 2: case 0x092 / 2: m_gpuregs[offset] = prevval; break; @@ -402,7 +402,7 @@ WRITE_LINE_MEMBER(gsan_state::vblank) void gsan_state::draw_quad_tex(u16 cmd, u16 *data) { - // logerror("Q2SD draw %04X src %d:%d sz %d:%d dst %d:%d %d:%d %d:%d %d:%d\n", cmd, data[0], data[1], data[2], data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], (s16)data[8], (s16)data[9], (s16)data[10], (s16)data[11]); + // logerror("Q2SD draw %04X src %d:%d sz %d:%d dst %d:%d %d:%d %d:%d %d:%d\n", cmd, data[0], data[1], data[2], data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], (s16)data[8], (s16)data[9], (s16)data[10], (s16)data[11]); if (cmd & 0x57f) logerror("Q2SD unhandled draw tex mode %04X\n", cmd); u32 ssx = data[0] & 0x3ff; @@ -453,7 +453,7 @@ void gsan_state::draw_quad_tex(u16 cmd, u16 *data) void gsan_state::draw_quad_bin(u16 cmd, u16 *data) { - // logerror("Q2SD draw %04X src %d:%d sz %d:%d dst %d:%d %d:%d %d:%d %d:%d\n", cmd, data[0], data[1], data[2], data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], (s16)data[8], (s16)data[9], (s16)data[10], (s16)data[11]); + // logerror("Q2SD draw %04X src %d:%d sz %d:%d dst %d:%d %d:%d %d:%d %d:%d\n", cmd, data[0], data[1], data[2], data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], (s16)data[8], (s16)data[9], (s16)data[10], (s16)data[11]); if (cmd & 0x57f) logerror("Q2SD unhandled draw bin mode %04X\n", cmd); @@ -511,7 +511,7 @@ void gsan_state::draw_quad_bin(u16 cmd, u16 *data) void gsan_state::fill_quad(u16 cmd, u16 *data) { - // logerror("Q2SD fill dst %d:%d %d:%d %d:%d %d:%d col %04X\n", (s16)data[0], (s16)data[1], (s16)data[2], (s16)data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], data[8]); + // logerror("Q2SD fill dst %d:%d %d:%d %d:%d %d:%d col %04X\n", (s16)data[0], (s16)data[1], (s16)data[2], (s16)data[3], (s16)data[4], (s16)data[5], (s16)data[6], (s16)data[7], data[8]); if (cmd & 0x77f) logerror("Q2SD unhandled draw mode %04X\n", cmd); s16 sdx = data[0]; @@ -881,7 +881,7 @@ static INPUT_PORTS_START( muscl ) PORT_DIPSETTING( 0x0000, "5 Coins/2 Credits" ) PORT_DIPNAME( 0x0078, 0x0078, "Coin Slot 2" ) PORT_DIPLOCATION("SW1:4,5,6,7") PORT_DIPSETTING( 0x0078, "2 Medals" ) -// PORT_DIPSETTING( 0x0070, "2 Medals" ) +// PORT_DIPSETTING( 0x0070, "2 Medals" ) PORT_DIPSETTING( 0x0068, "3 Medals" ) PORT_DIPSETTING( 0x0060, "4 Medals" ) PORT_DIPSETTING( 0x0058, "5 Medals" ) diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 991a363b912..10116a7df42 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -158,17 +158,17 @@ private: WRITE8_MEMBER(konmedal_state::control2_w) { /* CN3 - ---- ---x uPD7759 /ST (TMNT-based boards) - ---- --x- uPD7759 /RESET (TMNT-based boards) - ---- -x-- 10Y Counter - ---- x--- 100Y Counter - ---x ---- 10Y Lock - --x- ---- 100Y Lock - -x-- ---- Hopper On - x--- ---- K056832 RAM/ROM access switch (GX-based boards) + ---- ---x uPD7759 /ST (TMNT-based boards) + ---- --x- uPD7759 /RESET (TMNT-based boards) + ---- -x-- 10Y Counter + ---- x--- 100Y Counter + ---x ---- 10Y Lock + --x- ---- 100Y Lock + -x-- ---- Hopper On + x--- ---- K056832 RAM/ROM access switch (GX-based boards) */ m_control2 = data; - if (m_upd7759) // note: this is needed because games clear reset line and assert start line at the same time, but MAME's outport can't handle right order + if (m_upd7759) // note: this is needed because games clear reset line and assert start line at the same time, but MAME's outport can't handle right order m_upd7759->reset_w((data & 2) ? 1 : 0); m_outport->write(data); machine().bookkeeping().coin_counter_w(0, data & 4); @@ -180,9 +180,9 @@ WRITE8_MEMBER(konmedal_state::control2_w) WRITE8_MEMBER(konmedal_state::medalcnt_w) { /* CN5 - ---- ---x Medal counter +1 (medal in) - ---- --x- Medal counter -1 (hopper out) - ---- -x-- Medal Lock + ---- ---x Medal counter +1 (medal in) + ---- --x- Medal counter -1 (hopper out) + ---- -x-- Medal Lock */ machine().bookkeeping().coin_counter_w(2, data & 2); machine().bookkeeping().coin_lockout_w(2, (data & 4) ? 0 : 1); @@ -190,7 +190,7 @@ WRITE8_MEMBER(konmedal_state::medalcnt_w) WRITE8_MEMBER(konmedal_state::lamps_w) { -// CN6 +// CN6 for (int i = 0; i < 8; i++) m_lamps[i] = BIT(data, i); } @@ -277,7 +277,7 @@ K056832_CB_MEMBER(konmedal_state::tile_callback) m_k056832->read_avac(&mode, &avac); if (mode) *code = (((avac >> ((codebits >> 8) & 0xc)) & 0xf) << 10) | (codebits & 0x3ff); - else + else *code = codebits & 0xfff; *code = bitswap<14>(*code, 8, 9, 13, 12, 11, 10, 7, 6, 5, 4, 3, 2, 1, 0); diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp index fd8677564f4..233883403f6 100644 --- a/src/mame/drivers/legionna.cpp +++ b/src/mame/drivers/legionna.cpp @@ -1941,7 +1941,7 @@ ROM_START( godzilla ) ROM_LOAD( "copx-d2.313", 0x000000, 0x080000, CRC(7c52581b) SHA1(7e668476f886806b0c06fa0bcf4bbc955878c87c) ) ROM_END -/* +/* Denjin Makai newer set PCB labeled BP942KS @@ -1949,7 +1949,7 @@ All "denjin" ROM labels from this set are actually written in kanji chars. */ -ROM_START( denjinmk ) +ROM_START( denjinmk ) ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 code */ ROM_LOAD32_BYTE( "denjin_1.u025", 0x000000, 0x040000, CRC(b23a6e6f) SHA1(73ab330dfc0d2799984874f02da51deb8323b9e2) ) ROM_LOAD32_BYTE( "denjin_2.u024", 0x000001, 0x040000, CRC(4fde59e7) SHA1(1618db14a18acc2acabdd93b8e2563d7221e643d) ) diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp index 2c7d5251518..a45fc7f3b21 100644 --- a/src/mame/drivers/ms32.cpp +++ b/src/mame/drivers/ms32.cpp @@ -2031,7 +2031,7 @@ ROM_START( gratiaa ) ROM_LOAD( "mr94019-09.11", 0x200000, 0x200000, CRC(711ab08b) SHA1(185b80b965ac3aba4857b4f83637008c2c1cc6ff) ) ROM_REGION( 0x200000, "gfx3", 0 ) /* bg tiles */ -// ROM_LOAD( "mr94019-07.10", 0x000000, 0x200000, BAD_DUMP CRC(acb75824) SHA1(3b43e00a2d240761565042c8feead25a83ef0eb1) ) // FIXED BITS (xxxxxxxx11111111) +// ROM_LOAD( "mr94019-07.10", 0x000000, 0x200000, BAD_DUMP CRC(acb75824) SHA1(3b43e00a2d240761565042c8feead25a83ef0eb1) ) // FIXED BITS (xxxxxxxx11111111) ROM_LOAD( "mr94019-07.10", 0x000000, 0x200000, BAD_DUMP CRC(561a786b) SHA1(23df08d50801bd6e4a2f12dd3bb50632ff77f0f2) ) /* HAND CRAFTED: decrypted & re-encrypted 94019_2.07 - marked BAD_DUMP until proper ROM redump */ ROM_REGION( 0x080000, "gfx4", 0 ) /* tx tiles */ diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index 3d7b756a2d9..ff49f38dd44 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -59,9 +59,9 @@ Notes: - All rom pcb's have PLD's NA1R10 and NA1R2 OR they have a C354 in place of the 2 PLD's doing the same job (enable lines on the rom board) - Most games have been seen in both configurations / board styles. + Most games have been seen in both configurations / board styles. C354 is not to be confused with the Keycus, Both devices are 32pin and C3xx. - + - Test mode for NA2 games includes an additional item: UART Test. No games are known to actually link up and use the UART feature. It's been confirmed that a Numan Athletics fails the UART test, diff --git a/src/mame/drivers/nes_boot.cpp b/src/mame/drivers/nes_boot.cpp index 1fefcb1efa8..f6b1395a11e 100644 --- a/src/mame/drivers/nes_boot.cpp +++ b/src/mame/drivers/nes_boot.cpp @@ -29,7 +29,7 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - + WRITE8_MEMBER(sprite_dma_w); private: @@ -68,15 +68,15 @@ void nes_boot_state::machine_reset() void nes_boot_state::machine_start() { -// m_nt_ram = std::make_unique(0x1000); -// m_nt_page[0] = m_nt_ram.get(); -// m_nt_page[1] = m_nt_ram.get() + 0x400; -// m_nt_page[2] = m_nt_ram.get() + 0x800; -// m_nt_page[3] = m_nt_ram.get() + 0xc00; - -// m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(nes_boot_state::nes_boot_nt_r)), write8_delegate(*this, FUNC(nes_boot_state::nes_boot_nt_w))); -// m_ppu->space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank1"); -// membank("bank1")->set_base(memregion("gfx1")->base()); +// m_nt_ram = std::make_unique(0x1000); +// m_nt_page[0] = m_nt_ram.get(); +// m_nt_page[1] = m_nt_ram.get() + 0x400; +// m_nt_page[2] = m_nt_ram.get() + 0x800; +// m_nt_page[3] = m_nt_ram.get() + 0xc00; + +// m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(*this, FUNC(nes_boot_state::nes_boot_nt_r)), write8_delegate(*this, FUNC(nes_boot_state::nes_boot_nt_w))); +// m_ppu->space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank1"); +// membank("bank1")->set_base(memregion("gfx1")->base()); } void nes_boot_state::nes_boot(machine_config &config) diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index 115f732cfad..187bc4ebc9b 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -1412,15 +1412,15 @@ void nes_vt_state::do_dma(uint8_t data, bool has_ntsc_bug) case 0x6: length = 64; break; case 0x7: length = 128; break; } - + uint16_t src_addr = (data << 8) | (src_nib_74 << 4); logerror("vthh dma start ctrl=%02x addr=%04x\n", m_vdma_ctrl, src_addr); - + if (dma_mode == 1) { logerror("vdma dest %04x\n", m_ppu->get_vram_dest()); } - + if (has_ntsc_bug && (dma_mode == 1) && ((m_ppu->get_vram_dest() & 0xFF00) == 0x3F00) && !(m_ppu->get_201x_reg(0x1) & 0x80)) { length -= 1; diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp index 8c99b298d70..a12debf3214 100644 --- a/src/mame/drivers/nmk16.cpp +++ b/src/mame/drivers/nmk16.cpp @@ -131,19 +131,19 @@ remaps button 2 and 3 to button 1, so you can't enter the above sequence. - Tweaked enemy attack patterns - Tweaked boss behavior and attack patterns - Dramatically different stages (and only 7 of them): - - Stage 1: Became Stage 5, very different layouts - - Stage 2: Became Stage 7, with mostly slight enemy layout changes - - Stage 3: Became Stage 6, almost the same as final - - Stage 4: Stayed as Stage 4, with very minor enemy layout changes - - Stage 5: Entirely unique stage, majorly reworked to become final Stage 2 - - Stage 6: Became Stage 3, many enemy layout changes - - Stage 7: Entirely unique stage, majorly reworked to become final Stage 1 + - Stage 1: Became Stage 5, very different layouts + - Stage 2: Became Stage 7, with mostly slight enemy layout changes + - Stage 3: Became Stage 6, almost the same as final + - Stage 4: Stayed as Stage 4, with very minor enemy layout changes + - Stage 5: Entirely unique stage, majorly reworked to become final Stage 2 + - Stage 6: Became Stage 3, many enemy layout changes + - Stage 7: Entirely unique stage, majorly reworked to become final Stage 1 - No ending, instead loops forever - - Loop has extremely fast bullets - - The difficulty seems the same on all loops + - Loop has extremely fast bullets + - The difficulty seems the same on all loops - Player's blue shot has a wider maximum and minimum spread - Player's main shot hitbox is symmetrical and wider than final - - When the hitbox was shrunk for the final, it was only shrunk in one direction, making it extended to the right + - When the hitbox was shrunk for the final, it was only shrunk in one direction, making it extended to the right --- diff --git a/src/mame/drivers/psion5.cpp b/src/mame/drivers/psion5.cpp index 8c77cf41fc9..6e86916795c 100644 --- a/src/mame/drivers/psion5.cpp +++ b/src/mame/drivers/psion5.cpp @@ -18,43 +18,43 @@ #include "includes/psion5.h" -#define LOG_UNKNOWNS (1 << 0) -#define LOG_IRQ (1 << 1) -#define LOG_DISPLAY (1 << 2) -#define LOG_DRAM_READS (1 << 3) -#define LOG_LCD_READS (1 << 4) -#define LOG_POWER_READS (1 << 5) -#define LOG_EOI_READS (1 << 6) -#define LOG_INT_READS (1 << 7) -#define LOG_CODEC_READS (1 << 8) -#define LOG_SSP_READS (1 << 9) -#define LOG_TIMER_READS (1 << 10) -#define LOG_BUZZER_READS (1 << 11) -#define LOG_RTC_READS (1 << 12) -#define LOG_GPIO_READS (1 << 13) -#define LOG_KBD_READS (1 << 14) -#define LOG_DRAM_WRITES (1 << 15) -#define LOG_LCD_WRITES (1 << 16) -#define LOG_POWER_WRITES (1 << 17) -#define LOG_EOI_WRITES (1 << 18) -#define LOG_INT_WRITES (1 << 19) -#define LOG_CODEC_WRITES (1 << 20) -#define LOG_SSP_WRITES (1 << 21) -#define LOG_TIMER_WRITES (1 << 22) -#define LOG_BUZZER_WRITES (1 << 23) -#define LOG_RTC_WRITES (1 << 24) -#define LOG_GPIO_WRITES (1 << 25) -#define LOG_PIN_WRITES (1 << 26) -#define LOG_KBD_WRITES (1 << 27) - -#define LOG_WRITES (LOG_DRAM_WRITES | LOG_LCD_WRITES | LOG_POWER_WRITES | LOG_EOI_WRITES | LOG_INT_WRITES | LOG_CODEC_WRITES \ +#define LOG_UNKNOWNS (1 << 0) +#define LOG_IRQ (1 << 1) +#define LOG_DISPLAY (1 << 2) +#define LOG_DRAM_READS (1 << 3) +#define LOG_LCD_READS (1 << 4) +#define LOG_POWER_READS (1 << 5) +#define LOG_EOI_READS (1 << 6) +#define LOG_INT_READS (1 << 7) +#define LOG_CODEC_READS (1 << 8) +#define LOG_SSP_READS (1 << 9) +#define LOG_TIMER_READS (1 << 10) +#define LOG_BUZZER_READS (1 << 11) +#define LOG_RTC_READS (1 << 12) +#define LOG_GPIO_READS (1 << 13) +#define LOG_KBD_READS (1 << 14) +#define LOG_DRAM_WRITES (1 << 15) +#define LOG_LCD_WRITES (1 << 16) +#define LOG_POWER_WRITES (1 << 17) +#define LOG_EOI_WRITES (1 << 18) +#define LOG_INT_WRITES (1 << 19) +#define LOG_CODEC_WRITES (1 << 20) +#define LOG_SSP_WRITES (1 << 21) +#define LOG_TIMER_WRITES (1 << 22) +#define LOG_BUZZER_WRITES (1 << 23) +#define LOG_RTC_WRITES (1 << 24) +#define LOG_GPIO_WRITES (1 << 25) +#define LOG_PIN_WRITES (1 << 26) +#define LOG_KBD_WRITES (1 << 27) + +#define LOG_WRITES (LOG_DRAM_WRITES | LOG_LCD_WRITES | LOG_POWER_WRITES | LOG_EOI_WRITES | LOG_INT_WRITES | LOG_CODEC_WRITES \ | LOG_SSP_WRITES | LOG_TIMER_WRITES | LOG_BUZZER_WRITES | LOG_RTC_WRITES | LOG_GPIO_WRITES | LOG_PIN_WRITES | LOG_KBD_WRITES) -#define LOG_READS (LOG_DRAM_READS | LOG_LCD_READS | LOG_POWER_READS | LOG_EOI_READS | LOG_INT_READS | LOG_CODEC_READS \ +#define LOG_READS (LOG_DRAM_READS | LOG_LCD_READS | LOG_POWER_READS | LOG_EOI_READS | LOG_INT_READS | LOG_CODEC_READS \ | LOG_SSP_READS | LOG_TIMER_READS | LOG_BUZZER_READS | LOG_RTC_READS | LOG_GPIO_READS | LOG_KBD_READS) -#define LOG_ALL_IRQ (LOG_IRQ | LOG_EOI_WRITES | LOG_INT_WRITES | LOG_EOI_READS | LOG_INT_READS) -#define LOG_ALL (LOG_UNKNOWNS | LOG_IRQ | LOG_DISPLAY | LOG_WRITES | LOG_READS) +#define LOG_ALL_IRQ (LOG_IRQ | LOG_EOI_WRITES | LOG_INT_WRITES | LOG_EOI_READS | LOG_INT_READS) +#define LOG_ALL (LOG_UNKNOWNS | LOG_IRQ | LOG_DISPLAY | LOG_WRITES | LOG_READS) -#define VERBOSE (LOG_CODEC_READS | LOG_CODEC_WRITES | LOG_BUZZER_WRITES) +#define VERBOSE (LOG_CODEC_READS | LOG_CODEC_WRITES | LOG_BUZZER_WRITES) #include "logmacro.h" void psion5mx_state::machine_start() diff --git a/src/mame/drivers/pubint_storyreader.cpp b/src/mame/drivers/pubint_storyreader.cpp index e64c65cdb24..108d4d8f5b0 100644 --- a/src/mame/drivers/pubint_storyreader.cpp +++ b/src/mame/drivers/pubint_storyreader.cpp @@ -2,67 +2,67 @@ // copyright-holders:David Haywood /****************************************************************************** - Non-video 'electronic book' reader that takes cartridges - - Cartridges are accessed using serial read methods, contain data, not code - so must be internal ROMs on the systems. - - - --- - - V1 - rectangular cart - glob up, pins toward you, pins 1-10, left to right - - 1 tied high - 2 CE1 left glob - 3 CE2 right glob - 4 pin 5 - 5 pin 4 - 6 data - 7 ground - 8 clock - 9 3.3 volts - 10 tied high - - ---- - - V2 - rounded top cart - - 1 CE1 left glob - 2 CE2 right glob - 3 tied high - 4 ground - 5 clock - 6 data - 7 ground - 8 ground - 9 3.3 volts - 10 tied high - - V2 PCB silkscreened with GPR23L822A - 8Mbit serial ROM - - ---- - - To dump: - set data and clock high, CE1 low for 1 mS - set CE1 high for 3 uS - set data low for 2 uS - set clock low for 2 uS - set data high for 2 uS - set clock high for 2 uS - set clock low for 2 uS - set data low for 2 uS - loop 24 times: - set clock high for 1 uS - set clock low for 1 uS - make data high Z - loop 8M tims: - set clock high for 1 uS - sample data - set clock low for 1 uS - set CE1 low - - if 2 globs, repeat with CE2 + Non-video 'electronic book' reader that takes cartridges + + Cartridges are accessed using serial read methods, contain data, not code + so must be internal ROMs on the systems. + + + --- + + V1 - rectangular cart + glob up, pins toward you, pins 1-10, left to right + + 1 tied high + 2 CE1 left glob + 3 CE2 right glob + 4 pin 5 + 5 pin 4 + 6 data + 7 ground + 8 clock + 9 3.3 volts + 10 tied high + + ---- + + V2 - rounded top cart + + 1 CE1 left glob + 2 CE2 right glob + 3 tied high + 4 ground + 5 clock + 6 data + 7 ground + 8 ground + 9 3.3 volts + 10 tied high + + V2 PCB silkscreened with GPR23L822A - 8Mbit serial ROM + + ---- + + To dump: + set data and clock high, CE1 low for 1 mS + set CE1 high for 3 uS + set data low for 2 uS + set clock low for 2 uS + set data high for 2 uS + set clock high for 2 uS + set clock low for 2 uS + set data low for 2 uS + loop 24 times: + set clock high for 1 uS + set clock low for 1 uS + make data high Z + loop 8M tims: + set clock high for 1 uS + sample data + set clock low for 1 uS + set CE1 low + + if 2 globs, repeat with CE2 *******************************************************************************/ diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp index 64df6104125..b06ed7b7e65 100644 --- a/src/mame/drivers/segasp.cpp +++ b/src/mame/drivers/segasp.cpp @@ -519,7 +519,7 @@ ROM_START( mirworld ) ROM_LOAD( "ic63", 0x04000000, 0x4000000, CRC(ec7e58cb) SHA1(8c6a45da31cd87a71b8e2f7454dc31bc2891210b) ) ROM_PARAMETER( ":rom_board:id", "5502" ) // 2x 512Mbit FlashROMs - + ROM_REGION( 0x800, "pic_readout", ROMREGION_ERASEFF ) // not populated ROM_END diff --git a/src/mame/drivers/skopro.cpp b/src/mame/drivers/skopro.cpp index 98ea9698186..e7f883296d6 100644 --- a/src/mame/drivers/skopro.cpp +++ b/src/mame/drivers/skopro.cpp @@ -9,7 +9,7 @@ 1GB RAM nVidia GeForce 8400GS Integrated sound? - Hitachi Deskstar HDS721680PLA320 80 GB + Hitachi Deskstar HDS721680PLA320 80 GB EGIS2JVS V1.2 card Windows XP embedded diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp old mode 100755 new mode 100644 index f79dbfda150..1854e3605fc --- a/src/mame/drivers/snesb.cpp +++ b/src/mame/drivers/snesb.cpp @@ -4,7 +4,7 @@ Arcade games (hacks of console games) running on SNES hardware. - Driver (based on nss.cpp) by Tomasz Slanina + Driver (based on nss.cpp) by Tomasz Slanina Supported games: - Killer Instinct diff --git a/src/mame/drivers/spg110.cpp b/src/mame/drivers/spg110.cpp index 80a677f58e7..2978bf934bc 100644 --- a/src/mame/drivers/spg110.cpp +++ b/src/mame/drivers/spg110.cpp @@ -11,7 +11,7 @@ JAKKS Spiderman 5-in-1 (original release) Conny TV Virtual Tennis Conny Ping Pong - Conny TV Virtual Fighter + Conny TV Virtual Fighter assumed: JAKKS EA Sports (NHL 95 + Madden 95) (US) @@ -556,5 +556,5 @@ CONS( 2003, conyteni, 0, 0, spg110_base, conyteni, spg110_game_state, e CONS( 2003, conyping, 0, 0, spg110_base, conyteni, spg110_game_state, empty_init, "Conny / SDW Games", "Virtual Ping Pong (Conny / SDW Games)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a Big Ben 'TV Virtual Fighter' unit, although shows Free Fight Kung Fu on title screen -// Also sold by SDW Games as both TV Virtual Fighter and TV Kickboxing (unit still has TV Virtual Fighter stickers even when box is TV Kickboxing - possibly just box changed due to Sega?) +// Also sold by SDW Games as both TV Virtual Fighter and TV Kickboxing (unit still has TV Virtual Fighter stickers even when box is TV Kickboxing - possibly just box changed due to Sega?) CONS( 200?, conyfght, 0, 0, spg110_base, conyteni, spg110_game_state, empty_init, "Conny / Big Ben", "TV Virtual Fighter / Free Fight Kung Fu (Conny / Big Ben)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/spg2xx.cpp b/src/mame/drivers/spg2xx.cpp index 3c301f0d837..e17b256d820 100644 --- a/src/mame/drivers/spg2xx.cpp +++ b/src/mame/drivers/spg2xx.cpp @@ -865,10 +865,10 @@ void spg2xx_game_state::init_tvsprt10() // this hack means the ROM CRC fails, but without it the CRC is OK, so dump is good. /* port b 0010 = chip select? / always set when accessing? - 0008 = write enable (set when writing, not when reading) - 0004 = chip select? / always set when accessing? - 0002 = clock? (toggles) - 0001 = data in / out + 0008 = write enable (set when writing, not when reading) + 0004 = chip select? / always set when accessing? + 0002 = clock? (toggles) + 0001 = data in / out */ rom[0x18c55d] ^= 0x0001; } diff --git a/src/mame/drivers/spg2xx_lexibook.cpp b/src/mame/drivers/spg2xx_lexibook.cpp index e3875c39d1c..4519dd4dde1 100644 --- a/src/mame/drivers/spg2xx_lexibook.cpp +++ b/src/mame/drivers/spg2xx_lexibook.cpp @@ -12,7 +12,7 @@ public: void lexiseal(machine_config& config); void lexizeus(machine_config &config); - + void init_zeus(); protected: @@ -185,7 +185,7 @@ INPUT_PORTS_END WRITE16_MEMBER(spg2xx_lexiseal_game_state::portb_w) { //logerror("%s: portb_w %04x\n", machine().describe_context(), data); - + // only 2 banks if (data == 0x5f) switch_bank(0); diff --git a/src/mame/drivers/spg2xx_pdc.cpp b/src/mame/drivers/spg2xx_pdc.cpp index f82995fa80b..52cd17de569 100644 --- a/src/mame/drivers/spg2xx_pdc.cpp +++ b/src/mame/drivers/spg2xx_pdc.cpp @@ -53,7 +53,7 @@ void spg2xx_pdc100_game_state::machine_reset() WRITE16_MEMBER(spg2xx_pdc100_game_state::porta_w) { //logerror("%s: porta_w %04x\n", machine().describe_context(), data); - + // simply writes 0000 at times during bootup while initializing stuff, which causes an invalid bankswitch mid-code execution if (data & 0xff00) switch_bank(data & 0x0007); diff --git a/src/mame/drivers/spg2xx_playvision.cpp b/src/mame/drivers/spg2xx_playvision.cpp index 037bf736ec5..7d8650d345b 100644 --- a/src/mame/drivers/spg2xx_playvision.cpp +++ b/src/mame/drivers/spg2xx_playvision.cpp @@ -226,5 +226,5 @@ ROM_START( pvmil ) ROM_LOAD16_WORD_SWAP( "millionare4.bin", 0x000000, 0x400000, CRC(9c43d0f2) SHA1(fb4ba0115000b10b7c0e0d44b9fa3234c900e694) ) ROM_END -// there are other regions of this, including a Finnish version "Haluatko miljonääriksi?" (see https://millionaire.fandom.com/wiki/Haluatko_miljon%C3%A4%C3%A4riksi%3F_(Play_Vision_game) ) +// there are other regions of this, including a Finnish version "Haluatko miljonääriksi?" (see https://millionaire.fandom.com/wiki/Haluatko_miljon%C3%A4%C3%A4riksi%3F_(Play_Vision_game) ) CONS( 2006, pvmil, 0, 0, pvmil, pvmil, pvmil_state, empty_init, "Play Vision", "Who Wants to Be a Millionaire? (Play Vision, Plug and Play, UK)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/spg2xx_senario.cpp b/src/mame/drivers/spg2xx_senario.cpp index 237631325d9..4b217e1063a 100644 --- a/src/mame/drivers/spg2xx_senario.cpp +++ b/src/mame/drivers/spg2xx_senario.cpp @@ -2,15 +2,15 @@ // copyright-holders:Ryan Holtz, David Haywood /* - General Senario games on SunPlus hardware - - these check for flash ROM and actually save user data at 0x700000 (senmil/senbbs/senapren) in the flash ROM + General Senario games on SunPlus hardware - TODO: - senmil - Are the LEDs on the controllers meant to go out as players select answers like with pvmil, or are they just to show that the controller is connected? - sencosmo - fix Flash hookup (crashes if you use a Flash chip right now) - senapren - should it actually save data? chip really seems to be 2MB, data written at 7MB can't be saved at mirrored 1MB address or it would erase game code / data - senpmate - again seems to actually be a 2MB chip + these check for flash ROM and actually save user data at 0x700000 (senmil/senbbs/senapren) in the flash ROM + + TODO: + senmil - Are the LEDs on the controllers meant to go out as players select answers like with pvmil, or are they just to show that the controller is connected? + sencosmo - fix Flash hookup (crashes if you use a Flash chip right now) + senapren - should it actually save data? chip really seems to be 2MB, data written at 7MB can't be saved at mirrored 1MB address or it would erase game code / data + senpmate - again seems to actually be a 2MB chip */ @@ -80,7 +80,7 @@ public: { } void senmil(machine_config& config); - + protected: //virtual void machine_start() override; //virtual void machine_reset() override; @@ -238,7 +238,7 @@ WRITE16_MEMBER(spg2xx_senario_mil_state::portc_w) logerror("%s: spg2xx_senario_mil_state::portc_w %04x ---- %04x %04x \n", machine().describe_context(), data, data & 0x55, data & 0xaa); m_portc_data = data; } - + READ16_MEMBER(spg2xx_senario_mil_state::portc_r) { uint16_t ret = m_io_p3->read() & 0xffaa; // 0xaa must be set to register all controllers as turned on diff --git a/src/mame/drivers/spg2xx_senario_poker.cpp b/src/mame/drivers/spg2xx_senario_poker.cpp index ea2a090d845..3a532ba3d30 100644 --- a/src/mame/drivers/spg2xx_senario_poker.cpp +++ b/src/mame/drivers/spg2xx_senario_poker.cpp @@ -722,5 +722,5 @@ void sentx6p_state::init_sentx6pd() CONS( 2004, sentx6p, 0, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6p, "Senario", "Vs Maxx Texas Hold'em TV Poker - 6 Player Edition (US)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a US version, values in USD CONS( 2004, sentx6puk, sentx6p, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6puk, "Senario / Play Vision", "Vs Maxx Texas Hold'em TV Poker - 6 Player Edition (UK)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a UK Play Vision branded box, values in GBP -CONS( 2004, sentx6pd, 0, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6pd, "Senario", "Deluxe TV Poker - Texas Hold'em, Blackjack & Video Poker (US)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -// Deluxe version wasn't released outside of US? \ No newline at end of file +CONS( 2004, sentx6pd, 0, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6pd, "Senario", "Deluxe TV Poker - Texas Hold'em, Blackjack & Video Poker (US)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) +// Deluxe version wasn't released outside of US? diff --git a/src/mame/drivers/spg2xx_shredmjr.cpp b/src/mame/drivers/spg2xx_shredmjr.cpp index c4e40701e5b..bc6304e12ed 100644 --- a/src/mame/drivers/spg2xx_shredmjr.cpp +++ b/src/mame/drivers/spg2xx_shredmjr.cpp @@ -14,7 +14,7 @@ public: void shredmjr(machine_config &config); void taikeegr(machine_config &config); - + void init_taikeegr(); protected: diff --git a/src/mame/drivers/spg2xx_telestory.cpp b/src/mame/drivers/spg2xx_telestory.cpp index 7d29585ada0..bfc9537bd8e 100644 --- a/src/mame/drivers/spg2xx_telestory.cpp +++ b/src/mame/drivers/spg2xx_telestory.cpp @@ -28,7 +28,7 @@ protected: virtual DECLARE_WRITE16_MEMBER(porta_w) override; virtual DECLARE_WRITE16_MEMBER(portb_w) override; - virtual DECLARE_WRITE16_MEMBER(portc_w) override; + virtual DECLARE_WRITE16_MEMBER(portc_w) override; DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load_telestory); @@ -292,11 +292,11 @@ ROM_START( telestry ) ROM_END -/* Sound data for the narrator is written to the SIO data port +/* Sound data for the narrator is written to the SIO data port 013127: D319 3D54 [3d54] = r1 (Cinderella) - 4-bit data? The hidden test mode calls the speech test 'CELP' (possibly "Code-excited linear prediction" based?) https://en.wikipedia.org/wiki/Code-excited_linear_prediction - + TODO: check if it's a common implementation eg. Speex SIO port is not currently implemented in spg2xx_io.cpp however */ diff --git a/src/mame/drivers/spg2xx_zone_32bit.cpp b/src/mame/drivers/spg2xx_zone_32bit.cpp index c7e746b447b..7a048a4b2e8 100644 --- a/src/mame/drivers/spg2xx_zone_32bit.cpp +++ b/src/mame/drivers/spg2xx_zone_32bit.cpp @@ -14,7 +14,7 @@ public: { } void zon32bit(machine_config& config); - + void mem_map_zon32bit(address_map &map); void init_zon32bit() { m_game = 0; }; @@ -23,7 +23,7 @@ public: protected: virtual void machine_start() override; virtual void machine_reset() override; - + DECLARE_READ16_MEMBER(z32_rom_r); required_region_ptr m_romregion; @@ -48,15 +48,15 @@ private: }; READ16_MEMBER(zon32bit_state::porta_r) -{ +{ return m_porta_dat; } WRITE16_MEMBER(zon32bit_state::porta_w) -{ +{ //if (data != 0x0101) - // logerror("%s: porta_w (%04x)\n", machine().describe_context(), data); + // logerror("%s: porta_w (%04x)\n", machine().describe_context(), data); m_porta_dat = data; @@ -75,15 +75,15 @@ WRITE16_MEMBER(zon32bit_state::porta_w) /* if (data == 0x0335) { - logerror("%s: port a write 0x0355, port c is %04x %04X\n", machine().describe_context(), data, data & 0x1800); + logerror("%s: port a write 0x0355, port c is %04x %04X\n", machine().describe_context(), data, data & 0x1800); - m_upperbank = (m_portc_dat & 0x1800); + m_upperbank = (m_portc_dat & 0x1800); } */ } READ16_MEMBER(zon32bit_state::portc_r) -{ +{ // 0x03ff seem to be inputs for buttons (and some kind of output?) // 0xfc00 gets masked for other reasons (including banking?) @@ -98,7 +98,7 @@ READ16_MEMBER(zon32bit_state::portc_r) READ16_MEMBER(zon32bit_state::portb_r) -{ +{ return m_portb_dat; } @@ -118,7 +118,7 @@ WRITE16_MEMBER(zon32bit_state::portc_w) //logerror("%s: portc_w (%04x)\n", machine().describe_context(), data); //if ((pc >= 0x77261) && (pc <= 0x77268)) - // logerror("%s: port c %04x %04X-- BANK STUFF\n", machine().describe_context(), data, data & 0x1800); + // logerror("%s: port c %04x %04X-- BANK STUFF\n", machine().describe_context(), data, data & 0x1800); //logerror("%s: port c %04x %04x\n", machine().describe_context(), data, data & 0x1800); @@ -201,9 +201,9 @@ void zon32bit_state::mem_map_zon32bit(address_map &map) READ16_MEMBER(zon32bit_state::z32_rom_r) { /* - This has upper and lower bank, which can be changed independently. - Banking hookup is currently very hacky as bank values are written - to ports then erased at the moment, maybe they latch somehow? + This has upper and lower bank, which can be changed independently. + Banking hookup is currently very hacky as bank values are written + to ports then erased at the moment, maybe they latch somehow? */ if (m_game == 0) // zon32bit @@ -213,7 +213,7 @@ READ16_MEMBER(zon32bit_state::z32_rom_r) if (m_hackbank == 0) // if lower bank is 0 return m_romregion[offset + 0x000000]; else - { // if lower bank is 1 + { // if lower bank is 1 return m_romregion[offset + 0x400000]; } } @@ -250,7 +250,7 @@ READ16_MEMBER(zon32bit_state::z32_rom_r) { return m_romregion[offset + (0x3000000 / 2)]; } - else // Mi Guitar + else // Mi Guitar { return m_romregion[offset + (0x0000000 / 2)]; } @@ -270,7 +270,7 @@ READ16_MEMBER(zon32bit_state::z32_rom_r) { if ((m_upperbank & 0x1800) == 0x1000) return m_romregion[offset + (0x3400000 / 2)]; // base code for other bank else if ((m_upperbank & 0x1800) == 0x0800) return m_romregion[offset + (0x3800000 / 2)]; // - else if ((m_upperbank & 0x1800) == 0x1800) return m_romregion[offset + (0x3c00000 / 2)]; // + else if ((m_upperbank & 0x1800) == 0x1800) return m_romregion[offset + (0x3c00000 / 2)]; // else if ((m_upperbank & 0x1800) == 0x0000) return m_romregion[offset + (0x3400000 / 2)]; // } else @@ -403,7 +403,7 @@ static INPUT_PORTS_START( zon32bit ) PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - + PORT_START("P3") PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Up (vertical) Left (horizontal)") PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("Down (vertical) Right (horizontal)") @@ -434,7 +434,7 @@ static INPUT_PORTS_START( zon32bit ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) INPUT_PORTS_END void zon32bit_state::zon32bit(machine_config &config) @@ -464,7 +464,7 @@ ROM_END ROM_START( zon32bit ) ROM_REGION( 0x2000000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD16_WORD_SWAP( "41sports.bin", 0x0000, 0x2000000, CRC(86eee6e0) SHA1(3f6cab6649aebf596de5a8af21658bb1a27edb10) ) -ROM_END +ROM_END // Box advertises this as '40 Games Included' but the cartridge, which was glued directly to the PCB, not removable, is a 41-in-1. Maybe some versions exist with a 40 game selection. diff --git a/src/mame/drivers/storio.cpp b/src/mame/drivers/storio.cpp index 286cd03b467..b1733f21229 100644 --- a/src/mame/drivers/storio.cpp +++ b/src/mame/drivers/storio.cpp @@ -15,9 +15,9 @@ TODO: everything! - NAND types + NAND types - Storio Spanish old BIOS TC58NVG0S3ETA00 (2048+64) x 64 x 1024 + Storio Spanish old BIOS TC58NVG0S3ETA00 (2048+64) x 64 x 1024 *******************************************************************************/ diff --git a/src/mame/drivers/sunplus_gcm394.cpp b/src/mame/drivers/sunplus_gcm394.cpp index dc8fd552520..e66df242f9d 100644 --- a/src/mame/drivers/sunplus_gcm394.cpp +++ b/src/mame/drivers/sunplus_gcm394.cpp @@ -5,7 +5,7 @@ Compared to vii.cpp this is clearly newer, has extra opcodes, different internal map etc. also scaling and higher resolutions based on Spongebob - note, these SoC types always have a 128Kwords internal ROM, which the JAKKS games appear to use for basic bootstrap purposes. + note, these SoC types always have a 128Kwords internal ROM, which the JAKKS games appear to use for basic bootstrap purposes. GPAC800 / GCM394 (SpongeBob Bikini Bottom 500 Test Mode also calls this GPAC800, even if the mappings appear different to the NAND version below - different CS base, maybe just depends on boot mode?) Smart Fit Park @@ -31,14 +31,14 @@ these are all unsp 2.0 type, as they use the extended ocpodes - NAND types: + NAND types: - Toy Story Mania H27U518S2C dumped as HY27US08121A (512+16) x 32 x 4096 - Beam Box GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 - Golden Tee GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 - Cars 2 GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 + Toy Story Mania H27U518S2C dumped as HY27US08121A (512+16) x 32 x 4096 + Beam Box GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 + Golden Tee GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 + Cars 2 GPR27P512A dumped as HY27US08121A (512+16) x 32 x 4096 - V.Baby HY27UF081G2A (2048+64) x 64 x 1024 + V.Baby HY27UF081G2A (2048+64) x 64 x 1024 */ @@ -211,17 +211,17 @@ WRITE16_MEMBER(gcm394_game_state::cs4_w) { logerror("cs4_w %06x %04x\n", offset, /* - map info (NAND type) + map info (NAND type) - map(0x000000, 0x006fff) internal RAM - map(0x007000, 0x007fff) internal peripherals - map(0x008000, 0x00ffff) internal ROM (lower 32kwords) - can also be configured to mirror CS0 308000 area with external pin for boot from external ROM - map(0x010000, 0x027fff) internal ROM (upper 96kwords) - can't be switched - map(0x028000, 0x02ffff) reserved + map(0x000000, 0x006fff) internal RAM + map(0x007000, 0x007fff) internal peripherals + map(0x008000, 0x00ffff) internal ROM (lower 32kwords) - can also be configured to mirror CS0 308000 area with external pin for boot from external ROM + map(0x010000, 0x027fff) internal ROM (upper 96kwords) - can't be switched + map(0x028000, 0x02ffff) reserved - map(0x030000, 0x0.....) view into external spaces (CS0 area starts here. followed by CS1 area, CS2 area etc.) - - map(0x200000, 0x3fffff) continued view into external spaces, but this area is banked with m_membankswitch_7810 (valid bank values 0x00-0x3f) + map(0x030000, 0x0.....) view into external spaces (CS0 area starts here. followed by CS1 area, CS2 area etc.) + + map(0x200000, 0x3fffff) continued view into external spaces, but this area is banked with m_membankswitch_7810 (valid bank values 0x00-0x3f) */ @@ -349,12 +349,12 @@ protected: /* virtual DECLARE_READ16_MEMBER(porta_r) override { - return machine().rand(); + return machine().rand(); } virtual DECLARE_READ16_MEMBER(portb_r) override { - return machine().rand(); + return machine().rand(); } virtual DECLARE_WRITE16_MEMBER(porta_w) override @@ -467,7 +467,7 @@ READ16_MEMBER(jak_s500_game_state::porta_r) //address_space& mem = m_maincpu->space(AS_PROGRAM); //if (mem.read_word(0x22b408) == 0x4846) - // mem.write_word(0x22b408, 0x4840); // jak_s500 force service mode + // mem.write_word(0x22b408, 0x4840); // jak_s500 force service mode return data; } @@ -634,14 +634,14 @@ WRITE16_MEMBER(wrlshunt_game_state::porta_w) // HACK address_space& mem = m_maincpu->space(AS_PROGRAM); - if (mem.read_word(0x5b354) == 0xafd0) // wrlshubt - skip check (EEPROM?) + if (mem.read_word(0x5b354) == 0xafd0) // wrlshubt - skip check (EEPROM?) mem.write_word(0x5b354, 0xB403); } void generalplus_gpac800_game_state::generalplus_gpac800(machine_config &config) { - GPAC800(config, m_maincpu, 96000000/2, m_screen); + GPAC800(config, m_maincpu, 96000000/2, m_screen); m_maincpu->porta_in().set(FUNC(generalplus_gpac800_game_state::porta_r)); m_maincpu->portb_in().set(FUNC(generalplus_gpac800_game_state::portb_r)); m_maincpu->portc_in().set(FUNC(generalplus_gpac800_game_state::portc_r)); @@ -716,32 +716,32 @@ void gcm394_game_state::cs_callback(uint16_t cs0, uint16_t cs1, uint16_t cs2, ui int end_address; int size; // cs region sizes in kwords - - size = (((cs0 & 0xff00) >> 8) + 1) * 0x10000; + + size = (((cs0 & 0xff00) >> 8) + 1) * 0x10000; end_address = start_address + (size - 1); logerror("installing cs0 handler start_address %08x end_address %08x\n", start_address, end_address); m_memory->get_program()->install_readwrite_handler( start_address, end_address, read16_delegate(*this, FUNC(gcm394_game_state::cs0_r)), write16_delegate(*this, FUNC(gcm394_game_state::cs0_w))); start_address += size; - size = (((cs1 & 0xff00) >> 8) + 1) * 0x10000; + size = (((cs1 & 0xff00) >> 8) + 1) * 0x10000; end_address = start_address + (size - 1); logerror("installing cs1 handler start_address %08x end_address %08x\n", start_address, end_address); m_memory->get_program()->install_readwrite_handler( start_address, end_address, read16_delegate(*this, FUNC(gcm394_game_state::cs1_r)), write16_delegate(*this, FUNC(gcm394_game_state::cs1_w))); start_address += size; - size = (((cs2 & 0xff00) >> 8) + 1) * 0x10000; + size = (((cs2 & 0xff00) >> 8) + 1) * 0x10000; end_address = start_address + (size - 1); logerror("installing cs2 handler start_address %08x end_address %08x\n", start_address, end_address); m_memory->get_program()->install_readwrite_handler( start_address, end_address, read16_delegate(*this, FUNC(gcm394_game_state::cs2_r)), write16_delegate(*this, FUNC(gcm394_game_state::cs2_w))); start_address += size; - size = (((cs3 & 0xff00) >> 8) + 1) * 0x10000; + size = (((cs3 & 0xff00) >> 8) + 1) * 0x10000; end_address = start_address + (size - 1); logerror("installing cs3 handler start_address %08x end_address %08x\n", start_address, end_address); m_memory->get_program()->install_readwrite_handler( start_address, end_address, read16_delegate(*this, FUNC(gcm394_game_state::cs3_r)), write16_delegate(*this, FUNC(gcm394_game_state::cs3_w))); start_address += size; - size = (((cs4 & 0xff00) >> 8) + 1) * 0x10000; + size = (((cs4 & 0xff00) >> 8) + 1) * 0x10000; end_address = start_address + (size - 1); logerror("installing cs4 handler start_address %08x end_address %08x\n", start_address, end_address); m_memory->get_program()->install_readwrite_handler( start_address, end_address, read16_delegate(*this, FUNC(gcm394_game_state::cs4_r)), write16_delegate(*this, FUNC(gcm394_game_state::cs4_w))); @@ -751,7 +751,7 @@ void gcm394_game_state::cs_callback(uint16_t cs0, uint16_t cs1, uint16_t cs2, ui void generalplus_gpspispi_game_state::generalplus_gpspispi(machine_config &config) { - GP_SPISPI(config, m_maincpu, 96000000/2, m_screen); + GP_SPISPI(config, m_maincpu, 96000000/2, m_screen); m_maincpu->porta_in().set(FUNC(generalplus_gpspispi_game_state::porta_r)); m_maincpu->portb_in().set(FUNC(generalplus_gpspispi_game_state::portb_r)); m_maincpu->portc_in().set(FUNC(generalplus_gpspispi_game_state::portc_r)); @@ -789,7 +789,7 @@ DEVICE_IMAGE_LOAD_MEMBER(generalplus_gpspispi_bkrankp_game_state::cart_load) void generalplus_gpspispi_bkrankp_game_state::generalplus_gpspispi_bkrankp(machine_config &config) { - generalplus_gpspispi_game_state::generalplus_gpspispi(config); + generalplus_gpspispi_game_state::generalplus_gpspispi(config); GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "bkrankp_cart"); m_cart->set_width(GENERIC_ROM16_WIDTH); @@ -1349,7 +1349,7 @@ ROM_START(wrlshunt) //ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) ROM_REGION(0x8000000, "maincpu", ROMREGION_ERASE00) - ROM_LOAD16_WORD_SWAP("wireless.bin", 0x0000, 0x8000000, CRC(a6ecc20e) SHA1(3645f23ba2bb218e92d4560a8ae29dddbaabf796)) + ROM_LOAD16_WORD_SWAP("wireless.bin", 0x0000, 0x8000000, CRC(a6ecc20e) SHA1(3645f23ba2bb218e92d4560a8ae29dddbaabf796)) ROM_END /* @@ -1696,17 +1696,17 @@ void generalplus_gpspispi_game_state::init_spi() /* Offset(h) 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F - 00000000 50 47 70 73 73 69 69 70 70 73 44 00 44 3F 44 00 PGpssiipps - 00000010 -- -- -- -- -- bb -- -- -- -- -- -- -- -- -- -- - ^^ copy dest, just like with nand type + 00000000 50 47 70 73 73 69 69 70 70 73 44 00 44 3F 44 00 PGpssiipps + 00000010 -- -- -- -- -- bb -- -- -- -- -- -- -- -- -- -- + ^^ copy dest, just like with nand type - bb = where to copy first block + bb = where to copy first block - The header is GPspispi (byteswapped) then some params - one of the params appears to be for the initial code copy operation done - by the bootstrap + The header is GPspispi (byteswapped) then some params + one of the params appears to be for the initial code copy operation done + by the bootstrap */ - + // probably more bytes are used int dest = spirom[0x15] << 8; @@ -1736,4 +1736,4 @@ void generalplus_gpspispi_game_state::init_spi() } -CONS(200?, bkrankp, 0, 0, generalplus_gpspispi_bkrankp, gcm394, generalplus_gpspispi_bkrankp_game_state , init_spi, "Bandai", "Karaoke Ranking Party (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) +CONS(200?, bkrankp, 0, 0, generalplus_gpspispi_bkrankp, gcm394, generalplus_gpspispi_bkrankp_game_state , init_spi, "Bandai", "Karaoke Ranking Party (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/drivers/toki_ms.cpp b/src/mame/drivers/toki_ms.cpp index 787656a9fa5..a242dba8cd6 100644 --- a/src/mame/drivers/toki_ms.cpp +++ b/src/mame/drivers/toki_ms.cpp @@ -6,30 +6,30 @@ as with most of the 'Modular System' setups, the hardware is heavily modified from the original and consists of a multi-board stack in a cage, hence different driver. - Update: it doesn't seem all that different than tokib, the differences are: - * paletteram; - * video registers; + Update: it doesn't seem all that different than tokib, the differences are: + * paletteram; + * video registers; * sprite chip interface (basically shifting all the ports, why even?); - * switching from YM3812 to a double YM2203 setup; - - TODO: - - Subclass with tokib_state in toki.cpp driver; - - Sound needs improvements: - * meaning of port A/B of the two YMs; - * MSM playback; - * improve comms; - * ROM bank; - * One of the above for the scratchy sounds that happens from time to time; - * Mixing; - - Ranking screen has wrong colors, btanb? - - Slight sprite lag when game scrolls vertically, another btanb? - - "bajo licencia" -> "under license" ... from whoever developed Modular System or TAD itself? + * switching from YM3812 to a double YM2203 setup; + + TODO: + - Subclass with tokib_state in toki.cpp driver; + - Sound needs improvements: + * meaning of port A/B of the two YMs; + * MSM playback; + * improve comms; + * ROM bank; + * One of the above for the scratchy sounds that happens from time to time; + * Mixing; + - Ranking screen has wrong colors, btanb? + - Slight sprite lag when game scrolls vertically, another btanb? + - "bajo licencia" -> "under license" ... from whoever developed Modular System or TAD itself? NOTES: PCB lacks raster effect on title screen (like toki bootlegs) BOARDS - + Board 5-1 ___________________________________________________________ | ________________ ________________ | @@ -77,7 +77,7 @@ | | EMPTY | | EMPTY | | | |_______________| |_______________| | |__________________________________________________________| - + Board 8 __________________________________________________________________________________ | :::::::: <- Jumpers | @@ -112,7 +112,7 @@ | _____________________________ _______ _________________________________ | |__| |____74LS138N_| |__| |____________________________| |________________________________| - + CPU Board 6/1 Board 21/1 _____________________________________________ ______________________________________________ | _______________ __|_ | | @@ -156,7 +156,7 @@ | |74F74N XTAL 74LS368AB1 74LS132B1 | | | 74LS245B1 74LS245B1 |74LS08N 74LS174N | | 20.000MHz | |___| | |____________________________________________| |_____________________________________________| - + Board 51/3 Sound Board 1/3 _____________________________________________ ______________________________________________ | | | | @@ -328,7 +328,7 @@ private: void tokims_map(address_map &map); void audio_map(address_map &map); - + DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(adpcm_w); @@ -375,13 +375,13 @@ Copies from original location to an 8-bit RAM, split into two banks like palette First entry are global flags (unchecked) Offsets are in 16-bit to make this less confusing [0x000] tttt tttt tttt tttt ---- ---- ---- ---- tile low offset - ---- ---- ---- ---- yyyy yyyy yyyy yyyy Y offset + ---- ---- ---- ---- yyyy yyyy yyyy yyyy Y offset [0x002] xxxx xxxx xxxx xxxx ---- ---- ---- ---- X offset - ---- ---- ---- ---- ---- -f-- ---- ---- flip X - ---- ---- ---- ---- ---- --t- ---- ---- tile banking - ---- ---- ---- ---- ---- ---- tttt tttt tile upper offset + ---- ---- ---- ---- ---- -f-- ---- ---- flip X + ---- ---- ---- ---- ---- --t- ---- ---- tile banking + ---- ---- ---- ---- ---- ---- tttt tttt tile upper offset [0x200] x--- ---- ---- ---- ---- ---- ---- ---- x wraparound - ---- ---- ---- cccc ---- ---- ---- ---- color offset + ---- ---- ---- cccc ---- ---- ---- ---- color offset [0x202] ---- ---- ---- ---- ---- ---- ---- ---- */ void toki_ms_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) @@ -396,18 +396,18 @@ void toki_ms_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) u16 *hibank = &m_spriteram->buffer()[offs+bank_size]; y = 240 - (lobank[0] & 0xff); - + x = lobank[1] >> 8; if (!(hibank[0] & 0x8000)) x -= 256; - + flipx = (lobank[1] & 0x40); - + tile = (lobank[0] >> 8); tile |= ((lobank[1] & 0x0f) << 8); if (lobank[1] & 0x20) tile |= 0x1000; - + color = (hibank[0] & 0x0f00) >> 8; m_gfxdecode->gfx(1)->transpen(bitmap,cliprect, @@ -449,7 +449,7 @@ uint32_t toki_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitma else { m_bk1_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); - m_bk2_tilemap->draw(screen, bitmap, cliprect, 0, 0); + m_bk2_tilemap->draw(screen, bitmap, cliprect, 0, 0); } draw_sprites(bitmap, cliprect); m_tx_tilemap->draw(screen, bitmap, cliprect, 0, 0); @@ -516,7 +516,7 @@ void toki_ms_state::tokims_map(address_map &map) map(0x070000, 0x0707ff).rw(FUNC(toki_ms_state::palette_r), FUNC(toki_ms_state::palette_w)).umask16(0xffff); map(0x071000, 0x0713ff).ram().share("spriteram"); map(0x072000, 0x072001).nopr(); // irq ack? - map(0x073000, 0x07300f).ram().share("scrollram"); + map(0x073000, 0x07300f).ram().share("scrollram"); map(0x0a0000, 0x0a005f).nopw(); // scrollram left-over? map(0x0c0000, 0x0c0001).portr("DSW"); map(0x0c0002, 0x0c0003).portr("INPUTS"); @@ -526,12 +526,12 @@ void toki_ms_state::tokims_map(address_map &map) WRITE8_MEMBER(toki_ms_state::adpcm_w) { -// membank("sound_bank")->set_entry(((data & 0x10) >> 4) ^ 1); +// membank("sound_bank")->set_entry(((data & 0x10) >> 4) ^ 1); m_msm->reset_w(BIT(data, 4)); - + m_adpcm_data = data & 0xf; //m_msm->write_data(data & 0xf); -// m_msm->vclk_w(BIT(data, 7)); +// m_msm->vclk_w(BIT(data, 7)); //m_msm->vclk_w(1); //m_msm->vclk_w(0); } @@ -607,7 +607,7 @@ static INPUT_PORTS_START( tokims ) PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x0000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x8000, DEF_STR( On ) ) - + PORT_START("INPUTS") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY @@ -701,7 +701,7 @@ void toki_ms_state::tokims(machine_config &config) m_screen->screen_vblank().set("spriteram", FUNC(buffered_spriteram16_device::vblank_copy_rising)); PALETTE(config, m_palette).set_entries(0x400); - + GFXDECODE(config, m_gfxdecode, "palette", gfx_toki_ms); BUFFERED_SPRITERAM16(config, m_spriteram); diff --git a/src/mame/drivers/trkfldch.cpp b/src/mame/drivers/trkfldch.cpp index a9b35eaaf4e..81bd68b64c7 100644 --- a/src/mame/drivers/trkfldch.cpp +++ b/src/mame/drivers/trkfldch.cpp @@ -299,10 +299,10 @@ void trkfldch_state::draw_sprites(screen_device& screen, bitmap_ind16& bitmap, c // logerror("entry %02x %02x %02x %02x %02x\n", m_spriteram[i + 0], m_spriteram[i + 1], m_spriteram[i + 2], m_spriteram[i + 3], m_spriteram[i + 4]); int tilegfxbase = (m_modebank[0x05] * 0x800); - /* m_spriteram[i + 0] --pp tt-y - m_spriteram[i + 1] yyyy yyyy - m_spriteram[i + 2] tttt tttt - m_spriteram[i + 3] xxxx xxxx + /* m_spriteram[i + 0] --pp tt-y + m_spriteram[i + 1] yyyy yyyy + m_spriteram[i + 2] tttt tttt + m_spriteram[i + 3] xxxx xxxx m_spriteram[i + 4] --zfF-t-x p = palette bits @@ -970,7 +970,7 @@ static INPUT_PORTS_START( abl4play ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3) diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp index ef550f88a7b..af05dddcc2b 100644 --- a/src/mame/drivers/twins.cpp +++ b/src/mame/drivers/twins.cpp @@ -71,7 +71,7 @@ strange palette format. TODO: - Proper fix for twins & twinsed2 crash after round 1 (MT #07516): - after clearing 1-5 it pings i2c for a couple times, expect it to be 0 then 1 otherwise + after clearing 1-5 it pings i2c for a couple times, expect it to be 0 then 1 otherwise jumps to lalaland; - Improve blitter / clear logic for Spider. - Merge with hotblock.cpp; @@ -85,9 +85,9 @@ It is possible the Twins PCB has them too and doesn't use them. twinsed1 is significantly changed hardware, uses a regular RAMDAC hookup for palette etc. To access Service Mode: -- twins, twinsed2: you must boot with coin 1 and start 1 held down +- twins, twinsed2: you must boot with coin 1 and start 1 held down (there's a test button on the PCB tho?) -- spider, twinsed1: you must boot with P1 Left and P1 Right held down, +- spider, twinsed1: you must boot with P1 Left and P1 Right held down, this requires the -joystick_contradictory switch on the commandline; */ @@ -149,7 +149,7 @@ protected: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void video_start() override; - + static constexpr u32 ram_size = 0x10000/2; inline u16* get_vram_base(); @@ -173,7 +173,7 @@ public: twinsed1_state(const machine_config &mconfig, device_type type, const char *tag) : twins_state(mconfig, type, tag) {} - + void twinsed1(machine_config &config); private: @@ -188,7 +188,7 @@ public: spider_state(const machine_config &mconfig, device_type type, const char *tag) : twins_state(mconfig, type, tag) {} - + void spider(machine_config &config); private: @@ -213,11 +213,11 @@ void twins_state::video_start() save_item(NAME(m_spritesinit)); save_item(NAME(m_spriteswidth)); save_item(NAME(m_spritesaddr)); - + m_bgvram = std::make_unique(ram_size); std::fill_n(m_bgvram.get(), ram_size, 0); save_pointer(NAME(m_bgvram), ram_size); - + m_fgvram = std::make_unique(ram_size); std::fill_n(m_fgvram.get(), ram_size, 0); save_pointer(NAME(m_fgvram), ram_size); @@ -283,7 +283,7 @@ READ16_MEMBER(twins_state::eeprom_r) // printf("%08x: eeprom_r %04x\n", m_maincpu->pc(), mem_mask); // return m_i2cmem->read_sda();// | 0xfffe; // TODO: bit 1, i2c clock readback? - + return m_i2cmem->read_sda(); } @@ -348,7 +348,7 @@ WRITE16_MEMBER(twins_state::vram_rmw_w) { u16 *vram = get_vram_base(); -// printf("spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr); +// printf("spider_blitter_w %08x %04x %04x (previous data width %d address %08x)\n", offset * 2, data, mem_mask, m_spriteswidth, m_spritesaddr); for (int i = 0; i < m_spriteswidth; i++) { @@ -552,7 +552,7 @@ INPUT_PORTS_END void twins_state::base_config(machine_config &config) { I2C_24C02(config, m_i2cmem); - + ADDRESS_MAP_BANK(config, m_overlay).set_map(&twins_state::base_map).set_options(ENDIANNESS_LITTLE, 16, 24, 0x100000); } @@ -691,7 +691,7 @@ ROM_END void twins_state::init_twins() { u8 *rom = (u8 *)memregion("ipl")->base(); - + rom[0x3497d] = 0x90; rom[0x3497e] = 0x90; @@ -702,7 +702,7 @@ void twins_state::init_twins() void twins_state::init_twinsed2() { u8 *rom = (u8 *)memregion("ipl")->base(); - + rom[0x349d3] = 0x90; rom[0x349d4] = 0x90; diff --git a/src/mame/drivers/vsmile.cpp b/src/mame/drivers/vsmile.cpp index afc11e79e64..62de4a483b6 100644 --- a/src/mame/drivers/vsmile.cpp +++ b/src/mame/drivers/vsmile.cpp @@ -284,7 +284,7 @@ void vsmilem_state::vsmilem(machine_config &config) // NOTE: many games contain additional spare copies of the BIOS in their own cartridge ROM, reason unknown -ROM_START( vsmile ) +ROM_START( vsmile ) ROM_REGION16_BE( 0x800000, "sysrom", ROMREGION_ERASEFF ) ROM_SYSTEM_BIOS( 0, "v103", "v103" ) ROMX_LOAD( "vsmile_v103.bin", 0x000000, 0x200000, CRC(387fbc24) SHA1(5f2fd211b6ff3a6f5121b14adc6bbf4f49e89f33), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0) ) // this is the earliest version used on the V.Smile Pocket, but it isn't system specific diff --git a/src/mame/drivers/vsmileb.cpp b/src/mame/drivers/vsmileb.cpp index 3b11e932546..7bfa1285a3e 100644 --- a/src/mame/drivers/vsmileb.cpp +++ b/src/mame/drivers/vsmileb.cpp @@ -4,7 +4,7 @@ V-Tech V.Smile Baby console emulation - - mounting of cartridges doesn't appear to work? + - mounting of cartridges doesn't appear to work? *******************************************************************************/ diff --git a/src/mame/drivers/vt1682.cpp b/src/mame/drivers/vt1682.cpp index 15008deee5b..b40e8a5d6b5 100644 --- a/src/mame/drivers/vt1682.cpp +++ b/src/mame/drivers/vt1682.cpp @@ -39,22 +39,22 @@ + more - ----------- + ----------- Intec InterAct: Is there meant to be a 2nd player? (many games prompt a 2nd player to start, but inputs don't appear to be read?) - ----------- + ----------- - Excite Sports 48-in-1: + Excite Sports 48-in-1: - Why are the rasters broken on MX Motorstorm when the game game works in other collections? does the alt input reading throw the timing off enough that the current hookup fails - or is there a different PAL/NTSC detection method that we're failing? + Why are the rasters broken on MX Motorstorm when the game game works in other collections? does the alt input reading throw the timing off enough that the current hookup fails + or is there a different PAL/NTSC detection method that we're failing? - Why is the priority incorrect in Ping Pong, again it was fine in the other collections + Why is the priority incorrect in Ping Pong, again it was fine in the other collections - No sound in Archery? + No sound in Archery? */ @@ -544,7 +544,7 @@ private: void do_dma_external_to_internal(int data, bool is_video); void do_dma_internal_to_internal(int data, bool is_video); - + /* Sound CPU Related*/ uint8_t m_soundcpu_2118_dacleft_7_0; @@ -5872,7 +5872,7 @@ CONS( 200?, ii8in1, 0, 0, intech_interact, intec, intec_interact_state, CONS( 200?, ii32in1, 0, 0, intech_interact, intec, intec_interact_state, regular_init, "Intec", "InterAct 32-in-1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // a 40-in-1 also exists which combines the above -CONS( 200?, zone7in1, 0, 0, intech_interact, miwi2, intec_interact_state, regular_init, "", "Zone 7-in-1 Sports (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) +CONS( 200?, zone7in1, 0, 0, intech_interact, miwi2, intec_interact_state, regular_init, "", "Zone 7-in-1 Sports (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // UK version of Zone 7-in-1 has different games (Boxing / Tennis / Golf / Fishing / Table Tennis / Bowling / Football) with Fishing replacing Baseball CONS( 200?, miwi2_16, 0, 0, intech_interact, miwi2, intec_interact_state, regular_init, "", "MiWi2 16-in-1 + Drum Master", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // clearly older code, Highway has uncensored title screen, selection screen has 'Arcase' instead of 'Arcade' @@ -5882,7 +5882,7 @@ CONS( 200?, miwi2_7, 0, 0, intech_interact, miwi2, intec_interact_state, CONS( 200?, intact89, 0, 0, intech_interact_bank, miwi2, intec_interact_state, banked_init, "Intec", "InterAct Complete Video Game - 89-in-1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) /* -Box shows +Box shows InterAct Complete Video Game System diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp index 3abcf19495a..6e3eb53624a 100644 --- a/src/mame/drivers/xavix.cpp +++ b/src/mame/drivers/xavix.cpp @@ -2122,7 +2122,7 @@ CONS( 2002, epo_dmon, 0, 0, xavix_i2c_24c02, xavix_i2c,xavix_i2c_sta CONS( 200?, has_wamg, 0, 0, xavix, has_wamg, xavix_state, init_xavix, "Hasbro / Milton Bradley / SSD Company LTD", "TV Wild Adventure Mini Golf (NTSC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) CONS( 2002, tak_geig, 0, 0, xavix_nv, tak_geig, xavix_state, init_xavix, "Takara / SSD Company LTD", "Geigeki Go Go Shooting (Japan)", MACHINE_IMPERFECT_SOUND ) - + // was also distributed by Atlus as an arcade cabinet in 2005, ROM almost certainly different (this one will auto-power off after inactivity, an arcade wouldn't do that) CONS( 2003, jarajal, 0, 0, xavix_nv, jarajal, xavix_state, init_xavix, "Takara / SSD Company LTD", "Jara-Ja Land (Japan, home version)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/includes/psion5.h b/src/mame/includes/psion5.h index ff7e8561cc8..45e7fd2e7cc 100644 --- a/src/mame/includes/psion5.h +++ b/src/mame/includes/psion5.h @@ -143,22 +143,22 @@ private: enum { - IRQ_EXTFIQ = 0, // FiqExternal - IRQ_BLINT = 1, // FiqBatLow - IRQ_WEINT = 2, // FiqWatchDog - IRQ_MCINT = 3, // FiqMediaChg - IRQ_CSINT = 4, // IrqCodec - IRQ_EINT1 = 5, // IrqExt1 - IRQ_EINT2 = 6, // IrqExt2 - IRQ_EINT3 = 7, // IrqExt3 - IRQ_TC1OI = 8, // IrqTimer1 - IRQ_TC2OI = 9, // IrqTimer2 - IRQ_RTCMI = 10, // IrqRtcMatch - IRQ_TINT = 11, // IrqTick - IRQ_UART1 = 12, // IrqUart1 - IRQ_UART2 = 13, // IrqUart2 - IRQ_LCDINT = 14, // IrqLcd - IRQ_SSEOTI = 15, // IrqSpi + IRQ_EXTFIQ = 0, // FiqExternal + IRQ_BLINT = 1, // FiqBatLow + IRQ_WEINT = 2, // FiqWatchDog + IRQ_MCINT = 3, // FiqMediaChg + IRQ_CSINT = 4, // IrqCodec + IRQ_EINT1 = 5, // IrqExt1 + IRQ_EINT2 = 6, // IrqExt2 + IRQ_EINT3 = 7, // IrqExt3 + IRQ_TC1OI = 8, // IrqTimer1 + IRQ_TC2OI = 9, // IrqTimer2 + IRQ_RTCMI = 10, // IrqRtcMatch + IRQ_TINT = 11, // IrqTick + IRQ_UART1 = 12, // IrqUart1 + IRQ_UART2 = 13, // IrqUart2 + IRQ_LCDINT = 14, // IrqLcd + IRQ_SSEOTI = 15, // IrqSpi IRQ_FIQ_MASK = 0x000f, IRQ_IRQ_MASK = 0xfff0 }; @@ -216,4 +216,4 @@ private: emu_timer *m_rtc_ticker; }; -#endif // MAME_INCLUDES_PSION5_H \ No newline at end of file +#endif // MAME_INCLUDES_PSION5_H diff --git a/src/mame/includes/xavix.h b/src/mame/includes/xavix.h index aaf553f6c36..cc7559c5ea2 100644 --- a/src/mame/includes/xavix.h +++ b/src/mame/includes/xavix.h @@ -755,7 +755,7 @@ public: xavix_cart_state(const machine_config &mconfig, device_type type, const char *tag) : xavix_state(mconfig, type, tag), m_cartslot(*this, "cartslot") - { + { m_cartlimit = 0x400000; } @@ -936,7 +936,7 @@ class xavix_cart_gcslottv_state : public xavix_cart_state public: xavix_cart_gcslottv_state(const machine_config &mconfig, device_type type, const char *tag) : xavix_cart_state(mconfig, type, tag) - { + { m_cartlimit = 0x800000; } diff --git a/src/mame/machine/etna.cpp b/src/mame/machine/etna.cpp index e710b987006..6afb3de7523 100644 --- a/src/mame/machine/etna.cpp +++ b/src/mame/machine/etna.cpp @@ -13,13 +13,13 @@ #include "etna.h" -#define LOG_READS (1 << 0) -#define LOG_WRITES (1 << 1) -#define LOG_UNKNOWNS (1 << 2) -#define LOG_PROM (1 << 3) -#define LOG_ALL (LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_PROM) +#define LOG_READS (1 << 0) +#define LOG_WRITES (1 << 1) +#define LOG_UNKNOWNS (1 << 2) +#define LOG_PROM (1 << 3) +#define LOG_ALL (LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_PROM) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(ETNA, etna_device, "etna", "Psion 5mx ETNA") @@ -63,26 +63,26 @@ void etna_device::device_reset() m_prom[0x0c] = 20; m_prom[0x0d] = 30; - // some basic stuff to begin with - // set up the Psion's unique ID - m_prom[0x1b] = 0xde; - m_prom[0x1a] = 0xad; - m_prom[0x19] = 0xbe; - m_prom[0x18] = 0xef; + // some basic stuff to begin with + // set up the Psion's unique ID + m_prom[0x1b] = 0xde; + m_prom[0x1a] = 0xad; + m_prom[0x19] = 0xbe; + m_prom[0x18] = 0xef; - // give ourselves a neat custom device name - const char *key = "PSION"; - const char *name = "MAME!"; - m_prom[0x28] = strlen(name); - for (int i = 0; i < m_prom[0x28]; i++) - m_prom[0x29 + i] = name[i] ^ key[i]; + // give ourselves a neat custom device name + const char *key = "PSION"; + const char *name = "MAME!"; + m_prom[0x28] = strlen(name); + for (int i = 0; i < m_prom[0x28]; i++) + m_prom[0x29 + i] = name[i] ^ key[i]; - // calculate the checksum - uint8_t chk = 0; - for (int i = 0; i < 0x7F; i++) - chk ^= m_prom[i]; + // calculate the checksum + uint8_t chk = 0; + for (int i = 0; i < 0x7F; i++) + chk ^= m_prom[i]; - // EPOC is expecting 66 + // EPOC is expecting 66 m_prom[0x7f] = chk ^ 66; } diff --git a/src/mame/machine/etna.h b/src/mame/machine/etna.h index 5e47743f16b..15a14dabec5 100644 --- a/src/mame/machine/etna.h +++ b/src/mame/machine/etna.h @@ -70,4 +70,4 @@ private: DECLARE_DEVICE_TYPE(ETNA, etna_device) -#endif // MAME_MACHINE_ETNA_H \ No newline at end of file +#endif // MAME_MACHINE_ETNA_H diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp index 9468b4edcc8..e4bbea9962e 100644 --- a/src/mame/machine/naomigd.cpp +++ b/src/mame/machine/naomigd.cpp @@ -978,7 +978,7 @@ static void gdrom_devices(device_slot_interface& device) } #define CPU_CLOCK 200000000 // need to set the correct value here -#define PIC_CLOCK 20000000 // and here +#define PIC_CLOCK 20000000 // and here void naomi_gdrom_board::device_add_mconfig(machine_config &config) { diff --git a/src/mame/machine/naomigd.h b/src/mame/machine/naomigd.h index 0a44efe256f..5756fe4585c 100644 --- a/src/mame/machine/naomigd.h +++ b/src/mame/machine/naomigd.h @@ -52,34 +52,34 @@ public: virtual const tiny_rom_entry *device_rom_region() const override; - DECLARE_WRITE16_MEMBER(dimm_command_w); // 5f703c + DECLARE_WRITE16_MEMBER(dimm_command_w); // 5f703c DECLARE_READ16_MEMBER(dimm_command_r); - DECLARE_WRITE16_MEMBER(dimm_offsetl_w); // 5f7040 + DECLARE_WRITE16_MEMBER(dimm_offsetl_w); // 5f7040 DECLARE_READ16_MEMBER(dimm_offsetl_r); - DECLARE_WRITE16_MEMBER(dimm_parameterl_w); // 5f7044 + DECLARE_WRITE16_MEMBER(dimm_parameterl_w); // 5f7044 DECLARE_READ16_MEMBER(dimm_parameterl_r); - DECLARE_WRITE16_MEMBER(dimm_parameterh_w); // 5f7048 + DECLARE_WRITE16_MEMBER(dimm_parameterh_w); // 5f7048 DECLARE_READ16_MEMBER(dimm_parameterh_r); - DECLARE_WRITE16_MEMBER(dimm_status_w); // 5f704c + DECLARE_WRITE16_MEMBER(dimm_status_w); // 5f704c DECLARE_READ16_MEMBER(dimm_status_r); - DECLARE_WRITE32_MEMBER(sh4_unknown_w); // 14000000 + DECLARE_WRITE32_MEMBER(sh4_unknown_w); // 14000000 DECLARE_READ32_MEMBER(sh4_unknown_r); - DECLARE_WRITE32_MEMBER(sh4_command_w); // 14000014 + DECLARE_WRITE32_MEMBER(sh4_command_w); // 14000014 DECLARE_READ32_MEMBER(sh4_command_r); - DECLARE_WRITE32_MEMBER(sh4_offsetl_w); // 14000018 + DECLARE_WRITE32_MEMBER(sh4_offsetl_w); // 14000018 DECLARE_READ32_MEMBER(sh4_offsetl_r); - DECLARE_WRITE32_MEMBER(sh4_parameterl_w); // 1400001c + DECLARE_WRITE32_MEMBER(sh4_parameterl_w); // 1400001c DECLARE_READ32_MEMBER(sh4_parameterl_r); - DECLARE_WRITE32_MEMBER(sh4_parameterh_w); // 14000020 + DECLARE_WRITE32_MEMBER(sh4_parameterh_w); // 14000020 DECLARE_READ32_MEMBER(sh4_parameterh_r); - DECLARE_WRITE32_MEMBER(sh4_status_w); // 14000024 + DECLARE_WRITE32_MEMBER(sh4_status_w); // 14000024 DECLARE_READ32_MEMBER(sh4_status_r); - DECLARE_WRITE32_MEMBER(sh4_control_w); // 14000028 + DECLARE_WRITE32_MEMBER(sh4_control_w); // 14000028 DECLARE_READ32_MEMBER(sh4_control_r); - DECLARE_WRITE32_MEMBER(sh4_des_keyl_w); // 14000030 + DECLARE_WRITE32_MEMBER(sh4_des_keyl_w); // 14000030 DECLARE_READ32_MEMBER(sh4_des_keyl_r); - DECLARE_WRITE32_MEMBER(sh4_des_keyh_w); // 14000034 + DECLARE_WRITE32_MEMBER(sh4_des_keyh_w); // 14000034 DECLARE_READ32_MEMBER(sh4_des_keyh_r); DECLARE_READ64_MEMBER(i2cmem_dimm_r); diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 791485e60e1..1bbcd20ca0f 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -14623,7 +14623,7 @@ giclasex giclassvr @source:gigatron.cpp -gigatron // (c) 2018 Marcel van Kervinck +gigatron // (c) 2018 Marcel van Kervinck @source:gijoe.cpp gijoe // GX069 (c) 1991 (World) diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp index 7a09bd2ca34..b140119dd72 100644 --- a/src/tools/floptool.cpp +++ b/src/tools/floptool.cpp @@ -99,7 +99,7 @@ static floppy_format_type floppy_formats[] = { FLOPPY_APPLIX_FORMAT, FLOPPY_HPI_FORMAT, - FLOPPY_IMG_FORMAT, + FLOPPY_IMG_FORMAT, FLOPPY_DVK_MX_FORMAT, FLOPPY_AIM_FORMAT, -- cgit v1.2.3