From bb457cea6cc7fef408c0a964c1be0559b5cbfeff Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 25 Dec 2022 01:33:31 +1100 Subject: srcclean in preparation for 0.251 branch --- hash/apple2_flop_misc.xml | 6 +- hash/ibm5150.xml | 2 +- hash/ibm5170_cdrom.xml | 18 ++--- hash/pc8801_flop.xml | 2 +- hash/pc88va.xml | 2 +- hash/spectrum_cass.xml | 4 +- src/devices/bus/coco/meb_intrf.cpp | 6 +- src/devices/bus/tanbus/tugcombo.cpp | 2 +- src/devices/cpu/m6809/konami.cpp | 2 +- src/devices/machine/mc68328.h | 6 +- src/devices/video/mc68328lcd.h | 4 +- src/devices/video/sed1375.h | 92 ++++++++++++------------- src/mame/atari/sprint8.cpp | 2 +- src/mame/homebrew/minib.cpp | 6 +- src/mame/konami/hornet.cpp | 2 +- src/mame/konami/konami_gn676_lan.cpp | 40 +++++------ src/mame/misc/cave.cpp | 6 +- src/mame/misc/triton.cpp | 2 +- src/mame/namco/namcos22_v.cpp | 82 +++++++++++----------- src/mame/nec/pc88va_sgp.cpp | 8 +-- src/mame/palm/palm.cpp | 10 +-- src/mame/sega/mdioport.h | 2 +- src/mame/seta/x1_012.cpp | 2 +- src/mame/tvgames/xavix.cpp | 2 +- src/mame/vtech/vsmile.cpp | 12 ++-- src/mame/yamaha/ymdx100.cpp | 130 +++++++++++++++++------------------ src/mame/yamaha/ymdx9.cpp | 4 +- 27 files changed, 228 insertions(+), 228 deletions(-) diff --git a/hash/apple2_flop_misc.xml b/hash/apple2_flop_misc.xml index a4606d4b4c5..6346a207531 100644 --- a/hash/apple2_flop_misc.xml +++ b/hash/apple2_flop_misc.xml @@ -721,7 +721,7 @@ Generated by SLIST 0.2.1 - + Aleph Baiters @@ -2688,7 +2688,7 @@ Generated by SLIST 0.2.1 - + Borders 1983 @@ -5474,7 +5474,7 @@ Generated by SLIST 0.2.1 - + Nosh Kosh 1983 diff --git a/hash/ibm5150.xml b/hash/ibm5150.xml index 163b6d165bc..1b10d47cef6 100644 --- a/hash/ibm5150.xml +++ b/hash/ibm5150.xml @@ -16085,7 +16085,7 @@ Disk 1 has a modified OEM ID and accessed file stamp - + Teenage Mutant Hero Turtles (Spain, 5.25") 1990 diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml index f55ce5f8774..148daac85c0 100644 --- a/hash/ibm5170_cdrom.xml +++ b/hash/ibm5170_cdrom.xml @@ -1004,7 +1004,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2280,7 +2280,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2300,7 +2300,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2320,7 +2320,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2340,7 +2340,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2360,7 +2360,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2380,7 +2380,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2400,7 +2400,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + @@ -2420,7 +2420,7 @@ CD-ROM includes: "Boxing", "Chopper Command", "Cosmic Commuter", "Crackpots", "F - + diff --git a/hash/pc8801_flop.xml b/hash/pc8801_flop.xml index e672a3323b5..41bd4a7c5bf 100644 --- a/hash/pc8801_flop.xml +++ b/hash/pc8801_flop.xml @@ -30671,7 +30671,7 @@ Kinda ugly to look at without a shader - + diff --git a/hash/pc88va.xml b/hash/pc88va.xml index a81a53aeb1b..1ecc41ab0bb 100644 --- a/hash/pc88va.xml +++ b/hash/pc88va.xml @@ -1033,7 +1033,7 @@ Loads N88 BASIC then jumps to lalaland [FDC] - + diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml index 1a21a8e5ac2..f88469578f8 100644 --- a/hash/spectrum_cass.xml +++ b/hash/spectrum_cass.xml @@ -39117,7 +39117,7 @@ Tape 2 - Side B: - + 180 (Sparklers) 1983 @@ -149995,7 +149995,7 @@ Tape 2 - Side A - Game 3: Astroclone (Hewson Consultants) Tape 2 - Side A - Game 4: Give My Regards to Broad Street (Mind Games) Tape 2 - Side A - Game 5: Show Jumping (Alligata Software) ]]> - + diff --git a/src/devices/bus/coco/meb_intrf.cpp b/src/devices/bus/coco/meb_intrf.cpp index 0a9122a9a8b..74583f5109f 100644 --- a/src/devices/bus/coco/meb_intrf.cpp +++ b/src/devices/bus/coco/meb_intrf.cpp @@ -67,9 +67,9 @@ distomeb_slot_device::distomeb_slot_device(const machine_config &mconfig, const void distomeb_slot_device::device_start() { m_cart = get_card_device(); - m_cart_callback.resolve_safe(); + m_cart_callback.resolve_safe(); - save_item(NAME(m_cart_line)); + save_item(NAME(m_cart_line)); } @@ -124,7 +124,7 @@ template class device_finder; device_distomeb_interface::device_distomeb_interface(const machine_config &mconfig, device_t &device) : device_interface(device, "distomeb") , m_owning_slot(dynamic_cast(device.owner())) -{ +{ } diff --git a/src/devices/bus/tanbus/tugcombo.cpp b/src/devices/bus/tanbus/tugcombo.cpp index 2c652a45f55..8cee9bae33f 100644 --- a/src/devices/bus/tanbus/tugcombo.cpp +++ b/src/devices/bus/tanbus/tugcombo.cpp @@ -7,7 +7,7 @@ http://www.microtan.ukpc.net/pageProducts.html#ROM Usage: - G EFFC + G EFFC **********************************************************************/ diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp index f8e99af7768..5c189cc5758 100644 --- a/src/devices/cpu/m6809/konami.cpp +++ b/src/devices/cpu/m6809/konami.cpp @@ -3,7 +3,7 @@ /********************************************************************* Portable Konami cpu emulator - Custom HD6309 in a gate array with ROM blocks for instruction decoding. + Custom HD6309 in a gate array with ROM blocks for instruction decoding. Based on M6809 cpu core copyright John Butler diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h index dc1af423d61..36ac00d963a 100644 --- a/src/devices/machine/mc68328.h +++ b/src/devices/machine/mc68328.h @@ -374,7 +374,7 @@ protected: CSCD_COMPARE = 0xfff00000, INT_SPIM = 0, - INT_SPIM_MASK = (1 << INT_SPIM), + INT_SPIM_MASK = (1 << INT_SPIM), INT_TIMER2 = 1, INT_TIMER2_MASK = (1 << INT_TIMER2), INT_UART = 2, @@ -871,7 +871,7 @@ private: WCTLR_FI = 0x0002, WCTLR_WDEN = 0x0001, - RTCIENR_MASK = 0x001f, + RTCIENR_MASK = 0x001f, }; void grpmaska_w(u16 data); @@ -1087,7 +1087,7 @@ private: CSC_MASK = 0xf9ff, CSD_MASK = 0xffff, EMUCS_MASK = 0x0070, - CS_EN_BIT = 0, + CS_EN_BIT = 0, CS_SIZ_MASK = 0x000e, CS_SIZ_SHIFT = 1, CS_WS_MASK = 0x0070, diff --git a/src/devices/video/mc68328lcd.h b/src/devices/video/mc68328lcd.h index 0954eaa6505..c9a644f65a1 100644 --- a/src/devices/video/mc68328lcd.h +++ b/src/devices/video/mc68328lcd.h @@ -12,8 +12,8 @@ #pragma once class mc68328_lcd_device : public device_t, - public device_palette_interface, - public device_video_interface + public device_palette_interface, + public device_video_interface { public: mc68328_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); diff --git a/src/devices/video/sed1375.h b/src/devices/video/sed1375.h index 3301bea5193..eeba865e8a3 100644 --- a/src/devices/video/sed1375.h +++ b/src/devices/video/sed1375.h @@ -92,74 +92,74 @@ protected: enum : u8 { - MODE0_MASK = 0xff, - MODE0_WIDTH_MASK = 0x03, - MODE0_FPSHIFT_BIT = 2, - MODE0_FPFRAME_POL_BIT = 3, - MODE0_FPLINE_POL_BIT = 4, - MODE0_COLOR_BIT = 5, - MODE0_DUAL_BIT = 6, - MODE0_TFT_BIT = 7, + MODE0_MASK = 0xff, + MODE0_WIDTH_MASK = 0x03, + MODE0_FPSHIFT_BIT = 2, + MODE0_FPFRAME_POL_BIT = 3, + MODE0_FPLINE_POL_BIT = 4, + MODE0_COLOR_BIT = 5, + MODE0_DUAL_BIT = 6, + MODE0_TFT_BIT = 7, - MODE1_MASK = 0xff, - MODE1_SWINVERT_BIT = 0, - MODE1_HWINVERT_BIT = 1, - MODE1_FRREPEAT_BIT = 2, - MODE1_BLANK_BIT = 3, - MODE1_CLKDIV_BIT = 4, - MODE1_HIPERF_BIT = 5, - MODE1_BPP_MASK = 0xc0, - MODE1_BPP_SHIFT = 6, + MODE1_MASK = 0xff, + MODE1_SWINVERT_BIT = 0, + MODE1_HWINVERT_BIT = 1, + MODE1_FRREPEAT_BIT = 2, + MODE1_BLANK_BIT = 3, + MODE1_CLKDIV_BIT = 4, + MODE1_HIPERF_BIT = 5, + MODE1_BPP_MASK = 0xc0, + MODE1_BPP_SHIFT = 6, - MODE2_MASK = 0x0f, - MODE2_SWPWRSAVE_MASK = 0x03, - MODE2_SWPWRSAVE_SHIFT = 0, - MODE2_HWPWRSAVE_BIT = 2, - MODE2_LCDPWR_OVR_BIT = 3, + MODE2_MASK = 0x0f, + MODE2_SWPWRSAVE_MASK = 0x03, + MODE2_SWPWRSAVE_SHIFT = 0, + MODE2_HWPWRSAVE_BIT = 2, + MODE2_LCDPWR_OVR_BIT = 3, - PANEL_HSIZE_MASK = 0x7f, + PANEL_HSIZE_MASK = 0x7f, - FPLINE_START_MASK = 0x1f, + FPLINE_START_MASK = 0x1f, - HBLANK_MASK = 0x1f, + HBLANK_MASK = 0x1f, - FPFRAME_START_MASK = 0x3f, + FPFRAME_START_MASK = 0x3f, - VBLANK_MASK = 0x3f, - VBLANK_VBL_BIT = 7, + VBLANK_MASK = 0x3f, + VBLANK_VBL_BIT = 7, - MODRATE_MASK = 0x3f, + MODRATE_MASK = 0x3f, - START_OVF_MASK = 0x01, + START_OVF_MASK = 0x01, - MEM_ADDR_OFFSET_MASK = 0xff, + MEM_ADDR_OFFSET_MASK = 0xff, - LUT_ADDR_MASK = 0xff, + LUT_ADDR_MASK = 0xff, - LUT_DATA_MASK = 0xf0, - LUT_DATA_SHIFT = 4, + LUT_DATA_MASK = 0xf0, + LUT_DATA_SHIFT = 4, - GPIO_CONFIG_MASK = 0x1f, - GPIO_STATUS_MASK = 0x1f, + GPIO_CONFIG_MASK = 0x1f, + GPIO_STATUS_MASK = 0x1f, - SCRATCH_MASK = 0xff, + SCRATCH_MASK = 0xff, - SWIVEL_MODE_MASK = 0xc3, - SWIVEL_CLKSEL_MASK = 0x03, - SWIVEL_MODE_BIT = 6, - SWIVEL_ENABLE_BIT = 7, + SWIVEL_MODE_MASK = 0xc3, + SWIVEL_CLKSEL_MASK = 0x03, + SWIVEL_MODE_BIT = 6, + SWIVEL_ENABLE_BIT = 7, - SWIVEL_BYTECNT_MASK = 0xff + SWIVEL_BYTECNT_MASK = 0xff }; enum : u16 { - PANEL_VSIZE_MASK = 0x03ff, + PANEL_VSIZE_MASK = 0x03ff, - SCREEN1_START_MASK = 0xffff, - SCREEN2_START_MASK = 0xffff, + SCREEN1_START_MASK = 0xffff, + SCREEN2_START_MASK = 0xffff, - SCREEN1_VSIZE_MASK = 0x03ff + SCREEN1_VSIZE_MASK = 0x03ff }; memory_share_creator m_vram; diff --git a/src/mame/atari/sprint8.cpp b/src/mame/atari/sprint8.cpp index a4bd415828c..b0d07bcb740 100644 --- a/src/mame/atari/sprint8.cpp +++ b/src/mame/atari/sprint8.cpp @@ -126,7 +126,7 @@ void sprint8_state::sprint8_map(address_map &map) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) \ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) \ - \ + \ PORT_START("DIAL" #player) \ PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(player) diff --git a/src/mame/homebrew/minib.cpp b/src/mame/homebrew/minib.cpp index c3b0ae2ad17..f104c206cd6 100644 --- a/src/mame/homebrew/minib.cpp +++ b/src/mame/homebrew/minib.cpp @@ -90,11 +90,11 @@ void minib_state::machine_reset() //uint8_t minib_state::pa_r() //{ -// uint8_t data = 0x00; +// uint8_t data = 0x00; // -// data |= m_kbd->data_signal() << 1; +// data |= m_kbd->data_signal() << 1; // -// return data; +// return data; //} void minib_state::pa_w(uint8_t data) diff --git a/src/mame/konami/hornet.cpp b/src/mame/konami/hornet.cpp index 612588a3919..1c3a06cc916 100644 --- a/src/mame/konami/hornet.cpp +++ b/src/mame/konami/hornet.cpp @@ -693,7 +693,7 @@ void hornet_state::sysreg_w(offs_t offset, uint8_t data) // and ends up clearing IRQs out of turn. // The IRQ0 clear bit is also questionable but games run too fast and crash without it. // if (data & 0x80) - // m_maincpu->set_input_line(INPUT_LINE_IRQ1, CLEAR_LINE); + // m_maincpu->set_input_line(INPUT_LINE_IRQ1, CLEAR_LINE); if (data & 0x40) m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); diff --git a/src/mame/konami/konami_gn676_lan.cpp b/src/mame/konami/konami_gn676_lan.cpp index aa588c911d3..992db639e31 100644 --- a/src/mame/konami/konami_gn676_lan.cpp +++ b/src/mame/konami/konami_gn676_lan.cpp @@ -56,25 +56,25 @@ This pcb is the same as the A version but with one added chip: FPGA Bitstreams --------------- - Racing Jam (racingj) - - Uses type A board - - Firmware (CRC32 92fde8df, 29491 bytes) + - Uses type A board + - Firmware (CRC32 92fde8df, 29491 bytes) - Racing Jam 2 (racingj2, racingj2j) - - Uses type B board with x76 chip? (x76 isn't used?) - - Firmware (CRC32 dfc74cc9, 29491 bytes) + - Uses type B board with x76 chip? (x76 isn't used?) + - Firmware (CRC32 dfc74cc9, 29491 bytes) - Thrill Drive (thrilld, thrilldb, thrilldbu) - - Uses type B board with x76 chip (except thrilldbu which uses type A without the x76 chip) - - Firmware #1 (CRC32 3760e3ce, 29490 bytes) - - Used during initial device test (does not get uploaded with skip post) - - Tests every register and expects to be able to read back the values it wrote for every register *except* 0x05, 0x06, and 0x09 on lanc2 - - Seems to be a stubbed version of the normal firmware with the logic for all registers stubbed except memory-related registers - - Firmware #2 (CRC32 a8c97a75, 29490 bytes) - - Uploaded after boot sequence (even with skip post) - - Allows usage of x76 chip - - Firmware #3 (CRC32 93b86e35, 29490 bytes) - - Uploaded after security check (boot finishes, just as it starts the actual game) - - x76 chip capability unknown (TODO: this should be tested on real hardware) + - Uses type B board with x76 chip (except thrilldbu which uses type A without the x76 chip) + - Firmware #1 (CRC32 3760e3ce, 29490 bytes) + - Used during initial device test (does not get uploaded with skip post) + - Tests every register and expects to be able to read back the values it wrote for every register *except* 0x05, 0x06, and 0x09 on lanc2 + - Seems to be a stubbed version of the normal firmware with the logic for all registers stubbed except memory-related registers + - Firmware #2 (CRC32 a8c97a75, 29490 bytes) + - Uploaded after boot sequence (even with skip post) + - Allows usage of x76 chip + - Firmware #3 (CRC32 93b86e35, 29490 bytes) + - Uploaded after security check (boot finishes, just as it starts the actual game) + - x76 chip capability unknown (TODO: this should be tested on real hardware) Racing Jam 1 and 2 are both programmed to send one extra 0xff at the end of the upload sequence. The Thrill Drive a8c97a75 firmware and the Racing Jam 2 dfc74cc9 firmware are actually the same except for the final 0xff. @@ -314,11 +314,11 @@ void konami_gn676_lan_device::lanc2_w(offs_t offset, uint8_t data) if (m_x76f041 && m_x76f041_enabled) { /* - 0x01 = x76 SDA - 0x02 = x76 RST - 0x04 = x76 CS??? - 0x08 = x76 SCL - 0x10 = Controls direction of x76 SDA + 0x01 = x76 SDA + 0x02 = x76 RST + 0x04 = x76 CS??? + 0x08 = x76 SCL + 0x10 = Controls direction of x76 SDA */ if (BIT(data, 1)) diff --git a/src/mame/misc/cave.cpp b/src/mame/misc/cave.cpp index 3fc1072ca03..5f87be3c52e 100644 --- a/src/mame/misc/cave.cpp +++ b/src/mame/misc/cave.cpp @@ -4320,11 +4320,11 @@ Notes: U3 : 27C1001 EPROM U82 : 27C040 EPROM U42-45 : 27C040 EPROMs - U81, U89 : 8M 42 pin mask ROM (read as 27C800) + U81, U89 : 8M 42 pin mask ROM (read as 27C800) ALL other ROMs are soldered-in 16M 42 pin mask ROM (read as 27C160) */ -ROM_START( pwrinst2 ) /* 94.04.08 */ +ROM_START( pwrinst2 ) /* 94.04.08 */ ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "g02.u45a", 0x000000, 0x80000, CRC(ddfff811) SHA1(720f577dc77fc12aeb67511251e995169df754b6) ) ROM_LOAD16_BYTE( "g02.u44a", 0x000001, 0x80000, CRC(5561f620) SHA1(3241ccc47e909930d79ad0a1a1b11a11879b17be) ) @@ -4374,7 +4374,7 @@ ROM_START( pwrinst2 ) /* 94.04.08 */ ROM_LOAD( "peel18cv8p-15.u25", 0x02aa, 0x0155, CRC(61b414df) SHA1(f12c5e62f83114f83108895ee58ceea31cdcb9fd) ) /* PEEL18CV8P-15 */ ROM_END -ROM_START( pwrinst2a ) /* also 94.04.08 like pwrinst2, but different program roms */ +ROM_START( pwrinst2a ) /* also 94.04.08 like pwrinst2, but different program roms */ ROM_REGION( 0x200000, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "g02.u45", 0x000000, 0x80000, CRC(7b33bc43) SHA1(a68eb94e679f03c354932b8c5cd1bb2922fec0aa) ) ROM_LOAD16_BYTE( "g02.u44", 0x000001, 0x80000, CRC(8f6f6637) SHA1(024b12c0fe40e27c79e38bd7601a9183a62d75fd) ) diff --git a/src/mame/misc/triton.cpp b/src/mame/misc/triton.cpp index f5980954238..fe40a2af89b 100644 --- a/src/mame/misc/triton.cpp +++ b/src/mame/misc/triton.cpp @@ -168,7 +168,7 @@ static INPUT_PORTS_START(triton) PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('|') PORT_CHAR('\\') PORT_NAME(u8"¦ \\ FS") - PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('~') PORT_CHAR('^') PORT_NAME(u8"~ ↑ RS") + PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('~') PORT_CHAR('^') PORT_NAME(u8"~ \u2191 RS") // up arrow ↑ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_NAME("Esc") diff --git a/src/mame/namco/namcos22_v.cpp b/src/mame/namco/namcos22_v.cpp index bf9372b0952..a59f2a94641 100644 --- a/src/mame/namco/namcos22_v.cpp +++ b/src/mame/namco/namcos22_v.cpp @@ -2403,7 +2403,7 @@ void namcos22_state::update_mixer() if (m_is_ss22) { /* - 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 14 18 1c + 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 14 18 1c 00824000: ffffff00 00000000 0000007f 00ff006f fe00eded 0f700000 0000037f 00010007 // alpine surfer 00824000: ffffff00 00000000 0000007f 00ff0000 1000ff00 0f000000 00ff007f 00010007 // time crisis 00824000: ffffff00 00000000 1830407f 00800000 0000007f 0f000000 0000037f 00010007 // trans sprite @@ -2411,28 +2411,28 @@ void namcos22_state::update_mixer() 00824000: ffffff00 00000000 1800187f 00800000 0080007f 0f000000 0000037f 00010007 // trans poly(2) 00824000: ffffff00 00000000 1800187f 00000000 0000007f 0f800000 0000037f 00010007 // trans text - 00,01,02 polygon fade rgb - 03 - 04 - 05,06,07 world fog rgb - 08,09,0a background color - 0b - 0c - 0d,0e spot factor - 0f polygon alpha color mask - 10 polygon alpha pen mask - 11 global polygon alpha factor - 12,13 textlayer alpha pen comparison - 14 textlayer alpha pen mask? - 15 textlayer alpha factor - 16,17,18 global fade rgb - 19 global fade factor - 1a fade target flags - 1b textlayer palette base - 1c - 1d - 1e - 1f layer enable + 00,01,02 polygon fade rgb + 03 + 04 + 05,06,07 world fog rgb + 08,09,0a background color + 0b + 0c + 0d,0e spot factor + 0f polygon alpha color mask + 10 polygon alpha pen mask + 11 global polygon alpha factor + 12,13 textlayer alpha pen comparison + 14 textlayer alpha pen mask? + 15 textlayer alpha factor + 16,17,18 global fade rgb + 19 global fade factor + 1a fade target flags + 1b textlayer palette base + 1c + 1d + 1e + 1f layer enable */ m_poly_fade_r = nthbyte(m_mixer, 0x00); m_poly_fade_g = nthbyte(m_mixer, 0x01); @@ -2464,24 +2464,24 @@ void namcos22_state::update_mixer() 90020180: ff713700 00000000 00000000 00000000 90020200: ff100000 00000000 00000000 00000000 - 00,01 display flags - 02 - 03 - 04 bgcolor palette base? - 05 - 06 - 07 textlayer palette base? - 08,09,0a textlayer pen c shadow rgb - 0b,0c,0d textlayer pen d shadow rgb - 0e,0f,10 textlayer pen e shadow rgb - 11,12 global fade factor red - 13,14 global fade factor green - 15,16 global fade factor blue - 80-87 fog color mask? - 100,180,200 fog rgb 0 - 101,181,201 fog rgb 1 - 102,182,202 fog rgb 2 - 103,183,203 fog rgb 3 + 00,01 display flags + 02 + 03 + 04 bgcolor palette base? + 05 + 06 + 07 textlayer palette base? + 08,09,0a textlayer pen c shadow rgb + 0b,0c,0d textlayer pen d shadow rgb + 0e,0f,10 textlayer pen e shadow rgb + 11,12 global fade factor red + 13,14 global fade factor green + 15,16 global fade factor blue + 80-87 fog color mask? + 100,180,200 fog rgb 0 + 101,181,201 fog rgb 1 + 102,182,202 fog rgb 2 + 103,183,203 fog rgb 3 */ m_mixer_flags = nthbyte(m_mixer, 0x00) << 8 | nthbyte(m_mixer, 0x01); m_bg_palbase = nthbyte(m_mixer, 0x04) << 8 & 0x7f00; diff --git a/src/mame/nec/pc88va_sgp.cpp b/src/mame/nec/pc88va_sgp.cpp index 4e7f3cc74d2..17f78530acc 100644 --- a/src/mame/nec/pc88va_sgp.cpp +++ b/src/mame/nec/pc88va_sgp.cpp @@ -9,7 +9,7 @@ Unknown part number, used as GPU for PC88VA TODO: - timing details - specifics about what exactly happens in work area when either SGP runs or is idle. -- famista: during gameplay it BITBLT same source to destination 0x00037076 +- famista: during gameplay it BITBLT same source to destination 0x00037076 with tp_mode = 3 and pitch = 0 (!?); - rtype: during gameplay it does transfers with Pitch = 0xfff0, alias for negative draw? - basic fires a VABOT on loading; @@ -61,7 +61,7 @@ void pc88va_sgp_device::device_start() void pc88va_sgp_device::device_reset() { - + } /**************************************** @@ -334,7 +334,7 @@ void pc88va_sgp_device::start_exec() * ---- ---- ---- 1110 /(Src AND Dst) * ---- ---- ---- 1111 1 * - * PATBLT is identical to BITBLT except it repeats source copy + * PATBLT is identical to BITBLT except it repeats source copy * if it exceeds the clipping range. */ void pc88va_sgp_device::cmd_blit(u16 draw_mode, bool is_patblt) @@ -346,7 +346,7 @@ void pc88va_sgp_device::cmd_blit(u16 draw_mode, bool is_patblt) if (is_patblt == true) { LOG("PATBLT\n"); - // return; + // return; } // ballbrkr: 6 diff --git a/src/mame/palm/palm.cpp b/src/mame/palm/palm.cpp index 9900b2372a0..a5dfff1d35e 100644 --- a/src/mame/palm/palm.cpp +++ b/src/mame/palm/palm.cpp @@ -100,11 +100,11 @@ protected: enum : int { - PORTF_Y_VCCN_BIT = 0, - PORTF_Y_GND_BIT = 1, - PORTF_X_VCCN_BIT = 2, - PORTF_X_GND_BIT = 3, - PORTF_ADC_CSN_BIT = 7 + PORTF_Y_VCCN_BIT = 0, + PORTF_Y_GND_BIT = 1, + PORTF_X_VCCN_BIT = 2, + PORTF_X_GND_BIT = 3, + PORTF_ADC_CSN_BIT = 7 }; required_device m_lcdctrl; diff --git a/src/mame/sega/mdioport.h b/src/mame/sega/mdioport.h index e63b91fd1bc..806bdcefbe5 100644 --- a/src/mame/sega/mdioport.h +++ b/src/mame/sega/mdioport.h @@ -6,7 +6,7 @@ Seven I/O lines with individually selectable direction, UART, and interrupt output. - + Mega Drive has three instances of this block connected to the CTRL1, CTRL2 and EXP connectors. diff --git a/src/mame/seta/x1_012.cpp b/src/mame/seta/x1_012.cpp index e8d73367e51..9fcad149209 100644 --- a/src/mame/seta/x1_012.cpp +++ b/src/mame/seta/x1_012.cpp @@ -94,7 +94,7 @@ void x1_012_device::vctrl_w(offs_t offset, u16 data, u16 mem_mask) // // For the time being, we simply use a trampoline in the seta.cpp driver for Caliber 50 _only_, rather than // correctly reflecting current register values in all games. - + // m_screen->update_partial(m_screen->vpos()); // causes breakage, see note above diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index 8e571ab9cfb..f0ddb7093e5 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -1809,7 +1809,7 @@ ROM_END ROM_START( gungunad ) ROM_REGION(0x200000, "bios", ROMREGION_ERASE00) - // some lines were swapped going into the die, but it is unclear if they're swapped back inside it + // some lines were swapped going into the die, but it is unclear if they're swapped back inside it ROM_LOAD("gga.bin", 0x000000, 0x40000, CRC(5252b6bb) SHA1(8a9f920e4bccabbd337f37a838af574e2b16746f) ) ROM_CONTINUE(0x080000,0x040000) ROM_CONTINUE(0x040000,0x040000) diff --git a/src/mame/vtech/vsmile.cpp b/src/mame/vtech/vsmile.cpp index 4c09b85b9ec..d59833e81fb 100644 --- a/src/mame/vtech/vsmile.cpp +++ b/src/mame/vtech/vsmile.cpp @@ -120,18 +120,18 @@ uint16_t vsmile_state::portb_r() //bit 1 : Set to 0 to enable cartridge ROM (TODO) -> getCS2 //bit 2 : Set to 0 to enable internal ROM (TODO) //bit 3 : restart (see dipswitch) - // VSMILE_PORTB_RESET + // VSMILE_PORTB_RESET //bit 4 : ADC (TODO) //bit 5 : Voltage detect (TODO) //bit 6 : ON button, active low (see dipswitch) - // VSMILE_PORTB_ON_SW + // VSMILE_PORTB_ON_SW //bit 7 : OFF button, active low (see dipswitch) - // VSMILE_PORTB_OFF_SW - + // VSMILE_PORTB_OFF_SW + //LOG("%s: portb_r: %04x\n", machine().describe_context(), data); - + //On Vsmile, VSMILE_PORTB_RESET, VSMILE_PORTB_OFF_SW and VSMILE_PORTB_ON_SW actives will trigger BIOS test screen - return data; + return data; } void vsmile_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask) diff --git a/src/mame/yamaha/ymdx100.cpp b/src/mame/yamaha/ymdx100.cpp index b9ea0870627..cf790922198 100644 --- a/src/mame/yamaha/ymdx100.cpp +++ b/src/mame/yamaha/ymdx100.cpp @@ -57,12 +57,12 @@ service manual, but is still readily available. tape audio to MSX .cas files. dxconvert uses the command-line parameters "-p -e 4 -t 10"; I'm not sure how to interpret this, even after reading the code. - + The constant used below for testing against m_cassette->input() was guessed through trial and error until I could get a successful load at least somewhat consistently. It still isn't perfect, but I don't know how to refine this further. - + "dxconvert": https://github.com/rarepixel/dxconvert "castools": https://github.com/joyrex2001/castools The sample voices that I used to test can be found at @@ -154,27 +154,27 @@ service manual, but is still readily available. IPT_KEYBOARD is used, so use the UI mode key (default Scroll Lock) to re-enable the MAME UI. - No, I don't know why some voices (such as Pianobells) - seem to not let you turn off modulation even if you set - the mod wheel to its lowest point. You can set the pitch - sensitivity value ("PMS", Edit/Compare key 9) to 0 to - force it off. This might have to do with the YM2164 - moving the LFO Reset register; if not, it might have to - do with the default pitch wheel position not being 0 - (see TODO below). + No, I don't know why some voices (such as Pianobells) + seem to not let you turn off modulation even if you set + the mod wheel to its lowest point. You can set the pitch + sensitivity value ("PMS", Edit/Compare key 9) to 0 to + force it off. This might have to do with the YM2164 + moving the LFO Reset register; if not, it might have to + do with the default pitch wheel position not being 0 + (see TODO below). *** Test mode To enter test mode, hold 1 and 2 on the panel while powering the system on. You'll see the version number, and then a prompt asking if you want to enter test mode; press +1 to enter test mode. - + If 1 and 3 or 1 and 4 are held instead of 1 and 2, different subsets of the test mode will run instead. Furthermore, some tests will only be run on the DX100. - + For more details on the individual tests, refer to the service manual. - + To make developing this driver easier I wrote an init function for the DX100 1.1 driver which allows me to pick and choose which tests to actually run. I've disabled it in the final version of the driver, but here it is @@ -182,57 +182,57 @@ service manual, but is still readily available. void yamaha_dx100_state::init_dx100() { - // Since test mode forcibly halts on the first failed test, and we can only choose to not run certain tests, use these blocks of code to skip specific tests. - // The numbering and naming below is from the service manual, which, surprise, doesn't quite line up with the way the tests are written in the code. - u8 *rom = (u8 *) (memregion("program")->base()); - auto skip = [rom](u16 whichAddr, u16 jumpTo, u8 extraInst = 0, u16 nop2 = 0) { - if (extraInst != 0) { - rom[whichAddr & 0x7fff] = extraInst; - whichAddr++; - } - rom[whichAddr & 0x7fff] = 0x7e; - rom[(whichAddr + 1) & 0x7fff] = (u8) ((jumpTo >> 8) & 0xff); - rom[(whichAddr + 2) & 0x7fff] = (u8) (jumpTo & 0xff); - if (nop2 != 0) { - rom[nop2 & 0x7fff] = 0x01; - rom[(nop2 + 1) & 0x7fff] = 0x01; - } - }; - // 1. Output level, RAM battery voltage - skip(0xc464, 0xc4b3); - // 2. RAM, cassette interface, MIDI in/out, MIDI thru - // This is hard to skip as a unit in the code, so you need to skip them individually: - // Or to only disable a subset of these tests: - // 2a. RAM test - rom[0xc55f & 0x7fff] = 0x39; - // 2b. Cassette interface test (I'm not entirely sure MAME's cassette interface - // supports the direct writing; I *think* this is MSX format?) - rom[0xc66e & 0x7fff] = 0x39; - // 2c. MIDI in/out (I'm not sure why this is failing, but something's not right) - rom[0xc631 & 0x7fff] = 0x39; - // 2d. MIDI thru - skip(0xc6b0, 0xc52a, 0, 0xc4dd); - // 3. LCD test - // This is actually two tests in the code, so you need to skip them individually: - // 2a. LCD solid flashing test - skip(0xc6e1, 0xc52a, 0, 0xc4e6); - // 2b. LCD checkerboard test - skip(0xc6d1, 0xc52a, 0, 0xc4ef); - // 4. Pitch wheel, mod wheel, data entry slider, breath controller, foot switch - // AND (run as part of 4 in the code) - // 5. Foot switch detecting circuit - skip(0xc70f, 0xc7a9); - // Or to only disable a subset of these tests: - // 4a/5. Foot switch tests - skip(0xc7b3, 0xc7a9, 0x38); - // 6. Keyboard - skip(0xc86e, 0xc927); - // 7. LCD contrast - // AND (run as part of 7 in the code) - // 8. Main power, LED flash on low power - skip(0xc927, 0xc98f); - // 9. Panel switches - skip(0xc9d3, 0xca50); + // Since test mode forcibly halts on the first failed test, and we can only choose to not run certain tests, use these blocks of code to skip specific tests. + // The numbering and naming below is from the service manual, which, surprise, doesn't quite line up with the way the tests are written in the code. + u8 *rom = (u8 *) (memregion("program")->base()); + auto skip = [rom](u16 whichAddr, u16 jumpTo, u8 extraInst = 0, u16 nop2 = 0) { + if (extraInst != 0) { + rom[whichAddr & 0x7fff] = extraInst; + whichAddr++; + } + rom[whichAddr & 0x7fff] = 0x7e; + rom[(whichAddr + 1) & 0x7fff] = (u8) ((jumpTo >> 8) & 0xff); + rom[(whichAddr + 2) & 0x7fff] = (u8) (jumpTo & 0xff); + if (nop2 != 0) { + rom[nop2 & 0x7fff] = 0x01; + rom[(nop2 + 1) & 0x7fff] = 0x01; + } + }; + // 1. Output level, RAM battery voltage + skip(0xc464, 0xc4b3); + // 2. RAM, cassette interface, MIDI in/out, MIDI thru + // This is hard to skip as a unit in the code, so you need to skip them individually: + // Or to only disable a subset of these tests: + // 2a. RAM test + rom[0xc55f & 0x7fff] = 0x39; + // 2b. Cassette interface test (I'm not entirely sure MAME's cassette interface + // supports the direct writing; I *think* this is MSX format?) + rom[0xc66e & 0x7fff] = 0x39; + // 2c. MIDI in/out (I'm not sure why this is failing, but something's not right) + rom[0xc631 & 0x7fff] = 0x39; + // 2d. MIDI thru + skip(0xc6b0, 0xc52a, 0, 0xc4dd); + // 3. LCD test + // This is actually two tests in the code, so you need to skip them individually: + // 2a. LCD solid flashing test + skip(0xc6e1, 0xc52a, 0, 0xc4e6); + // 2b. LCD checkerboard test + skip(0xc6d1, 0xc52a, 0, 0xc4ef); + // 4. Pitch wheel, mod wheel, data entry slider, breath controller, foot switch + // AND (run as part of 4 in the code) + // 5. Foot switch detecting circuit + skip(0xc70f, 0xc7a9); + // Or to only disable a subset of these tests: + // 4a/5. Foot switch tests + skip(0xc7b3, 0xc7a9, 0x38); + // 6. Keyboard + skip(0xc86e, 0xc927); + // 7. LCD contrast + // AND (run as part of 7 in the code) + // 8. Main power, LED flash on low power + skip(0xc927, 0xc98f); + // 9. Panel switches + skip(0xc9d3, 0xca50); } *******************************************************************************/ @@ -525,7 +525,7 @@ static INPUT_PORTS_START(dx100) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("AN0") // The pitch wheel returns to center once released. PORT_BIT( 0xff, 0x7f, IPT_AD_STICK_Y ) PORT_NAME("Pitch Wheel") PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_MINMAX(0x00, 0xff) PORT_CODE_INC(KEYCODE_QUOTE) PORT_CODE_DEC(KEYCODE_SLASH) diff --git a/src/mame/yamaha/ymdx9.cpp b/src/mame/yamaha/ymdx9.cpp index 1ec7239283c..0a606e3c164 100644 --- a/src/mame/yamaha/ymdx9.cpp +++ b/src/mame/yamaha/ymdx9.cpp @@ -332,7 +332,7 @@ uint8_t yamaha_dx9_state::p1_r(offs_t offset) return m_adc->eoc_r() << 4; } - + /** * yamaha_dx9_state::p2_r */ @@ -341,7 +341,7 @@ uint8_t yamaha_dx9_state::p2_r(offs_t offset) return m_rx_data << 3; } - + /** * yamaha_dx9_state::p1_w */ -- cgit v1.2.3