From f99c502820eac58590f99f840bdf4b90196066aa Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 25 Nov 2018 11:49:51 +1100 Subject: srcclean and fixup (nw) --- hash/ekara.xml | 304 +++++++++---------- hash/gameboy.xml | 184 ++++++------ hash/n64.xml | 36 +-- hash/pce_tourvision.xml | 2 +- hash/wswan.xml | 2 +- src/devices/bus/bbc/1mhzbus/ieee488.cpp | 24 +- src/devices/bus/bbc/1mhzbus/ieee488.h | 24 +- src/devices/bus/hp_dio/hp98550.cpp | 2 +- src/devices/bus/sgikbd/hlekbd.h | 48 +-- src/devices/cpu/m68000/m68000.h | 2 +- src/devices/cpu/mips/mips3.cpp | 2 +- src/devices/cpu/mips/o2dprintf.hxx | 498 +++++++++++++++---------------- src/devices/machine/dp8573.cpp | 2 +- src/devices/machine/dp8573.h | 164 +++++----- src/devices/machine/t10sbc.cpp | 2 +- src/devices/machine/wd33c93.cpp | 18 +- src/devices/machine/wd33c93.h | 24 +- src/devices/sound/swp30.cpp | 15 +- src/devices/video/catseye.cpp | 4 +- src/devices/video/imagetek_i4100.cpp | 2 +- src/devices/video/stvvdp1.cpp | 2 +- src/emu/screen.h | 2 +- src/mame/audio/xavix.cpp | 26 +- src/mame/drivers/4dpi.cpp | 10 +- src/mame/drivers/ampoker2.cpp | 28 +- src/mame/drivers/applix.cpp | 2 +- src/mame/drivers/asuka.cpp | 2 +- src/mame/drivers/bigevglf.cpp | 2 +- src/mame/drivers/blmbycar.cpp | 2 +- src/mame/drivers/cps1.cpp | 2 +- src/mame/drivers/crimson.cpp | 14 +- src/mame/drivers/funworld.cpp | 2 +- src/mame/drivers/gts80b.cpp | 6 +- src/mame/drivers/hh_sm510.cpp | 12 +- src/mame/drivers/indigo.cpp | 122 ++++---- src/mame/drivers/itgambl2.cpp | 18 +- src/mame/drivers/karnov.cpp | 2 +- src/mame/drivers/kickgoal.cpp | 4 +- src/mame/drivers/ncd17c.cpp | 2 +- src/mame/drivers/nes_vt.cpp | 2 +- src/mame/drivers/o2.cpp | 16 +- src/mame/drivers/octane.cpp | 16 +- src/mame/drivers/pbaction.cpp | 6 +- src/mame/drivers/pengadvb.cpp | 2 +- src/mame/drivers/pgm.cpp | 2 +- src/mame/drivers/qvt102.cpp | 2 +- src/mame/drivers/sandscrp.cpp | 2 +- src/mame/drivers/segahang.cpp | 18 +- src/mame/drivers/segas18.cpp | 2 +- src/mame/drivers/slotcarn.cpp | 2 +- src/mame/drivers/stadhero.cpp | 2 +- src/mame/drivers/xerox820.cpp | 56 ++-- src/mame/drivers/ymmu100.cpp | 32 +- src/mame/includes/blmbycar.h | 2 +- src/mame/includes/kickgoal.h | 2 +- src/mame/includes/pbaction.h | 2 +- src/mame/includes/xavix.h | 8 +- src/mame/layout/pbactiont.lay | 6 +- src/mame/machine/hal2.cpp | 10 +- src/mame/machine/hpc1.cpp | 32 +- src/mame/machine/hpc1.h | 38 +-- src/mame/machine/hpc3.cpp | 20 +- src/mame/machine/ioc2.cpp | 30 +- src/mame/machine/ioc2.h | 4 +- src/mame/machine/mace.cpp | 78 ++--- src/mame/machine/mace.h | 6 +- src/mame/machine/sgi.cpp | 20 +- src/mame/machine/xavix.cpp | 16 +- src/mame/machine/xavix_madfb_ball.cpp | 14 +- src/mame/video/crime.cpp | 10 +- src/mame/video/gaelco_wrally_sprites.cpp | 16 +- src/mame/video/newport.cpp | 18 +- src/mame/video/supbtime.cpp | 4 +- src/mame/video/xavix.cpp | 12 +- 74 files changed, 1064 insertions(+), 1063 deletions(-) diff --git a/hash/ekara.xml b/hash/ekara.xml index 5f2aaaa25ef..aad67ccd67e 100644 --- a/hash/ekara.xml +++ b/hash/ekara.xml @@ -2,8 +2,8 @@ - - - + - + e-kara US Volume 1 (US-E001) @@ -366,16 +366,16 @@ - - + + + --> e-kara US Volume 5 (US-E005) 2001 @@ -435,19 +435,19 @@ - - + + e-kara US Volume 6 (US-E006) @@ -458,8 +458,8 @@ - - + + e-kara US Volume 7 (US-E007) @@ -481,8 +481,8 @@ - - + + + --> e-kara US Volume 9 'No Boys Allowed' (US-E009) 2002 @@ -527,15 +527,15 @@ - - + + - + - + + --> e-kara UK / Europe Volume 7 (UK-E007) 2002 @@ -670,8 +670,8 @@ - - + + + --> e-kara Germany 5-Songs Starter (GER-M001) 2002 @@ -689,10 +689,10 @@ - - + + - + J-Pop Mix Volume 2 (Japan) (EC0002-JPM) 2000 @@ -702,8 +702,8 @@ - - + + J-Pop Mix Volume 3 (Japan) (EC0003-JPM) 2000 @@ -713,7 +713,7 @@ - + ENK Volume 1 (Japan) (EC0006-ENK) @@ -724,8 +724,8 @@ - - + + 1979-81 Volume 1 (Japan) (EC0008-G79) 2000 @@ -735,8 +735,8 @@ - - + + Kid's Mix Volume 1 (Japan) (EC0010-KID) 2000 @@ -746,8 +746,8 @@ - - + + J-Pop Mix Volume 7 (Japan) (EC0012-JPM) 2000 @@ -757,8 +757,8 @@ - - + + J-Pop Mix Volume 8 (Japan) (EC0013-JPM) 2000 @@ -768,8 +768,8 @@ - - + + Artist Selection Volume 1 (unknown) (Japan) (EC0014-ATS) 2000 @@ -779,8 +779,8 @@ - - + + Artist Selection Volume 2 (unknown) (Japan) (EC0015-ATS) 2000 @@ -790,8 +790,8 @@ - - + + J-Pop Mix Volume 10 (Japan) (EC0022-JPM) 2000 @@ -802,7 +802,7 @@ - + J-Pop Mix Volume 11 (Japan) (EC0023-JPM) 2000 @@ -812,8 +812,8 @@ - - + + J-Pop Mix Volume 13 (Japan) (EC0025-JPM) 2000 @@ -823,8 +823,8 @@ - - + + J-Pop Mix Volume 14 (Japan) (EC0026-JPM) 2000 @@ -834,8 +834,8 @@ - - + + J-Pop Mix Volume 15 (Japan) (EC0027-JPM) 2000 @@ -845,8 +845,8 @@ - - + + Artist Selection Volume 3 (Dreams Come True) (Japan) (EC0029-ATS) 2000 @@ -856,8 +856,8 @@ - - + + Artist Selection Volume 4 (unknown) (Japan) (EC0031-ATS) 2000 @@ -867,8 +867,8 @@ - - + + Kid's Mix Volume 3 (Japan) (EC0034-KID) 2000 @@ -878,7 +878,7 @@ - + Artist Selection Volume 5 (Matsuda Seiko) (Japan) (EC0035-ATS) @@ -889,7 +889,7 @@ - + Artist Selection Volume 6 (KinKi Kids) (Japan) (EC0036-ATS) @@ -900,8 +900,8 @@ - - + + Artist Selection Volume 8 (unknown) (Japan) (EC0041-ATS) 2000 @@ -911,8 +911,8 @@ - - + + J-Pop Mix Volume 19 (Japan) (EC0042-JPM) 2000 @@ -922,8 +922,8 @@ - - + + Artist Selection Volume 9 (Every Little Thing) (Japan) (EC0044-ATS) 2000 @@ -944,8 +944,8 @@ - - + + ENK Volume 6 (Japan) (EC0048-ENK) 2000 @@ -955,8 +955,8 @@ - - + + Artist Selection Volume 11 (Judy and Mary) (Japan) (EC0049-ATS) 2000 @@ -966,8 +966,8 @@ - - + + J-Pop Mix Volume 23 (Japan) (EC0054-JPM) 2000 @@ -977,7 +977,7 @@ - + J-Pop Mix Volume 33 (Japan) (EC0068-JPM) @@ -988,8 +988,8 @@ - - + + J-Pop Mix Volume 34 (Japan) (EC0070-JPM) 2000 @@ -999,8 +999,8 @@ - - + + J-Pop Mix Volume 36 (Japan) (EC0072-JPM) 2000 @@ -1010,8 +1010,8 @@ - - + + J-Pop Mix Volume 39 (Japan) (EC0076-JPM) 2000 @@ -1021,10 +1021,10 @@ - - + + - + BHT Volume 1 (Japan) (GC0002-BHT) 2000 @@ -1034,7 +1034,7 @@ - + BHT Volume 3 (Japan) (GC0006-BHT) @@ -1046,10 +1046,10 @@ - + - + Mini Volume 1 (Japan) (MC0001-ATM) 2003 @@ -1059,11 +1059,11 @@ - - + + - + SAI Volume 1 (Japan) (SC0005-SAI) 2001 @@ -1073,8 +1073,8 @@ - - + + SAI Volume 2 (Japan) (SC0006-SAI) 2001 @@ -1084,8 +1084,8 @@ - - + + SAI Volume 3 (Japan) (SC0009-SAI) 2001 @@ -1095,8 +1095,8 @@ - - + + HWK (Japan) (SC0010-HKW) 2001 @@ -1106,8 +1106,8 @@ - - + + SAI Volume 6 (Japan) (SC0019-SAI) 2001 @@ -1129,7 +1129,7 @@ - + SAI Volume 8 (Japan) (SC0022-SAI) 2001 @@ -1139,8 +1139,8 @@ - - + + @@ -1153,7 +1153,7 @@ - - - + + + diff --git a/hash/gameboy.xml b/hash/gameboy.xml index a1937f845c8..2276307baaa 100644 --- a/hash/gameboy.xml +++ b/hash/gameboy.xml @@ -1762,26 +1762,26 @@ Battle Space requires Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards (all EAN-13): - 1 (up): - 4905672306367 - 1 (down): - 4902776809367 - 2 (up): - 4908052808369 - 2 (down): - 4907981000301 - 3 (up): - 4911826551347 - 3 (down): - 4909062206350 - 4 (up): - 4913508504399 - 4 (down): - 4912713004366 - 5 (up): - 4918156001351 - 5 (down): - 4916911302309 + 1 (up): + 4905672306367 + 1 (down): + 4902776809367 + 2 (up): + 4908052808369 + 2 (down): + 4907981000301 + 3 (up): + 4911826551347 + 3 (down): + 4909062206350 + 4 (up): + 4913508504399 + 4 (down): + 4912713004366 + 5 (up): + 4918156001351 + 5 (down): + 4916911302309 There is also a "free card" without barcodes. --> @@ -5872,19 +5872,19 @@ Family Jockey 2 is compatible with Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards: - バーコードカード No. 1 (barcode card #1) - 競争馬 A (Racehorse A): 5893713522816 (EAN-13) - 競争馬 B (Racehorse B): 1509843019075 (EAN-13) - バーコードカード No. 2 (barcode card #2) - 繁殖馬 A (Breeding horse A): 2378649896765 (EAN-13) - 繁殖馬 B (Breeding horse B): 4232978865152 (EAN-13) - バーコードカード No. 3 (barcode card #3) - 繁殖馬 C (Breeding horse C): 7164625542390 (EAN-13) - バーコードカード No. 4 (barcode card #4) - 種馬 A (Stallion A): 9845554422318 (EAN-13) - 種馬 B (Stallion B): 3572821107673 (EAN-13) - バーコードカード No. 5 (barcode card #5) - 種馬 C (Stallion C) : 6319537443513 (EAN-13) + バーコードカード No. 1 (barcode card #1) + 競争馬 A (Racehorse A): 5893713522816 (EAN-13) + 競争馬 B (Racehorse B): 1509843019075 (EAN-13) + バーコードカード No. 2 (barcode card #2) + 繁殖馬 A (Breeding horse A): 2378649896765 (EAN-13) + 繁殖馬 B (Breeding horse B): 4232978865152 (EAN-13) + バーコードカード No. 3 (barcode card #3) + 繁殖馬 C (Breeding horse C): 7164625542390 (EAN-13) + バーコードカード No. 4 (barcode card #4) + 種馬 A (Stallion A): 9845554422318 (EAN-13) + 種馬 B (Stallion B): 3572821107673 (EAN-13) + バーコードカード No. 5 (barcode card #5) + 種馬 C (Stallion C) : 6319537443513 (EAN-13) --> Family Jockey 2 - Meiba no Kettou (Jpn) @@ -5949,14 +5949,14 @@ Family Stadium 3 (Famista 3) is compatible with Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards (all EAN-13): - No. 1: ホームランバッター - 8357933639923 - No. 2: 高打率バッター - 7814374127798 - No. 3: 駿足バッター - 9880692151263 - No. 4: ピッチャー - 1414213562177 + No. 1: ホームランバッター + 8357933639923 + No. 2: 高打率バッター + 7814374127798 + No. 3: 駿足バッター + 9880692151263 + No. 4: ピッチャー + 1414213562177 --> Famista 3 (Jpn) @@ -6820,7 +6820,7 @@ + The game cart has an integrated speaker and a replaceable battery (CR2016). --> Game de Hakken!! Tamagotchi - Osutchi to Mesutchi (Jpn) 1998 Bandai @@ -7080,7 +7080,7 @@ @@ -10160,18 +10160,18 @@ Kattobi Road is compatible with Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards (all EAN-13): - No. 1: - 4903301160625 - No. 2: - 4987084410924 - No. 3: - 4902888119101 - No. 4: - 4901121110004 - No. 5 (up): - 4902105002063 - No. 5 (down): - 4901780161157 + No. 1: + 4903301160625 + No. 2: + 4987084410924 + No. 3: + 4902888119101 + No. 4: + 4901121110004 + No. 5 (up): + 4902105002063 + No. 5 (down): + 4901780161157 --> Kattobi Road (Jpn) @@ -13390,22 +13390,22 @@ Monster Maker requires Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards (all EAN-13): - 1 (fg up): - 9120153954577 - 1 (fg down): - 9022038781998 - 1 (bg up): - 9362462085911 - 1 (bg down): - 9752412234900 - 2 (fg up): - 9052091324955 - 2 (fg down): - 9322158686716 - 2 (bg up): - 9447410810323 - 2 (bg down): - 9998017308336 + 1 (fg up): + 9120153954577 + 1 (fg down): + 9022038781998 + 1 (bg up): + 9362462085911 + 1 (bg down): + 9752412234900 + 2 (fg up): + 9052091324955 + 2 (fg down): + 9322158686716 + 2 (bg up): + 9447410810323 + 2 (bg down): + 9998017308336 Cards 3, 4 and 5 contains no barcodes. --> @@ -13429,22 +13429,22 @@ Monster Maker - Barcode Saga requires Barcode Boy, a barcode reader accessory for Game Boy. The Barcode Boy is based on Intel N80C51BH (internal ROM undumped). It came bundled with the following barcode cards (all EAN-13): - 1 (fg up): - 9120153954577 - 1 (fg down): - 9022038781998 - 1 (bg up): - 9362462085911 - 1 (bg down): - 9752412234900 - 2 (fg up): - 9052091324955 - 2 (fg down): - 9322158686716 - 2 (bg up): - 9447410810323 - 2 (bg down): - 9998017308336 + 1 (fg up): + 9120153954577 + 1 (fg down): + 9022038781998 + 1 (bg up): + 9362462085911 + 1 (bg down): + 9752412234900 + 2 (fg up): + 9052091324955 + 2 (fg down): + 9322158686716 + 2 (bg up): + 9447410810323 + 2 (bg down): + 9998017308336 Cards 3, 4 and 5 contains no barcodes. --> @@ -25793,11 +25793,11 @@ patch the rom to 0x00 and 0x00....and at 0x0B3D also patch it to diff --git a/hash/n64.xml b/hash/n64.xml index 3aeac11f910..36bb5541bf2 100644 --- a/hash/n64.xml +++ b/hash/n64.xml @@ -2186,12 +2186,12 @@ patched out (+ a fix for internal checksum) Densha de Go! 64 (Jpn) @@ -3886,12 +3886,12 @@ This cart features a RTC, currently unemulated Hey You, Pikachu! (USA) @@ -7614,12 +7614,12 @@ patched out (+ a fix for internal checksum) Pikachuu Genki de Chuu (Jpn) diff --git a/hash/pce_tourvision.xml b/hash/pce_tourvision.xml index 132834e998f..38694319206 100644 --- a/hash/pce_tourvision.xml +++ b/hash/pce_tourvision.xml @@ -5,7 +5,7 @@ - + @@ -188,7 +188,7 @@ - - + + diff --git a/src/mame/machine/hal2.cpp b/src/mame/machine/hal2.cpp index 7bb6286ab12..4993b6d9a1d 100644 --- a/src/mame/machine/hal2.cpp +++ b/src/mame/machine/hal2.cpp @@ -9,12 +9,12 @@ #include "emu.h" #include "machine/hal2.h" -#define LOG_UNKNOWN (1 << 0U) -#define LOG_READS (1 << 1U) -#define LOG_WRITES (1 << 2U) -#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) +#define LOG_UNKNOWN (1 << 0U) +#define LOG_READS (1 << 1U) +#define LOG_WRITES (1 << 2U) +#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HAL2, hal2_device, "hal2", "SGI HAL2") diff --git a/src/mame/machine/hpc1.cpp b/src/mame/machine/hpc1.cpp index 9dce211eac4..9bce71552bb 100644 --- a/src/mame/machine/hpc1.cpp +++ b/src/mame/machine/hpc1.cpp @@ -17,22 +17,22 @@ #include "machine/hpc1.h" #include "speaker.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_INT (1 << 3) -#define LOG_EEPROM (1 << 4) -#define LOG_SCSI (1 << 5) -#define LOG_SCSI_DMA (1 << 6) -#define LOG_DUART0 (1 << 7) -#define LOG_DUART1 (1 << 8) -#define LOG_DUART2 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_REGS (LOG_UNKNOWN | LOG_READS | LOG_WRITES) -#define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2) -#define LOG_ALL (LOG_REGS | LOG_INT | LOG_EEPROM | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT) - -#define VERBOSE (LOG_UNKNOWN) +#define LOG_UNKNOWN (1 << 0) +#define LOG_READS (1 << 1) +#define LOG_WRITES (1 << 2) +#define LOG_INT (1 << 3) +#define LOG_EEPROM (1 << 4) +#define LOG_SCSI (1 << 5) +#define LOG_SCSI_DMA (1 << 6) +#define LOG_DUART0 (1 << 7) +#define LOG_DUART1 (1 << 8) +#define LOG_DUART2 (1 << 9) +#define LOG_PIT (1 << 10) +#define LOG_REGS (LOG_UNKNOWN | LOG_READS | LOG_WRITES) +#define LOG_DUART (LOG_DUART0 | LOG_DUART1 | LOG_DUART2) +#define LOG_ALL (LOG_REGS | LOG_INT | LOG_EEPROM | LOG_SCSI | LOG_SCSI_DMA | LOG_DUART | LOG_PIT) + +#define VERBOSE (LOG_UNKNOWN) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HPC1, hpc1_device, "hpc1", "SGI HPC1") diff --git a/src/mame/machine/hpc1.h b/src/mame/machine/hpc1.h index beee8affc06..efde8747f9d 100644 --- a/src/mame/machine/hpc1.h +++ b/src/mame/machine/hpc1.h @@ -66,29 +66,29 @@ protected: enum { - LOCAL0_FIFO_GIO0 = 0x01, - LOCAL0_PARALLEL = 0x02, - LOCAL0_SCSI = 0x04, - LOCAL0_ETHERNET = 0x08, - LOCAL0_GFX_DMA = 0x10, - LOCAL0_DUART = 0x20, - LOCAL0_GIO1 = 0x40, - LOCAL0_VME0 = 0x80, - - LOCAL1_GR1_CASE = 0x02, - LOCAL1_VME1 = 0x08, - LOCAL1_DSP = 0x10, - LOCAL1_ACFAIL = 0x20, - LOCAL1_VIDEO = 0x40, - LOCAL1_RETRACE_GIO2 = 0x80 + LOCAL0_FIFO_GIO0 = 0x01, + LOCAL0_PARALLEL = 0x02, + LOCAL0_SCSI = 0x04, + LOCAL0_ETHERNET = 0x08, + LOCAL0_GFX_DMA = 0x10, + LOCAL0_DUART = 0x20, + LOCAL0_GIO1 = 0x40, + LOCAL0_VME0 = 0x80, + + LOCAL1_GR1_CASE = 0x02, + LOCAL1_VME1 = 0x08, + LOCAL1_DSP = 0x10, + LOCAL1_ACFAIL = 0x20, + LOCAL1_VIDEO = 0x40, + LOCAL1_RETRACE_GIO2 = 0x80 }; enum { - HPC_DMACTRL_RESET = 0x01, - HPC_DMACTRL_FLUSH = 0x02, - HPC_DMACTRL_TO_MEM = 0x10, - HPC_DMACTRL_ENABLE = 0x80 + HPC_DMACTRL_RESET = 0x01, + HPC_DMACTRL_FLUSH = 0x02, + HPC_DMACTRL_TO_MEM = 0x10, + HPC_DMACTRL_ENABLE = 0x80 }; struct scsi_dma_t diff --git a/src/mame/machine/hpc3.cpp b/src/mame/machine/hpc3.cpp index 860a28b54a9..3728be15dc7 100644 --- a/src/mame/machine/hpc3.cpp +++ b/src/mame/machine/hpc3.cpp @@ -9,16 +9,16 @@ #include "emu.h" #include "machine/hpc3.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_PBUS_DMA (1 << 1) -#define LOG_SCSI (1 << 2) -#define LOG_SCSI_DMA (1 << 3) -#define LOG_ETHERNET (1 << 4) -#define LOG_PBUS4 (1 << 5) -#define LOG_CHAIN (1 << 6) -#define LOG_ALL (LOG_UNKNOWN | LOG_PBUS_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_ETHERNET | LOG_PBUS4 | LOG_CHAIN) - -#define VERBOSE (0) +#define LOG_UNKNOWN (1 << 0) +#define LOG_PBUS_DMA (1 << 1) +#define LOG_SCSI (1 << 2) +#define LOG_SCSI_DMA (1 << 3) +#define LOG_ETHERNET (1 << 4) +#define LOG_PBUS4 (1 << 5) +#define LOG_CHAIN (1 << 6) +#define LOG_ALL (LOG_UNKNOWN | LOG_PBUS_DMA | LOG_SCSI | LOG_SCSI_DMA | LOG_ETHERNET | LOG_PBUS4 | LOG_CHAIN) + +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_HPC3, hpc3_device, "hpc3", "SGI HPC3") diff --git a/src/mame/machine/ioc2.cpp b/src/mame/machine/ioc2.cpp index 4387f2a7ea2..120d6cadc93 100644 --- a/src/mame/machine/ioc2.cpp +++ b/src/mame/machine/ioc2.cpp @@ -10,21 +10,21 @@ #include "bus/rs232/rs232.h" #include "machine/ioc2.h" -#define LOG_PI1 (1 << 0) -#define LOG_SERIAL (1 << 1) -#define LOG_MOUSEKBD (1 << 2) -#define LOG_PANEL (1 << 3) -#define LOG_SYSID (1 << 4) -#define LOG_READ (1 << 5) -#define LOG_DMA_SEL (1 << 6) -#define LOG_RESET (1 << 7) -#define LOG_WRITE (1 << 8) -#define LOG_INT3 (1 << 9) -#define LOG_PIT (1 << 10) -#define LOG_ALL (LOG_PI1 | LOG_SERIAL | LOG_MOUSEKBD | LOG_PANEL | LOG_SYSID | LOG_READ | LOG_DMA_SEL | LOG_RESET | LOG_WRITE | LOG_INT3 | LOG_PIT) -#define LOG_DEFAULT (LOG_ALL & ~(LOG_SYSID | LOG_MOUSEKBD)) - -#define VERBOSE (0) +#define LOG_PI1 (1 << 0) +#define LOG_SERIAL (1 << 1) +#define LOG_MOUSEKBD (1 << 2) +#define LOG_PANEL (1 << 3) +#define LOG_SYSID (1 << 4) +#define LOG_READ (1 << 5) +#define LOG_DMA_SEL (1 << 6) +#define LOG_RESET (1 << 7) +#define LOG_WRITE (1 << 8) +#define LOG_INT3 (1 << 9) +#define LOG_PIT (1 << 10) +#define LOG_ALL (LOG_PI1 | LOG_SERIAL | LOG_MOUSEKBD | LOG_PANEL | LOG_SYSID | LOG_READ | LOG_DMA_SEL | LOG_RESET | LOG_WRITE | LOG_INT3 | LOG_PIT) +#define LOG_DEFAULT (LOG_ALL & ~(LOG_SYSID | LOG_MOUSEKBD)) + +#define VERBOSE (0) #include "logmacro.h" /*static*/ char const *const ioc2_device::SCC_TAG = "scc"; diff --git a/src/mame/machine/ioc2.h b/src/mame/machine/ioc2.h index fe2b1bc3fc7..a90011ae919 100644 --- a/src/mame/machine/ioc2.h +++ b/src/mame/machine/ioc2.h @@ -142,8 +142,8 @@ protected: FRONT_PANEL_VOL_UP_HOLD = 0x80, FRONT_PANEL_INT_MASK = FRONT_PANEL_POWER_BUTTON_INT | - FRONT_PANEL_VOL_DOWN_INT | - FRONT_PANEL_VOL_UP_INT + FRONT_PANEL_VOL_DOWN_INT | + FRONT_PANEL_VOL_UP_INT }; enum diff --git a/src/mame/machine/mace.cpp b/src/mame/machine/mace.cpp index 9767b86b31d..7cc34ef497c 100644 --- a/src/mame/machine/mace.cpp +++ b/src/mame/machine/mace.cpp @@ -9,45 +9,45 @@ #include "emu.h" #include "machine/mace.h" -#define LOG_READ_PCI (1 << 0U) -#define LOG_READ_VIN1 (1 << 1U) -#define LOG_READ_VIN2 (1 << 2U) -#define LOG_READ_VOUT (1 << 3U) -#define LOG_READ_ENET (1 << 4U) -#define LOG_READ_AUDIO (1 << 5U) -#define LOG_READ_ISA (1 << 6U) -#define LOG_READ_KBDMS (1 << 7U) -#define LOG_READ_I2C (1 << 8U) -#define LOG_READ_UST_MSC (1 << 9U) -#define LOG_READ_ISA_EXT (1 << 10U) -#define LOG_READ_RTC (1 << 11U) -#define LOG_WRITE_PCI (1 << 12U) -#define LOG_WRITE_VIN1 (1 << 13U) -#define LOG_WRITE_VIN2 (1 << 14U) -#define LOG_WRITE_VOUT (1 << 15U) -#define LOG_WRITE_ENET (1 << 16U) -#define LOG_WRITE_AUDIO (1 << 17U) -#define LOG_WRITE_ISA (1 << 18U) -#define LOG_WRITE_KBDMS (1 << 19U) -#define LOG_WRITE_I2C (1 << 20U) -#define LOG_WRITE_UST_MSC (1 << 21U) -#define LOG_WRITE_ISA_EXT (1 << 22U) -#define LOG_WRITE_RTC (1 << 23U) -#define LOG_HIFREQ (1 << 24U) -#define LOG_PCI (LOG_READ_PCI | LOG_WRITE_PCI) -#define LOG_VIN1 (LOG_READ_VIN1 | LOG_WRITE_VIN1) -#define LOG_VIN2 (LOG_READ_VIN2 | LOG_WRITE_VIN2) -#define LOG_VOUT (LOG_READ_VOUT | LOG_WRITE_VOUT) -#define LOG_ENET (LOG_READ_ENET | LOG_WRITE_ENET) -#define LOG_AUDIO (LOG_READ_AUDIO | LOG_WRITE_AUDIO) -#define LOG_ISA (LOG_READ_ISA | LOG_WRITE_ISA) -#define LOG_KBDMS (LOG_READ_KBDMS | LOG_WRITE_KBDMS) -#define LOG_UST_MSC (LOG_READ_UST_MSC | LOG_WRITE_UST_MSC) -#define LOG_ISA_EXT (LOG_READ_ISA_EXT | LOG_WRITE_ISA_EXT) -#define LOG_RTC (LOG_READ_RTC | LOG_WRITE_RTC) -#define LOG_ALL (LOG_PCI | LOG_VIN1 | LOG_VIN2 | LOG_VOUT | LOG_ENET | LOG_AUDIO | LOG_ISA | LOG_KBDMS | LOG_UST_MSC | LOG_ISA_EXT | LOG_RTC) - -#define VERBOSE (LOG_ALL) +#define LOG_READ_PCI (1 << 0U) +#define LOG_READ_VIN1 (1 << 1U) +#define LOG_READ_VIN2 (1 << 2U) +#define LOG_READ_VOUT (1 << 3U) +#define LOG_READ_ENET (1 << 4U) +#define LOG_READ_AUDIO (1 << 5U) +#define LOG_READ_ISA (1 << 6U) +#define LOG_READ_KBDMS (1 << 7U) +#define LOG_READ_I2C (1 << 8U) +#define LOG_READ_UST_MSC (1 << 9U) +#define LOG_READ_ISA_EXT (1 << 10U) +#define LOG_READ_RTC (1 << 11U) +#define LOG_WRITE_PCI (1 << 12U) +#define LOG_WRITE_VIN1 (1 << 13U) +#define LOG_WRITE_VIN2 (1 << 14U) +#define LOG_WRITE_VOUT (1 << 15U) +#define LOG_WRITE_ENET (1 << 16U) +#define LOG_WRITE_AUDIO (1 << 17U) +#define LOG_WRITE_ISA (1 << 18U) +#define LOG_WRITE_KBDMS (1 << 19U) +#define LOG_WRITE_I2C (1 << 20U) +#define LOG_WRITE_UST_MSC (1 << 21U) +#define LOG_WRITE_ISA_EXT (1 << 22U) +#define LOG_WRITE_RTC (1 << 23U) +#define LOG_HIFREQ (1 << 24U) +#define LOG_PCI (LOG_READ_PCI | LOG_WRITE_PCI) +#define LOG_VIN1 (LOG_READ_VIN1 | LOG_WRITE_VIN1) +#define LOG_VIN2 (LOG_READ_VIN2 | LOG_WRITE_VIN2) +#define LOG_VOUT (LOG_READ_VOUT | LOG_WRITE_VOUT) +#define LOG_ENET (LOG_READ_ENET | LOG_WRITE_ENET) +#define LOG_AUDIO (LOG_READ_AUDIO | LOG_WRITE_AUDIO) +#define LOG_ISA (LOG_READ_ISA | LOG_WRITE_ISA) +#define LOG_KBDMS (LOG_READ_KBDMS | LOG_WRITE_KBDMS) +#define LOG_UST_MSC (LOG_READ_UST_MSC | LOG_WRITE_UST_MSC) +#define LOG_ISA_EXT (LOG_READ_ISA_EXT | LOG_WRITE_ISA_EXT) +#define LOG_RTC (LOG_READ_RTC | LOG_WRITE_RTC) +#define LOG_ALL (LOG_PCI | LOG_VIN1 | LOG_VIN2 | LOG_VOUT | LOG_ENET | LOG_AUDIO | LOG_ISA | LOG_KBDMS | LOG_UST_MSC | LOG_ISA_EXT | LOG_RTC) + +#define VERBOSE (LOG_ALL) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_MACE, mace_device, "sgimace", "SGI MACE") diff --git a/src/mame/machine/mace.h b/src/mame/machine/mace.h index 9c18042d562..0a46f03e676 100644 --- a/src/mame/machine/mace.h +++ b/src/mame/machine/mace.h @@ -69,9 +69,9 @@ protected: enum { - ISA_INT_COMPARE1 = 0x2000, - ISA_INT_COMPARE2 = 0x4000, - ISA_INT_COMPARE3 = 0x8000, + ISA_INT_COMPARE1 = 0x2000, + ISA_INT_COMPARE2 = 0x4000, + ISA_INT_COMPARE3 = 0x8000, }; struct isa_t diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp index 942f734cbfe..2172f9b5969 100644 --- a/src/mame/machine/sgi.cpp +++ b/src/mame/machine/sgi.cpp @@ -12,17 +12,17 @@ #include "sgi.h" #include "cpu/mips/mips3.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_READS (1 << 1) -#define LOG_WRITES (1 << 2) -#define LOG_RPSS (1 << 3) -#define LOG_WATCHDOG (1 << 4) -#define LOG_MEMCFG (1 << 5) -#define LOG_MEMCFG_EXT (1 << 6) -#define LOG_EEPROM (1 << 7) -#define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_RPSS | LOG_WATCHDOG | LOG_UNKNOWN) +#define LOG_UNKNOWN (1 << 0) +#define LOG_READS (1 << 1) +#define LOG_WRITES (1 << 2) +#define LOG_RPSS (1 << 3) +#define LOG_WATCHDOG (1 << 4) +#define LOG_MEMCFG (1 << 5) +#define LOG_MEMCFG_EXT (1 << 6) +#define LOG_EEPROM (1 << 7) +#define LOG_DEFAULT (LOG_READS | LOG_WRITES | LOG_RPSS | LOG_WATCHDOG | LOG_UNKNOWN) -#define VERBOSE (0) +#define VERBOSE (0) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_MC, sgi_mc_device, "sgi_mc", "SGI Memory Controller") diff --git a/src/mame/machine/xavix.cpp b/src/mame/machine/xavix.cpp index c45e8c89574..a63e0ec7444 100644 --- a/src/mame/machine/xavix.cpp +++ b/src/mame/machine/xavix.cpp @@ -241,13 +241,13 @@ WRITE8_MEMBER(xavix_state::adc_7b80_w) WRITE8_MEMBER(xavix_state::adc_7b81_w) { -// m_irqsource &= ~0x04; -// update_irqs(); +// m_irqsource &= ~0x04; +// update_irqs(); LOG("%s: adc_7b81_w %02x\n", machine().describe_context(), data); m_adc_control = data; -// m_adc_timer->adjust(attotime::from_usec(200)); +// m_adc_timer->adjust(attotime::from_usec(200)); } @@ -425,13 +425,13 @@ void xavix_i2c_state::write_io1(uint8_t data, uint8_t direction) if (direction & 0x10) { m_i2cmem->write_scl((data & 0x10) >> 4); - } + } } uint8_t xavix_i2c_lotr_state::read_io1(uint8_t direction) { uint8_t ret = m_in1->read(); - + // some kind of comms with the IR sensor? ret ^= (machine().rand() & 0x02); ret ^= (machine().rand() & 0x04); @@ -621,7 +621,7 @@ WRITE8_MEMBER(xavix_state::timer_control_w) { /* timer is actively used by ttv_lotr, ttv_sw, drgqst, has_wamg, rad_rh, eka_*, epo_efdx, rad_bass, rad_bb2 - + gets turned on briefly during the bootup of rad_crdn, but then off again runs during rad_fb / rad_madf, but with IRQs turned off @@ -651,7 +651,7 @@ WRITE8_MEMBER(xavix_state::timer_control_w) // uint32_t freq = m_maincpu->unscaled_clock()/2; // m_freq_timer->adjust(attotime::from_hz(freq / divide) * m_timer_baseval*20); //m_freq_timer->adjust(attotime::from_usec(1000)); - m_freq_timer->adjust(attotime::from_usec(50)); + m_freq_timer->adjust(attotime::from_usec(50)); } else { @@ -719,7 +719,7 @@ TIMER_CALLBACK_MEMBER(xavix_state::freq_timer_done) m_timer_control |= 0x80; update_irqs(); } - + //logerror("freq_timer_done\n"); // reload //m_freq_timer->adjust(attotime::from_usec(50000)); diff --git a/src/mame/machine/xavix_madfb_ball.cpp b/src/mame/machine/xavix_madfb_ball.cpp index 11c419dab51..1f254840576 100644 --- a/src/mame/machine/xavix_madfb_ball.cpp +++ b/src/mame/machine/xavix_madfb_ball.cpp @@ -2,15 +2,15 @@ // copyright-holders:David Haywood /* - Motion Football simulation for XaviX based games - EA Sports Madden Football - Play TV Football + Motion Football simulation for XaviX based games + EA Sports Madden Football + Play TV Football - seems to register a pulse when you move it, and another when it stops moving - game uses current timer register (without interrupt) to measure time between pulses - to get 'throw' value + seems to register a pulse when you move it, and another when it stops moving + game uses current timer register (without interrupt) to measure time between pulses + to get 'throw' value - need to verify with code and work out how best to handle this + need to verify with code and work out how best to handle this */ #include "emu.h" diff --git a/src/mame/video/crime.cpp b/src/mame/video/crime.cpp index 05c76f7da73..31ce3d8b64b 100644 --- a/src/mame/video/crime.cpp +++ b/src/mame/video/crime.cpp @@ -9,12 +9,12 @@ #include "emu.h" #include "video/crime.h" -#define LOG_UNKNOWN (1 << 0U) -#define LOG_READS (1 << 1U) -#define LOG_WRITES (1 << 2U) -#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) +#define LOG_UNKNOWN (1 << 0U) +#define LOG_READS (1 << 1U) +#define LOG_WRITES (1 << 2U) +#define LOG_ALL (LOG_UNKNOWN | LOG_READS | LOG_WRITES) -#define VERBOSE (LOG_ALL) +#define VERBOSE (LOG_ALL) #include "logmacro.h" DEFINE_DEVICE_TYPE(SGI_CRIME, crime_device, "sgicrime", "SGI CRIME") diff --git a/src/mame/video/gaelco_wrally_sprites.cpp b/src/mame/video/gaelco_wrally_sprites.cpp index 6ce719939c9..c865e658a66 100644 --- a/src/mame/video/gaelco_wrally_sprites.cpp +++ b/src/mame/video/gaelco_wrally_sprites.cpp @@ -41,13 +41,13 @@ void gaelco_wrally_sprites_device::device_reset() 0 | x------- -------- | flipy 1 | xxxxxxxx xxxxxxxx | unknown - - 2 | ------xx xxxxxxxx | x position - 2 | --xxxx-- -------- | sprite color (low 4 bits) - 2 | -x------ -------- | shadows/highlights (see below) + + 2 | ------xx xxxxxxxx | x position + 2 | --xxxx-- -------- | sprite color (low 4 bits) + 2 | -x------ -------- | shadows/highlights (see below) 2 | x------- -------- | not used? - - 3 | --xxxxxx xxxxxxxx | sprite code + + 3 | --xxxxxx xxxxxxxx | sprite code 3 | xx------ -------- | not used? For shadows/highlights, the tile color below the sprite will be set using a @@ -133,7 +133,7 @@ void gaelco_wrally_sprites_device::draw_sprites(const rectangle &cliprect, uint1 // if there's already a sprite pixel use the existing priority value? (or you get a glitch against the start line arch at the start of a night stage) possibly because existing priority scheme is bogus? // this causes a slight shadow of your car to be visible as you pass through the arch instead, but looking at 14:01 in this video seems to show the same on a PCB https://www.youtube.com/watch?v=vZUUK8c-GZ0 - if (src_color != 0) + if (src_color != 0) { *pixel = src_color |= ((gfx_pen - 8) << 12) | 0x200; } @@ -167,7 +167,7 @@ void gaelco_wrally_sprites_device::mix_sprites(bitmap_ind16 &bitmap, const recta if (pridat == priority) { const int shadow = (spriteptr[x] & 0x200) >> 9; - + if (!shadow) { const uint16_t pendat = (spriteptr[x] & 0xff); diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index ca3013ac298..f26ec2039ec 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -29,15 +29,15 @@ #include "emu.h" #include "video/newport.h" -#define LOG_UNKNOWN (1 << 0) -#define LOG_VC2 (1 << 1) -#define LOG_CMAP0 (1 << 2) -#define LOG_CMAP1 (1 << 3) -#define LOG_XMAP0 (1 << 4) -#define LOG_XMAP1 (1 << 5) -#define LOG_REX3 (1 << 6) -#define LOG_COMMANDS (1 << 7) -#define LOG_ALL (LOG_UNKNOWN | LOG_VC2 | LOG_CMAP0 | LOG_CMAP1 | LOG_XMAP0 | LOG_XMAP1 | LOG_REX3) +#define LOG_UNKNOWN (1 << 0) +#define LOG_VC2 (1 << 1) +#define LOG_CMAP0 (1 << 2) +#define LOG_CMAP1 (1 << 3) +#define LOG_XMAP0 (1 << 4) +#define LOG_XMAP1 (1 << 5) +#define LOG_REX3 (1 << 6) +#define LOG_COMMANDS (1 << 7) +#define LOG_ALL (LOG_UNKNOWN | LOG_VC2 | LOG_CMAP0 | LOG_CMAP1 | LOG_XMAP0 | LOG_XMAP1 | LOG_REX3) #define VERBOSE (0) #include "logmacro.h" diff --git a/src/mame/video/supbtime.cpp b/src/mame/video/supbtime.cpp index d77b7ca0a02..7fa8add9e52 100644 --- a/src/mame/video/supbtime.cpp +++ b/src/mame/video/supbtime.cpp @@ -6,8 +6,8 @@ Video mixing - - are there priority registers / bits in the sprites that would allow - this to be collapsed further? + - are there priority registers / bits in the sprites that would allow + this to be collapsed further? ***************************************************************************/ diff --git a/src/mame/video/xavix.cpp b/src/mame/video/xavix.cpp index 05b4a926e77..68f3352b921 100644 --- a/src/mame/video/xavix.cpp +++ b/src/mame/video/xavix.cpp @@ -191,7 +191,7 @@ void xavix_state::decode_inline_header(int &flipx, int &flipy, int &test, int &p byte1 = get_next_byte(); // only the first byte matters when it comes to setting palette / flips, the rest are just ignored until we reach a 0x6 command, after which there is the tile data - if (first == 1) + if (first == 1) { pal = (byte1 & 0xf0) >> 4; int cmd = (byte1 & 0x0f); @@ -208,7 +208,7 @@ void xavix_state::decode_inline_header(int &flipx, int &flipy, int &test, int &p case 0xe: // this is just the end command, changes nothing, can be pointed at directly tho - case 0x6: + case 0x6: break; // flip cases @@ -344,7 +344,7 @@ void xavix_state::draw_tilemap_line(screen_device &screen, bitmap_ind16 &bitmap, if (tileregs[0x0] != 0x00) { //tile |= m_maincpu->read_full_data_sp((tileregs[0x0] << 8) + count); - tile |= read_full_data_sp_bypass((tileregs[0x0] << 8) + count); + tile |= read_full_data_sp_bypass((tileregs[0x0] << 8) + count); } // only read the next byte if we're not in an 8-bit mode @@ -433,9 +433,9 @@ void xavix_state::draw_tilemap_line(screen_device &screen, bitmap_ind16 &bitmap, tile += gfxbase; set_data_address(tile, 0); - + decode_inline_header(flipx, flipy, test, pal, debug_packets); - + tile = get_current_address_byte(); } @@ -638,7 +638,7 @@ void xavix_state::draw_sprites_line(screen_device &screen, bitmap_ind16 &bitmap, tile = (tile * drawheight * drawwidth * bpp) / 8; basereg = 0; // always uses segment register 0 in tile addressing mode? } - else + else { // 8-byte alignment Addressing Mode uses a fixed offset? if (alt_addressing == 2) -- cgit v1.2.3