diff options
author | 2016-02-24 07:46:57 +0100 | |
---|---|---|
committer | 2016-02-24 07:46:57 +0100 | |
commit | 3abcaee63ff285514e8b51a60949c97a7dfa5304 (patch) | |
tree | 63e6be46c1932606689f9bfacc920d69cfc4b51f | |
parent | 0cbd8782119b140920097a2bee76f36aef014be9 (diff) |
Cleanups and version bump
176 files changed, 4711 insertions, 4732 deletions
diff --git a/hash/a2600.xml b/hash/a2600.xml index bc707e4fc27..01d954dac9d 100644 --- a/hash/a2600.xml +++ b/hash/a2600.xml @@ -9,7 +9,7 @@ Info from Atariage and Atarimania <software name="adventp"> <description>Adventure +</description> <year>2003</year> - <publisher>Homebrew</publisher> + <publisher>Homebrew</publisher> <info name="programmer" value="Steve Engelhardt" /> <sharedfeat name="compatibility" value="NTSC" /> <part name="cart" interface="a2600_cart"> @@ -22,7 +22,7 @@ Info from Atariage and Atarimania <software name="elfadven"> <description>Elf Adventure (Prototype)</description> <year>1983</year> - <publisher>Atari</publisher> + <publisher>Atari</publisher> <info name="programmer" value="Warren Robinett" /> <sharedfeat name="compatibility" value="NTSC" /> <part name="cart" interface="a2600_cart"> @@ -31,11 +31,11 @@ Info from Atariage and Atarimania </dataarea> </part> </software> - + <software name="ret2hh"> <description>Return to Haunted House (Flashback 2)</description> <year>2005</year> - <publisher>Syzygy Company</publisher> + <publisher>Syzygy Company</publisher> <info name="programmer" value="Curt Vensel" /> <sharedfeat name="compatibility" value="NTSC" /> <part name="cart" interface="a2600_cart"> @@ -44,11 +44,11 @@ Info from Atariage and Atarimania </dataarea> </part> </software> - + <software name="advent2" supported="no"> <description>Adventure II (Flashback 2)</description> <year>2005</year> - <publisher>Syzygy Company</publisher> + <publisher>Syzygy Company</publisher> <info name="programmer" value="Curt Vensel" /> <sharedfeat name="compatibility" value="NTSC" /> <part name="cart" interface="a2600_cart"> @@ -56,7 +56,7 @@ Info from Atariage and Atarimania <rom name="Adventure 2.a26" size="8192" crc="bfd846c5" sha1="48d3b94e41371dd7f41d96e1195c324913c228bd" offset="0" /> </dataarea> </part> - </software> + </software> <software name="2pakblac"> <description>2 Pak Special: Challenge + Surfing (PAL)</description> diff --git a/hash/a800_flop.xml b/hash/a800_flop.xml index 4a86cc2948f..94da3a533e4 100644 --- a/hash/a800_flop.xml +++ b/hash/a800_flop.xml @@ -17,7 +17,7 @@ <description>Star Raiders II [Aric Wilmunder]</description> <year>1984</year> <publisher>Atari</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Wilmunder_Star_Raiders_II_8-2.atr" size="92176" crc="fd4e3401" sha1="90a53c361bb3a89f6c5db93b0441d04feccc6d90" offset="0" /> </dataarea> @@ -28,7 +28,7 @@ <description>S.A.M.</description> <year>1982</year> <publisher>Don't Ask</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="sam.atr" size="92176" crc="a5895d13" sha1="da2118f26dd46b0435ba6a486f17069734bad812" offset="0" /> </dataarea> @@ -39,17 +39,17 @@ <description>Ulysses and the Golden Fleece</description> <year>1986</year> <publisher>Sierra On-Line</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Ulysses And The Golden Fleece [Rel. 1] [Side A].atr" size="92176" crc="e16b8dc8" sha1="4e55312b5259c96138f48703fcaa58a6edd0d922" offset="0" /> </dataarea> </part> - <part name="flop2" interface="floppy_5_25"> + <part name="flop2" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Ulysses And The Golden Fleece [Side B].atr" size="92176" crc="40915a46" sha1="a0c539aba57f93a44e23fd20bf444b0ae59c582c" offset="0" /> </dataarea> </part> - <part name="flop3" interface="floppy_5_25"> + <part name="flop3" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Ulysses And The Golden Fleece [Side C].atr" size="92176" crc="525a47fb" sha1="6afd6d46af274d96a3cce97dfb4ec7776fe47a6b" offset="0" /> </dataarea> @@ -60,7 +60,7 @@ <description>Tagalon</description> <year>1986</year> <publisher>Tynesoft</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Tagalon.ATR" size="92176" crc="f1d7bc3b" sha1="ced50da056a9fc208b613dbf1a51c0053ec251d1" offset="0" /> </dataarea> @@ -71,7 +71,7 @@ <description>Ninja</description> <year>1986</year> <publisher>Mastertronic</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Ninja (v1).atr" size="92176" crc="54c732ed" sha1="8cd6d106904d62bb417acc0c58928dc40e10c462" offset="0" /> </dataarea> @@ -82,7 +82,7 @@ <description>Countdown</description> <year>1984</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Countdown.atr" size="92176" crc="0471796a" sha1="d02b8ad67b2f1f27b340e6fa94aa0c9bc03d2ad7" offset="0" /> </dataarea> @@ -93,7 +93,7 @@ <description>Silent Service</description> <year>1985</year> <publisher>Microprose</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Silent Service.atr" size="92176" crc="bda9ac46" sha1="312c76e40f0941749e3909afd4a7d7a83f398210" offset="0" /> </dataarea> @@ -104,7 +104,7 @@ <description>Temple Of Apshai Triology</description> <year>1985</year> <publisher>Epyx</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Temple of Apshai Trilogy (The).atr" size="92176" crc="a5cdca88" sha1="e9955303ba855beeafb0e5bf9b5b683d0fbb8701" offset="0" /> </dataarea> @@ -115,7 +115,7 @@ <description>Necromancer</description> <year>1982</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Necromancer (v3).atr" size="92176" crc="e88a29c6" sha1="2445a652bb2980b7def4b189718332997f9fa584" offset="0" /> </dataarea> @@ -126,7 +126,7 @@ <description>Shamus: Case II</description> <year>1983</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Shamus - Case II.atr" size="92176" crc="2b6696c6" sha1="f3079c19f54ae5dc6fc9de6ca80341e9a2527c05" offset="0" /> </dataarea> @@ -137,7 +137,7 @@ <description>World Karate Championship</description> <year>1986</year> <publisher>Epyx</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="133136"> <rom name="World Karate Championship (v4).atr" size="133136" crc="a89bf1e6" sha1="97fbaf575d9f9ddbecd1528c7d5090d2fdac6f3e" offset="0" /> </dataarea> @@ -148,7 +148,7 @@ <description>Lode Runner</description> <year>1983</year> <publisher>Broderbund</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Lode Runner (1983)(Broderbund).atr" size="92176" crc="3a6f19ae" sha1="1add070c088b73488fb83e815294cd1d0e38e039" offset="0" /> </dataarea> @@ -159,7 +159,7 @@ <description>Championship Lode Runner</description> <year>1985</year> <publisher>Broderbund</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Championship Lode Runner.atr" size="92176" crc="53e02689" sha1="dc92e8616fa2e00432b388df97d508c1a0b6db3c" offset="0" /> </dataarea> @@ -170,7 +170,7 @@ <description>Mars Mission II</description> <year>1981</year> <publisher>Antic</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Mars Mission II.atr" size="92176" crc="59694595" sha1="4b2ad8bdcbbd4c8f5aef154e55bf4950b15798f3" offset="0" /> </dataarea> @@ -181,7 +181,7 @@ <description>Caverns of Khafka</description> <year>1983</year> <publisher>Cosmi</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Caverns of Khafka.atr" size="92176" crc="587862ff" sha1="53ec7aa10e7f7231b4cc7d194b21fda735135263" offset="0" /> </dataarea> @@ -192,7 +192,7 @@ <description>Bruce Lee</description> <year>1984</year> <publisher>Datasoft</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Bruce Lee (v1).atr" size="92176" crc="5870eb7f" sha1="789b4c0ce4ade89559179999751a29f250325787" offset="0" /> </dataarea> @@ -203,7 +203,7 @@ <description>Boulder Dash II</description> <year>1985</year> <publisher>First Star</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Boulder Dash II (v4).atr" size="92176" crc="1145500d" sha1="6cbbe6c497f6462b1e3aabaa72a91ce5daa35fb6" offset="0" /> </dataarea> @@ -214,7 +214,7 @@ <description>Blue Max 2001</description> <year>1984</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="65552"> <rom name="Blue Max 2001.atr" size="65552" crc="e8fb6d8f" sha1="2b3fe701ea1a7d4660d5d6d403228fbabf4cc711" offset="0" /> </dataarea> @@ -225,7 +225,7 @@ <description>Aztec Challenge</description> <year>1983</year> <publisher>Cosmi</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="13584"> <rom name="Aztec Challenge.atr" size="13584" crc="ea4be8e7" sha1="bd9362aa4023a54a35ef2c3f3c7100523100820b" offset="0" /> </dataarea> @@ -236,7 +236,7 @@ <description>Spy Vs Spy</description> <year>1984</year> <publisher>First Star</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Spy Vs Spy (1984)(First Star).atr" size="92176" crc="91940f40" sha1="d57d8ecbb0b14987c8fc64b27fe1511779c62f4d" offset="0" /> </dataarea> @@ -247,7 +247,7 @@ <description>Spy Vs Spy - Arctic Antics</description> <year>1987</year> <publisher>First Star</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Spy Vs Spy - Arctic Antics (1987)(First Star).atr" size="92176" crc="0bd44669" sha1="e6fe39584e5facc62116c7c4f5952e4d5046323a" offset="0" /> </dataarea> @@ -258,7 +258,7 @@ <description>Spy Vs Spy - The Island Caper</description> <year>1985</year> <publisher>First Star Software</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Spy Vs Spy - The Island Caper (1985)(First Star).atr" size="92176" crc="7ac8a99a" sha1="ce4241641a3d0981beaa766f01bf0093552c70de" offset="0" /> </dataarea> @@ -269,7 +269,7 @@ <description>Montezuma's Revenge</description> <year>1984</year> <publisher>Parker Brothers</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="Montezuma's Revenge _ Parker Brothers.atr" size="92176" crc="3ec0b7e2" sha1="3535dfc1cf25f59c8bdc050689bb89877fef9da0" offset="0" /> </dataarea> @@ -280,7 +280,7 @@ <description>Montezuma's Revenge! (Prototype)</description> <year>1983</year> <publisher>Utopia Software</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="34960"> <rom name="Montezuma's Revenge!.atr" size="34960" crc="fd7387dd" sha1="563832104dd0658d09411b24cc0c251be5041d33" offset="0" /> </dataarea> @@ -292,7 +292,7 @@ <description>Mr. Robot and his Robot Factory</description> <year>1983</year> <publisher>Datamost</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="mr robot and his robot factory.atr" size="92176" crc="36f3bdb0" sha1="8bb1f04783e883bb20aec5b83e3493632d9dd0bd" offset="0" /> </dataarea> @@ -303,7 +303,7 @@ <description>Castle Wolfenstein</description> <year>1983</year> <publisher>Muse Software</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="castle wolfenstein.atr" size="92176" crc="7745cd05" sha1="03ba4218d20f260f3e17c7ce540c952cd071bdf5" offset="0" /> </dataarea> @@ -314,7 +314,7 @@ <description>Beyond Castle Wolfenstein</description> <year>1984</year> <publisher>Muse Software</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="beyond castle wolfenstein.atr" size="92176" crc="78ef8db7" sha1="a0916bd0dde1b748834411c96cb2ae058b38f3c2" offset="0" /> </dataarea> @@ -325,7 +325,7 @@ <description>Quasimodo</description> <year>1984</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="27024"> <rom name="quasmodo.atr" size="27024" crc="0a2e0469" sha1="ae973c2b8f7863ce7b519a2a4dd689ad1a4b20a3" offset="0" /> </dataarea> @@ -336,7 +336,7 @@ <description>Zorro</description> <year>1985</year> <publisher>Datasoft</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="zorro.atr" size="92176" crc="df552763" sha1="c219f6eb373df61e620b40d19aef66f8f03e7356" offset="0" /> </dataarea> @@ -347,7 +347,7 @@ <description>Alley Cat</description> <year>1983</year> <publisher>Synapse</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="65552"> <rom name="alleycat.atr" size="65552" crc="12e2eb0d" sha1="a99e131f024e5df10316860b6d174a16aadc8651" offset="0" /> </dataarea> @@ -358,7 +358,7 @@ <description>Galahad and the Holy Grail</description> <year>1982</year> <publisher>Atari Program Exchange</publisher> - <part name="flop1" interface="floppy_5_25"> + <part name="flop1" interface="floppy_5_25"> <dataarea name="flop" size="92176"> <rom name="galahad.atr" size="92176" crc="d575a0bb" sha1="9f03ddbd745919e93113daed1117a59751f22ae5" offset="0" /> </dataarea> diff --git a/hash/electron_cass.xml b/hash/electron_cass.xml index 8dce4799365..82dd4236d26 100644 --- a/hash/electron_cass.xml +++ b/hash/electron_cass.xml @@ -876,7 +876,7 @@ </dataarea> </part> </software> - + <software name="biology"> <description>Biology</description> <year>1983</year> diff --git a/hash/k28m2.xml b/hash/k28m2.xml index 27ce1fdf58f..1d4a0bce5a8 100644 --- a/hash/k28m2.xml +++ b/hash/k28m2.xml @@ -52,17 +52,17 @@ </software> <!-- - <software name="m5"> - <description>Expansion Module 5</description> - <year>1987</year> - <publisher>Tiger Electronics</publisher> - <info name="serial" value="CM62218"/> - <part name="cart" interface="k28m2"> - <dataarea name="rom" size="0x4000"> - <rom name="cm62217.vsm" size="0x4000" crc="x" sha1="x" offset="0" /> - </dataarea> - </part> - </software> + <software name="m5"> + <description>Expansion Module 5</description> + <year>1987</year> + <publisher>Tiger Electronics</publisher> + <info name="serial" value="CM62218"/> + <part name="cart" interface="k28m2"> + <dataarea name="rom" size="0x4000"> + <rom name="cm62217.vsm" size="0x4000" crc="x" sha1="x" offset="0" /> + </dataarea> + </part> + </software> --> <software name="m6"> diff --git a/hash/m5_cart.xml b/hash/m5_cart.xml index 0ff509f2e89..1163b21d0eb 100644 --- a/hash/m5_cart.xml +++ b/hash/m5_cart.xml @@ -619,7 +619,7 @@ come from... they might be eventually removed --> </part> </software> -<!-- Homebrew memory modules --> +<!-- Homebrew memory modules --> <software name="64kbi" supported="no"> <description>EM-64 Expansion memory 64Kb</description> @@ -645,7 +645,7 @@ come from... they might be eventually removed --> </dataarea> </part> </software> - + <software name="64krx" supported="no"> <description>64Krx Expansion board 64Kb</description> <year>199?</year> @@ -665,7 +665,7 @@ come from... they might be eventually removed --> </part> </software> - <!-- Brno mod ROMs --> + <!-- Brno mod ROMs --> <software name="brno_con" supported="no"> <description>Boot for Brno ramdisk [console version]</description> @@ -688,5 +688,5 @@ come from... they might be eventually removed --> </dataarea> </part> </software> - + </softwarelist> diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 77a130b26bf..7185a43ea7e 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -132,7 +132,7 @@ static MACHINE_CONFIG_FRAGMENT( epson_lx810l ) MCFG_UPD7810_CO0(WRITELINE(epson_lx810l_t, co0_w)) MCFG_UPD7810_CO1(WRITELINE(epson_lx810l_t, co1_w)) -// MCFG_DEFAULT_LAYOUT(layout_lx800) +// MCFG_DEFAULT_LAYOUT(layout_lx800) /* video hardware (simulates paper) */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp index 162d802136e..92bda7e5fbd 100644 --- a/src/devices/bus/m5/slot.cpp +++ b/src/devices/bus/m5/slot.cpp @@ -175,7 +175,6 @@ bool m5_cart_slot_device::call_load() if (m_type == M5_STD || m_type>2) //carts with roms { - UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom"); if (size > 0x5000 && m_type == M5_STD) @@ -190,12 +189,12 @@ bool m5_cart_slot_device::call_load() fread(m_cart->get_rom_base(), size); else memcpy(m_cart->get_rom_base(), get_software_region("rom"), size); - + } if (!M5_STD) if (get_software_region("ram")) m_cart->ram_alloc(get_software_region_length("ram")); - + //printf("Type: %s\n", m5_get_slot(m_type)); } diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h index 177977043cf..5f584ea2b82 100644 --- a/src/devices/bus/m5/slot.h +++ b/src/devices/bus/m5/slot.h @@ -18,7 +18,7 @@ enum }; -#define M5_STD 0 +#define M5_STD 0 // ======================> device_m5_cart_interface diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index 71aec796760..14858af369b 100644 --- a/src/devices/cpu/hphybrid/hphybrid.cpp +++ b/src/devices/cpu/hphybrid/hphybrid.cpp @@ -673,7 +673,7 @@ UINT16 hp_hybrid_cpu_device::RM(UINT32 addr) return RIO(CURRENT_PA , addr_wo_bsc - HP_REG_R4_ADDR); case HP_REG_IV_ADDR: - return m_reg_IV; + return m_reg_IV; case HP_REG_PA_ADDR: return CURRENT_PA; diff --git a/src/devices/cpu/m6800/6800ops.inc b/src/devices/cpu/m6800/6800ops.inc index 078529d16ab..d6c3d7634a5 100644 --- a/src/devices/cpu/m6800/6800ops.inc +++ b/src/devices/cpu/m6800/6800ops.inc @@ -2305,4 +2305,4 @@ OP_HANDLER( stx_nsc ) CLR_NZV; SET_NZ8(val); WM(EAD,val); -}
\ No newline at end of file +} diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index e798a1153b2..bafc40e1ea3 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -3591,7 +3591,7 @@ void z80_device::execute_set_input(int inputnum, int state) case Z80_INPUT_LINE_WAIT: m_wait_state = state; break; - + default: break; } diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp index 76203d31ee3..eb94faf3b05 100644 --- a/src/devices/machine/hp_taco.cpp +++ b/src/devices/machine/hp_taco.cpp @@ -148,8 +148,8 @@ // Timers enum { - TAPE_TMR_ID, - HOLE_TMR_ID + TAPE_TMR_ID, + HOLE_TMR_ID }; // Constants @@ -178,52 +178,52 @@ enum { // Parts of command register #define CMD_CODE(reg) \ - (((reg) >> 10) & 0x1f) + (((reg) >> 10) & 0x1f) #define DIR_FWD(reg) \ - (BIT(reg , 15)) + (BIT(reg , 15)) #define SPEED_FAST(reg) \ - (BIT(reg , 7)) + (BIT(reg , 7)) #define CMD_OPT(reg) \ - (BIT(reg , 6)) + (BIT(reg , 6)) #define UNKNOWN_B9(reg) \ - (BIT(reg , 9)) + (BIT(reg , 9)) #define DIR_FWD_MASK BIT_MASK(15) // Direction = forward #define SPEED_FAST_MASK BIT_MASK(7) // Speed = fast // Commands enum { - CMD_INDTA_INGAP, // 00: scan for data first then for gap - CMD_UNK_01, // 01: unknown - CMD_FINAL_GAP, // 02: write final gap - CMD_INIT_WRITE, // 03: write words for tape formatting - CMD_STOP, // 04: stop - CMD_UNK_05, // 05: unknown - CMD_SET_TRACK, // 06: set A/B track - CMD_UNK_07, // 07: unknown - CMD_UNK_08, // 08: unknown - CMD_UNK_09, // 09: unknown - CMD_MOVE, // 0a: move tape - CMD_UNK_0b, // 0b: unknown - CMD_INGAP_MOVE, // 0c: scan for gap then move a bit further (used to gain some margin when inverting tape movement) - CMD_UNK_0d, // 0d: unknown - CMD_CLEAR, // 0e: clear errors/unlatch status bits - CMD_UNK_0f, // 0f: unknown - CMD_NOT_INDTA, // 10: scan for end of data - CMD_UNK_11, // 11: unknown - CMD_UNK_12, // 12: unknown - CMD_UNK_13, // 13: unknown - CMD_UNK_14, // 14: unknown - CMD_UNK_15, // 15: unknown - CMD_WRITE_IRG, // 16: write inter-record gap - CMD_UNK_17, // 17: unknown - CMD_SCAN_RECORDS, // 18: scan records (count IRGs) - CMD_RECORD_WRITE, // 19: write record words - CMD_MOVE_INDTA, // 1a: move then scan for data - CMD_UNK_1b, // 1b: unknown (for now it seems harmless to handle it as NOP) - CMD_DELTA_MOVE_HOLE, // 1c: move tape a given distance, intr at end or first hole found (whichever comes first) - CMD_START_READ, // 1d: start record reading - CMD_DELTA_MOVE_IRG, // 1e: move tape a given distance, detect gaps in parallel - CMD_END_READ // 1f: stop reading + CMD_INDTA_INGAP, // 00: scan for data first then for gap + CMD_UNK_01, // 01: unknown + CMD_FINAL_GAP, // 02: write final gap + CMD_INIT_WRITE, // 03: write words for tape formatting + CMD_STOP, // 04: stop + CMD_UNK_05, // 05: unknown + CMD_SET_TRACK, // 06: set A/B track + CMD_UNK_07, // 07: unknown + CMD_UNK_08, // 08: unknown + CMD_UNK_09, // 09: unknown + CMD_MOVE, // 0a: move tape + CMD_UNK_0b, // 0b: unknown + CMD_INGAP_MOVE, // 0c: scan for gap then move a bit further (used to gain some margin when inverting tape movement) + CMD_UNK_0d, // 0d: unknown + CMD_CLEAR, // 0e: clear errors/unlatch status bits + CMD_UNK_0f, // 0f: unknown + CMD_NOT_INDTA, // 10: scan for end of data + CMD_UNK_11, // 11: unknown + CMD_UNK_12, // 12: unknown + CMD_UNK_13, // 13: unknown + CMD_UNK_14, // 14: unknown + CMD_UNK_15, // 15: unknown + CMD_WRITE_IRG, // 16: write inter-record gap + CMD_UNK_17, // 17: unknown + CMD_SCAN_RECORDS, // 18: scan records (count IRGs) + CMD_RECORD_WRITE, // 19: write record words + CMD_MOVE_INDTA, // 1a: move then scan for data + CMD_UNK_1b, // 1b: unknown (for now it seems harmless to handle it as NOP) + CMD_DELTA_MOVE_HOLE, // 1c: move tape a given distance, intr at end or first hole found (whichever comes first) + CMD_START_READ, // 1d: start record reading + CMD_DELTA_MOVE_IRG, // 1e: move tape a given distance, detect gaps in parallel + CMD_END_READ // 1f: stop reading }; // Bits of status register @@ -250,17 +250,17 @@ enum { // O O O O // static const hp_taco_device::tape_pos_t tape_holes[] = { - (hp_taco_device::tape_pos_t)(23.891 * ONE_INCH_POS), // 24 - 0.218 / 2 - (hp_taco_device::tape_pos_t)(24.109 * ONE_INCH_POS), // 24 + 0.218 / 2 - (hp_taco_device::tape_pos_t)(35.891 * ONE_INCH_POS), // 36 - 0.218 / 2 - (hp_taco_device::tape_pos_t)(36.109 * ONE_INCH_POS), // 36 + 0.218 / 2 - (hp_taco_device::tape_pos_t)(47.891 * ONE_INCH_POS), // 48 - 0.218 / 2 - (hp_taco_device::tape_pos_t)(48.109 * ONE_INCH_POS), // 48 + 0.218 / 2 - 72 * ONE_INCH_POS, // 72 - 1752 * ONE_INCH_POS, // 1752 - 1776 * ONE_INCH_POS, // 1776 - 1788 * ONE_INCH_POS, // 1788 - 1800 * ONE_INCH_POS // 1800 + (hp_taco_device::tape_pos_t)(23.891 * ONE_INCH_POS), // 24 - 0.218 / 2 + (hp_taco_device::tape_pos_t)(24.109 * ONE_INCH_POS), // 24 + 0.218 / 2 + (hp_taco_device::tape_pos_t)(35.891 * ONE_INCH_POS), // 36 - 0.218 / 2 + (hp_taco_device::tape_pos_t)(36.109 * ONE_INCH_POS), // 36 + 0.218 / 2 + (hp_taco_device::tape_pos_t)(47.891 * ONE_INCH_POS), // 48 - 0.218 / 2 + (hp_taco_device::tape_pos_t)(48.109 * ONE_INCH_POS), // 48 + 0.218 / 2 + 72 * ONE_INCH_POS, // 72 + 1752 * ONE_INCH_POS, // 1752 + 1776 * ONE_INCH_POS, // 1776 + 1788 * ONE_INCH_POS, // 1788 + 1800 * ONE_INCH_POS // 1800 }; // Device type definition @@ -268,144 +268,144 @@ const device_type HP_TACO = &device_creator<hp_taco_device>; // Constructors hp_taco_device::hp_taco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) - : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), - device_image_interface(mconfig , *this), - m_irq_handler(*this), - m_flg_handler(*this), - m_sts_handler(*this), - m_tape_pos(TAPE_INIT_POS), - m_image_dirty(false) + : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__), + device_image_interface(mconfig , *this), + m_irq_handler(*this), + m_flg_handler(*this), + m_sts_handler(*this), + m_tape_pos(TAPE_INIT_POS), + m_image_dirty(false) { - clear_state(); + clear_state(); } hp_taco_device::hp_taco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, HP_TACO, "HP TACO", tag, owner, clock, "TACO", __FILE__), - device_image_interface(mconfig , *this), - m_irq_handler(*this), - m_flg_handler(*this), - m_sts_handler(*this), - m_tape_pos(TAPE_INIT_POS), - m_image_dirty(false) + : device_t(mconfig, HP_TACO, "HP TACO", tag, owner, clock, "TACO", __FILE__), + device_image_interface(mconfig , *this), + m_irq_handler(*this), + m_flg_handler(*this), + m_sts_handler(*this), + m_tape_pos(TAPE_INIT_POS), + m_image_dirty(false) { - clear_state(); + clear_state(); } WRITE16_MEMBER(hp_taco_device::reg_w) { - LOG_0(("wr R%u = %04x\n", 4 + offset , data)); - - // Any I/O activity clears IRQ - irq_w(false); - - switch (offset) { - case 0: - // Data register - m_data_reg = data; - m_data_reg_full = true; - break; - - case 1: - // Command register - start_cmd_exec(data & CMD_REG_MASK); - break; - - case 2: - // Tachometer register - m_tach_reg = data; - break; - - case 3: - // Timing register - m_timing_reg = data; - break; - } + LOG_0(("wr R%u = %04x\n", 4 + offset , data)); + + // Any I/O activity clears IRQ + irq_w(false); + + switch (offset) { + case 0: + // Data register + m_data_reg = data; + m_data_reg_full = true; + break; + + case 1: + // Command register + start_cmd_exec(data & CMD_REG_MASK); + break; + + case 2: + // Tachometer register + m_tach_reg = data; + break; + + case 3: + // Timing register + m_timing_reg = data; + break; + } } READ16_MEMBER(hp_taco_device::reg_r) { - UINT16 res = 0; + UINT16 res = 0; - // Any I/O activity clears IRQ - irq_w(false); + // Any I/O activity clears IRQ + irq_w(false); - switch (offset) { - case 0: - // Data register - res = m_data_reg; - break; + switch (offset) { + case 0: + // Data register + res = m_data_reg; + break; - case 1: - // Command & status register - res = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK); - break; + case 1: + // Command & status register + res = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK); + break; - case 2: - // Tachometer register - res = m_tach_reg; - break; + case 2: + // Tachometer register + res = m_tach_reg; + break; - case 3: - // Checksum register: it clears when read - res = m_checksum_reg; - m_checksum_reg = 0; - break; - } + case 3: + // Checksum register: it clears when read + res = m_checksum_reg; + m_checksum_reg = 0; + break; + } - LOG_0(("rd R%u = %04x\n", 4 + offset , res)); + LOG_0(("rd R%u = %04x\n", 4 + offset , res)); - return res; + return res; } READ_LINE_MEMBER(hp_taco_device::flg_r) { - return m_flg; + return m_flg; } READ_LINE_MEMBER(hp_taco_device::sts_r) { - return m_sts; + return m_sts; } // device_config_complete void hp_taco_device::device_config_complete() { - LOG(("device_config_complete")); + LOG(("device_config_complete")); update_names(); } // device_start void hp_taco_device::device_start() { - LOG(("device_start")); - m_irq_handler.resolve_safe(); - m_flg_handler.resolve_safe(); - m_sts_handler.resolve_safe(); - - save_item(NAME(m_data_reg)); - save_item(NAME(m_data_reg_full)); - save_item(NAME(m_cmd_reg)); - save_item(NAME(m_cmd_state)); - save_item(NAME(m_status_reg)); - save_item(NAME(m_tach_reg)); - save_item(NAME(m_checksum_reg)); - save_item(NAME(m_timing_reg)); - save_item(NAME(m_irq)); - save_item(NAME(m_flg)); - save_item(NAME(m_sts)); - save_item(NAME(m_tape_pos)); - save_item(NAME(m_start_time)); - save_item(NAME(m_tape_fwd)); - save_item(NAME(m_tape_fast)); - save_item(NAME(m_image_dirty)); - save_item(NAME(m_tape_wr)); - save_item(NAME(m_rw_pos)); - save_item(NAME(m_next_word)); - save_item(NAME(m_rd_it_valid)); - save_item(NAME(m_gap_detect_start)); - - m_tape_timer = timer_alloc(TAPE_TMR_ID); - m_hole_timer = timer_alloc(HOLE_TMR_ID); + LOG(("device_start")); + m_irq_handler.resolve_safe(); + m_flg_handler.resolve_safe(); + m_sts_handler.resolve_safe(); + + save_item(NAME(m_data_reg)); + save_item(NAME(m_data_reg_full)); + save_item(NAME(m_cmd_reg)); + save_item(NAME(m_cmd_state)); + save_item(NAME(m_status_reg)); + save_item(NAME(m_tach_reg)); + save_item(NAME(m_checksum_reg)); + save_item(NAME(m_timing_reg)); + save_item(NAME(m_irq)); + save_item(NAME(m_flg)); + save_item(NAME(m_sts)); + save_item(NAME(m_tape_pos)); + save_item(NAME(m_start_time)); + save_item(NAME(m_tape_fwd)); + save_item(NAME(m_tape_fast)); + save_item(NAME(m_image_dirty)); + save_item(NAME(m_tape_wr)); + save_item(NAME(m_rw_pos)); + save_item(NAME(m_next_word)); + save_item(NAME(m_rd_it_valid)); + save_item(NAME(m_gap_detect_start)); + + m_tape_timer = timer_alloc(TAPE_TMR_ID); + m_hole_timer = timer_alloc(HOLE_TMR_ID); } // device_stop @@ -416,593 +416,593 @@ void hp_taco_device::device_stop() // device_reset void hp_taco_device::device_reset() { - LOG(("device_reset")); - clear_state(); + LOG(("device_reset")); + clear_state(); - m_irq = false; - m_flg = true; + m_irq = false; + m_flg = true; - m_irq_handler(false); - m_flg_handler(true); - set_error(false); + m_irq_handler(false); + m_flg_handler(true); + set_error(false); } void hp_taco_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - if (CMD_CODE(m_cmd_reg) != CMD_STOP) { - update_tape_pos(); - } - - switch (id) { - case TAPE_TMR_ID: - LOG_0(("Tape tmr @%g\n" , machine().time().as_double())); - - tape_pos_t length; - - switch (CMD_CODE(m_cmd_reg)) { - case CMD_INDTA_INGAP: - if (m_cmd_state == 0) { - m_cmd_state = 1; - tape_pos_t target = m_tape_pos; - if (next_n_gap(target, 1, MIN_IRG_LENGTH)) { - m_tape_timer->adjust(time_to_target(target)); - } - return; - } - break; - - case CMD_RECORD_WRITE: - if (m_cmd_state == 0) { - if (m_rd_it->second == PREAMBLE_WORD) { - LOG_0(("Got preamble\n")); - m_cmd_state = 1; - // m_rw_pos already at correct position - m_tape_timer->adjust(fetch_next_wr_word()); - break; - } else { - adv_res_t res = adv_it(m_rd_it); - if (res != ADV_NO_MORE_DATA) { - m_tape_timer->adjust(time_to_rd_next_word(m_rw_pos)); - } - // No IRQ - return; - } - } - // Intentional fall-through - case CMD_INIT_WRITE: - write_word(m_rw_pos , m_next_word , length); - pos_offset(m_rw_pos , length); - // Just to be sure.. - m_tape_pos = m_rw_pos; - m_tape_timer->adjust(fetch_next_wr_word()); - break; - - case CMD_STOP: - move_tape_pos(m_tape_fast ? FAST_BRAKE_DIST : SLOW_BRAKE_DIST); - stop_tape(); - break; - - case CMD_INGAP_MOVE: - if (m_cmd_state == 0) { - m_cmd_state = 1; - m_tape_timer->adjust(time_to_tach_pulses()); - return; - } - break; - - case CMD_FINAL_GAP: - case CMD_WRITE_IRG: - write_gap(m_rw_pos , m_tape_pos); - m_hole_timer->reset(); - break; - - case CMD_SCAN_RECORDS: - if (m_cmd_state == 0) { - m_cmd_state = 1; - tape_pos_t target = m_tape_pos; - if (next_n_gap(target, 0x10000U - m_tach_reg, MIN_IRG_LENGTH)) { - LOG_0(("%u gaps @%d\n" , 0x10000U - m_tach_reg, target)); - m_tape_timer->adjust(time_to_target(target)); - } - return; - } else { - m_hole_timer->reset(); - } - break; - - case CMD_MOVE_INDTA: - if (m_cmd_state == 0) { - if (next_data(m_rd_it , m_tape_pos , true)) { - m_cmd_state = 1; - m_tape_timer->adjust(time_to_target(farthest_end(m_rd_it))); - } - // No IRQ - return; - } - // m_cmd_state == 1 -> IRQ & cmd end - break; - - case CMD_DELTA_MOVE_HOLE: - case CMD_DELTA_MOVE_IRG: - // Interrupt at end of movement - m_hole_timer->reset(); - break; - - case CMD_START_READ: - { - bool set_intr = true; - // Just to be sure.. - m_tape_pos = m_rw_pos; - if (m_cmd_state == 0) { - set_intr = false; - if (m_rd_it->second == PREAMBLE_WORD) { - m_cmd_state = 1; - } - LOG_0(("Got preamble\n")); - } else { - m_data_reg = m_rd_it->second; - m_checksum_reg += m_data_reg; - LOG_0(("RD %04x\n" , m_data_reg)); - } - adv_res_t res = adv_it(m_rd_it); - LOG_0(("adv_it %d\n" , res)); - if (res == ADV_NO_MORE_DATA) { - m_rd_it_valid = false; - } else { - if (res == ADV_DISCONT_DATA) { - // Hit a gap, restart preamble search - m_cmd_state = 0; - } - m_tape_timer->adjust(time_to_rd_next_word(m_rw_pos)); - } - if (!set_intr) { - return; - } - } - break; - - case CMD_END_READ: - { - m_tape_pos = m_rw_pos; - // Note: checksum is not updated - m_data_reg = m_rd_it->second; - LOG_0(("Final RD %04x\n" , m_data_reg)); - adv_res_t res = adv_it(m_rd_it); - if (res == ADV_NO_MORE_DATA) { - m_rd_it_valid = false; - } - m_hole_timer->reset(); - } - break; - - default: - // Other commands: just raise irq - break; - } - irq_w(true); - break; - - case HOLE_TMR_ID: - LOG_0(("Hole tmr @%g\n" , machine().time().as_double())); - - BIT_SET(m_status_reg , STATUS_HOLE_BIT); - - switch (CMD_CODE(m_cmd_reg)) { - case CMD_FINAL_GAP: - case CMD_WRITE_IRG: - write_gap(m_rw_pos , m_tape_pos); - m_rw_pos = m_tape_pos; - break; - - case CMD_SCAN_RECORDS: - case CMD_DELTA_MOVE_HOLE: - // Cmds 18 & 1c are terminated at first hole - m_tape_timer->reset(); - irq_w(true); - // No reloading of hole timer - return; - - case CMD_DELTA_MOVE_IRG: - // TODO: update r6 - m_hole_timer->adjust(time_to_next_hole()); - // No IRQ at holes - return; - - case CMD_START_READ: - case CMD_END_READ: - set_error(true); - break; - - default: - // Other cmds: default processing (update tape pos, set IRQ, schedule timer for next hole) - break; - } - - irq_w(true); - m_hole_timer->adjust(time_to_next_hole()); - break; - - default: - break; - } + if (CMD_CODE(m_cmd_reg) != CMD_STOP) { + update_tape_pos(); + } + + switch (id) { + case TAPE_TMR_ID: + LOG_0(("Tape tmr @%g\n" , machine().time().as_double())); + + tape_pos_t length; + + switch (CMD_CODE(m_cmd_reg)) { + case CMD_INDTA_INGAP: + if (m_cmd_state == 0) { + m_cmd_state = 1; + tape_pos_t target = m_tape_pos; + if (next_n_gap(target, 1, MIN_IRG_LENGTH)) { + m_tape_timer->adjust(time_to_target(target)); + } + return; + } + break; + + case CMD_RECORD_WRITE: + if (m_cmd_state == 0) { + if (m_rd_it->second == PREAMBLE_WORD) { + LOG_0(("Got preamble\n")); + m_cmd_state = 1; + // m_rw_pos already at correct position + m_tape_timer->adjust(fetch_next_wr_word()); + break; + } else { + adv_res_t res = adv_it(m_rd_it); + if (res != ADV_NO_MORE_DATA) { + m_tape_timer->adjust(time_to_rd_next_word(m_rw_pos)); + } + // No IRQ + return; + } + } + // Intentional fall-through + case CMD_INIT_WRITE: + write_word(m_rw_pos , m_next_word , length); + pos_offset(m_rw_pos , length); + // Just to be sure.. + m_tape_pos = m_rw_pos; + m_tape_timer->adjust(fetch_next_wr_word()); + break; + + case CMD_STOP: + move_tape_pos(m_tape_fast ? FAST_BRAKE_DIST : SLOW_BRAKE_DIST); + stop_tape(); + break; + + case CMD_INGAP_MOVE: + if (m_cmd_state == 0) { + m_cmd_state = 1; + m_tape_timer->adjust(time_to_tach_pulses()); + return; + } + break; + + case CMD_FINAL_GAP: + case CMD_WRITE_IRG: + write_gap(m_rw_pos , m_tape_pos); + m_hole_timer->reset(); + break; + + case CMD_SCAN_RECORDS: + if (m_cmd_state == 0) { + m_cmd_state = 1; + tape_pos_t target = m_tape_pos; + if (next_n_gap(target, 0x10000U - m_tach_reg, MIN_IRG_LENGTH)) { + LOG_0(("%u gaps @%d\n" , 0x10000U - m_tach_reg, target)); + m_tape_timer->adjust(time_to_target(target)); + } + return; + } else { + m_hole_timer->reset(); + } + break; + + case CMD_MOVE_INDTA: + if (m_cmd_state == 0) { + if (next_data(m_rd_it , m_tape_pos , true)) { + m_cmd_state = 1; + m_tape_timer->adjust(time_to_target(farthest_end(m_rd_it))); + } + // No IRQ + return; + } + // m_cmd_state == 1 -> IRQ & cmd end + break; + + case CMD_DELTA_MOVE_HOLE: + case CMD_DELTA_MOVE_IRG: + // Interrupt at end of movement + m_hole_timer->reset(); + break; + + case CMD_START_READ: + { + bool set_intr = true; + // Just to be sure.. + m_tape_pos = m_rw_pos; + if (m_cmd_state == 0) { + set_intr = false; + if (m_rd_it->second == PREAMBLE_WORD) { + m_cmd_state = 1; + } + LOG_0(("Got preamble\n")); + } else { + m_data_reg = m_rd_it->second; + m_checksum_reg += m_data_reg; + LOG_0(("RD %04x\n" , m_data_reg)); + } + adv_res_t res = adv_it(m_rd_it); + LOG_0(("adv_it %d\n" , res)); + if (res == ADV_NO_MORE_DATA) { + m_rd_it_valid = false; + } else { + if (res == ADV_DISCONT_DATA) { + // Hit a gap, restart preamble search + m_cmd_state = 0; + } + m_tape_timer->adjust(time_to_rd_next_word(m_rw_pos)); + } + if (!set_intr) { + return; + } + } + break; + + case CMD_END_READ: + { + m_tape_pos = m_rw_pos; + // Note: checksum is not updated + m_data_reg = m_rd_it->second; + LOG_0(("Final RD %04x\n" , m_data_reg)); + adv_res_t res = adv_it(m_rd_it); + if (res == ADV_NO_MORE_DATA) { + m_rd_it_valid = false; + } + m_hole_timer->reset(); + } + break; + + default: + // Other commands: just raise irq + break; + } + irq_w(true); + break; + + case HOLE_TMR_ID: + LOG_0(("Hole tmr @%g\n" , machine().time().as_double())); + + BIT_SET(m_status_reg , STATUS_HOLE_BIT); + + switch (CMD_CODE(m_cmd_reg)) { + case CMD_FINAL_GAP: + case CMD_WRITE_IRG: + write_gap(m_rw_pos , m_tape_pos); + m_rw_pos = m_tape_pos; + break; + + case CMD_SCAN_RECORDS: + case CMD_DELTA_MOVE_HOLE: + // Cmds 18 & 1c are terminated at first hole + m_tape_timer->reset(); + irq_w(true); + // No reloading of hole timer + return; + + case CMD_DELTA_MOVE_IRG: + // TODO: update r6 + m_hole_timer->adjust(time_to_next_hole()); + // No IRQ at holes + return; + + case CMD_START_READ: + case CMD_END_READ: + set_error(true); + break; + + default: + // Other cmds: default processing (update tape pos, set IRQ, schedule timer for next hole) + break; + } + + irq_w(true); + m_hole_timer->adjust(time_to_next_hole()); + break; + + default: + break; + } } void hp_taco_device::clear_state(void) { - m_data_reg = 0; - m_data_reg_full = false; - m_cmd_reg = 0; - m_status_reg = 0; - m_tach_reg = 0; - m_checksum_reg = 0; - m_timing_reg = 0; - m_cmd_state = 0; - // m_tape_pos is not reset, tape stays where it is - m_start_time = attotime::never; - m_tape_fwd = false; - m_tape_fast = false; - // m_image_dirty is not touched - m_tape_wr = false; - m_rw_pos = 0; - m_next_word = 0; - m_rd_it_valid = false; - m_gap_detect_start = NULL_TAPE_POS; - - set_tape_present(false); - set_tape_present(is_loaded()); + m_data_reg = 0; + m_data_reg_full = false; + m_cmd_reg = 0; + m_status_reg = 0; + m_tach_reg = 0; + m_checksum_reg = 0; + m_timing_reg = 0; + m_cmd_state = 0; + // m_tape_pos is not reset, tape stays where it is + m_start_time = attotime::never; + m_tape_fwd = false; + m_tape_fast = false; + // m_image_dirty is not touched + m_tape_wr = false; + m_rw_pos = 0; + m_next_word = 0; + m_rd_it_valid = false; + m_gap_detect_start = NULL_TAPE_POS; + + set_tape_present(false); + set_tape_present(is_loaded()); } void hp_taco_device::irq_w(bool state) { - if (state != m_irq) { - m_irq = state; - m_irq_handler(state); - LOG_0(("IRQ = %d\n" , state)); - } + if (state != m_irq) { + m_irq = state; + m_irq_handler(state); + LOG_0(("IRQ = %d\n" , state)); + } } void hp_taco_device::set_error(bool state) { - m_sts = !state; - m_sts_handler(m_sts); - LOG_0(("error = %d\n" , state)); + m_sts = !state; + m_sts_handler(m_sts); + LOG_0(("error = %d\n" , state)); } unsigned hp_taco_device::speed_to_tick_freq(void) const { - return m_tape_fast ? TACH_FREQ_FAST * TAPE_POS_FRACT : TACH_FREQ_SLOW * TAPE_POS_FRACT; + return m_tape_fast ? TACH_FREQ_FAST * TAPE_POS_FRACT : TACH_FREQ_SLOW * TAPE_POS_FRACT; } bool hp_taco_device::pos_offset(tape_pos_t& pos , tape_pos_t offset) const { - if (offset == 0) { - return true; - } - - if (!m_tape_fwd) { - offset = -offset; - } - - pos += offset; - - // In real life tape would unspool.. - if (pos > TAPE_LENGTH) { - pos = TAPE_LENGTH; - return false; - } else if (pos < 0) { - pos = 0; - return false; - } else { - return true; - } + if (offset == 0) { + return true; + } + + if (!m_tape_fwd) { + offset = -offset; + } + + pos += offset; + + // In real life tape would unspool.. + if (pos > TAPE_LENGTH) { + pos = TAPE_LENGTH; + return false; + } else if (pos < 0) { + pos = 0; + return false; + } else { + return true; + } } void hp_taco_device::move_tape_pos(tape_pos_t delta_pos) { - tape_pos_t tape_start_pos = m_tape_pos; - if (!pos_offset(m_tape_pos , delta_pos)) { - LOG(("Tape unspooled!\n")); - } - m_start_time = machine().time(); - LOG_0(("Tape pos = %u\n" , m_tape_pos)); - if (any_hole(tape_start_pos , m_tape_pos)) { - // Crossed one or more holes - BIT_SET(m_status_reg , STATUS_HOLE_BIT); - } + tape_pos_t tape_start_pos = m_tape_pos; + if (!pos_offset(m_tape_pos , delta_pos)) { + LOG(("Tape unspooled!\n")); + } + m_start_time = machine().time(); + LOG_0(("Tape pos = %u\n" , m_tape_pos)); + if (any_hole(tape_start_pos , m_tape_pos)) { + // Crossed one or more holes + BIT_SET(m_status_reg , STATUS_HOLE_BIT); + } } void hp_taco_device::update_tape_pos(void) { - if (m_start_time.is_never()) { - // Tape not moving - return; - } - - attotime delta_time(machine().time() - m_start_time); - LOG_0(("delta_time = %g\n" , delta_time.as_double())); - // How many tachometer ticks has the tape moved? - tape_pos_t delta_tach = (tape_pos_t)(delta_time.as_ticks(speed_to_tick_freq())); - LOG_0(("delta_tach = %u\n" , delta_tach)); - - move_tape_pos(delta_tach); - - // Gap detection - bool gap_detected = false; - if (m_gap_detect_start != NULL_TAPE_POS && abs(m_gap_detect_start - m_tape_pos) >= MIN_IRG_LENGTH) { - tape_pos_t tmp = m_tape_pos; - pos_offset(tmp , -MIN_IRG_LENGTH); - gap_detected = just_gap(tmp , m_tape_pos); - } - if (gap_detected) { - BIT_SET(m_status_reg, STATUS_GAP_BIT); - } else { - BIT_CLR(m_status_reg, STATUS_GAP_BIT); - } + if (m_start_time.is_never()) { + // Tape not moving + return; + } + + attotime delta_time(machine().time() - m_start_time); + LOG_0(("delta_time = %g\n" , delta_time.as_double())); + // How many tachometer ticks has the tape moved? + tape_pos_t delta_tach = (tape_pos_t)(delta_time.as_ticks(speed_to_tick_freq())); + LOG_0(("delta_tach = %u\n" , delta_tach)); + + move_tape_pos(delta_tach); + + // Gap detection + bool gap_detected = false; + if (m_gap_detect_start != NULL_TAPE_POS && abs(m_gap_detect_start - m_tape_pos) >= MIN_IRG_LENGTH) { + tape_pos_t tmp = m_tape_pos; + pos_offset(tmp , -MIN_IRG_LENGTH); + gap_detected = just_gap(tmp , m_tape_pos); + } + if (gap_detected) { + BIT_SET(m_status_reg, STATUS_GAP_BIT); + } else { + BIT_CLR(m_status_reg, STATUS_GAP_BIT); + } } void hp_taco_device::ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b) { - if (a > b) { - // Ensure A always comes before B - tape_pos_t tmp; - tmp = a; - a = b; - b = tmp; - } + if (a > b) { + // Ensure A always comes before B + tape_pos_t tmp; + tmp = a; + a = b; + b = tmp; + } } // Is there any hole in a given section of tape? bool hp_taco_device::any_hole(tape_pos_t tape_pos_a , tape_pos_t tape_pos_b) { - ensure_a_lt_b(tape_pos_a , tape_pos_b); + ensure_a_lt_b(tape_pos_a , tape_pos_b); - for (tape_pos_t hole : tape_holes) { - if (tape_pos_a < hole && tape_pos_b >= hole) { - return true; - } - } + for (tape_pos_t hole : tape_holes) { + if (tape_pos_a < hole && tape_pos_b >= hole) { + return true; + } + } - return false; + return false; } // Position of next hole tape will reach in a given direction hp_taco_device::tape_pos_t hp_taco_device::next_hole(void) const { - if (m_tape_fwd) { - for (tape_pos_t hole : tape_holes) { - if (hole > m_tape_pos) { - LOG_0(("next hole fwd @%u = %u\n" , m_tape_pos , hole)); - return hole; - } - } - // No more holes: will hit end of tape - return TAPE_LENGTH; - } else { - for (int i = (sizeof(tape_holes) / sizeof(tape_holes[ 0 ])) - 1; i >= 0; i--) { - if (tape_holes[ i ] < m_tape_pos) { - LOG_0(("next hole rev @%u = %u\n" , m_tape_pos , tape_holes[ i ])); - return tape_holes[ i ]; - } - } - // No more holes: will hit start of tape - return 0; - } + if (m_tape_fwd) { + for (tape_pos_t hole : tape_holes) { + if (hole > m_tape_pos) { + LOG_0(("next hole fwd @%u = %u\n" , m_tape_pos , hole)); + return hole; + } + } + // No more holes: will hit end of tape + return TAPE_LENGTH; + } else { + for (int i = (sizeof(tape_holes) / sizeof(tape_holes[ 0 ])) - 1; i >= 0; i--) { + if (tape_holes[ i ] < m_tape_pos) { + LOG_0(("next hole rev @%u = %u\n" , m_tape_pos , tape_holes[ i ])); + return tape_holes[ i ]; + } + } + // No more holes: will hit start of tape + return 0; + } } attotime hp_taco_device::time_to_distance(tape_pos_t distance) const { - // +1 for rounding - return attotime::from_ticks(distance + 1 , speed_to_tick_freq()); + // +1 for rounding + return attotime::from_ticks(distance + 1 , speed_to_tick_freq()); } attotime hp_taco_device::time_to_target(tape_pos_t target) const { - return time_to_distance(abs(target - m_tape_pos)); + return time_to_distance(abs(target - m_tape_pos)); } bool hp_taco_device::start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0) { - m_cmd_reg = cmd_reg; - - UINT16 to_be_tested = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK); - // Bits in STATUS_ERR_MASK must always be 0 - must_be_0 |= STATUS_ERR_MASK; - - // It's not an error if the error state is already set (sts false) - if (((to_be_tested & (must_be_1 | must_be_0)) ^ must_be_1) != 0) { - set_error(true); - return false; - } else { - bool prev_tape_wr = m_tape_wr; - bool prev_tape_fwd = m_tape_fwd; - bool prev_tape_fast = m_tape_fast; - bool not_moving = m_start_time.is_never(); - - m_start_time = machine().time(); - m_tape_wr = (must_be_0 & STATUS_WPR_MASK) != 0; - m_tape_fwd = DIR_FWD(m_cmd_reg); - m_tape_fast = SPEED_FAST(m_cmd_reg); - // TODO: remove? - BIT_CLR(m_status_reg, STATUS_HOLE_BIT); - - if (m_tape_wr) { - // Write command: disable gap detector - m_gap_detect_start = NULL_TAPE_POS; - BIT_CLR(m_status_reg, STATUS_GAP_BIT); - m_image_dirty = true; - } else if (not_moving || prev_tape_wr != m_tape_wr || prev_tape_fwd != m_tape_fwd || prev_tape_fast != m_tape_fast) { - // Tape started right now, switched from writing to reading, direction changed or speed changed: (re)start gap detector - m_gap_detect_start = m_tape_pos; - BIT_CLR(m_status_reg, STATUS_GAP_BIT); - } - return true; - } + m_cmd_reg = cmd_reg; + + UINT16 to_be_tested = (m_cmd_reg & CMD_REG_MASK) | (m_status_reg & STATUS_REG_MASK); + // Bits in STATUS_ERR_MASK must always be 0 + must_be_0 |= STATUS_ERR_MASK; + + // It's not an error if the error state is already set (sts false) + if (((to_be_tested & (must_be_1 | must_be_0)) ^ must_be_1) != 0) { + set_error(true); + return false; + } else { + bool prev_tape_wr = m_tape_wr; + bool prev_tape_fwd = m_tape_fwd; + bool prev_tape_fast = m_tape_fast; + bool not_moving = m_start_time.is_never(); + + m_start_time = machine().time(); + m_tape_wr = (must_be_0 & STATUS_WPR_MASK) != 0; + m_tape_fwd = DIR_FWD(m_cmd_reg); + m_tape_fast = SPEED_FAST(m_cmd_reg); + // TODO: remove? + BIT_CLR(m_status_reg, STATUS_HOLE_BIT); + + if (m_tape_wr) { + // Write command: disable gap detector + m_gap_detect_start = NULL_TAPE_POS; + BIT_CLR(m_status_reg, STATUS_GAP_BIT); + m_image_dirty = true; + } else if (not_moving || prev_tape_wr != m_tape_wr || prev_tape_fwd != m_tape_fwd || prev_tape_fast != m_tape_fast) { + // Tape started right now, switched from writing to reading, direction changed or speed changed: (re)start gap detector + m_gap_detect_start = m_tape_pos; + BIT_CLR(m_status_reg, STATUS_GAP_BIT); + } + return true; + } } void hp_taco_device::stop_tape(void) { - m_start_time = attotime::never; - m_gap_detect_start = NULL_TAPE_POS; + m_start_time = attotime::never; + m_gap_detect_start = NULL_TAPE_POS; } hp_taco_device::tape_track_t& hp_taco_device::current_track(void) { - return m_tracks[ BIT(m_status_reg , STATUS_TRACKB_BIT) ]; + return m_tracks[ BIT(m_status_reg , STATUS_TRACKB_BIT) ]; } // Return physical length of a 16-bit word on tape hp_taco_device::tape_pos_t hp_taco_device::word_length(tape_word_t w) { - unsigned zeros , ones; + unsigned zeros , ones; - // pop count of w - ones = (w & 0x5555) + ((w >> 1) & 0x5555); - ones = (ones & 0x3333) + ((ones >> 2) & 0x3333); - ones = (ones & 0x0f0f) + ((ones >> 4) & 0x0f0f); - ones = (ones & 0x00ff) + ((ones >> 8) & 0x00ff); + // pop count of w + ones = (w & 0x5555) + ((w >> 1) & 0x5555); + ones = (ones & 0x3333) + ((ones >> 2) & 0x3333); + ones = (ones & 0x0f0f) + ((ones >> 4) & 0x0f0f); + ones = (ones & 0x00ff) + ((ones >> 8) & 0x00ff); - zeros = 16 - ones; + zeros = 16 - ones; - return zeros * ZERO_BIT_LEN + (ones + 1) * ONE_BIT_LEN; + return zeros * ZERO_BIT_LEN + (ones + 1) * ONE_BIT_LEN; } hp_taco_device::tape_pos_t hp_taco_device::word_end_pos(const tape_track_t::iterator& it) { - return it->first + word_length(it->second); + return it->first + word_length(it->second); } void hp_taco_device::adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos) { - if (it != track.begin()) { - it--; - if (word_end_pos(it) <= pos) { - it++; - } - } + if (it != track.begin()) { + it--; + if (word_end_pos(it) <= pos) { + it++; + } + } } // Write a word on current tape track void hp_taco_device::write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length) { - tape_track_t& track = current_track(); - tape_track_t::iterator it_low = track.lower_bound(start); - adjust_it(track , it_low , start); - length = word_length(word); - tape_pos_t end_pos = start + length; - tape_track_t::iterator it_high = track.lower_bound(end_pos); + tape_track_t& track = current_track(); + tape_track_t::iterator it_low = track.lower_bound(start); + adjust_it(track , it_low , start); + length = word_length(word); + tape_pos_t end_pos = start + length; + tape_track_t::iterator it_high = track.lower_bound(end_pos); - track.erase(it_low , it_high); + track.erase(it_low , it_high); - track.insert(it_high , std::make_pair(start, word)); - LOG_0(("WR %04x @ T%u:%u\n" , word , BIT(m_status_reg , STATUS_TRACKB_BIT) , start)); + track.insert(it_high , std::make_pair(start, word)); + LOG_0(("WR %04x @ T%u:%u\n" , word , BIT(m_status_reg , STATUS_TRACKB_BIT) , start)); } // Write a gap on current track void hp_taco_device::write_gap(tape_pos_t a , tape_pos_t b) { - ensure_a_lt_b(a , b); - tape_track_t& track = current_track(); - tape_track_t::iterator it_low = track.lower_bound(a); - adjust_it(track , it_low , a); - tape_track_t::iterator it_high = track.lower_bound(b); + ensure_a_lt_b(a , b); + tape_track_t& track = current_track(); + tape_track_t::iterator it_low = track.lower_bound(a); + adjust_it(track , it_low , a); + tape_track_t::iterator it_high = track.lower_bound(b); - track.erase(it_low, it_high); + track.erase(it_low, it_high); - LOG_0(("GAP on T%u:[%u,%u)\n" , BIT(m_status_reg , STATUS_TRACKB_BIT) , a , b)); + LOG_0(("GAP on T%u:[%u,%u)\n" , BIT(m_status_reg , STATUS_TRACKB_BIT) , a , b)); } bool hp_taco_device::just_gap(tape_pos_t a , tape_pos_t b) { - ensure_a_lt_b(a , b); - tape_track_t& track = current_track(); - tape_track_t::iterator it_low = track.lower_bound(a); - tape_track_t::iterator it_high = track.lower_bound(b); + ensure_a_lt_b(a , b); + tape_track_t& track = current_track(); + tape_track_t::iterator it_low = track.lower_bound(a); + tape_track_t::iterator it_high = track.lower_bound(b); - adjust_it(track, it_low, a); + adjust_it(track, it_low, a); - return it_low == it_high; + return it_low == it_high; } hp_taco_device::tape_pos_t hp_taco_device::farthest_end(const tape_track_t::iterator& it) const { - if (m_tape_fwd) { - return word_end_pos(it); - } else { - return it->first; - } + if (m_tape_fwd) { + return word_end_pos(it); + } else { + return it->first; + } } bool hp_taco_device::next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive) { - tape_track_t& track = current_track(); - it = track.lower_bound(pos); - if (m_tape_fwd) { - if (inclusive) { - adjust_it(track, it, pos); - } - return it != track.end(); - } else { - // Never more than 2 iterations - do { - if (it == track.begin()) { - it = track.end(); - return false; - } - it--; - } while (!inclusive && word_end_pos(it) > pos); - return true; - } + tape_track_t& track = current_track(); + it = track.lower_bound(pos); + if (m_tape_fwd) { + if (inclusive) { + adjust_it(track, it, pos); + } + return it != track.end(); + } else { + // Never more than 2 iterations + do { + if (it == track.begin()) { + it = track.end(); + return false; + } + it--; + } while (!inclusive && word_end_pos(it) > pos); + return true; + } } hp_taco_device::adv_res_t hp_taco_device::adv_it(tape_track_t::iterator& it) { - tape_track_t& track = current_track(); - if (m_tape_fwd) { - tape_pos_t prev_pos = word_end_pos(it); - it++; - if (it == track.end()) { - return ADV_NO_MORE_DATA; - } else { - adv_res_t res = prev_pos == it->first ? ADV_CONT_DATA : ADV_DISCONT_DATA; - return res; - } - } else { - if (it == track.begin()) { - it = track.end(); - return ADV_NO_MORE_DATA; - } else { - tape_pos_t prev_pos = it->first; - it--; - return prev_pos == word_end_pos(it) ? ADV_CONT_DATA : ADV_DISCONT_DATA; - } - } + tape_track_t& track = current_track(); + if (m_tape_fwd) { + tape_pos_t prev_pos = word_end_pos(it); + it++; + if (it == track.end()) { + return ADV_NO_MORE_DATA; + } else { + adv_res_t res = prev_pos == it->first ? ADV_CONT_DATA : ADV_DISCONT_DATA; + return res; + } + } else { + if (it == track.begin()) { + it = track.end(); + return ADV_NO_MORE_DATA; + } else { + tape_pos_t prev_pos = it->first; + it--; + return prev_pos == word_end_pos(it) ? ADV_CONT_DATA : ADV_DISCONT_DATA; + } + } } attotime hp_taco_device::fetch_next_wr_word(void) { - if (m_data_reg_full) { - m_next_word = m_data_reg; - m_data_reg_full = false; - LOG_0(("next %04x (DR)\n" , m_next_word)); - } else { - // When data register is empty, write checksum word - m_next_word = m_checksum_reg; - LOG_0(("next %04x (CS)\n" , m_next_word)); - } - // Update checksum with new word - m_checksum_reg += m_next_word; - - return time_to_distance(word_length(m_next_word)); + if (m_data_reg_full) { + m_next_word = m_data_reg; + m_data_reg_full = false; + LOG_0(("next %04x (DR)\n" , m_next_word)); + } else { + // When data register is empty, write checksum word + m_next_word = m_checksum_reg; + LOG_0(("next %04x (CS)\n" , m_next_word)); + } + // Update checksum with new word + m_checksum_reg += m_next_word; + + return time_to_distance(word_length(m_next_word)); } attotime hp_taco_device::time_to_rd_next_word(tape_pos_t& word_rd_pos) { - if (m_rd_it_valid) { - word_rd_pos = farthest_end(m_rd_it); - return time_to_target(word_rd_pos); - } else { - return attotime::never; - } + if (m_rd_it_valid) { + word_rd_pos = farthest_end(m_rd_it); + return time_to_target(word_rd_pos); + } else { + return attotime::never; + } } /** @@ -1017,451 +1017,451 @@ attotime hp_taco_device::time_to_rd_next_word(tape_pos_t& word_rd_pos) */ bool hp_taco_device::next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap) { - tape_track_t& track = current_track(); - bool done = false; - tape_track_t::iterator prev_it; - - if (m_tape_fwd) { - tape_pos_t next_pos; - - while (1) { - if (it == track.end()) { - next_pos = TAPE_LENGTH; - done = true; - } else { - next_pos = it->first; - } - if (((next_pos - pos) >= min_gap && --n_gaps == 0) || done) { - break; - } - adv_res_t adv_res; - do { - prev_it = it; - adv_res = adv_it(it); - } while (adv_res == ADV_CONT_DATA); - pos = word_end_pos(prev_it); - } - } else { - tape_pos_t next_pos; - - while (1) { - if (it == track.end()) { - next_pos = 0; - done = true; - } else { - next_pos = word_end_pos(it); - } - if (((pos - next_pos) >= min_gap && --n_gaps == 0) || done) { - break; - } - adv_res_t adv_res; - do { - prev_it = it; - adv_res = adv_it(it); - } while (adv_res == ADV_CONT_DATA); - pos = prev_it->first; - } - } - - // Set "pos" where minimum gap size is met - pos_offset(pos , min_gap); - - return n_gaps == 0; + tape_track_t& track = current_track(); + bool done = false; + tape_track_t::iterator prev_it; + + if (m_tape_fwd) { + tape_pos_t next_pos; + + while (1) { + if (it == track.end()) { + next_pos = TAPE_LENGTH; + done = true; + } else { + next_pos = it->first; + } + if (((next_pos - pos) >= min_gap && --n_gaps == 0) || done) { + break; + } + adv_res_t adv_res; + do { + prev_it = it; + adv_res = adv_it(it); + } while (adv_res == ADV_CONT_DATA); + pos = word_end_pos(prev_it); + } + } else { + tape_pos_t next_pos; + + while (1) { + if (it == track.end()) { + next_pos = 0; + done = true; + } else { + next_pos = word_end_pos(it); + } + if (((pos - next_pos) >= min_gap && --n_gaps == 0) || done) { + break; + } + adv_res_t adv_res; + do { + prev_it = it; + adv_res = adv_it(it); + } while (adv_res == ADV_CONT_DATA); + pos = prev_it->first; + } + } + + // Set "pos" where minimum gap size is met + pos_offset(pos , min_gap); + + return n_gaps == 0; } bool hp_taco_device::next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap) { - tape_track_t::iterator it; - // First align with next data - next_data(it, pos, true); - // Then scan for n_gaps - return next_n_gap(pos, it, n_gaps, min_gap); + tape_track_t::iterator it; + // First align with next data + next_data(it, pos, true); + // Then scan for n_gaps + return next_n_gap(pos, it, n_gaps, min_gap); } void hp_taco_device::clear_tape(void) { - for (unsigned track_n = 0; track_n < 2; track_n++) { - m_tracks[ track_n ].clear(); - } + for (unsigned track_n = 0; track_n < 2; track_n++) { + m_tracks[ track_n ].clear(); + } } void hp_taco_device::dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words) { - if (n_words) { - UINT32 tmp32; - UINT16 tmp16; - - tmp32 = n_words; - fwrite(&tmp32 , sizeof(tmp32)); - tmp32 = it_start->first; - fwrite(&tmp32 , sizeof(tmp32)); - - for (unsigned i = 0; i < n_words; i++) { - tmp16 = it_start->second; - fwrite(&tmp16 , sizeof(tmp16)); - it_start++; - } - } + if (n_words) { + UINT32 tmp32; + UINT16 tmp16; + + tmp32 = n_words; + fwrite(&tmp32 , sizeof(tmp32)); + tmp32 = it_start->first; + fwrite(&tmp32 , sizeof(tmp32)); + + for (unsigned i = 0; i < n_words; i++) { + tmp16 = it_start->second; + fwrite(&tmp16 , sizeof(tmp16)); + it_start++; + } + } } void hp_taco_device::save_tape(void) { - UINT32 tmp32; - - fseek(0, SEEK_SET); - - tmp32 = FILE_MAGIC; - fwrite(&tmp32 , sizeof(tmp32)); - - for (unsigned track_n = 0; track_n < 2; track_n++) { - const tape_track_t& track = m_tracks[ track_n ]; - tape_pos_t next_pos = (tape_pos_t)-1; - unsigned n_words = 0; - tape_track_t::const_iterator it_start; - for (tape_track_t::const_iterator it = track.cbegin(); it != track.cend(); it++) { - if (it->first != next_pos) { - dump_sequence(it_start , n_words); - it_start = it; - n_words = 0; - } - next_pos = it->first + word_length(it->second); - n_words++; - } - dump_sequence(it_start , n_words); - // End of track - tmp32 = (UINT32)-1; - fwrite(&tmp32 , sizeof(tmp32)); - } + UINT32 tmp32; + + fseek(0, SEEK_SET); + + tmp32 = FILE_MAGIC; + fwrite(&tmp32 , sizeof(tmp32)); + + for (unsigned track_n = 0; track_n < 2; track_n++) { + const tape_track_t& track = m_tracks[ track_n ]; + tape_pos_t next_pos = (tape_pos_t)-1; + unsigned n_words = 0; + tape_track_t::const_iterator it_start; + for (tape_track_t::const_iterator it = track.cbegin(); it != track.cend(); it++) { + if (it->first != next_pos) { + dump_sequence(it_start , n_words); + it_start = it; + n_words = 0; + } + next_pos = it->first + word_length(it->second); + n_words++; + } + dump_sequence(it_start , n_words); + // End of track + tmp32 = (UINT32)-1; + fwrite(&tmp32 , sizeof(tmp32)); + } } bool hp_taco_device::load_track(tape_track_t& track) { - UINT32 tmp32; + UINT32 tmp32; - track.clear(); + track.clear(); - while (1) { - if (fread(&tmp32 , sizeof(tmp32)) != sizeof(tmp32)) { - return false; - } + while (1) { + if (fread(&tmp32 , sizeof(tmp32)) != sizeof(tmp32)) { + return false; + } - if (tmp32 == (UINT32)-1) { - return true; - } + if (tmp32 == (UINT32)-1) { + return true; + } - unsigned n_words = tmp32; + unsigned n_words = tmp32; - if (fread(&tmp32 , sizeof(tmp32)) != sizeof(tmp32)) { - return false; - } + if (fread(&tmp32 , sizeof(tmp32)) != sizeof(tmp32)) { + return false; + } - tape_pos_t pos = (tape_pos_t)tmp32; + tape_pos_t pos = (tape_pos_t)tmp32; - for (unsigned i = 0; i < n_words; i++) { - UINT16 tmp16; + for (unsigned i = 0; i < n_words; i++) { + UINT16 tmp16; - if (fread(&tmp16 , sizeof(tmp16)) != sizeof(tmp16)) { - return false; - } + if (fread(&tmp16 , sizeof(tmp16)) != sizeof(tmp16)) { + return false; + } - track.insert(std::make_pair(pos , tmp16)); - pos += word_length(tmp16); - } - } + track.insert(std::make_pair(pos , tmp16)); + pos += word_length(tmp16); + } + } } bool hp_taco_device::load_tape(void) { - UINT32 magic; - - if (fread(&magic , sizeof(magic)) != sizeof(magic) || - magic != FILE_MAGIC) { - return false; - } - - for (unsigned track_n = 0; track_n < 2; track_n++) { - if (!load_track(m_tracks[ track_n ])) { - LOG(("load_tape failed")); - clear_tape(); - return false; - } - } - - LOG(("load_tape done\n")); - return true; + UINT32 magic; + + if (fread(&magic , sizeof(magic)) != sizeof(magic) || + magic != FILE_MAGIC) { + return false; + } + + for (unsigned track_n = 0; track_n < 2; track_n++) { + if (!load_track(m_tracks[ track_n ])) { + LOG(("load_tape failed")); + clear_tape(); + return false; + } + } + + LOG(("load_tape done\n")); + return true; } void hp_taco_device::set_tape_present(bool present) { - if (present) { - if (is_readonly()) { - BIT_SET(m_status_reg, STATUS_WPR_BIT); - } else { - BIT_CLR(m_status_reg, STATUS_WPR_BIT); - } - // STATUS_CART_OUT_BIT is reset by CMD_CLEAR - } else { - BIT_SET(m_status_reg, STATUS_CART_OUT_BIT); - BIT_SET(m_status_reg, STATUS_WPR_BIT); - } + if (present) { + if (is_readonly()) { + BIT_SET(m_status_reg, STATUS_WPR_BIT); + } else { + BIT_CLR(m_status_reg, STATUS_WPR_BIT); + } + // STATUS_CART_OUT_BIT is reset by CMD_CLEAR + } else { + BIT_SET(m_status_reg, STATUS_CART_OUT_BIT); + BIT_SET(m_status_reg, STATUS_WPR_BIT); + } } attotime hp_taco_device::time_to_next_hole(void) const { - return time_to_target(next_hole()); + return time_to_target(next_hole()); } attotime hp_taco_device::time_to_tach_pulses(void) const { - return time_to_distance((tape_pos_t)(0x10000U - m_tach_reg) * TAPE_POS_FRACT); + return time_to_distance((tape_pos_t)(0x10000U - m_tach_reg) * TAPE_POS_FRACT); } void hp_taco_device::start_cmd_exec(UINT16 new_cmd_reg) { - LOG(("Cmd = %02x\n" , CMD_CODE(new_cmd_reg))); - - update_tape_pos(); - - attotime cmd_duration = attotime::never; - attotime time_to_hole = attotime::never; - - unsigned new_cmd_code = CMD_CODE(new_cmd_reg); - - if (new_cmd_code != CMD_START_READ && - new_cmd_code != CMD_END_READ && - new_cmd_code != CMD_CLEAR) { - m_rd_it_valid = false; - } - - switch (new_cmd_code) { - case CMD_INDTA_INGAP: - // Errors: CART OUT,FAST SPEED - if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - m_cmd_state = 0; - if (next_data(m_rd_it , m_tape_pos , true)) { - cmd_duration = time_to_target(farthest_end(m_rd_it)); - } - } - break; - - case CMD_FINAL_GAP: - // Errors: WP,CART OUT - if (start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK)) { - m_rw_pos = m_tape_pos; - cmd_duration = time_to_distance(END_GAP_LENGTH); - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_CLEAR: - set_error(false); - BIT_CLR(m_status_reg, STATUS_HOLE_BIT); - BIT_CLR(m_status_reg, STATUS_CART_OUT_BIT); - BIT_CLR(m_status_reg, STATUS_WPR_BIT); - set_tape_present(is_loaded()); - // This is a special command: it doesn't raise IRQ at completion and it - // doesn't replace current command - return; - - case CMD_NOT_INDTA: - // Errors: CART OUT,FAST SPEED - if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - tape_pos_t target = m_tape_pos; - if (next_n_gap(target, 1, NO_DATA_GAP)) { - LOG_0(("End of data @%d\n" , target)); - cmd_duration = time_to_target(target); - } - // Holes detected? - } - break; - - case CMD_INIT_WRITE: - // Errors: WP,CART OUT,fast speed,reverse - if (start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK)) { - m_next_word = PREAMBLE_WORD; - m_rw_pos = m_tape_pos; - cmd_duration = time_to_distance(word_length(m_next_word)); - } - break; - - case CMD_STOP: - if (CMD_CODE(m_cmd_reg) != CMD_STOP) { - if (m_start_time.is_never()) { - // Tape is already stopped - cmd_duration = attotime::from_usec(QUICK_CMD_USEC); - } else { - // Start braking timer - cmd_duration = attotime::from_msec(m_tape_fast ? FAST_BRAKE_MSEC : SLOW_BRAKE_MSEC); - } - m_cmd_reg = new_cmd_reg; - } else { - // TODO: check if ok - return; - } - break; - - case CMD_SET_TRACK: - // Don't know if this command really starts the tape or not (probably it doesn't) - if (start_tape_cmd(new_cmd_reg , 0 , 0)) { - // When b9 is 0, set track A/B - // When b9 is 1, ignore command (in TACO chip it has an unknown purpose) - if (!UNKNOWN_B9(new_cmd_reg)) { - if (CMD_OPT(new_cmd_reg)) { - BIT_SET(m_status_reg, STATUS_TRACKB_BIT); - } else { - BIT_CLR(m_status_reg, STATUS_TRACKB_BIT); - } - } - cmd_duration = attotime::from_usec(QUICK_CMD_USEC); - } - break; - - case CMD_MOVE: - if (start_tape_cmd(new_cmd_reg , 0 , 0)) { - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_INGAP_MOVE: - // Errors: CART OUT,FAST SPEED - if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - m_cmd_state = 0; - tape_pos_t target = m_tape_pos; - if (next_n_gap(target, 1, MIN_IRG_LENGTH)) { - LOG_0(("IRG @%d\n" , target)); - cmd_duration = time_to_target(target); - } - // Holes detected? - } - break; - - case CMD_WRITE_IRG: - // Errors: WP,CART OUT - if (start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK)) { - m_rw_pos = m_tape_pos; - cmd_duration = time_to_tach_pulses(); - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_SCAN_RECORDS: - // Errors: CART OUT - if (start_tape_cmd(new_cmd_reg , 0 , 0)) { - m_cmd_state = 0; - if (next_data(m_rd_it , m_tape_pos , true)) { - cmd_duration = time_to_target(farthest_end(m_rd_it)); - } - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_RECORD_WRITE: - // Errors: WP,CART OUT,fast speed,reverse - if (start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK)) { - // Search for preamble first - m_cmd_state = 0; - m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false); - cmd_duration = time_to_rd_next_word(m_rw_pos); - // Holes detected? - } - break; - - case CMD_MOVE_INDTA: - // Errors: CART OUT,FAST SPEED - if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - m_cmd_state = 0; - cmd_duration = time_to_tach_pulses(); - // Holes detected? - } - break; - - case CMD_UNK_1b: - if (start_tape_cmd(new_cmd_reg , 0 , 0)) { - // Unknown purpose, but make it a NOP (it's used in "T" test of test ROM) - cmd_duration = attotime::from_usec(QUICK_CMD_USEC); - } - break; - - case CMD_DELTA_MOVE_HOLE: - case CMD_DELTA_MOVE_IRG: - if (start_tape_cmd(new_cmd_reg , 0 , 0)) { - cmd_duration = time_to_tach_pulses(); - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_START_READ: - // Yes, you can read tape backwards: test "C" does that! - // Because of this DIR_FWD_MASK is not in the "must be 1" mask. - if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - // TODO: check anche m_rw_pos sforato - if (!m_rd_it_valid) { - // Search for preamble first - m_cmd_state = 0; - m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false); - } - - cmd_duration = time_to_rd_next_word(m_rw_pos); - time_to_hole = time_to_next_hole(); - } - break; - - case CMD_END_READ: - // This command only makes sense after CMD_START_READ - if (CMD_CODE(m_cmd_reg) == CMD_START_READ && m_cmd_state == 1 && - start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { - LOG_0(("END_READ %d\n" , m_rd_it_valid)); - cmd_duration = time_to_rd_next_word(m_rw_pos); - time_to_hole = time_to_next_hole(); - } - break; - - default: - LOG(("Unrecognized command\n")); - break; - } - - m_tape_timer->adjust(cmd_duration); - m_hole_timer->adjust(time_to_hole); + LOG(("Cmd = %02x\n" , CMD_CODE(new_cmd_reg))); + + update_tape_pos(); + + attotime cmd_duration = attotime::never; + attotime time_to_hole = attotime::never; + + unsigned new_cmd_code = CMD_CODE(new_cmd_reg); + + if (new_cmd_code != CMD_START_READ && + new_cmd_code != CMD_END_READ && + new_cmd_code != CMD_CLEAR) { + m_rd_it_valid = false; + } + + switch (new_cmd_code) { + case CMD_INDTA_INGAP: + // Errors: CART OUT,FAST SPEED + if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + m_cmd_state = 0; + if (next_data(m_rd_it , m_tape_pos , true)) { + cmd_duration = time_to_target(farthest_end(m_rd_it)); + } + } + break; + + case CMD_FINAL_GAP: + // Errors: WP,CART OUT + if (start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK)) { + m_rw_pos = m_tape_pos; + cmd_duration = time_to_distance(END_GAP_LENGTH); + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_CLEAR: + set_error(false); + BIT_CLR(m_status_reg, STATUS_HOLE_BIT); + BIT_CLR(m_status_reg, STATUS_CART_OUT_BIT); + BIT_CLR(m_status_reg, STATUS_WPR_BIT); + set_tape_present(is_loaded()); + // This is a special command: it doesn't raise IRQ at completion and it + // doesn't replace current command + return; + + case CMD_NOT_INDTA: + // Errors: CART OUT,FAST SPEED + if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + tape_pos_t target = m_tape_pos; + if (next_n_gap(target, 1, NO_DATA_GAP)) { + LOG_0(("End of data @%d\n" , target)); + cmd_duration = time_to_target(target); + } + // Holes detected? + } + break; + + case CMD_INIT_WRITE: + // Errors: WP,CART OUT,fast speed,reverse + if (start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK)) { + m_next_word = PREAMBLE_WORD; + m_rw_pos = m_tape_pos; + cmd_duration = time_to_distance(word_length(m_next_word)); + } + break; + + case CMD_STOP: + if (CMD_CODE(m_cmd_reg) != CMD_STOP) { + if (m_start_time.is_never()) { + // Tape is already stopped + cmd_duration = attotime::from_usec(QUICK_CMD_USEC); + } else { + // Start braking timer + cmd_duration = attotime::from_msec(m_tape_fast ? FAST_BRAKE_MSEC : SLOW_BRAKE_MSEC); + } + m_cmd_reg = new_cmd_reg; + } else { + // TODO: check if ok + return; + } + break; + + case CMD_SET_TRACK: + // Don't know if this command really starts the tape or not (probably it doesn't) + if (start_tape_cmd(new_cmd_reg , 0 , 0)) { + // When b9 is 0, set track A/B + // When b9 is 1, ignore command (in TACO chip it has an unknown purpose) + if (!UNKNOWN_B9(new_cmd_reg)) { + if (CMD_OPT(new_cmd_reg)) { + BIT_SET(m_status_reg, STATUS_TRACKB_BIT); + } else { + BIT_CLR(m_status_reg, STATUS_TRACKB_BIT); + } + } + cmd_duration = attotime::from_usec(QUICK_CMD_USEC); + } + break; + + case CMD_MOVE: + if (start_tape_cmd(new_cmd_reg , 0 , 0)) { + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_INGAP_MOVE: + // Errors: CART OUT,FAST SPEED + if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + m_cmd_state = 0; + tape_pos_t target = m_tape_pos; + if (next_n_gap(target, 1, MIN_IRG_LENGTH)) { + LOG_0(("IRG @%d\n" , target)); + cmd_duration = time_to_target(target); + } + // Holes detected? + } + break; + + case CMD_WRITE_IRG: + // Errors: WP,CART OUT + if (start_tape_cmd(new_cmd_reg , 0 , STATUS_WPR_MASK)) { + m_rw_pos = m_tape_pos; + cmd_duration = time_to_tach_pulses(); + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_SCAN_RECORDS: + // Errors: CART OUT + if (start_tape_cmd(new_cmd_reg , 0 , 0)) { + m_cmd_state = 0; + if (next_data(m_rd_it , m_tape_pos , true)) { + cmd_duration = time_to_target(farthest_end(m_rd_it)); + } + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_RECORD_WRITE: + // Errors: WP,CART OUT,fast speed,reverse + if (start_tape_cmd(new_cmd_reg , DIR_FWD_MASK , STATUS_WPR_MASK | SPEED_FAST_MASK)) { + // Search for preamble first + m_cmd_state = 0; + m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false); + cmd_duration = time_to_rd_next_word(m_rw_pos); + // Holes detected? + } + break; + + case CMD_MOVE_INDTA: + // Errors: CART OUT,FAST SPEED + if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + m_cmd_state = 0; + cmd_duration = time_to_tach_pulses(); + // Holes detected? + } + break; + + case CMD_UNK_1b: + if (start_tape_cmd(new_cmd_reg , 0 , 0)) { + // Unknown purpose, but make it a NOP (it's used in "T" test of test ROM) + cmd_duration = attotime::from_usec(QUICK_CMD_USEC); + } + break; + + case CMD_DELTA_MOVE_HOLE: + case CMD_DELTA_MOVE_IRG: + if (start_tape_cmd(new_cmd_reg , 0 , 0)) { + cmd_duration = time_to_tach_pulses(); + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_START_READ: + // Yes, you can read tape backwards: test "C" does that! + // Because of this DIR_FWD_MASK is not in the "must be 1" mask. + if (start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + // TODO: check anche m_rw_pos sforato + if (!m_rd_it_valid) { + // Search for preamble first + m_cmd_state = 0; + m_rd_it_valid = next_data(m_rd_it , m_tape_pos , false); + } + + cmd_duration = time_to_rd_next_word(m_rw_pos); + time_to_hole = time_to_next_hole(); + } + break; + + case CMD_END_READ: + // This command only makes sense after CMD_START_READ + if (CMD_CODE(m_cmd_reg) == CMD_START_READ && m_cmd_state == 1 && + start_tape_cmd(new_cmd_reg , 0 , SPEED_FAST_MASK)) { + LOG_0(("END_READ %d\n" , m_rd_it_valid)); + cmd_duration = time_to_rd_next_word(m_rw_pos); + time_to_hole = time_to_next_hole(); + } + break; + + default: + LOG(("Unrecognized command\n")); + break; + } + + m_tape_timer->adjust(cmd_duration); + m_hole_timer->adjust(time_to_hole); } bool hp_taco_device::call_load() { - LOG(("call_load %d\n" , has_been_created())); - if (has_been_created()) { - clear_tape(); - save_tape(); - } else if (!load_tape()) { - seterror(IMAGE_ERROR_INVALIDIMAGE , "Wrong format"); - set_tape_present(false); - return IMAGE_INIT_FAIL; - } - - m_image_dirty = false; - - set_tape_present(true); + LOG(("call_load %d\n" , has_been_created())); + if (has_been_created()) { + clear_tape(); + save_tape(); + } else if (!load_tape()) { + seterror(IMAGE_ERROR_INVALIDIMAGE , "Wrong format"); + set_tape_present(false); + return IMAGE_INIT_FAIL; + } + + m_image_dirty = false; + + set_tape_present(true); return IMAGE_INIT_PASS; } bool hp_taco_device::call_create(int format_type, option_resolution *format_options) { - LOG(("call_create %d\n" , has_been_created())); - return call_load(); + LOG(("call_create %d\n" , has_been_created())); + return call_load(); } void hp_taco_device::call_unload() { - LOG(("call_unload dirty=%d\n" , m_image_dirty)); - if (m_image_dirty) { - save_tape(); - m_image_dirty = false; - } - - clear_tape(); - set_tape_present(false); + LOG(("call_unload dirty=%d\n" , m_image_dirty)); + if (m_image_dirty) { + save_tape(); + m_image_dirty = false; + } + + clear_tape(); + set_tape_present(false); } const char *hp_taco_device::file_extensions() const { - return "hti"; + return "hti"; } diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h index c8b794c79a2..1695b7ce706 100644 --- a/src/devices/machine/hp_taco.h +++ b/src/devices/machine/hp_taco.h @@ -14,36 +14,36 @@ #include <map> #define MCFG_TACO_IRQ_HANDLER(_devcb) \ - devcb = &hp_taco_device::set_irq_handler(*device , DEVCB_##_devcb); + devcb = &hp_taco_device::set_irq_handler(*device , DEVCB_##_devcb); #define MCFG_TACO_FLG_HANDLER(_devcb) \ - devcb = &hp_taco_device::set_flg_handler(*device , DEVCB_##_devcb); + devcb = &hp_taco_device::set_flg_handler(*device , DEVCB_##_devcb); #define MCFG_TACO_STS_HANDLER(_devcb) \ - devcb = &hp_taco_device::set_sts_handler(*device , DEVCB_##_devcb); + devcb = &hp_taco_device::set_sts_handler(*device , DEVCB_##_devcb); class hp_taco_device : public device_t , - public device_image_interface + public device_image_interface { public: - // construction/destruction - hp_taco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - hp_taco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + // construction/destruction + hp_taco_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + hp_taco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - // static configuration helpers - template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_irq_handler.set_callback(object); } - template<class _Object> static devcb_base &set_flg_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_flg_handler.set_callback(object); } - template<class _Object> static devcb_base &set_sts_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_sts_handler.set_callback(object); } + // static configuration helpers + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_flg_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_flg_handler.set_callback(object); } + template<class _Object> static devcb_base &set_sts_handler(device_t &device, _Object object) { return downcast<hp_taco_device &>(device).m_sts_handler.set_callback(object); } - // Register read/write - DECLARE_WRITE16_MEMBER(reg_w); - DECLARE_READ16_MEMBER(reg_r); + // Register read/write + DECLARE_WRITE16_MEMBER(reg_w); + DECLARE_READ16_MEMBER(reg_r); - // Flag & status read - DECLARE_READ_LINE_MEMBER(flg_r); - DECLARE_READ_LINE_MEMBER(sts_r); + // Flag & status read + DECLARE_READ_LINE_MEMBER(flg_r); + DECLARE_READ_LINE_MEMBER(sts_r); - // device_image_interface overrides + // device_image_interface overrides virtual bool call_load() override; virtual bool call_create(int format_type, option_resolution *format_options) override; virtual void call_unload() override; @@ -56,111 +56,111 @@ public: virtual const char *file_extensions() const override; virtual const option_guide *create_option_guide() const override { return nullptr; } - // Tape position, 1 unit = 1 inch / (968 * 1024) - typedef INT32 tape_pos_t; + // Tape position, 1 unit = 1 inch / (968 * 1024) + typedef INT32 tape_pos_t; - // Words stored on tape - typedef UINT16 tape_word_t; + // Words stored on tape + typedef UINT16 tape_word_t; protected: - // device-level overrides + // device-level overrides virtual void device_config_complete() override; - virtual void device_start() override; - virtual void device_stop() override; - virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: - // Storage of tracks: mapping from a tape position to word stored there - typedef std::map<tape_pos_t , tape_word_t> tape_track_t; - - devcb_write_line m_irq_handler; - devcb_write_line m_flg_handler; - devcb_write_line m_sts_handler; - - // Registers - UINT16 m_data_reg; - bool m_data_reg_full; - UINT16 m_cmd_reg; - UINT16 m_status_reg; - UINT16 m_tach_reg; - UINT16 m_checksum_reg; - UINT16 m_timing_reg; - - // State - bool m_irq; - bool m_flg; - bool m_sts; - UINT8 m_cmd_state; - - // Tape position & motion - tape_pos_t m_tape_pos; - attotime m_start_time; // Tape moving if != never - bool m_tape_fwd; - bool m_tape_fast; - - // Timers - emu_timer *m_tape_timer; - emu_timer *m_hole_timer; - - // Content of tape tracks - tape_track_t m_tracks[ 2 ]; - bool m_image_dirty; - - // Reading & writing - bool m_tape_wr; - tape_pos_t m_rw_pos; - UINT16 m_next_word; - tape_track_t::iterator m_rd_it; - bool m_rd_it_valid; - - // Gap detection - tape_pos_t m_gap_detect_start; - - typedef enum { - ADV_NO_MORE_DATA, - ADV_CONT_DATA, - ADV_DISCONT_DATA - } adv_res_t; - - void clear_state(void); - void irq_w(bool state); - void set_error(bool state); - unsigned speed_to_tick_freq(void) const; - bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const; - void move_tape_pos(tape_pos_t delta_pos); - void update_tape_pos(void); - static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b); - static bool any_hole(tape_pos_t tape_pos_a , tape_pos_t tape_pos_b); - tape_pos_t next_hole(void) const; - attotime time_to_distance(tape_pos_t distance) const; - attotime time_to_target(tape_pos_t target) const; - bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0); - void start_tape(UINT16 cmd_reg); - void stop_tape(void); - tape_track_t& current_track(void); - static tape_pos_t word_length(tape_word_t w); - static tape_pos_t word_end_pos(const tape_track_t::iterator& it); - static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos); - void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length); - void write_gap(tape_pos_t a , tape_pos_t b); - bool just_gap(tape_pos_t a , tape_pos_t b); - tape_pos_t farthest_end(const tape_track_t::iterator& it) const; - bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive); - adv_res_t adv_it(tape_track_t::iterator& it); - attotime fetch_next_wr_word(void); - attotime time_to_rd_next_word(tape_pos_t& word_rd_pos); - bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap); - bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap); - void clear_tape(void); - void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words); - void save_tape(void); - bool load_track(tape_track_t& track); - bool load_tape(void); - void set_tape_present(bool present); - attotime time_to_next_hole(void) const; - attotime time_to_tach_pulses(void) const; - void start_cmd_exec(UINT16 new_cmd_reg); + // Storage of tracks: mapping from a tape position to word stored there + typedef std::map<tape_pos_t , tape_word_t> tape_track_t; + + devcb_write_line m_irq_handler; + devcb_write_line m_flg_handler; + devcb_write_line m_sts_handler; + + // Registers + UINT16 m_data_reg; + bool m_data_reg_full; + UINT16 m_cmd_reg; + UINT16 m_status_reg; + UINT16 m_tach_reg; + UINT16 m_checksum_reg; + UINT16 m_timing_reg; + + // State + bool m_irq; + bool m_flg; + bool m_sts; + UINT8 m_cmd_state; + + // Tape position & motion + tape_pos_t m_tape_pos; + attotime m_start_time; // Tape moving if != never + bool m_tape_fwd; + bool m_tape_fast; + + // Timers + emu_timer *m_tape_timer; + emu_timer *m_hole_timer; + + // Content of tape tracks + tape_track_t m_tracks[ 2 ]; + bool m_image_dirty; + + // Reading & writing + bool m_tape_wr; + tape_pos_t m_rw_pos; + UINT16 m_next_word; + tape_track_t::iterator m_rd_it; + bool m_rd_it_valid; + + // Gap detection + tape_pos_t m_gap_detect_start; + + typedef enum { + ADV_NO_MORE_DATA, + ADV_CONT_DATA, + ADV_DISCONT_DATA + } adv_res_t; + + void clear_state(void); + void irq_w(bool state); + void set_error(bool state); + unsigned speed_to_tick_freq(void) const; + bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const; + void move_tape_pos(tape_pos_t delta_pos); + void update_tape_pos(void); + static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b); + static bool any_hole(tape_pos_t tape_pos_a , tape_pos_t tape_pos_b); + tape_pos_t next_hole(void) const; + attotime time_to_distance(tape_pos_t distance) const; + attotime time_to_target(tape_pos_t target) const; + bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0); + void start_tape(UINT16 cmd_reg); + void stop_tape(void); + tape_track_t& current_track(void); + static tape_pos_t word_length(tape_word_t w); + static tape_pos_t word_end_pos(const tape_track_t::iterator& it); + static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos); + void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length); + void write_gap(tape_pos_t a , tape_pos_t b); + bool just_gap(tape_pos_t a , tape_pos_t b); + tape_pos_t farthest_end(const tape_track_t::iterator& it) const; + bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive); + adv_res_t adv_it(tape_track_t::iterator& it); + attotime fetch_next_wr_word(void); + attotime time_to_rd_next_word(tape_pos_t& word_rd_pos); + bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap); + bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap); + void clear_tape(void); + void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words); + void save_tape(void); + bool load_track(tape_track_t& track); + bool load_tape(void); + void set_tape_present(bool present); + attotime time_to_next_hole(void) const; + attotime time_to_tach_pulses(void) const; + void start_cmd_exec(UINT16 new_cmd_reg); }; // device type definition diff --git a/src/devices/video/ef9364.cpp b/src/devices/video/ef9364.cpp index b850f05d531..5b683b15e09 100644 --- a/src/devices/video/ef9364.cpp +++ b/src/devices/video/ef9364.cpp @@ -31,7 +31,7 @@ const device_type EF9364 = &device_creator<ef9364_device>; // default address map //------------------------------------------------- static ADDRESS_MAP_START( ef9364, AS_0, 8, ef9364_device ) - AM_RANGE(0x00000, ( ( EF9364_TXTPLANE_MAX_SIZE * EF9364_MAX_TXTPLANES ) - 1 ) ) AM_RAM + AM_RANGE(0x00000, ( ( EF9364_TXTPLANE_MAX_SIZE * EF9364_MAX_TXTPLANES ) - 1 ) ) AM_RAM ADDRESS_MAP_END //------------------------------------------------- @@ -41,7 +41,7 @@ ADDRESS_MAP_END const address_space_config *ef9364_device::memory_space_config(address_spacenum spacenum) const { - return (spacenum == AS_0) ? &m_space_config : NULL; + return (spacenum == AS_0) ? &m_space_config : NULL; } //************************************************************************** @@ -57,13 +57,13 @@ const address_space_config *ef9364_device::memory_space_config(address_spacenum //------------------------------------------------- ef9364_device::ef9364_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, EF9364, "EF9364", tag, owner, clock, "ef9364", __FILE__), - device_memory_interface(mconfig, *this), - device_video_interface(mconfig, *this), - m_space_config("textram", ENDIANNESS_LITTLE, 8, 12, 0, nullptr, *ADDRESS_MAP_NAME(ef9364)), - m_palette(*this) + device_t(mconfig, EF9364, "EF9364", tag, owner, clock, "ef9364", __FILE__), + device_memory_interface(mconfig, *this), + device_video_interface(mconfig, *this), + m_space_config("textram", ENDIANNESS_LITTLE, 8, 12, 0, nullptr, *ADDRESS_MAP_NAME(ef9364)), + m_palette(*this) { - clock_freq = clock; + clock_freq = clock; } //------------------------------------------------- @@ -73,7 +73,7 @@ ef9364_device::ef9364_device(const machine_config &mconfig, const char *tag, dev void ef9364_device::static_set_palette_tag(device_t &device, const char *tag) { - downcast<ef9364_device &>(device).m_palette.set_tag(tag); + downcast<ef9364_device &>(device).m_palette.set_tag(tag); } //------------------------------------------------- @@ -82,10 +82,10 @@ void ef9364_device::static_set_palette_tag(device_t &device, const char *tag) void ef9364_device::static_set_nb_of_pages(device_t &device, int nb_of_pages ) { - if( nb_of_pages > 0 && nb_of_pages <= 8 ) - { - downcast<ef9364_device &>(device).nb_of_pages = nb_of_pages; - } + if( nb_of_pages > 0 && nb_of_pages <= 8 ) + { + downcast<ef9364_device &>(device).nb_of_pages = nb_of_pages; + } } //------------------------------------------------- @@ -95,14 +95,14 @@ void ef9364_device::static_set_nb_of_pages(device_t &device, int nb_of_pages ) void ef9364_device::set_color_entry( int index, UINT8 r, UINT8 g, UINT8 b ) { - if( index < 2 ) - { - palette[index] = rgb_t(r, g, b); - } - else - { - logerror("Invalid EF9364 Palette entry : %02x\n", index); - } + if( index < 2 ) + { + palette[index] = rgb_t(r, g, b); + } + else + { + logerror("Invalid EF9364 Palette entry : %02x\n", index); + } } //------------------------------------------------- @@ -111,26 +111,26 @@ void ef9364_device::set_color_entry( int index, UINT8 r, UINT8 g, UINT8 b ) void ef9364_device::device_start() { - m_textram = &space(0); - m_charset = region(); + m_textram = &space(0); + m_charset = region(); - bitplane_xres = EF9364_NB_OF_COLUMNS*8; - bitplane_yres = EF9364_NB_OF_ROWS*(8+4); + bitplane_xres = EF9364_NB_OF_COLUMNS*8; + bitplane_yres = EF9364_NB_OF_ROWS*(8+4); - vsync_scanline_pos = 250; + vsync_scanline_pos = 250; - // Default palette : Black and white - palette[0] = rgb_t(0, 0, 0); - palette[1] = rgb_t(255, 255, 255); + // Default palette : Black and white + palette[0] = rgb_t(0, 0, 0); + palette[1] = rgb_t(255, 255, 255); - m_screen_out.allocate( bitplane_xres, m_screen->height() ); + m_screen_out.allocate( bitplane_xres, m_screen->height() ); - cursor_cnt = 0; - cursor_state = 0; + cursor_cnt = 0; + cursor_state = 0; - save_item(NAME(m_border)); + save_item(NAME(m_border)); - save_item(NAME(m_screen_out)); + save_item(NAME(m_screen_out)); } //------------------------------------------------- @@ -139,23 +139,23 @@ void ef9364_device::device_start() void ef9364_device::device_reset() { - int i; + int i; - x_curs_pos = 0; - y_curs_pos = 0; + x_curs_pos = 0; + y_curs_pos = 0; - char_latch = 0x00; + char_latch = 0x00; - for(i=0;i<EF9364_NB_OF_COLUMNS * EF9364_NB_OF_ROWS * nb_of_pages;i++) - { - m_textram->write_byte ( i , 0x7F ); - } + for(i=0;i<EF9364_NB_OF_COLUMNS * EF9364_NB_OF_ROWS * nb_of_pages;i++) + { + m_textram->write_byte ( i , 0x7F ); + } - memset(m_border, 0, sizeof(m_border)); + memset(m_border, 0, sizeof(m_border)); - m_screen_out.fill(0); + m_screen_out.fill(0); - set_video_mode(); + set_video_mode(); } //------------------------------------------------- @@ -164,18 +164,18 @@ void ef9364_device::device_reset() void ef9364_device::set_video_mode(void) { - UINT16 new_width = bitplane_xres; + UINT16 new_width = bitplane_xres; - if (m_screen->width() != new_width) - { - rectangle visarea = m_screen->visible_area(); - visarea.max_x = new_width - 1; + if (m_screen->width() != new_width) + { + rectangle visarea = m_screen->visible_area(); + visarea.max_x = new_width - 1; - m_screen->configure(new_width, m_screen->height(), visarea, m_screen->frame_period().attoseconds()); - } + m_screen->configure(new_width, m_screen->height(), visarea, m_screen->frame_period().attoseconds()); + } - //border color - memset(m_border, 0, sizeof(m_border)); + //border color + memset(m_border, 0, sizeof(m_border)); } //------------------------------------------------- @@ -193,41 +193,41 @@ void ef9364_device::draw_border(UINT16 line) UINT32 ef9364_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - int x,y,r; - unsigned char c; - - for( r = 0 ; r < EF9364_NB_OF_ROWS ; r++ ) - { - for( y = 0 ; y < 8 ; y++ ) - { - for( x = 0 ; x < EF9364_NB_OF_COLUMNS * 8 ; x++ ) - { - if( ( ( x >> 3 ) != x_curs_pos ) || ( r != y_curs_pos ) || !cursor_state) - { - c = m_textram->read_byte( ( r * EF9364_NB_OF_COLUMNS ) + ( x>>3 ) ); - - if( m_charset->u8(((c&0x7F)<<3) + y ) & (0x80>>(x&7)) ) - m_screen_out.pix32((r*12)+y, x) = palette[1]; - else - m_screen_out.pix32((r*12)+y, x) = palette[0]; - } - else - { - if(y != 7) - m_screen_out.pix32((r*12)+y, x) = palette[0]; - else - m_screen_out.pix32((r*12)+y, x) = palette[1]; - } - } - } - } - - cursor_cnt = (cursor_cnt + 1) % 13; - if(!cursor_cnt) - cursor_state ^= 1; - - copybitmap(bitmap, m_screen_out, 0, 0, 0, 0, cliprect); - return 0; + int x,y,r; + unsigned char c; + + for( r = 0 ; r < EF9364_NB_OF_ROWS ; r++ ) + { + for( y = 0 ; y < 8 ; y++ ) + { + for( x = 0 ; x < EF9364_NB_OF_COLUMNS * 8 ; x++ ) + { + if( ( ( x >> 3 ) != x_curs_pos ) || ( r != y_curs_pos ) || !cursor_state) + { + c = m_textram->read_byte( ( r * EF9364_NB_OF_COLUMNS ) + ( x>>3 ) ); + + if( m_charset->u8(((c&0x7F)<<3) + y ) & (0x80>>(x&7)) ) + m_screen_out.pix32((r*12)+y, x) = palette[1]; + else + m_screen_out.pix32((r*12)+y, x) = palette[0]; + } + else + { + if(y != 7) + m_screen_out.pix32((r*12)+y, x) = palette[0]; + else + m_screen_out.pix32((r*12)+y, x) = palette[1]; + } + } + } + } + + cursor_cnt = (cursor_cnt + 1) % 13; + if(!cursor_cnt) + cursor_state ^= 1; + + copybitmap(bitmap, m_screen_out, 0, 0, 0, 0, cliprect); + return 0; } //------------------------------------------------- @@ -236,15 +236,15 @@ UINT32 ef9364_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, void ef9364_device::update_scanline(UINT16 scanline) { - if (scanline == vsync_scanline_pos) - { - // vsync - } - - if (scanline == 0) - { - draw_border(0); - } + if (scanline == vsync_scanline_pos) + { + // vsync + } + + if (scanline == 0) + { + draw_border(0); + } } //------------------------------------------------- @@ -253,107 +253,107 @@ void ef9364_device::update_scanline(UINT16 scanline) void ef9364_device::command_w(UINT8 cmd) { - int x,y,i,j; - - switch( cmd&7 ) - { - case 0x0: // Page Erase & Cursor home - for( y=0 ; y < EF9364_NB_OF_ROWS ; y++ ) - { - for( x=0 ; x < EF9364_NB_OF_COLUMNS ; x++ ) - { - m_textram->write_byte ( y * EF9364_NB_OF_COLUMNS + x , 0x7F ); - } - } - x_curs_pos = 0; - y_curs_pos = 0; - break; - - case 0x1: // Erase to end of the line and return cursor - for( ; x_curs_pos < EF9364_NB_OF_COLUMNS ; x_curs_pos++ ) - { - m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x_curs_pos , 0x7F ); - } - x_curs_pos = 0; - break; - - case 0x2: // Line feed - y_curs_pos++; - if( y_curs_pos >= EF9364_NB_OF_ROWS ) - { - // Scroll - for( j = 1 ; j < EF9364_NB_OF_ROWS ; j++ ) - { - for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) - { - m_textram->write_byte ( (j-1) * EF9364_NB_OF_COLUMNS + i , m_textram->read_byte ( j * EF9364_NB_OF_COLUMNS + i ) ); - } - } - // Erase last line - for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) - { - m_textram->write_byte ( ( EF9364_NB_OF_ROWS - 1 ) * EF9364_NB_OF_COLUMNS + i , 0x7F ); - } - - y_curs_pos = EF9364_NB_OF_ROWS - 1; - } - break; - - case 0x3: // Nop - - break; - - case 0x4: // Cursor left - if(x_curs_pos) - x_curs_pos--; - break; - - case 0x5: // Erasure of cursor Line. - for( x = 0 ; x < EF9364_NB_OF_COLUMNS ; x++ ) - { - m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x , 0x7F ); - } - break; - - case 0x6: // Cursor up - if(y_curs_pos) - y_curs_pos--; - break; - - case 0x7: // Write char - if(cmd&0x8) - m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x_curs_pos , char_latch ); - - x_curs_pos++; - if( x_curs_pos >= EF9364_NB_OF_COLUMNS ) - { - x_curs_pos=0; - y_curs_pos++; - if( y_curs_pos >= EF9364_NB_OF_ROWS ) - { - // Scroll - for( j = 1 ; j < EF9364_NB_OF_ROWS ; j++ ) - { - for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) - { - m_textram->write_byte ( (j-1) * EF9364_NB_OF_COLUMNS + i , m_textram->read_byte ( j * EF9364_NB_OF_COLUMNS + i ) ); - } - } - // Erase last line - for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) - { - m_textram->write_byte ( ( EF9364_NB_OF_ROWS - 1 ) * EF9364_NB_OF_COLUMNS + i , 0x7F ); - } - - y_curs_pos = EF9364_NB_OF_ROWS - 1; - } - } - break; - - } + int x,y,i,j; + + switch( cmd&7 ) + { + case 0x0: // Page Erase & Cursor home + for( y=0 ; y < EF9364_NB_OF_ROWS ; y++ ) + { + for( x=0 ; x < EF9364_NB_OF_COLUMNS ; x++ ) + { + m_textram->write_byte ( y * EF9364_NB_OF_COLUMNS + x , 0x7F ); + } + } + x_curs_pos = 0; + y_curs_pos = 0; + break; + + case 0x1: // Erase to end of the line and return cursor + for( ; x_curs_pos < EF9364_NB_OF_COLUMNS ; x_curs_pos++ ) + { + m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x_curs_pos , 0x7F ); + } + x_curs_pos = 0; + break; + + case 0x2: // Line feed + y_curs_pos++; + if( y_curs_pos >= EF9364_NB_OF_ROWS ) + { + // Scroll + for( j = 1 ; j < EF9364_NB_OF_ROWS ; j++ ) + { + for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) + { + m_textram->write_byte ( (j-1) * EF9364_NB_OF_COLUMNS + i , m_textram->read_byte ( j * EF9364_NB_OF_COLUMNS + i ) ); + } + } + // Erase last line + for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) + { + m_textram->write_byte ( ( EF9364_NB_OF_ROWS - 1 ) * EF9364_NB_OF_COLUMNS + i , 0x7F ); + } + + y_curs_pos = EF9364_NB_OF_ROWS - 1; + } + break; + + case 0x3: // Nop + + break; + + case 0x4: // Cursor left + if(x_curs_pos) + x_curs_pos--; + break; + + case 0x5: // Erasure of cursor Line. + for( x = 0 ; x < EF9364_NB_OF_COLUMNS ; x++ ) + { + m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x , 0x7F ); + } + break; + + case 0x6: // Cursor up + if(y_curs_pos) + y_curs_pos--; + break; + + case 0x7: // Write char + if(cmd&0x8) + m_textram->write_byte ( y_curs_pos * EF9364_NB_OF_COLUMNS + x_curs_pos , char_latch ); + + x_curs_pos++; + if( x_curs_pos >= EF9364_NB_OF_COLUMNS ) + { + x_curs_pos=0; + y_curs_pos++; + if( y_curs_pos >= EF9364_NB_OF_ROWS ) + { + // Scroll + for( j = 1 ; j < EF9364_NB_OF_ROWS ; j++ ) + { + for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) + { + m_textram->write_byte ( (j-1) * EF9364_NB_OF_COLUMNS + i , m_textram->read_byte ( j * EF9364_NB_OF_COLUMNS + i ) ); + } + } + // Erase last line + for( i = 0 ; i < EF9364_NB_OF_COLUMNS ; i++ ) + { + m_textram->write_byte ( ( EF9364_NB_OF_ROWS - 1 ) * EF9364_NB_OF_COLUMNS + i , 0x7F ); + } + + y_curs_pos = EF9364_NB_OF_ROWS - 1; + } + } + break; + + } } void ef9364_device::char_latch_w(UINT8 data) { - char_latch = data; + char_latch = data; } diff --git a/src/devices/video/ef9364.h b/src/devices/video/ef9364.h index 1519d817196..4c5f57bb211 100644 --- a/src/devices/video/ef9364.h +++ b/src/devices/video/ef9364.h @@ -20,13 +20,13 @@ #define EF9364_MAX_TXTPLANES 2 #define MCFG_EF9364_PALETTE(_palette_tag) \ - ef9364_device::static_set_palette_tag(*device, "^" _palette_tag); + ef9364_device::static_set_palette_tag(*device, "^" _palette_tag); #define MCFG_EF9364_PAGES_CNT(_pages_number) \ - ef9364_device::static_set_nb_of_pages(*device,_pages_number); + ef9364_device::static_set_nb_of_pages(*device,_pages_number); #define MCFG_EF9364_IRQ_HANDLER(_devcb) \ - devcb = &ef9364_device::set_irq_handler(*device, DEVCB_##_devcb); + devcb = &ef9364_device::set_irq_handler(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -35,67 +35,67 @@ // ======================> ef9364_device class ef9364_device : public device_t, - public device_memory_interface, - public device_video_interface + public device_memory_interface, + public device_video_interface { public: - // construction/destruction - ef9364_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + // construction/destruction + ef9364_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - // static configuration - static void static_set_palette_tag(device_t &device, const char *tag); - static void static_set_nb_of_pages(device_t &device, int nb_bitplanes ); + // static configuration + static void static_set_palette_tag(device_t &device, const char *tag); + static void static_set_nb_of_pages(device_t &device, int nb_bitplanes ); - // device interface + // device interface - void update_scanline(UINT16 scanline); - void set_color_entry( int index, UINT8 r, UINT8 g, UINT8 b ); + void update_scanline(UINT16 scanline); + void set_color_entry( int index, UINT8 r, UINT8 g, UINT8 b ); - UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void char_latch_w(UINT8 data); - void command_w(UINT8 cmd); + UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + void char_latch_w(UINT8 data); + void command_w(UINT8 cmd); protected: - // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; + // device-level overrides + virtual void device_start() override; + virtual void device_reset() override; - // device_config_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; + // device_config_memory_interface overrides + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; - // address space configurations - const address_space_config m_space_config; + // address space configurations + const address_space_config m_space_config; - // inline helper + // inline helper private: - void screen_scanning( int force_clear ); - void set_video_mode(void); - void draw_border(UINT16 line); + void screen_scanning( int force_clear ); + void set_video_mode(void); + void draw_border(UINT16 line); - // internal state + // internal state - memory_region *m_charset; - address_space *m_textram; + memory_region *m_charset; + address_space *m_textram; - UINT8 x_curs_pos; - UINT8 y_curs_pos; - UINT8 char_latch; + UINT8 x_curs_pos; + UINT8 y_curs_pos; + UINT8 char_latch; - UINT8 m_border[80]; //border color + UINT8 m_border[80]; //border color - rgb_t palette[2]; - int nb_of_pages; - int bitplane_xres; - int bitplane_yres; - int vsync_scanline_pos; - int cursor_cnt; - int cursor_state; + rgb_t palette[2]; + int nb_of_pages; + int bitplane_xres; + int bitplane_yres; + int vsync_scanline_pos; + int cursor_cnt; + int cursor_state; - UINT32 clock_freq; - bitmap_rgb32 m_screen_out; + UINT32 clock_freq; + bitmap_rgb32 m_screen_out; - required_device<palette_device> m_palette; + required_device<palette_device> m_palette; }; // device type definition diff --git a/src/devices/video/jangou_blitter.cpp b/src/devices/video/jangou_blitter.cpp index e2acdb37ca1..032ed96a4ed 100644 --- a/src/devices/video/jangou_blitter.cpp +++ b/src/devices/video/jangou_blitter.cpp @@ -2,15 +2,15 @@ // copyright-holders:Angelo Salese /*************************************************************************** - Jangou Custom Blitter Chip, codename "???" (name scratched afaik) + Jangou Custom Blitter Chip, codename "???" (name scratched afaik) - device emulation by Angelo Salese, from original jangou.cpp implementation - by Angelo Salese, David Haywood and Phil Bennett. + device emulation by Angelo Salese, from original jangou.cpp implementation + by Angelo Salese, David Haywood and Phil Bennett. + + TODO: + - BLTFLIP mechanism; + - clean-ups; - TODO: - - BLTFLIP mechanism; - - clean-ups; - ***************************************************************************/ #include "emu.h" @@ -51,7 +51,7 @@ void jangou_blitter_device::device_start() if (m_gfxrom == nullptr) fatalerror("JANGOU_BLITTER: \"gfx\" memory base not found"); m_gfxrommask = devregion->bytes()-1; - + save_item(NAME(m_pen_data)); save_item(NAME(m_blit_data)); save_item(NAME(m_blit_buffer)); @@ -84,12 +84,12 @@ UINT8 jangou_blitter_device::gfx_nibble( UINT32 niboffset ) } void jangou_blitter_device::plot_gfx_pixel( UINT8 pix, int x, int y ) -{ +{ if (y < 0 || y >= 256) return; if (x < 0 || x >= 256) return; - + if (x & 1) m_blit_buffer[(y * 256) + (x >> 1)] = (m_blit_buffer[(y * 256) + (x >> 1)] & 0x0f) | ((pix << 4) & 0xf0); else @@ -112,11 +112,11 @@ WRITE8_MEMBER( jangou_blitter_device::process_w ) src |= (m_blit_data[6] & 3) << 16; x = (m_blit_data[2] & 0xff); y = (m_blit_data[3] & 0xff); - + #if 0 if(m_bltflip == true) { - printf("%02x %02x %02x %02x %02x %02x %02x\n", m_blit_data[0], m_blit_data[1], m_blit_data[2],m_blit_data[3], m_blit_data[4], m_blit_data[5],m_blit_data[6]); + printf("%02x %02x %02x %02x %02x %02x %02x\n", m_blit_data[0], m_blit_data[1], m_blit_data[2],m_blit_data[3], m_blit_data[4], m_blit_data[5],m_blit_data[6]); printf("=>"); for(int i=0;i<0x10;i++) printf("%02x ",m_pen_data[i]); @@ -131,7 +131,7 @@ WRITE8_MEMBER( jangou_blitter_device::process_w ) else src -= (w * h) - 1; - + for (ycount = 0; ycount < h; ycount++) { for(xcount = 0; xcount < w; xcount++) @@ -152,9 +152,9 @@ WRITE8_MEMBER( jangou_blitter_device::process_w ) count++; } } - + //UINT32 new_src = src + count; - + // update source and height after blitter operation // TODO: Jangou doesn't agree with this, later HW? #if 0 diff --git a/src/devices/video/jangou_blitter.h b/src/devices/video/jangou_blitter.h index 7a39172e7ca..d5d6e92a55f 100644 --- a/src/devices/video/jangou_blitter.h +++ b/src/devices/video/jangou_blitter.h @@ -43,9 +43,9 @@ public: protected: // device-level overrides - virtual void device_start() override; + virtual void device_start() override; virtual void device_reset() override; - + private: void plot_gfx_pixel( UINT8 pix, int x, int y ); UINT8 gfx_nibble( UINT32 niboffset ); diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 32d4d2c3c63..070c9e4fbec 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -94,7 +94,7 @@ enum #define UPD7220_COMMAND_CCHAR 0x4b #define UPD7220_COMMAND_START 0x6b #define UPD7220_COMMAND_BCTRL 0x0c // & 0xfe -#define UPD7220_COMMAND_05 0x05 +#define UPD7220_COMMAND_05 0x05 #define UPD7220_COMMAND_ZOOM 0x46 #define UPD7220_COMMAND_CURS 0x49 #define UPD7220_COMMAND_PRAM 0x70 // & 0xf0 diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 7fe0b94a007..025c0fa140f 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -960,7 +960,7 @@ TIMER_CALLBACK_MEMBER( voodoo_device::vblank_callback ) /* set a timer for the next off state */ machine().scheduler().timer_set(screen->time_until_pos(0), timer_expired_delegate(FUNC(voodoo_device::vblank_off_callback),this), 0, this); - + /* set internal state and call the client */ fbi.vblank = TRUE; @@ -2877,7 +2877,7 @@ default_case: * *************************************/ INT32 voodoo_device::lfb_direct_w(voodoo_device *vd, offs_t offset, UINT32 data, UINT32 mem_mask) -{ +{ UINT16 *dest; UINT32 destmax; int x, y; @@ -2923,7 +2923,6 @@ INT32 voodoo_device::lfb_direct_w(voodoo_device *vd, offs_t offset, UINT32 data, INT32 voodoo_device::lfb_w(voodoo_device* vd, offs_t offset, UINT32 data, UINT32 mem_mask) { - UINT16 *dest, *depth; UINT32 destmax, depthmax; int sr[2], sg[2], sb[2], sa[2], sw[2]; @@ -3783,7 +3782,6 @@ WRITE32_MEMBER( voodoo_device::voodoo_w ) static UINT32 register_r(voodoo_device *vd, offs_t offset) { - int regnum = offset & 0xff; UINT32 result; @@ -4053,7 +4051,6 @@ static UINT32 lfb_r(voodoo_device *vd, offs_t offset, bool lfb_3d) READ32_MEMBER( voodoo_device::voodoo_r ) { - /* if we have something pending, flush the FIFOs up to the current time */ if (pci.op_pending) flush_fifos(this, machine().time()); @@ -4699,7 +4696,6 @@ WRITE32_MEMBER( voodoo_banshee_device::banshee_agp_w ) WRITE32_MEMBER( voodoo_banshee_device::banshee_w ) { - /* if we have something pending, flush the FIFOs up to the current time */ if (pci.op_pending) flush_fifos(this, machine().time()); @@ -5045,7 +5041,7 @@ void voodoo_device::common_start_voodoo(UINT8 type) pci.fifo.in = pci.fifo.out = 0; pci.stall_state = NOT_STALLED; pci.continue_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(voodoo_device::stall_cpu_callback),this), nullptr); - + /* allocate memory */ tmumem0 = m_tmumem0; tmumem1 = m_tmumem1; diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index 1dc1a4a59ec..81951a17087 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -1777,7 +1777,7 @@ public: const char * m_cputag; devcb_write_line m_vblank; devcb_write_line m_stall; - + TIMER_CALLBACK_MEMBER( vblank_off_callback ); TIMER_CALLBACK_MEMBER( stall_cpu_callback ); TIMER_CALLBACK_MEMBER( vblank_callback ); @@ -1826,11 +1826,9 @@ public: static void raster_generic_2tmu(void *dest, INT32 scanline, const poly_extent *extent, const void *extradata, int threadid); #define RASTERIZER_HEADER(name) \ - static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, const void *extradata, int threadid); \ - + static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, const void *extradata, int threadid); #define RASTERIZER_ENTRY(fbzcp, alpha, fog, fbz, tex0, tex1) \ - RASTERIZER_HEADER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1) \ - + RASTERIZER_HEADER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1) #include "voodoo_rast.inc" #undef RASTERIZER_ENTRY diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp index 6b75841df83..8967e4c0343 100644 --- a/src/emu/clifront.cpp +++ b/src/emu/clifront.cpp @@ -107,10 +107,10 @@ int cli_frontend::execute(int argc, char **argv) m_options.parse_command_line(argc, argv, option_errors); m_options.parse_standard_inis(option_errors); - + //load_translation(); load_translation(m_options); - + manager->start_luaengine(); if (*(m_options.software_name()) != 0) diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index c4686c5566f..727b08e8f60 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -1930,7 +1930,7 @@ void device_debug::instruction_hook(offs_t curpc) machine.debug_view().flush_osd_updates(); machine.manager().lua()->periodic_check(); - + // clear the memory modified flag and wait global->memory_modified = false; if (machine.debug_flags & DEBUG_FLAG_OSD_ENABLED) diff --git a/src/emu/drivers/empty.cpp b/src/emu/drivers/empty.cpp index be4f53b24a7..f012e376813 100644 --- a/src/emu/drivers/empty.cpp +++ b/src/emu/drivers/empty.cpp @@ -33,7 +33,7 @@ public: if (strcmp(machine().options().ui(),"simple")==0) { ui_simple_menu_select_game::force_game_select(machine(), &machine().render().ui_container()); } else { - ui_menu_select_game::force_game_select(machine(), &machine().render().ui_container()); + ui_menu_select_game::force_game_select(machine(), &machine().render().ui_container()); } } diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 1fb827ed1a6..2ff24849bf8 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -184,8 +184,8 @@ const options_entry emu_options::s_option_entries[] = { OPTION_BIOS, nullptr, OPTION_STRING, "select the system BIOS to use" }, { OPTION_CHEAT ";c", "0", OPTION_BOOLEAN, "enable cheat subsystem" }, { OPTION_SKIP_GAMEINFO, "0", OPTION_BOOLEAN, "skip displaying the information screen at startup" }, - { OPTION_UI_FONT, "default", OPTION_STRING, "specify a font to use" }, - { OPTION_UI, "cabinet", OPTION_STRING, "type of UI (simple|cabinet)" }, + { OPTION_UI_FONT, "default", OPTION_STRING, "specify a font to use" }, + { OPTION_UI, "cabinet", OPTION_STRING, "type of UI (simple|cabinet)" }, { OPTION_RAMSIZE ";ram", nullptr, OPTION_STRING, "size of RAM (if supported by driver)" }, { OPTION_CONFIRM_QUIT, "0", OPTION_BOOLEAN, "display confirm quit screen on exit" }, { OPTION_UI_MOUSE, "1", OPTION_BOOLEAN, "display ui mouse cursor" }, diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 85e054a4c43..79df39c7438 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -74,7 +74,7 @@ enum #define OPTION_PLAYBACK "playback" #define OPTION_RECORD "record" #define OPTION_RECORD_TIMECODE "record_timecode" -#define OPTION_EXIT_AFTER_PLAYBACK "exit_after_playback" +#define OPTION_EXIT_AFTER_PLAYBACK "exit_after_playback" #define OPTION_MNGWRITE "mngwrite" #define OPTION_AVIWRITE "aviwrite" #ifdef MAME_DEBUG @@ -178,7 +178,7 @@ enum #define OPTION_CHEAT "cheat" #define OPTION_SKIP_GAMEINFO "skip_gameinfo" #define OPTION_UI_FONT "uifont" -#define OPTION_UI "ui" +#define OPTION_UI "ui" #define OPTION_RAMSIZE "ramsize" // core comm options @@ -359,7 +359,7 @@ public: const char *bios() const { return value(OPTION_BIOS); } bool cheat() const { return bool_value(OPTION_CHEAT); } bool skip_gameinfo() const { return bool_value(OPTION_SKIP_GAMEINFO); } - const char *ui_font() const { return value(OPTION_UI_FONT); } + const char *ui_font() const { return value(OPTION_UI_FONT); } const char *ui() const { return value(OPTION_UI); } const char *ram_size() const { return value(OPTION_RAMSIZE); } @@ -368,7 +368,7 @@ public: const char *comm_localport() const { return value(OPTION_COMM_LOCAL_PORT); } const char *comm_remotehost() const { return value(OPTION_COMM_REMOTE_HOST); } const char *comm_remoteport() const { return value(OPTION_COMM_REMOTE_PORT); } - + bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); } bool ui_mouse() const { return bool_value(OPTION_UI_MOUSE); } @@ -378,7 +378,7 @@ public: const char *autoboot_script() const { return value(OPTION_AUTOBOOT_SCRIPT); } bool console() const { return bool_value(OPTION_CONSOLE); } - + const char *language() const { return value(OPTION_LANGUAGE); } // FIXME: Couriersud: This should be in image_device_exit diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp index a898a10051b..4d2a7852f91 100644 --- a/src/emu/ioport.cpp +++ b/src/emu/ioport.cpp @@ -2479,7 +2479,7 @@ ioport_manager::ioport_manager(running_machine &machine) m_has_dips(false), m_has_bioses(false), m_autofire_toggle(false), - m_autofire_delay(3) // 1 seems too fast for a bunch of games + m_autofire_delay(3) // 1 seems too fast for a bunch of games { memset(m_type_to_entry, 0, sizeof(m_type_to_entry)); } @@ -3555,8 +3555,8 @@ void ioport_manager::timecode_write(_Type value) /*template<> void ioport_manager::timecode_write<bool>(bool value) { - UINT8 byte = UINT8(value); - timecode_write(byte); + UINT8 byte = UINT8(value); + timecode_write(byte); }*/ template<> void ioport_manager::timecode_write<std::string>(std::string value) { diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 6d9d941fa4a..bc8dab543be 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -1096,7 +1096,7 @@ public: struct user_settings { ioport_value value; // for DIP switches - bool autofire; // for autofire settings + bool autofire; // for autofire settings input_seq seq[SEQ_TYPE_TOTAL]; // sequences of all types INT32 sensitivity; // for analog controls INT32 delta; // for analog controls @@ -1486,8 +1486,8 @@ private: UINT64 m_playback_accumulated_speed; // accumulated speed during playback UINT32 m_playback_accumulated_frames; // accumulated frames during playback emu_file m_timecode_file; // timecode/frames playback file (NULL if not recording) - int m_timecode_count; - attotime m_timecode_last_time; + int m_timecode_count; + attotime m_timecode_last_time; // has... bool m_has_configs; diff --git a/src/emu/language.cpp b/src/emu/language.cpp index 23a2d251fab..b47605f50c8 100644 --- a/src/emu/language.cpp +++ b/src/emu/language.cpp @@ -2,9 +2,9 @@ // copyright-holders:Miodrag Milanovic /*************************************************************************** - language.cpp + language.cpp - Multi-language support. + Multi-language support. ***************************************************************************/ @@ -75,4 +75,4 @@ void load_translation(emu_options &m_options) } global_free_array(buffer); } -}
\ No newline at end of file +} diff --git a/src/emu/language.h b/src/emu/language.h index ce536531d89..2a9d934576b 100644 --- a/src/emu/language.h +++ b/src/emu/language.h @@ -2,9 +2,9 @@ // copyright-holders:Miodrag Milanovic /*************************************************************************** - language.h + language.h - Multi-language support. + Multi-language support. ***************************************************************************/ #pragma once @@ -20,13 +20,12 @@ // LOCALIZATION SUPPORT //************************************************************************** -#define _(param) lang_translate(param) +#define _(param) lang_translate(param) // Fake one to make possible using it in static text definitions, on those // lang_translate must be called afterwards -#define __(param) param +#define __(param) param void load_translation(emu_options &option); const char *lang_translate(const char *word); #endif /*__LANGUAGE_H__*/ - diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index 990f417eac4..b8f1d0772ec 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -51,7 +51,7 @@ extern "C" { int luaopen_zlib(lua_State *L); int luaopen_luv(lua_State *L); int luaopen_lfs(lua_State *L); - uv_loop_t* luv_loop(lua_State* L); + uv_loop_t* luv_loop(lua_State* L); } static void lstop(lua_State *L, lua_Debug *ar) @@ -744,7 +744,7 @@ int lua_engine::lua_options_entry::l_entry_value(lua_State *L) luaL_error(L, "%s", error.c_str()); } } - + switch (e->type()) { case OPTION_BOOLEAN: @@ -1194,7 +1194,7 @@ lua_engine::lua_engine() lua_gc(m_lua_state, LUA_GCSTOP, 0); /* stop collector during initialization */ luaL_openlibs(m_lua_state); /* open libraries */ - // Get package.preload so we can store builtins in it. + // Get package.preload so we can store builtins in it. lua_getglobal(m_lua_state, "package"); lua_getfield(m_lua_state, -1, "preload"); lua_remove(m_lua_state, -2); // Remove package @@ -1205,13 +1205,13 @@ lua_engine::lua_engine() lua_pushcfunction(m_lua_state, luaopen_zlib); lua_setfield(m_lua_state, -2, "zlib"); - + lua_pushcfunction(m_lua_state, luaopen_lsqlite3); lua_setfield(m_lua_state, -2, "lsqlite3"); lua_pushcfunction(m_lua_state, luaopen_lfs); lua_setfield(m_lua_state, -2, "lfs"); - + luaopen_ioport(m_lua_state); lua_gc(m_lua_state, LUA_GCRESTART, 0); @@ -1668,7 +1668,7 @@ void lua_engine::periodic_check() auto loop = luv_loop(m_lua_state); if (loop!=nullptr) uv_run(loop, UV_RUN_NOWAIT); - + } //------------------------------------------------- diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 5119dec397c..0c8d85a4540 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -2,69 +2,69 @@ // copyright-holders:Aaron Giles /*************************************************************************** - machine.c + machine.c - Controls execution of the core MAME system. + Controls execution of the core MAME system. **************************************************************************** - Since there has been confusion in the past over the order of - initialization and other such things, here it is, all spelled out - as of January, 2008: - - main() - - does platform-specific init - - calls mame_execute() [mame.c] - - mame_execute() [mame.c] - - calls mame_validitychecks() [validity.c] to perform validity checks on all compiled drivers - - begins resource tracking (level 1) - - calls create_machine [mame.c] to initialize the running_machine structure - - calls init_machine() [mame.c] - - init_machine() [mame.c] - - calls fileio_init() [fileio.c] to initialize file I/O info - - calls config_init() [config.c] to initialize configuration system - - calls input_init() [input.c] to initialize the input system - - calls output_init() [output.c] to initialize the output system - - calls state_init() [state.c] to initialize save state system - - calls state_save_allow_registration() [state.c] to allow registrations - - calls palette_init() [palette.c] to initialize palette system - - calls render_init() [render.c] to initialize the rendering system - - calls ui_init() [ui.c] to initialize the user interface - - calls generic_machine_init() [machine/generic.c] to initialize generic machine structures - - calls timer_init() [timer.c] to reset the timer system - - calls osd_init() [osdepend.h] to do platform-specific initialization - - calls input_port_init() [inptport.c] to set up the input ports - - calls rom_init() [romload.c] to load the game's ROMs - - calls memory_init() [memory.c] to process the game's memory maps - - calls the driver's DRIVER_INIT callback - - calls device_list_start() [devintrf.c] to start any devices - - calls video_init() [video.c] to start the video system - - calls tilemap_init() [tilemap.c] to start the tilemap system - - calls crosshair_init() [crsshair.c] to configure the crosshairs - - calls sound_init() [sound.c] to start the audio system - - calls debugger_init() [debugger.c] to set up the debugger - - calls the driver's MACHINE_START, SOUND_START, and VIDEO_START callbacks - - calls cheat_init() [cheat.c] to initialize the cheat system - - calls image_init() [image.c] to initialize the image system - - - calls config_load_settings() [config.c] to load the configuration file - - calls nvram_load [machine/generic.c] to load NVRAM - - calls ui_display_startup_screens() [ui.c] to display the startup screens - - begins resource tracking (level 2) - - calls soft_reset() [mame.c] to reset all systems - - -------------------( at this point, we're up and running )---------------------- - - - calls scheduler->timeslice() [schedule.c] over and over until we exit - - ends resource tracking (level 2), freeing all auto_mallocs and timers - - calls the nvram_save() [machine/generic.c] to save NVRAM - - calls config_save_settings() [config.c] to save the game's configuration - - calls all registered exit routines [mame.c] - - ends resource tracking (level 1), freeing all auto_mallocs and timers - - - exits the program + Since there has been confusion in the past over the order of + initialization and other such things, here it is, all spelled out + as of January, 2008: + + main() + - does platform-specific init + - calls mame_execute() [mame.c] + + mame_execute() [mame.c] + - calls mame_validitychecks() [validity.c] to perform validity checks on all compiled drivers + - begins resource tracking (level 1) + - calls create_machine [mame.c] to initialize the running_machine structure + - calls init_machine() [mame.c] + + init_machine() [mame.c] + - calls fileio_init() [fileio.c] to initialize file I/O info + - calls config_init() [config.c] to initialize configuration system + - calls input_init() [input.c] to initialize the input system + - calls output_init() [output.c] to initialize the output system + - calls state_init() [state.c] to initialize save state system + - calls state_save_allow_registration() [state.c] to allow registrations + - calls palette_init() [palette.c] to initialize palette system + - calls render_init() [render.c] to initialize the rendering system + - calls ui_init() [ui.c] to initialize the user interface + - calls generic_machine_init() [machine/generic.c] to initialize generic machine structures + - calls timer_init() [timer.c] to reset the timer system + - calls osd_init() [osdepend.h] to do platform-specific initialization + - calls input_port_init() [inptport.c] to set up the input ports + - calls rom_init() [romload.c] to load the game's ROMs + - calls memory_init() [memory.c] to process the game's memory maps + - calls the driver's DRIVER_INIT callback + - calls device_list_start() [devintrf.c] to start any devices + - calls video_init() [video.c] to start the video system + - calls tilemap_init() [tilemap.c] to start the tilemap system + - calls crosshair_init() [crsshair.c] to configure the crosshairs + - calls sound_init() [sound.c] to start the audio system + - calls debugger_init() [debugger.c] to set up the debugger + - calls the driver's MACHINE_START, SOUND_START, and VIDEO_START callbacks + - calls cheat_init() [cheat.c] to initialize the cheat system + - calls image_init() [image.c] to initialize the image system + + - calls config_load_settings() [config.c] to load the configuration file + - calls nvram_load [machine/generic.c] to load NVRAM + - calls ui_display_startup_screens() [ui.c] to display the startup screens + - begins resource tracking (level 2) + - calls soft_reset() [mame.c] to reset all systems + + -------------------( at this point, we're up and running )---------------------- + + - calls scheduler->timeslice() [schedule.c] over and over until we exit + - ends resource tracking (level 2), freeing all auto_mallocs and timers + - calls the nvram_save() [machine/generic.c] to save NVRAM + - calls config_save_settings() [config.c] to save the game's configuration + - calls all registered exit routines [mame.c] + - ends resource tracking (level 1), freeing all auto_mallocs and timers + + - exits the program ***************************************************************************/ @@ -1326,12 +1326,12 @@ void system_time::full_time::set(struct tm &t) { second = t.tm_sec; minute = t.tm_min; - hour = t.tm_hour; - mday = t.tm_mday; + hour = t.tm_hour; + mday = t.tm_mday; month = t.tm_mon; - year = t.tm_year + 1900; + year = t.tm_year + 1900; weekday = t.tm_wday; - day = t.tm_yday; + day = t.tm_yday; is_dst = t.tm_isdst; } diff --git a/src/emu/ui/auditmenu.cpp b/src/emu/ui/auditmenu.cpp index 97d84568118..9703545948e 100644 --- a/src/emu/ui/auditmenu.cpp +++ b/src/emu/ui/auditmenu.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* diff --git a/src/emu/ui/cheatopt.cpp b/src/emu/ui/cheatopt.cpp index 6de3cb55936..9191323d059 100644 --- a/src/emu/ui/cheatopt.cpp +++ b/src/emu/ui/cheatopt.cpp @@ -192,7 +192,7 @@ void ui_menu_autofire::handle() if (menu_event->itemref == ITEMREF_AUTOFIRE_STATUS) { // toggle autofire status - bool autofire_toggle = machine().ioport().get_autofire_toggle(); // (menu_event->iptkey == IPT_UI_LEFT); + bool autofire_toggle = machine().ioport().get_autofire_toggle(); // (menu_event->iptkey == IPT_UI_LEFT); machine().ioport().set_autofire_toggle(!autofire_toggle); changed = true; } @@ -321,5 +321,3 @@ void ui_menu_autofire::populate() last_toggle = autofire_toggle; } - - diff --git a/src/emu/ui/ctrlmenu.cpp b/src/emu/ui/ctrlmenu.cpp index f954a596f7a..9215ef19783 100644 --- a/src/emu/ui/ctrlmenu.cpp +++ b/src/emu/ui/ctrlmenu.cpp @@ -44,7 +44,7 @@ ui_menu_controller_mapping::ui_menu_controller_mapping(running_machine &machine, ui_menu_controller_mapping::~ui_menu_controller_mapping() { std::string error_string; - for (int d = 1; d < ARRAY_LENGTH(m_options); ++d) + for (int d = 1; d < ARRAY_LENGTH(m_options); ++d) { if (strcmp(machine().options().value(m_options[d].option),m_device_status[m_options[d].status])!=0) { @@ -104,7 +104,7 @@ void ui_menu_controller_mapping::custom_render(void *selectedref, float top, flo ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Device Mapping"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -124,7 +124,7 @@ void ui_menu_controller_mapping::custom_render(void *selectedref, float top, flo // draw the text within it mui.draw_text_full(container, _("Device Mapping"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/custmenu.cpp b/src/emu/ui/custmenu.cpp index 3a50f4bfc03..e52c9ced27d 100644 --- a/src/emu/ui/custmenu.cpp +++ b/src/emu/ui/custmenu.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* @@ -208,7 +208,7 @@ void ui_menu_custom_filter::custom_render(void *selectedref, float top, float bo // get the size of the text mui.draw_text_full(container, _("Select custom filters:"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += (2.0f * UI_BOX_LR_BORDER) + 0.01f; float maxwidth = MAX(width, origx2 - origx1); @@ -228,7 +228,7 @@ void ui_menu_custom_filter::custom_render(void *selectedref, float top, float bo // draw the text within it mui.draw_text_full(container, _("Select custom filters:"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- @@ -521,7 +521,7 @@ void ui_menu_swcustom_filter::custom_render(void *selectedref, float top, float // get the size of the text mui.draw_text_full(container, _("Select custom filters:"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += (2.0f * UI_BOX_LR_BORDER) + 0.01f; float maxwidth = MAX(width, origx2 - origx1); @@ -541,7 +541,7 @@ void ui_menu_swcustom_filter::custom_render(void *selectedref, float top, float // draw the text within it mui.draw_text_full(container, _("Select custom filters:"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- @@ -577,4 +577,3 @@ void ui_menu_swcustom_filter::save_sw_custom_filters() file.close(); } } - diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp index 6492faebabf..55f2e40afbb 100644 --- a/src/emu/ui/custui.cpp +++ b/src/emu/ui/custui.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* @@ -16,10 +16,10 @@ #include "ui/utils.h" #include <algorithm> -const char *ui_menu_custom_ui::hide_status[] = { - __("Show All"), - __("Hide Filters"), - __("Hide Info/Image"), +const char *ui_menu_custom_ui::hide_status[] = { + __("Show All"), + __("Hide Filters"), + __("Hide Info/Image"), __("Hide Both") }; //------------------------------------------------- @@ -63,7 +63,7 @@ ui_menu_custom_ui::~ui_menu_custom_ui() ui_globals::reset = true; } -//------------------------------------------------- +//------------------------------------------------- // handle //------------------------------------------------- @@ -160,7 +160,7 @@ void ui_menu_custom_ui::custom_render(void *selectedref, float top, float bottom ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Custom UI Settings"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -180,7 +180,7 @@ void ui_menu_custom_ui::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, _("Custom UI Settings"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- @@ -406,7 +406,7 @@ void ui_menu_font_ui::custom_render(void *selectedref, float top, float bottom, std::string topbuf(_("UI Fonts Settings")); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -426,14 +426,14 @@ void ui_menu_font_ui::custom_render(void *selectedref, float top, float bottom, // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); if ((FPTR)selectedref == INFOS_SIZE) { topbuf = _("Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr, m_info_size); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr, m_info_size); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(origx2 - origx1, width); @@ -453,7 +453,7 @@ void ui_menu_font_ui::custom_render(void *selectedref, float top, float bottom, // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_LEFT, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, m_info_size); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, m_info_size); } } @@ -565,7 +565,7 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom std::string topbuf(_("UI Colors Settings")); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -585,7 +585,7 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // bottom text // get the text for 'UI Select' @@ -593,7 +593,7 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom topbuf.assign(_("Double click or press ")).append(ui_select_text.c_str()).append(_(" to change the color value")); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -613,13 +613,13 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // compute maxwidth topbuf = _("Menu Preview"); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); maxwidth = width + 2.0f * UI_BOX_LR_BORDER; std::string sampletxt[5]; @@ -633,7 +633,7 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom for (auto & elem: sampletxt) { mui.draw_text_full(container, elem.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); } @@ -655,7 +655,7 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // compute our bounds for menu preview x1 -= UI_BOX_LR_BORDER; @@ -673,29 +673,29 @@ void ui_menu_colors_ui::custom_render(void *selectedref, float top, float bottom // draw normal text mui.draw_text_full(container, sampletxt[0].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, m_color_table[MUI_TEXT_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); + DRAW_NORMAL, m_color_table[MUI_TEXT_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); y1 += line_height; // draw subitem text mui.draw_text_full(container, sampletxt[1].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, m_color_table[MUI_SUBITEM_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); + DRAW_NORMAL, m_color_table[MUI_SUBITEM_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); y1 += line_height; // draw selected text highlight(container, x1, y1, x2, y1 + line_height, m_color_table[MUI_SELECTED_BG_COLOR].color); mui.draw_text_full(container, sampletxt[2].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, m_color_table[MUI_SELECTED_COLOR].color, m_color_table[MUI_SELECTED_BG_COLOR].color, nullptr, nullptr); + DRAW_NORMAL, m_color_table[MUI_SELECTED_COLOR].color, m_color_table[MUI_SELECTED_BG_COLOR].color, nullptr, nullptr); y1 += line_height; // draw mouse over text highlight(container, x1, y1, x2, y1 + line_height, m_color_table[MUI_MOUSEOVER_BG_COLOR].color); mui.draw_text_full(container, sampletxt[3].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, m_color_table[MUI_MOUSEOVER_COLOR].color, m_color_table[MUI_MOUSEOVER_BG_COLOR].color, nullptr, nullptr); + DRAW_NORMAL, m_color_table[MUI_MOUSEOVER_COLOR].color, m_color_table[MUI_MOUSEOVER_BG_COLOR].color, nullptr, nullptr); y1 += line_height; // draw clone text mui.draw_text_full(container, sampletxt[4].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, m_color_table[MUI_CLONE_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); + DRAW_NORMAL, m_color_table[MUI_CLONE_COLOR].color, m_color_table[MUI_TEXT_BG_COLOR].color, nullptr, nullptr); } @@ -912,7 +912,7 @@ void ui_menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, f // top text std::string topbuf = std::string(m_title).append(_(" - ARGB Settings")); mui.draw_text_full(container, topbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -932,12 +932,12 @@ void ui_menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, f // draw the text within it mui.draw_text_full(container, topbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); std::string sampletxt(_("Color preview =")); maxwidth = origx2 - origx1; mui.draw_text_full(container, sampletxt.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -957,7 +957,7 @@ void ui_menu_rgb_ui::custom_render(void *selectedref, float top, float bottom, f // draw the normal text mui.draw_text_full(container, sampletxt.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr); + DRAW_NORMAL, ARGB_WHITE, ARGB_BLACK, nullptr, nullptr); float t_x2 = x1 - UI_BOX_LR_BORDER + maxwidth; x1 = x2 + 2.0f * UI_BOX_LR_BORDER; @@ -1046,7 +1046,7 @@ ui_menu_palette_sel::palcolor ui_menu_palette_sel::m_palette[] = { // ctor //------------------------------------------------- -ui_menu_palette_sel::ui_menu_palette_sel(running_machine &machine, render_container *container, rgb_t &_color) +ui_menu_palette_sel::ui_menu_palette_sel(running_machine &machine, render_container *container, rgb_t &_color) : ui_menu(machine, container), m_original(_color) { } diff --git a/src/emu/ui/custui.h b/src/emu/ui/custui.h index 0a2caf8de8c..2ff13994cb6 100644 --- a/src/emu/ui/custui.h +++ b/src/emu/ui/custui.h @@ -68,9 +68,9 @@ private: }; #ifdef UI_WINDOWS - UINT16 m_actual; - std::vector<std::string> m_fonts; - bool m_bold, m_italic; + UINT16 m_actual; + std::vector<std::string> m_fonts; + bool m_bold, m_italic; void list(); static int CALLBACK EnumFontFamiliesExProc(const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, DWORD FontType, LPARAM lParam); diff --git a/src/emu/ui/datfile.cpp b/src/emu/ui/datfile.cpp index 9171242d072..7a5ebb57e6f 100644 --- a/src/emu/ui/datfile.cpp +++ b/src/emu/ui/datfile.cpp @@ -25,7 +25,7 @@ static std::string TAG_COMMAND("$cmd"); static std::string TAG_END("$end"); static std::string TAG_DRIVER("$drv"); static std::string TAG_STORY("$story"); -static std::string TAG_HISTORY_R("## REVISION:"); +static std::string TAG_HISTORY_R("## REVISION:"); static std::string TAG_MAMEINFO_R("# MAMEINFO.DAT"); static std::string TAG_MESSINFO_R("# MESSINFO.DAT"); static std::string TAG_SYSINFO_R("# This file was generated on"); @@ -540,7 +540,7 @@ int datfile_manager::index_datafile(dataindex &index, int &swcount) } //--------------------------------------------------------- -// parseopen - Open up file for reading +// parseopen - Open up file for reading //--------------------------------------------------------- bool datfile_manager::parseopen(const char *filename) { @@ -647,4 +647,4 @@ void datfile_manager::command_sub_menu(const game_driver *drv, std::vector<std:: menuitems.push_back(elem.first); parseclose(); } -}
\ No newline at end of file +} diff --git a/src/emu/ui/datfile.h b/src/emu/ui/datfile.h index 8002a26daf4..66d76d17501 100644 --- a/src/emu/ui/datfile.h +++ b/src/emu/ui/datfile.h @@ -38,7 +38,7 @@ public: std::string rev_messinfo() const { return m_mess_rev; } std::string rev_sysinfo() const { return m_sysinfo_rev; } std::string rev_storyinfo() const { return m_story_rev; } - + bool has_history(const game_driver *driver) { return (m_histidx.find(driver) != m_histidx.end()); } bool has_mameinfo(const game_driver *driver) { return (m_mameidx.find(driver) != m_mameidx.end()); } bool has_messinfo(const game_driver *driver) { return (m_messidx.find(driver) != m_messidx.end()); } @@ -46,8 +46,8 @@ public: bool has_sysinfo(const game_driver *driver) { return (m_sysidx.find(driver) != m_sysidx.end()); } bool has_story(const game_driver *driver) { return (m_storyidx.find(driver) != m_storyidx.end()); } - bool has_data(const game_driver *d) - { + bool has_data(const game_driver *d) + { return (has_history(d) || has_mameinfo(d) || has_messinfo(d) || has_command(d) || has_sysinfo(d) || has_story(d)); } private: @@ -84,8 +84,8 @@ private: running_machine &m_machine; // reference to our machine std::string m_fullpath; static std::string m_history_rev, m_mame_rev, m_mess_rev, m_sysinfo_rev, m_story_rev; - FILE *fp = nullptr; - static bool first_run; + FILE *fp = nullptr; + static bool first_run; }; diff --git a/src/emu/ui/datmenu.cpp b/src/emu/ui/datmenu.cpp index ba8dde22bad..a86c7eee5ed 100644 --- a/src/emu/ui/datmenu.cpp +++ b/src/emu/ui/datmenu.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* @@ -198,7 +198,7 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom std::string revision; revision.assign(_("Revision: ")).append(m_items_list[actual].revision); mui.draw_text_full(container, revision.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(origx2 - origx1, width); @@ -218,7 +218,7 @@ void ui_menu_dats_view::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, revision.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- @@ -300,4 +300,3 @@ void ui_menu_dats_view::init_items() if (datfile.has_command(m_driver)) m_items_list.emplace_back(_("Command"), UI_COMMAND_LOAD, ""); } - diff --git a/src/emu/ui/datmenu.h b/src/emu/ui/datmenu.h index f799e5fa7d0..0d2ae7d686d 100644 --- a/src/emu/ui/datmenu.h +++ b/src/emu/ui/datmenu.h @@ -31,7 +31,7 @@ public: virtual void custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) override; private: - int actual; + int actual; const game_driver *m_driver; ui_software_info *m_swinfo; std::string m_list, m_short, m_long, m_parent; @@ -43,7 +43,7 @@ private: { list_items(std::string l, int i, std::string rev) { label = l; option = i; revision = rev; } std::string label; - int option; + int option; std::string revision; }; std::vector<list_items> m_items_list; diff --git a/src/emu/ui/dirmenu.cpp b/src/emu/ui/dirmenu.cpp index f1cc16bae0b..30a992f2363 100644 --- a/src/emu/ui/dirmenu.cpp +++ b/src/emu/ui/dirmenu.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* @@ -28,33 +28,33 @@ struct folders_entry static const folders_entry s_folders[] = { - { __("ROMs"), OPTION_MEDIAPATH, ADDING }, - { __("UI"), OPTION_UI_PATH, CHANGE }, - { __("Language"), OPTION_LANGUAGEPATH, CHANGE }, - { __("Samples"), OPTION_SAMPLEPATH, ADDING }, - { __("DATs"), OPTION_HISTORY_PATH, CHANGE }, - { __("INIs"), OPTION_INIPATH, ADDING }, - { __("Extra INIs"), OPTION_EXTRAINI_PATH, CHANGE }, - { __("Icons"), OPTION_ICONS_PATH, ADDING }, - { __("Cheats"), OPTION_CHEATPATH, ADDING }, - { __("Snapshots"), OPTION_SNAPSHOT_DIRECTORY, ADDING }, - { __("Cabinets"), OPTION_CABINETS_PATH, ADDING }, - { __("Flyers"), OPTION_FLYERS_PATH, ADDING }, - { __("Titles"), OPTION_TITLES_PATH, ADDING }, - { __("Ends"), OPTION_ENDS_PATH, ADDING }, - { __("PCBs"), OPTION_PCBS_PATH, ADDING }, - { __("Marquees"), OPTION_MARQUEES_PATH, ADDING }, - { __("Controls Panels"), OPTION_CPANELS_PATH, ADDING }, - { __("Crosshairs"), OPTION_CROSSHAIRPATH, ADDING }, - { __("Artworks"), OPTION_ARTPATH, ADDING }, - { __("Bosses"), OPTION_BOSSES_PATH, ADDING }, - { __("Artworks Preview"), OPTION_ARTPREV_PATH, ADDING }, - { __("Select"), OPTION_SELECT_PATH, ADDING }, - { __("GameOver"), OPTION_GAMEOVER_PATH, ADDING }, - { __("HowTo"), OPTION_HOWTO_PATH, ADDING }, - { __("Logos"), OPTION_LOGOS_PATH, ADDING }, - { __("Scores"), OPTION_SCORES_PATH, ADDING }, - { __("Versus"), OPTION_VERSUS_PATH, ADDING }, + { __("ROMs"), OPTION_MEDIAPATH, ADDING }, + { __("UI"), OPTION_UI_PATH, CHANGE }, + { __("Language"), OPTION_LANGUAGEPATH, CHANGE }, + { __("Samples"), OPTION_SAMPLEPATH, ADDING }, + { __("DATs"), OPTION_HISTORY_PATH, CHANGE }, + { __("INIs"), OPTION_INIPATH, ADDING }, + { __("Extra INIs"), OPTION_EXTRAINI_PATH, CHANGE }, + { __("Icons"), OPTION_ICONS_PATH, ADDING }, + { __("Cheats"), OPTION_CHEATPATH, ADDING }, + { __("Snapshots"), OPTION_SNAPSHOT_DIRECTORY, ADDING }, + { __("Cabinets"), OPTION_CABINETS_PATH, ADDING }, + { __("Flyers"), OPTION_FLYERS_PATH, ADDING }, + { __("Titles"), OPTION_TITLES_PATH, ADDING }, + { __("Ends"), OPTION_ENDS_PATH, ADDING }, + { __("PCBs"), OPTION_PCBS_PATH, ADDING }, + { __("Marquees"), OPTION_MARQUEES_PATH, ADDING }, + { __("Controls Panels"), OPTION_CPANELS_PATH, ADDING }, + { __("Crosshairs"), OPTION_CROSSHAIRPATH, ADDING }, + { __("Artworks"), OPTION_ARTPATH, ADDING }, + { __("Bosses"), OPTION_BOSSES_PATH, ADDING }, + { __("Artworks Preview"), OPTION_ARTPREV_PATH, ADDING }, + { __("Select"), OPTION_SELECT_PATH, ADDING }, + { __("GameOver"), OPTION_GAMEOVER_PATH, ADDING }, + { __("HowTo"), OPTION_HOWTO_PATH, ADDING }, + { __("Logos"), OPTION_LOGOS_PATH, ADDING }, + { __("Scores"), OPTION_SCORES_PATH, ADDING }, + { __("Versus"), OPTION_VERSUS_PATH, ADDING }, }; @@ -94,7 +94,6 @@ void ui_menu_directory::handle() void ui_menu_directory::populate() { - for (auto & elem : s_folders) item_append(_(elem.name), nullptr, 0, (void *)(FPTR)elem.action); @@ -143,7 +142,7 @@ void ui_menu_directory::custom_render(void *selectedref, float top, float bottom // ctor / dtor //------------------------------------------------- -ui_menu_display_actual::ui_menu_display_actual(running_machine &machine, render_container *container, int ref) +ui_menu_display_actual::ui_menu_display_actual(running_machine &machine, render_container *container, int ref) : ui_menu(machine, container), m_ref(ref) { } @@ -238,7 +237,7 @@ void ui_menu_display_actual::custom_render(void *selectedref, float top, float b y1 += UI_BOX_TB_BORDER; // draw the text within it - mui.draw_text_full(container, m_tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, + mui.draw_text_full(container, m_tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // compute our bounds @@ -376,7 +375,7 @@ void ui_menu_add_change_folder::handle() { machine().ui().options().set_value(s_folders[m_ref].option, m_current_path.c_str(), OPTION_PRIORITY_CMDLINE, error_string); } - else + else { if (strcmp(machine().options().value(s_folders[m_ref].option), m_current_path.c_str()) != 0) { @@ -401,7 +400,7 @@ void ui_menu_add_change_folder::handle() { machine().ui().options().set_value(s_folders[m_ref].option, tmppath.c_str(), OPTION_PRIORITY_CMDLINE, error_string); } - else + else { if (strcmp(machine().options().value(s_folders[m_ref].option), tmppath.c_str()) != 0) { @@ -582,9 +581,9 @@ void ui_menu_add_change_folder::custom_render(void *selectedref, float top, floa ui_menu_remove_folder::ui_menu_remove_folder(running_machine &machine, render_container *container, int ref) : ui_menu(machine, container) { m_ref = ref; - if (machine.ui().options().exists(s_folders[m_ref].option)) + if (machine.ui().options().exists(s_folders[m_ref].option)) m_searchpath.assign(machine.ui().options().value(s_folders[m_ref].option)); - else + else m_searchpath.assign(machine.options().value(s_folders[m_ref].option)); path_iterator path(m_searchpath.c_str()); @@ -620,11 +619,11 @@ void ui_menu_remove_folder::handle() { machine().ui().options().set_value(s_folders[m_ref].option, tmppath.c_str(), OPTION_PRIORITY_CMDLINE, error_string); } - else + else { if (strcmp(machine().options().value(s_folders[m_ref].option),tmppath.c_str())!=0) { - machine().options().set_value(s_folders[m_ref].option, tmppath.c_str(), OPTION_PRIORITY_CMDLINE, error_string); + machine().options().set_value(s_folders[m_ref].option, tmppath.c_str(), OPTION_PRIORITY_CMDLINE, error_string); machine().options().mark_changed(s_folders[m_ref].option); } } @@ -679,6 +678,6 @@ void ui_menu_remove_folder::custom_render(void *selectedref, float top, float bo y1 += UI_BOX_TB_BORDER; // draw the text within it - mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NORMAL, + mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/dsplmenu.cpp b/src/emu/ui/dsplmenu.cpp index 93cf3771133..c93bdd960ca 100644 --- a/src/emu/ui/dsplmenu.cpp +++ b/src/emu/ui/dsplmenu.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /********************************************************************* @@ -23,10 +23,10 @@ ui_menu_display_options::video_modes ui_menu_display_options::m_video = { - { "auto", "Auto" }, - { "opengl", "OpenGL" }, - { "bgfx", "BGFX" }, - { "d3d", "Direct3D" }, + { "auto", "Auto" }, + { "opengl", "OpenGL" }, + { "bgfx", "BGFX" }, + { "d3d", "Direct3D" }, { "gdi", "GDI" }, { "ddraw", "DirectDraw" }, { "soft", "Software" }, @@ -107,20 +107,20 @@ ui_menu_display_options::ui_menu_display_options(running_machine &machine, rende ui_menu_display_options::~ui_menu_display_options() { std::string error_string; - for (int d = 2; d < ARRAY_LENGTH(m_options); ++d) + for (int d = 2; d < ARRAY_LENGTH(m_options); ++d) { if (machine().options().int_value(m_options[d].option) != m_options[d].status) { machine().options().set_value(m_options[d].option, m_options[d].status, OPTION_PRIORITY_CMDLINE, error_string); machine().options().mark_changed(m_options[d].option); - } + } } if (machine().options().value(m_options[1].option) != m_list[m_options[1].status]) { machine().options().set_value(m_options[1].option, m_list[m_options[1].status].c_str(), OPTION_PRIORITY_CMDLINE, error_string); machine().options().mark_changed(m_options[1].option); - } + } ui_globals::reset = true; } diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp index 1c92b43a4d6..0c7d7a1a01b 100644 --- a/src/emu/ui/inifile.cpp +++ b/src/emu/ui/inifile.cpp @@ -142,7 +142,7 @@ void inifile_manager::load_ini_category(std::vector<int> &temp_filter) } //--------------------------------------------------------- -// parseopen - Open up file for reading +// parseopen - Open up file for reading //--------------------------------------------------------- bool inifile_manager::parseopen(const char *filename) @@ -303,7 +303,7 @@ bool favorite_manager::isgame_favorite() image_loaded = true; for (size_t current = 0; current < m_list.size(); current++) if (m_list[current].shortname == swinfo->shortname() && - m_list[current].listname == image->software_list_name()) + m_list[current].listname == image->software_list_name()) { m_current = current; return true; diff --git a/src/emu/ui/inifile.h b/src/emu/ui/inifile.h index 5a90b0d3d83..5c9e7ebdc65 100644 --- a/src/emu/ui/inifile.h +++ b/src/emu/ui/inifile.h @@ -70,7 +70,7 @@ private: // internal state running_machine &m_machine; // reference to our machine std::string m_fullpath; - FILE *fp = nullptr; + FILE *fp = nullptr; }; //------------------------------------------------- @@ -108,7 +108,7 @@ public: private: const char *favorite_filename = "favorites.ini"; - + // current int m_current; diff --git a/src/emu/ui/mainmenu.cpp b/src/emu/ui/mainmenu.cpp index caf531c41ef..66381a3df1f 100644 --- a/src/emu/ui/mainmenu.cpp +++ b/src/emu/ui/mainmenu.cpp @@ -138,14 +138,14 @@ void ui_menu_main::populate() item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); /* add favorite menu */ - if (!machine().favorite().isgame_favorite()) + if (!machine().favorite().isgame_favorite()) item_append(_("Add To Favorites"), nullptr, 0, (void *)ADD_FAVORITE); else item_append(_("Remove From Favorites"), nullptr, 0, (void *)REMOVE_FAVORITE); item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr); -// item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME); +// item_append(_("Quit from Machine"), nullptr, 0, (void *)QUIT_GAME); /* add reset and exit menus */ item_append(_("Select New Machine"), nullptr, 0, (void *)SELECT_GAME); @@ -246,7 +246,7 @@ void ui_menu_main::handle() ui_menu::stack_push(global_alloc_clear<ui_simple_menu_select_game>(machine(), container, nullptr)); } else { ui_menu::stack_push(global_alloc_clear<ui_menu_select_game>(machine(), container, nullptr)); - } + } break; case BIOS_SELECTION: @@ -262,12 +262,12 @@ void ui_menu_main::handle() break; case ADD_FAVORITE: - machine().favorite().add_favorite_game(); + machine().favorite().add_favorite_game(); reset(UI_MENU_RESET_REMEMBER_POSITION); break; case REMOVE_FAVORITE: - machine().favorite().remove_favorite_game(); + machine().favorite().remove_favorite_game(); reset(UI_MENU_RESET_REMEMBER_POSITION); break; diff --git a/src/emu/ui/menu.cpp b/src/emu/ui/menu.cpp index 3803790c359..4772b39e6fd 100644 --- a/src/emu/ui/menu.cpp +++ b/src/emu/ui/menu.cpp @@ -2,9 +2,9 @@ // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods /********************************************************************* - ui/menu.c + ui/menu.c - Internal MAME menus for the user interface. + Internal MAME menus for the user interface. *********************************************************************/ @@ -27,7 +27,7 @@ /*************************************************************************** - CONSTANTS + CONSTANTS ***************************************************************************/ #define UI_MENU_POOL_SIZE 65536 @@ -68,7 +68,7 @@ static const char *hover_msg[] = { }; /*************************************************************************** - GLOBAL VARIABLES + GLOBAL VARIABLES ***************************************************************************/ ui_menu *ui_menu::menu_stack; @@ -93,7 +93,7 @@ bitmap_argb32 *ui_menu::toolbar_bitmap[UI_TOOLBAR_BUTTONS]; bitmap_argb32 *ui_menu::sw_toolbar_bitmap[UI_TOOLBAR_BUTTONS]; /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ //------------------------------------------------- @@ -126,7 +126,7 @@ inline bool ui_menu::exclusive_input_pressed(int key, int repeat) /*************************************************************************** - CORE SYSTEM MANAGEMENT + CORE SYSTEM MANAGEMENT ***************************************************************************/ //------------------------------------------------- @@ -193,7 +193,7 @@ void ui_menu::exit(running_machine &machine) /*************************************************************************** - CORE MENU MANAGEMENT + CORE MENU MANAGEMENT ***************************************************************************/ //------------------------------------------------- @@ -334,7 +334,7 @@ const ui_menu_event *ui_menu::process(UINT32 flags) menu_event.iptkey = IPT_INVALID; // first make sure our selection is valid -// if (!(flags & UI_MENU_PROCESS_NOINPUT)) +// if (!(flags & UI_MENU_PROCESS_NOINPUT)) validate_selection(1); // draw the menu @@ -451,7 +451,7 @@ void ui_menu::set_selection(void *selected_itemref) /*************************************************************************** - INTERNAL MENU PROCESSING + INTERNAL MENU PROCESSING ***************************************************************************/ //------------------------------------------------- @@ -713,7 +713,7 @@ void ui_menu::draw(bool customonly, bool noimage, bool noinput) // compute the multi-line target width/height machine().ui().draw_text_full(container, pitem.subtext, 0, 0, visible_width * 0.75f, - JUSTIFY_RIGHT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); + JUSTIFY_RIGHT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); // determine the target location target_x = visible_left + visible_width - target_width - UI_BOX_LR_BORDER; @@ -725,8 +725,8 @@ void ui_menu::draw(bool customonly, bool noimage, bool noinput) machine().ui().draw_outlined_box(container, target_x - UI_BOX_LR_BORDER, target_y - UI_BOX_TB_BORDER, target_x + target_width + UI_BOX_LR_BORDER, - target_y + target_height + UI_BOX_TB_BORDER, - subitem_invert ? UI_SELECTED_BG_COLOR : UI_BACKGROUND_COLOR); + target_y + target_height + UI_BOX_TB_BORDER, + subitem_invert ? UI_SELECTED_BG_COLOR : UI_BACKGROUND_COLOR); machine().ui().draw_text_full(container, pitem.subtext, target_x, target_y, target_width, JUSTIFY_RIGHT, WRAP_WORD, DRAW_NORMAL, UI_SELECTED_COLOR, UI_SELECTED_BG_COLOR, nullptr, nullptr); } @@ -736,8 +736,8 @@ void ui_menu::draw(bool customonly, bool noimage, bool noinput) // return the number of visible lines, minus 1 for top arrow and 1 for bottom arrow visitems = visible_lines - (top_line != 0) - (top_line + visible_lines != item.size()); -// if (history_flag && (top_line + visible_lines >= item.size())) -// selected = item.size() - 1; +// if (history_flag && (top_line + visible_lines >= item.size())) +// selected = item.size() - 1; } void ui_menu::custom_render(void *selectedref, float top, float bottom, float x, float y, float x2, float y2) @@ -762,7 +762,7 @@ void ui_menu::draw_text_box() // compute the multi-line target width/height machine().ui().draw_text_full(container, text, 0, 0, 1.0f - 2.0f * UI_BOX_LR_BORDER - 2.0f * gutter_width, - JUSTIFY_LEFT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); + JUSTIFY_LEFT, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); target_height += 2.0f * line_height; if (target_height > 1.0f - 2.0f * UI_BOX_TB_BORDER) target_height = floorf((1.0f - 2.0f * UI_BOX_TB_BORDER) / line_height) * line_height; @@ -787,20 +787,20 @@ void ui_menu::draw_text_box() // add a box around that machine().ui().draw_outlined_box(container, target_x - UI_BOX_LR_BORDER - gutter_width, - target_y - UI_BOX_TB_BORDER, - target_x + target_width + gutter_width + UI_BOX_LR_BORDER, - target_y + target_height + UI_BOX_TB_BORDER, - (item[0].flags & MENU_FLAG_REDTEXT) ? UI_RED_COLOR : UI_BACKGROUND_COLOR); + target_y - UI_BOX_TB_BORDER, + target_x + target_width + gutter_width + UI_BOX_LR_BORDER, + target_y + target_height + UI_BOX_TB_BORDER, + (item[0].flags & MENU_FLAG_REDTEXT) ? UI_RED_COLOR : UI_BACKGROUND_COLOR); machine().ui().draw_text_full(container, text, target_x, target_y, target_width, JUSTIFY_LEFT, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // draw the "return to prior menu" text with a hilight behind it highlight(container, - target_x + 0.5f * UI_LINE_WIDTH, - target_y + target_height - line_height, - target_x + target_width - 0.5f * UI_LINE_WIDTH, - target_y + target_height, - UI_SELECTED_BG_COLOR); + target_x + 0.5f * UI_LINE_WIDTH, + target_y + target_height - line_height, + target_x + target_width - 0.5f * UI_LINE_WIDTH, + target_y + target_height, + UI_SELECTED_BG_COLOR); machine().ui().draw_text_full(container, backtext, target_x, target_y + target_height - line_height, target_width, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_SELECTED_COLOR, UI_SELECTED_BG_COLOR, nullptr, nullptr); @@ -1097,7 +1097,7 @@ void ui_menu::clear_free_list(running_machine &machine) /*************************************************************************** - MENU STACK MANAGEMENT + MENU STACK MANAGEMENT ***************************************************************************/ //------------------------------------------------- @@ -1167,7 +1167,7 @@ void ui_menu::do_handle() /*************************************************************************** - UI SYSTEM INTERACTION + UI SYSTEM INTERACTION ***************************************************************************/ //------------------------------------------------- @@ -1196,7 +1196,7 @@ UINT32 ui_menu::ui_handler(running_machine &machine, render_container *container } /*************************************************************************** - MENU HELPERS + MENU HELPERS ***************************************************************************/ //------------------------------------------------- @@ -1848,7 +1848,7 @@ void ui_menu::handle_main_keys(UINT32 flags) if (menu_event.iptkey == IPT_INVALID) for (int code = IPT_UI_FIRST + 1; code < IPT_UI_LAST; code++) { - if (ui_error || code == IPT_UI_CONFIGURE || (code == IPT_UI_LEFT && ignoreleft) || (code == IPT_UI_RIGHT && ignoreright) || (code == IPT_UI_PAUSE && ignorepause)) + if (ui_error || code == IPT_UI_CONFIGURE || (code == IPT_UI_LEFT && ignoreleft) || (code == IPT_UI_RIGHT && ignoreright) || (code == IPT_UI_PAUSE && ignorepause)) continue; if (exclusive_input_pressed(code, 0)) @@ -2768,4 +2768,4 @@ void ui_menu::draw_dats_menu() // return the number of visible lines, minus 1 for top arrow and 1 for bottom arrow visitems = visible_lines - (top_line != 0) - (top_line + visible_lines != visible_items); -}
\ No newline at end of file +} diff --git a/src/emu/ui/menu.h b/src/emu/ui/menu.h index d5f5e8a33e6..a19cb0b23dc 100644 --- a/src/emu/ui/menu.h +++ b/src/emu/ui/menu.h @@ -2,9 +2,9 @@ // copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods /*************************************************************************** - ui/menu.h + ui/menu.h - Internal MAME menus for the user interface. + Internal MAME menus for the user interface. ***************************************************************************/ @@ -17,7 +17,7 @@ /*************************************************************************** - CONSTANTS + CONSTANTS ***************************************************************************/ // flags for menu items @@ -55,7 +55,7 @@ enum ui_menu_reset_options /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ // menu-related events @@ -255,7 +255,7 @@ protected: static render_texture *hilight_main_texture; private: static std::unique_ptr<bitmap_argb32> no_avail_bitmap, bgrnd_bitmap, star_bitmap; -// static std::unique_ptr<bitmap_rgb32> hilight_main_bitmap; +// static std::unique_ptr<bitmap_rgb32> hilight_main_bitmap; static render_texture *bgrnd_texture, *star_texture; static bitmap_argb32 *icons_bitmap[]; static render_texture *icons_texture[]; diff --git a/src/emu/ui/miscmenu.cpp b/src/emu/ui/miscmenu.cpp index 5d232729bd2..cd99d0b6820 100644 --- a/src/emu/ui/miscmenu.cpp +++ b/src/emu/ui/miscmenu.cpp @@ -651,7 +651,7 @@ void ui_menu_misc_options::custom_render(void *selectedref, float top, float bot ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Miscellaneous Options"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -671,5 +671,5 @@ void ui_menu_misc_options::custom_render(void *selectedref, float top, float bot // draw the text within it mui.draw_text_full(container, _("Miscellaneous Options"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/moptions.cpp b/src/emu/ui/moptions.cpp index 63c51d26438..4ab64fb38f7 100644 --- a/src/emu/ui/moptions.cpp +++ b/src/emu/ui/moptions.cpp @@ -19,61 +19,61 @@ const options_entry ui_options::s_option_entries[] = { // seach path options - { nullptr, nullptr, OPTION_HEADER, "UI SEARCH PATH OPTIONS" }, - { OPTION_HISTORY_PATH, "history;dats;.", OPTION_STRING, "path to history files" }, - { OPTION_EXTRAINI_PATH, "folders", OPTION_STRING, "path to extra ini files" }, - { OPTION_CABINETS_PATH, "cabinets;cabdevs", OPTION_STRING, "path to cabinets / devices image" }, - { OPTION_CPANELS_PATH, "cpanel", OPTION_STRING, "path to control panel image" }, - { OPTION_PCBS_PATH, "pcb", OPTION_STRING, "path to pcbs image" }, - { OPTION_FLYERS_PATH, "flyers", OPTION_STRING, "path to flyers image" }, - { OPTION_TITLES_PATH, "titles", OPTION_STRING, "path to titles image" }, - { OPTION_ENDS_PATH, "ends", OPTION_STRING, "path to ends image" }, - { OPTION_MARQUEES_PATH, "marquees", OPTION_STRING, "path to marquees image" }, - { OPTION_ARTPREV_PATH, "artwork preview", OPTION_STRING, "path to artwork preview image" }, - { OPTION_BOSSES_PATH, "bosses", OPTION_STRING, "path to bosses image" }, - { OPTION_LOGOS_PATH, "logo", OPTION_STRING, "path to logos image" }, - { OPTION_SCORES_PATH, "scores", OPTION_STRING, "path to scores image" }, - { OPTION_VERSUS_PATH, "versus", OPTION_STRING, "path to versus image" }, - { OPTION_GAMEOVER_PATH, "gameover", OPTION_STRING, "path to gameover image" }, - { OPTION_HOWTO_PATH, "howto", OPTION_STRING, "path to howto image" }, - { OPTION_SELECT_PATH, "select", OPTION_STRING, "path to select image" }, - { OPTION_ICONS_PATH, "icons", OPTION_STRING, "path to ICOns image" }, - { OPTION_UI_PATH, "ui", OPTION_STRING, "path to UI files" }, + { nullptr, nullptr, OPTION_HEADER, "UI SEARCH PATH OPTIONS" }, + { OPTION_HISTORY_PATH, "history;dats;.", OPTION_STRING, "path to history files" }, + { OPTION_EXTRAINI_PATH, "folders", OPTION_STRING, "path to extra ini files" }, + { OPTION_CABINETS_PATH, "cabinets;cabdevs", OPTION_STRING, "path to cabinets / devices image" }, + { OPTION_CPANELS_PATH, "cpanel", OPTION_STRING, "path to control panel image" }, + { OPTION_PCBS_PATH, "pcb", OPTION_STRING, "path to pcbs image" }, + { OPTION_FLYERS_PATH, "flyers", OPTION_STRING, "path to flyers image" }, + { OPTION_TITLES_PATH, "titles", OPTION_STRING, "path to titles image" }, + { OPTION_ENDS_PATH, "ends", OPTION_STRING, "path to ends image" }, + { OPTION_MARQUEES_PATH, "marquees", OPTION_STRING, "path to marquees image" }, + { OPTION_ARTPREV_PATH, "artwork preview", OPTION_STRING, "path to artwork preview image" }, + { OPTION_BOSSES_PATH, "bosses", OPTION_STRING, "path to bosses image" }, + { OPTION_LOGOS_PATH, "logo", OPTION_STRING, "path to logos image" }, + { OPTION_SCORES_PATH, "scores", OPTION_STRING, "path to scores image" }, + { OPTION_VERSUS_PATH, "versus", OPTION_STRING, "path to versus image" }, + { OPTION_GAMEOVER_PATH, "gameover", OPTION_STRING, "path to gameover image" }, + { OPTION_HOWTO_PATH, "howto", OPTION_STRING, "path to howto image" }, + { OPTION_SELECT_PATH, "select", OPTION_STRING, "path to select image" }, + { OPTION_ICONS_PATH, "icons", OPTION_STRING, "path to ICOns image" }, + { OPTION_UI_PATH, "ui", OPTION_STRING, "path to UI files" }, // misc options - { nullptr, nullptr, OPTION_HEADER, "UI MISC OPTIONS" }, - { OPTION_DATS_ENABLED, "1", OPTION_BOOLEAN, "enable DATs support" }, - { OPTION_REMEMBER_LAST, "1", OPTION_BOOLEAN, "reselect in main menu last played game" }, - { OPTION_ENLARGE_SNAPS, "1", OPTION_BOOLEAN, "enlarge arts (snapshot, title, etc...) in right panel (keeping aspect ratio)" }, - { OPTION_FORCED4X3, "1", OPTION_BOOLEAN, "force the appearance of the snapshot in the list software to 4:3" }, - { OPTION_USE_BACKGROUND, "1", OPTION_BOOLEAN, "enable background image in main view" }, - { OPTION_SKIP_BIOS_MENU, "0", OPTION_BOOLEAN, "skip bios submenu, start with configured or default" }, - { OPTION_SKIP_PARTS_MENU, "0", OPTION_BOOLEAN, "skip parts submenu, start with first part" }, - { OPTION_LAST_USED_FILTER, "", OPTION_STRING, "latest used filter" }, - { OPTION_LAST_USED_MACHINE, "", OPTION_STRING, "latest used machine" }, - { OPTION_INFO_AUTO_AUDIT, "0", OPTION_BOOLEAN, "enable auto audit in the general info panel" }, + { nullptr, nullptr, OPTION_HEADER, "UI MISC OPTIONS" }, + { OPTION_DATS_ENABLED, "1", OPTION_BOOLEAN, "enable DATs support" }, + { OPTION_REMEMBER_LAST, "1", OPTION_BOOLEAN, "reselect in main menu last played game" }, + { OPTION_ENLARGE_SNAPS, "1", OPTION_BOOLEAN, "enlarge arts (snapshot, title, etc...) in right panel (keeping aspect ratio)" }, + { OPTION_FORCED4X3, "1", OPTION_BOOLEAN, "force the appearance of the snapshot in the list software to 4:3" }, + { OPTION_USE_BACKGROUND, "1", OPTION_BOOLEAN, "enable background image in main view" }, + { OPTION_SKIP_BIOS_MENU, "0", OPTION_BOOLEAN, "skip bios submenu, start with configured or default" }, + { OPTION_SKIP_PARTS_MENU, "0", OPTION_BOOLEAN, "skip parts submenu, start with first part" }, + { OPTION_LAST_USED_FILTER, "", OPTION_STRING, "latest used filter" }, + { OPTION_LAST_USED_MACHINE, "", OPTION_STRING, "latest used machine" }, + { OPTION_INFO_AUTO_AUDIT, "0", OPTION_BOOLEAN, "enable auto audit in the general info panel" }, // UI options - { nullptr, nullptr, OPTION_HEADER, "UI OPTIONS" }, - { OPTION_INFOS_SIZE "(0.05-1.00)", "0.75", OPTION_FLOAT, "UI right panel infos text size (0.05 - 1.00)" }, - { OPTION_FONT_ROWS "(25-40)", "30", OPTION_INTEGER, "UI font text size (25 - 40)" }, - { OPTION_HIDE_PANELS "(0-3)", "0", OPTION_INTEGER, "UI hide left/right panel in main view (0 = Show all, 1 = hide left, 2 = hide right, 3 = hide both" }, - { OPTION_UI_BORDER_COLOR, "ffffffff", OPTION_STRING, "UI border color (ARGB)" }, - { OPTION_UI_BACKGROUND_COLOR, "ef101030", OPTION_STRING, "UI background color (ARGB)" }, - { OPTION_UI_CLONE_COLOR, "ff808080", OPTION_STRING, "UI clone color (ARGB)" }, - { OPTION_UI_DIPSW_COLOR, "ffffff00", OPTION_STRING, "UI dipswitch color (ARGB)" }, - { OPTION_UI_GFXVIEWER_BG_COLOR, "ef101030", OPTION_STRING, "UI gfx viewer color (ARGB)" }, - { OPTION_UI_MOUSEDOWN_BG_COLOR, "b0606000", OPTION_STRING, "UI mouse down bg color (ARGB)" }, - { OPTION_UI_MOUSEDOWN_COLOR, "ffffff80", OPTION_STRING, "UI mouse down color (ARGB)" }, - { OPTION_UI_MOUSEOVER_BG_COLOR, "70404000", OPTION_STRING, "UI mouse over bg color (ARGB)" }, - { OPTION_UI_MOUSEOVER_COLOR, "ffffff80", OPTION_STRING, "UI mouse over color (ARGB)" }, - { OPTION_UI_SELECTED_BG_COLOR, "ef808000", OPTION_STRING, "UI selected bg color (ARGB)" }, - { OPTION_UI_SELECTED_COLOR, "ffffff00", OPTION_STRING, "UI selected color (ARGB)" }, - { OPTION_UI_SLIDER_COLOR, "ffffffff", OPTION_STRING, "UI slider color (ARGB)" }, - { OPTION_UI_SUBITEM_COLOR, "ffffffff", OPTION_STRING, "UI subitem color (ARGB)" }, - { OPTION_UI_TEXT_BG_COLOR, "ef000000", OPTION_STRING, "UI text bg color (ARGB)" }, - { OPTION_UI_TEXT_COLOR, "ffffffff", OPTION_STRING, "UI text color (ARGB)" }, - { OPTION_UI_UNAVAILABLE_COLOR, "ff404040", OPTION_STRING, "UI unavailable color (ARGB)" }, + { nullptr, nullptr, OPTION_HEADER, "UI OPTIONS" }, + { OPTION_INFOS_SIZE "(0.05-1.00)", "0.75", OPTION_FLOAT, "UI right panel infos text size (0.05 - 1.00)" }, + { OPTION_FONT_ROWS "(25-40)", "30", OPTION_INTEGER, "UI font text size (25 - 40)" }, + { OPTION_HIDE_PANELS "(0-3)", "0", OPTION_INTEGER, "UI hide left/right panel in main view (0 = Show all, 1 = hide left, 2 = hide right, 3 = hide both" }, + { OPTION_UI_BORDER_COLOR, "ffffffff", OPTION_STRING, "UI border color (ARGB)" }, + { OPTION_UI_BACKGROUND_COLOR, "ef101030", OPTION_STRING, "UI background color (ARGB)" }, + { OPTION_UI_CLONE_COLOR, "ff808080", OPTION_STRING, "UI clone color (ARGB)" }, + { OPTION_UI_DIPSW_COLOR, "ffffff00", OPTION_STRING, "UI dipswitch color (ARGB)" }, + { OPTION_UI_GFXVIEWER_BG_COLOR, "ef101030", OPTION_STRING, "UI gfx viewer color (ARGB)" }, + { OPTION_UI_MOUSEDOWN_BG_COLOR, "b0606000", OPTION_STRING, "UI mouse down bg color (ARGB)" }, + { OPTION_UI_MOUSEDOWN_COLOR, "ffffff80", OPTION_STRING, "UI mouse down color (ARGB)" }, + { OPTION_UI_MOUSEOVER_BG_COLOR, "70404000", OPTION_STRING, "UI mouse over bg color (ARGB)" }, + { OPTION_UI_MOUSEOVER_COLOR, "ffffff80", OPTION_STRING, "UI mouse over color (ARGB)" }, + { OPTION_UI_SELECTED_BG_COLOR, "ef808000", OPTION_STRING, "UI selected bg color (ARGB)" }, + { OPTION_UI_SELECTED_COLOR, "ffffff00", OPTION_STRING, "UI selected color (ARGB)" }, + { OPTION_UI_SLIDER_COLOR, "ffffffff", OPTION_STRING, "UI slider color (ARGB)" }, + { OPTION_UI_SUBITEM_COLOR, "ffffffff", OPTION_STRING, "UI subitem color (ARGB)" }, + { OPTION_UI_TEXT_BG_COLOR, "ef000000", OPTION_STRING, "UI text bg color (ARGB)" }, + { OPTION_UI_TEXT_COLOR, "ffffffff", OPTION_STRING, "UI text color (ARGB)" }, + { OPTION_UI_UNAVAILABLE_COLOR, "ff404040", OPTION_STRING, "UI unavailable color (ARGB)" }, { nullptr } }; diff --git a/src/emu/ui/optsmenu.cpp b/src/emu/ui/optsmenu.cpp index 54e269bf4ed..29ada94b08e 100644 --- a/src/emu/ui/optsmenu.cpp +++ b/src/emu/ui/optsmenu.cpp @@ -52,8 +52,8 @@ void ui_menu_game_options::handle() bool changed = false; // process the menu -// ui_menu::menu_stack->parent->process(UI_MENU_PROCESS_NOINPUT); -// const ui_menu_event *m_event = process(UI_MENU_PROCESS_LR_REPEAT | UI_MENU_PROCESS_NOIMAGE); +// ui_menu::menu_stack->parent->process(UI_MENU_PROCESS_NOINPUT); +// const ui_menu_event *m_event = process(UI_MENU_PROCESS_LR_REPEAT | UI_MENU_PROCESS_NOIMAGE); const ui_menu_event *m_event = process(UI_MENU_PROCESS_LR_REPEAT); if (m_event != nullptr && m_event->itemref != nullptr) @@ -191,8 +191,8 @@ void ui_menu_game_options::handle() void ui_menu_game_options::populate() { - if (strcmp(machine().options().ui(),"simple")!=0) - { + if (strcmp(machine().options().ui(),"simple")!=0) + { // set filter arrow std::string fbuff; @@ -265,7 +265,7 @@ void ui_menu_game_options::custom_render(void *selectedref, float top, float bot float width; ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Settings"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -285,7 +285,7 @@ void ui_menu_game_options::custom_render(void *selectedref, float top, float bot // draw the text within it mui.draw_text_full(container, _("Settings"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- diff --git a/src/emu/ui/selector.cpp b/src/emu/ui/selector.cpp index f4c94e6bc2d..ae786dd1834 100644 --- a/src/emu/ui/selector.cpp +++ b/src/emu/ui/selector.cpp @@ -18,7 +18,7 @@ // ctor / dtor //------------------------------------------------- -ui_menu_selector::ui_menu_selector(running_machine &machine, render_container *container, std::vector<std::string> s_sel, UINT16 &s_actual, int category, int _hover) +ui_menu_selector::ui_menu_selector(running_machine &machine, render_container *container, std::vector<std::string> s_sel, UINT16 &s_actual, int category, int _hover) : ui_menu(machine, container), m_selector(s_actual) { m_category = category; @@ -152,7 +152,7 @@ void ui_menu_selector::custom_render(void *selectedref, float top, float bottom, std::string tempbuf = std::string(_("Selection List - Search: ")).append(m_search).append("_"); // get the size of the text - mui.draw_text_full(container, tempbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, + mui.draw_text_full(container, tempbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += (2.0f * UI_BOX_LR_BORDER) + 0.01f; float maxwidth = MAX(width, origx2 - origx1); @@ -172,7 +172,7 @@ void ui_menu_selector::custom_render(void *selectedref, float top, float bottom, y1 += UI_BOX_TB_BORDER; // draw the text within it - mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, + mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); // bottom text @@ -180,7 +180,7 @@ void ui_menu_selector::custom_render(void *selectedref, float top, float bottom, std::string ui_select_text = machine().input().seq_name(machine().ioport().type_seq(IPT_UI_SELECT, 0, SEQ_TYPE_STANDARD)); tempbuf.assign(_("Double click or press ")).append(ui_select_text).append(_(" to select")); - mui.draw_text_full(container, tempbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, + mui.draw_text_full(container, tempbuf.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -200,7 +200,7 @@ void ui_menu_selector::custom_render(void *selectedref, float top, float bottom, y1 += UI_BOX_TB_BORDER; // draw the text within it - mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, + mui.draw_text_full(container, tempbuf.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp index e950c96b1b9..8aebd63772b 100644 --- a/src/emu/ui/selgame.cpp +++ b/src/emu/ui/selgame.cpp @@ -131,7 +131,7 @@ void save_main_option(running_machine &machine) for (emu_options::entry *f_entry = machine.options().first(); f_entry != nullptr; f_entry = f_entry->next()) { - if (f_entry->is_changed()) + if (f_entry->is_changed()) { options.set_value(f_entry->name(), f_entry->value(), OPTION_PRIORITY_CMDLINE, error_string); } @@ -150,7 +150,7 @@ void save_main_option(running_machine &machine) else { machine.popmessage("**Error to save %s.ini**", emulator_info::get_configname()); return; - } + } } machine.ui().popup_time(3, "\n Configuration saved \n\n"); } @@ -484,7 +484,7 @@ void ui_menu_select_game::handle() // if we're in an error state, overlay an error message if (ui_error) - machine().ui().draw_text_box(container, "The selected machine is missing one or more required ROM or CHD images. " + machine().ui().draw_text_box(container, "The selected machine is missing one or more required ROM or CHD images. " "Please select a different machine.\n\nPress any key (except ESC) to continue.", JUSTIFY_CENTER, 0.5f, 0.5f, UI_RED_COLOR); // handle filters selection from key shortcuts @@ -723,7 +723,7 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott ui_manager &mui = machine().ui(); float tbarspace = mui.get_line_height(); - strprintf(tempbuf[0], "MAME %s ( %d / %d machines (%d BIOS) )", bare_build_version, visible_items, (driver_list::total() - 1), m_isabios); + strprintf(tempbuf[0], "MAME %s ( %d / %d machines (%d BIOS) )", bare_build_version, visible_items, (driver_list::total() - 1), m_isabios); std::string filtered; if (main_filters::actual == FILTER_CATEGORY && !machine().inifile().ini_index.empty()) @@ -749,7 +749,7 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott for (int line = 0; line < 2; ++line) { mui.draw_text_full(container, tempbuf[line].c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(width, maxwidth); } @@ -771,7 +771,7 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott // draw the text within it for (int line = 0; line < 2; ++line) { - mui.draw_text_full(container, tempbuf[line].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, + mui.draw_text_full(container, tempbuf[line].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); y1 += mui.get_line_height(); } @@ -828,7 +828,7 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott color = UI_GREEN_COLOR; if ((driver->flags & (MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_COLORS - | MACHINE_NO_SOUND | MACHINE_IMPERFECT_SOUND)) != 0) + | MACHINE_NO_SOUND | MACHINE_IMPERFECT_SOUND)) != 0) color = UI_YELLOW_COLOR; if ((driver->flags & (MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION)) != 0) @@ -896,7 +896,7 @@ void ui_menu_select_game::custom_render(void *selectedref, float top, float bott for (auto & elem : tempbuf) { - mui.draw_text_full(container, elem.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, + mui.draw_text_full(container, elem.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); @@ -968,7 +968,7 @@ void ui_menu_select_game::inkey_select(const ui_menu_event *m_event) ui_menu::stack_push(global_alloc_clear<ui_menu_directory>(machine(), container)); // anything else is a driver else if ((FPTR)driver == 3) { - save_main_option(machine()); + save_main_option(machine()); } // anything else is a driver else @@ -1413,7 +1413,7 @@ void ui_menu_select_game::populate_search() if (cx != -1 && ((driver_list::driver(cx).flags & MACHINE_IS_BIOS_ROOT) != 0)) cloneof = false; } - item_append(m_searchlist[curitem]->description, nullptr, (!cloneof) ? flags_ui : (MENU_FLAG_INVERT | flags_ui), + item_append(m_searchlist[curitem]->description, nullptr, (!cloneof) ? flags_ui : (MENU_FLAG_INVERT | flags_ui), (void *)m_searchlist[curitem]); } } @@ -1758,11 +1758,11 @@ float ui_menu_select_game::draw_left_panel(float x1, float y1, float x2, float y hover = phover + filter; } -/* if (afilter == filter) - { - bgcolor = UI_SELECTED_BG_COLOR; - fgcolor = UI_SELECTED_COLOR; - } +/* if (afilter == filter) + { + bgcolor = UI_SELECTED_BG_COLOR; + fgcolor = UI_SELECTED_COLOR; + } */ if (bgcolor != UI_TEXT_BG_COLOR) container->add_rect(x1, y1, x2, y1 + line_height_max, bgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(TRUE)); @@ -1797,7 +1797,7 @@ float ui_menu_select_game::draw_left_panel(float x1, float y1, float x2, float y convert_command_glyph(str); } - mui.draw_text_full(container, str.c_str(), x1t, y1, x2 - x1, JUSTIFY_LEFT, WRAP_NEVER, + mui.draw_text_full(container, str.c_str(), x1t, y1, x2 - x1, JUSTIFY_LEFT, WRAP_NEVER, DRAW_NORMAL, fgcolor, bgcolor, nullptr, nullptr, text_size); y1 += line_height_max; } @@ -1905,13 +1905,13 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or for (int x = UI_FIRST_LOAD; x < UI_LAST_LOAD; ++x) { - mui.draw_text_full(container, dats_info[x], origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, + mui.draw_text_full(container, dats_info[x], origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &txt_lenght, nullptr); txt_lenght += 0.01f; title_size = MAX(txt_lenght, title_size); } - mui.draw_text_full(container, snaptext.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, + mui.draw_text_full(container, snaptext.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::curdats_view, UI_FIRST_LOAD, UI_LAST_LOAD, title_size); @@ -1948,7 +1948,7 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or if (buffer.empty()) { - mui.draw_text_full(container, _("No Infos Available"), origx1, (origy2 + origy1) * 0.5f, origx2 - origx1, JUSTIFY_CENTER, + mui.draw_text_full(container, _("No Infos Available"), origx1, (origy2 + origy1) * 0.5f, origx2 - origx1, JUSTIFY_CENTER, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); return; } @@ -2002,7 +2002,7 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &item_width, nullptr, tmp_size); mui.draw_text_full(container, last_part.c_str(), effective_left + item_width, oy1, - origx2 - origx1 - 2.0f * gutter_width - item_width, JUSTIFY_RIGHT, WRAP_TRUNCATE, + origx2 - origx1 - 2.0f * gutter_width - item_width, JUSTIFY_RIGHT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, tmp_size); } } @@ -2022,18 +2022,18 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or std::string first_part(tempbuf.substr(0, first_dspace)); std::string last_part(tempbuf.substr(first_dspace + 1)); strtrimspace(last_part); - mui.draw_text_full(container, first_part.c_str(), effective_left, oy1, effective_width, JUSTIFY_LEFT, + mui.draw_text_full(container, first_part.c_str(), effective_left, oy1, effective_width, JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, tmp_size); - mui.draw_text_full(container, last_part.c_str(), effective_left, oy1, origx2 - origx1 - 2.0f * gutter_width, + mui.draw_text_full(container, last_part.c_str(), effective_left, oy1, origx2 - origx1 - 2.0f * gutter_width, JUSTIFY_RIGHT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, tmp_size); } else - mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, + mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, tmp_size); } else - mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, + mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, text_size); oy1 += (line_height * text_size); @@ -2065,13 +2065,13 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or for (auto & elem: t_text) { - mui.draw_text_full(container, elem.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, + mui.draw_text_full(container, elem.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &txt_lenght, nullptr); txt_lenght += 0.01f; title_size = MAX(txt_lenght, title_size); } - mui.draw_text_full(container, t_text[ui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1, + mui.draw_text_full(container, t_text[ui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::cur_sw_dats_view, 0, 1, title_size); @@ -2122,7 +2122,7 @@ void ui_menu_select_game::infos_render(void *selectedref, float origx1, float or else if (r == r_visible_lines - 1 && itemline != totallines - 1) info_arrow(1, origx1, origx2, oy1, line_height, text_size, ud_arrow_width); else - mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, + mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr, text_size); oy1 += (line_height * text_size); } diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp index 3122f286917..ad374bb9b83 100644 --- a/src/emu/ui/selsoft.cpp +++ b/src/emu/ui/selsoft.cpp @@ -1,4 +1,4 @@ -// license:BSD-3-Clause +// license:BSD-3-Clause // copyright-holders:Dankan1890 /*************************************************************************** @@ -29,9 +29,9 @@ std::string reselect_last::software; std::string reselect_last::swlist; bool reselect_last::m_reselect = false; static const char *region_lists[] = { "arab", "arg", "asia", "aus", "aut", "bel", "blr", "bra", "can", "chi", "chn", "cze", "den", - "ecu", "esp", "euro", "fin", "fra", "gbr", "ger", "gre", "hkg", "hun", "irl", "isr", - "isv", "ita", "jpn", "kaz", "kor", "lat", "lux", "mex", "ned", "nld", "nor", "nzl", - "pol", "rus", "slo", "spa", "sui", "swe", "tha", "tpe", "tw", "uk", "ukr", "usa" }; + "ecu", "esp", "euro", "fin", "fra", "gbr", "ger", "gre", "hkg", "hun", "irl", "isr", + "isv", "ita", "jpn", "kaz", "kor", "lat", "lux", "mex", "ned", "nld", "nor", "nzl", + "pol", "rus", "slo", "spa", "sui", "swe", "tha", "tpe", "tw", "uk", "ukr", "usa" }; //------------------------------------------------- // compares two items in the software list and @@ -424,7 +424,7 @@ void ui_menu_select_software::populate() old_software = m_has_empty_start ? curitem + 1 : curitem; item_append(m_displaylist[curitem]->longname.c_str(), m_displaylist[curitem]->devicetype.c_str(), - m_displaylist[curitem]->parentname.empty() ? flags_ui : (MENU_FLAG_INVERT | flags_ui), (void *)m_displaylist[curitem]); + m_displaylist[curitem]->parentname.empty() ? flags_ui : (MENU_FLAG_INVERT | flags_ui), (void *)m_displaylist[curitem]); } } @@ -434,8 +434,8 @@ void ui_menu_select_software::populate() for (int curitem = 0; m_searchlist[curitem] != nullptr; ++curitem) item_append(m_searchlist[curitem]->longname.c_str(), m_searchlist[curitem]->devicetype.c_str(), - m_searchlist[curitem]->parentname.empty() ? flags_ui : (MENU_FLAG_INVERT | flags_ui), - (void *)m_searchlist[curitem]); + m_searchlist[curitem]->parentname.empty() ? flags_ui : (MENU_FLAG_INVERT | flags_ui), + (void *)m_searchlist[curitem]); } item_append(MENU_SEPARATOR_ITEM, nullptr, flags_ui, nullptr); @@ -636,7 +636,7 @@ void ui_menu_select_software::custom_render(void *selectedref, float top, float for (int line = 0; line < 3; ++line) { mui.draw_text_full(container, tempbuf[line].c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(width, maxwidth); } @@ -659,7 +659,7 @@ void ui_menu_select_software::custom_render(void *selectedref, float top, float for (int line = 0; line < 3; ++line) { mui.draw_text_full(container, tempbuf[line].c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); y1 += mui.get_line_height(); } @@ -781,7 +781,7 @@ void ui_menu_select_software::custom_render(void *selectedref, float top, float for (auto & elem : tempbuf) { mui.draw_text_full(container, elem.c_str(), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; maxwidth = MAX(maxwidth, width); } @@ -808,7 +808,7 @@ void ui_menu_select_software::custom_render(void *selectedref, float top, float for (auto & elem : tempbuf) { mui.draw_text_full(container, elem.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_NEVER, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); y1 += machine().ui().get_line_height(); } } @@ -1088,7 +1088,6 @@ std::string c_sw_publisher::getname(std::string &str) //------------------------------------------------- void ui_menu_select_software::build_list(std::vector<ui_software_info *> &s_drivers, const char *filter_text, int filter) { - if (s_drivers.empty() && filter == -1) { filter = sw_filters::actual; @@ -1319,11 +1318,11 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo hover = phover + filter; } -/* if (afilter == filter) - { - bgcolor = UI_SELECTED_BG_COLOR; - fgcolor = UI_SELECTED_COLOR; - } +/* if (afilter == filter) + { + bgcolor = UI_SELECTED_BG_COLOR; + fgcolor = UI_SELECTED_COLOR; + } */ if (bgcolor != UI_TEXT_BG_COLOR) container->add_rect(x1, y1, x2, y1 + line_height, bgcolor, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXWRAP(TRUE)); @@ -1359,7 +1358,7 @@ float ui_menu_select_software::draw_left_panel(float x1, float y1, float x2, flo } mui.draw_text_full(container, str.c_str(), x1t, y1, x2 - x1, JUSTIFY_LEFT, WRAP_NEVER, - DRAW_NORMAL, fgcolor, bgcolor, nullptr, nullptr, text_size); + DRAW_NORMAL, fgcolor, bgcolor, nullptr, nullptr, text_size); y1 += line_height; } @@ -1439,7 +1438,7 @@ void ui_menu_select_software::infos_render(void *selectedref, float origx1, floa if (soft && soft->usage.empty()) { mui.draw_text_full(container, _("History"), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); ui_globals::cur_sw_dats_view = 0; } else @@ -1453,14 +1452,14 @@ void ui_menu_select_software::infos_render(void *selectedref, float origx1, floa for (auto & elem : t_text) { mui.draw_text_full(container, elem.c_str(), origx1, origy1, origx2 - origx1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &txt_lenght, nullptr); + DRAW_NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &txt_lenght, nullptr); txt_lenght += 0.01f; title_size = MAX(txt_lenght, title_size); } mui.draw_text_full(container, t_text[ui_globals::cur_sw_dats_view].c_str(), origx1, origy1, origx2 - origx1, - JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, - nullptr, nullptr); + JUSTIFY_CENTER, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, + nullptr, nullptr); draw_common_arrow(origx1, origy1, origx2, origy2, ui_globals::cur_sw_dats_view, 0, 1, title_size); } @@ -1484,7 +1483,7 @@ void ui_menu_select_software::infos_render(void *selectedref, float origx1, floa if (buffer.empty()) { mui.draw_text_full(container, _("No Infos Available"), origx1, (origy2 + origy1) * 0.5f, origx2 - origx1, JUSTIFY_CENTER, - WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); return; } else @@ -1512,8 +1511,8 @@ void ui_menu_select_software::infos_render(void *selectedref, float origx1, floa info_arrow(1, origx1, origx2, oy1, line_height, text_size, ud_arrow_width); else mui.draw_text_full(container, tempbuf.c_str(), origx1 + gutter_width, oy1, origx2 - origx1, - JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, - nullptr, nullptr, text_size); + JUSTIFY_LEFT, WRAP_TRUNCATE, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, + nullptr, nullptr, text_size); oy1 += (line_height * text_size); } @@ -1820,7 +1819,7 @@ void ui_software_parts::custom_render(void *selectedref, float top, float bottom float width; ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Software part selection:"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -1840,7 +1839,7 @@ void ui_software_parts::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, _("Software part selection:"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } //------------------------------------------------- @@ -1958,7 +1957,7 @@ void ui_bios_selection::custom_render(void *selectedref, float top, float bottom float width; ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Bios selection:"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -1978,5 +1977,5 @@ void ui_bios_selection::custom_render(void *selectedref, float top, float bottom // draw the text within it mui.draw_text_full(container, _("Bios selection:"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/sndmenu.cpp b/src/emu/ui/sndmenu.cpp index 37134f8db25..cc5e8490406 100644 --- a/src/emu/ui/sndmenu.cpp +++ b/src/emu/ui/sndmenu.cpp @@ -150,7 +150,7 @@ void ui_menu_sound_options::custom_render(void *selectedref, float top, float bo float width; ui_manager &mui = machine().ui(); mui.draw_text_full(container, _("Sound Options"), 0.0f, 0.0f, 1.0f, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); + DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &width, nullptr); width += 2 * UI_BOX_LR_BORDER; float maxwidth = MAX(origx2 - origx1, width); @@ -170,5 +170,5 @@ void ui_menu_sound_options::custom_render(void *selectedref, float top, float bo // draw the text within it mui.draw_text_full(container, _("Sound Options"), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE, - DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); + DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, nullptr, nullptr); } diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index f3ce51feea6..b474c7c61f6 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -1698,12 +1698,12 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co if (machine.ui_input().pressed(IPT_UI_PAUSE)) { // with a shift key, it is single step -// if (is_paused && (machine.input().code_pressed(KEYCODE_LSHIFT) || machine.input().code_pressed(KEYCODE_RSHIFT))) -// { -// machine.ui().set_single_step(true); -// machine.resume(); -// } -// else +// if (is_paused && (machine.input().code_pressed(KEYCODE_LSHIFT) || machine.input().code_pressed(KEYCODE_RSHIFT))) +// { +// machine.ui().set_single_step(true); +// machine.resume(); +// } +// else machine.toggle_pause(); } @@ -2702,8 +2702,8 @@ int ui_manager::wrap_text(render_container *container, const char *origs, float if (curwidth > maxwidth) maxwidth = curwidth; - xstart.push_back(linestart - origs); - xend.push_back(s - origs); + xstart.push_back(linestart - origs); + xend.push_back(s - origs); // loop from the line start and add the characters while (linestart < s) diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h index ffd2fddc371..81034500733 100644 --- a/src/emu/ui/ui.h +++ b/src/emu/ui/ui.h @@ -103,9 +103,9 @@ struct slider_state INT32 defval; /* default value */ INT32 maxval; /* maximum value */ INT32 incval; /* increment value */ - bool hidden; /* hidden or not */ - INT32 id; /* unique identifier */ - char description[1]; /* textual description */ + bool hidden; /* hidden or not */ + INT32 id; /* unique identifier */ + char description[1]; /* textual description */ }; @@ -114,111 +114,111 @@ struct slider_state class ui_manager { public: - // construction/destruction - ui_manager(running_machine &machine); + // construction/destruction + ui_manager(running_machine &machine); void init(); - // getters - running_machine &machine() const { return m_machine; } - bool single_step() const { return m_single_step; } + // getters + running_machine &machine() const { return m_machine; } + bool single_step() const { return m_single_step; } ui_options &options() { return m_ui_options; } - // setters - void set_single_step(bool single_step) { m_single_step = single_step; } - - // methods - void initialize(running_machine &machine); - UINT32 set_handler(ui_callback callback, UINT32 param); - void display_startup_screens(bool first_time, bool show_disclaimer); - void set_startup_text(const char *text, bool force); - void update_and_render(render_container *container); - render_font *get_font(); - float get_line_height(); - float get_char_width(unicode_char ch); - float get_string_width(const char *s); - void draw_outlined_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t backcolor); - void draw_outlined_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t fgcolor, rgb_t bgcolor); - void draw_text(render_container *container, const char *buf, float x, float y); + // setters + void set_single_step(bool single_step) { m_single_step = single_step; } + + // methods + void initialize(running_machine &machine); + UINT32 set_handler(ui_callback callback, UINT32 param); + void display_startup_screens(bool first_time, bool show_disclaimer); + void set_startup_text(const char *text, bool force); + void update_and_render(render_container *container); + render_font *get_font(); + float get_line_height(); + float get_char_width(unicode_char ch); + float get_string_width(const char *s); + void draw_outlined_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t backcolor); + void draw_outlined_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t fgcolor, rgb_t bgcolor); + void draw_text(render_container *container, const char *buf, float x, float y); void draw_text_full(render_container *container, const char *origs, float x, float y, float origwrapwidth, int justify, int wrap, int draw, rgb_t fgcolor, rgb_t bgcolor, float *totalwidth = nullptr, float *totalheight = nullptr, float text_size = 1.0f); void draw_text_box(render_container *container, const char *text, int justify, float xpos, float ypos, rgb_t backcolor); - void draw_message_window(render_container *container, const char *text); - - void CLIB_DECL popup_time(int seconds, const char *text, ...) ATTR_PRINTF(3,4); - void show_fps_temp(double seconds); - void set_show_fps(bool show); - bool show_fps() const; - bool show_fps_counter(); - void set_show_profiler(bool show); - bool show_profiler() const; - void show_menu(); - void show_mouse(bool status); - bool is_menu_active(); - bool can_paste(); - void paste(); - bool use_natural_keyboard() const; - void set_use_natural_keyboard(bool use_natural_keyboard); - void image_handler_ingame(); - void increase_frameskip(); - void decrease_frameskip(); - void request_quit(); - - // print the game info string into a buffer - std::string &game_info_astring(std::string &str); - - // slider controls - const slider_state *get_slider_list(void); - - // other - void process_natural_keyboard(); - - void set_show_timecode_counter(bool value) { m_show_timecode_counter = value; m_show_timecode_total = true; } - bool show_timecode_counter(); - bool show_timecode_total(); + void draw_message_window(render_container *container, const char *text); + + void CLIB_DECL popup_time(int seconds, const char *text, ...) ATTR_PRINTF(3,4); + void show_fps_temp(double seconds); + void set_show_fps(bool show); + bool show_fps() const; + bool show_fps_counter(); + void set_show_profiler(bool show); + bool show_profiler() const; + void show_menu(); + void show_mouse(bool status); + bool is_menu_active(); + bool can_paste(); + void paste(); + bool use_natural_keyboard() const; + void set_use_natural_keyboard(bool use_natural_keyboard); + void image_handler_ingame(); + void increase_frameskip(); + void decrease_frameskip(); + void request_quit(); + + // print the game info string into a buffer + std::string &game_info_astring(std::string &str); + + // slider controls + const slider_state *get_slider_list(void); + + // other + void process_natural_keyboard(); + + void set_show_timecode_counter(bool value) { m_show_timecode_counter = value; m_show_timecode_total = true; } + bool show_timecode_counter(); + bool show_timecode_total(); // word wrap - int wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, std::vector<int> &xstart, std::vector<int> &xend, float text_size = 1.0f); + int wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, std::vector<int> &xstart, std::vector<int> &xend, float text_size = 1.0f); - // draw an outlined box with given line color and filled with a texture - void draw_textured_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t backcolor, rgb_t linecolor, render_texture *texture = nullptr, UINT32 flags = PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); + // draw an outlined box with given line color and filled with a texture + void draw_textured_box(render_container *container, float x0, float y0, float x1, float y1, rgb_t backcolor, rgb_t linecolor, render_texture *texture = nullptr, UINT32 flags = PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA)); - // return text string width with given text size - float get_string_width_ex(const char *s, float text_size); + // return text string width with given text size + float get_string_width_ex(const char *s, float text_size); private: - // instance variables - running_machine & m_machine; - render_font * m_font; - ui_callback m_handler_callback; - UINT32 m_handler_param; - bool m_single_step; - bool m_showfps; - osd_ticks_t m_showfps_end; - bool m_show_profiler; - osd_ticks_t m_popup_text_end; - bool m_use_natural_keyboard; + // instance variables + running_machine & m_machine; + render_font * m_font; + ui_callback m_handler_callback; + UINT32 m_handler_param; + bool m_single_step; + bool m_showfps; + osd_ticks_t m_showfps_end; + bool m_show_profiler; + osd_ticks_t m_popup_text_end; + bool m_use_natural_keyboard; std::unique_ptr<UINT8[]> m_non_char_keys_down; - render_texture * m_mouse_arrow_texture; - bool m_mouse_show; - bool m_show_timecode_counter; + render_texture * m_mouse_arrow_texture; + bool m_mouse_show; + bool m_show_timecode_counter; bool m_show_timecode_total; bool m_load_save_hold; ui_options m_ui_options; - // text generators - std::string &disclaimer_string(std::string &buffer); - std::string &warnings_string(std::string &buffer); + // text generators + std::string &disclaimer_string(std::string &buffer); + std::string &warnings_string(std::string &buffer); - // UI handlers - static UINT32 handler_messagebox(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_ingame(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_load_save(running_machine &machine, render_container *container, UINT32 state); - static UINT32 handler_confirm_quit(running_machine &machine, render_container *container, UINT32 state); + // UI handlers + static UINT32 handler_messagebox(running_machine &machine, render_container *container, UINT32 state); + static UINT32 handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state); + static UINT32 handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state); + static UINT32 handler_ingame(running_machine &machine, render_container *container, UINT32 state); + static UINT32 handler_load_save(running_machine &machine, render_container *container, UINT32 state); + static UINT32 handler_confirm_quit(running_machine &machine, render_container *container, UINT32 state); - // private methods - void exit(); + // private methods + void exit(); }; diff --git a/src/emu/ui/utils.cpp b/src/emu/ui/utils.cpp index 7ac94d5e050..333ee95971a 100644 --- a/src/emu/ui/utils.cpp +++ b/src/emu/ui/utils.cpp @@ -25,7 +25,7 @@ std::vector<std::string> c_mnfct::ui; // Main filters UINT16 main_filters::actual = 0; -const char *main_filters::text[] = { "All", "Available", "Unavailable", "Working", "Not Working", "Mechanical", "Not Mechanical", +const char *main_filters::text[] = { "All", "Available", "Unavailable", "Working", "Not Working", "Mechanical", "Not Mechanical", "Category", "Favorites", "BIOS", "Originals", "Clones", "Manufacturers", "Years", "Support Save", "Not Support Save", "CHD", "No CHD", "Vertical", "Horizontal", "Custom" }; size_t main_filters::length = ARRAY_LENGTH(main_filters::text); diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp index c55038d3065..053389c95e1 100644 --- a/src/emu/uiinput.cpp +++ b/src/emu/uiinput.cpp @@ -326,8 +326,8 @@ void ui_input_manager::push_char_event(render_target* target, unicode_char ch) } /*------------------------------------------------- - push_mouse_wheel_event - pushes a mouse - wheel event to the specified render_target + push_mouse_wheel_event - pushes a mouse + wheel event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_wheel_event(render_target *target, INT32 x, INT32 y, short delta, int ucNumLines) @@ -350,4 +350,4 @@ void ui_input_manager::mark_all_as_pressed() { for (int code = IPT_UI_FIRST + 1; code < IPT_UI_LAST; code++) m_next_repeat[code] = osd_ticks(); -}
\ No newline at end of file +} diff --git a/src/emu/video.h b/src/emu/video.h index 7a1808ad095..67939d47eaa 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -94,7 +94,7 @@ public: void begin_recording(const char *name, movie_format format); void end_recording(movie_format format); void add_sound_to_recording(const INT16 *sound, int numsamples); - + void set_timecode_enabled(bool value) { m_timecode_enabled = value; } bool get_timecode_enabled() { return m_timecode_enabled; } bool get_timecode_write() { return m_timecode_write; } @@ -104,7 +104,7 @@ public: void add_to_total_time(attotime time) { m_timecode_total += time; } std::string &timecode_text(std::string &str); std::string &timecode_total_text(std::string &str); - + private: // internal helpers @@ -196,13 +196,13 @@ private: static const attoseconds_t ATTOSECONDS_PER_SPEED_UPDATE = ATTOSECONDS_PER_SECOND / 4; static const int PAUSED_REFRESH_RATE = 30; - - bool m_timecode_enabled; // inp.timecode record enabled - bool m_timecode_write; // Show/hide timer at right (partial time) - std::string m_timecode_text; // Message for that video part (intro, gameplay, extra) - attotime m_timecode_start; // Starting timer for that video part (intro, gameplay, extra) - attotime m_timecode_total; // Show/hide timer at left (total elapsed on resulting video preview) - + + bool m_timecode_enabled; // inp.timecode record enabled + bool m_timecode_write; // Show/hide timer at right (partial time) + std::string m_timecode_text; // Message for that video part (intro, gameplay, extra) + attotime m_timecode_start; // Starting timer for that video part (intro, gameplay, extra) + attotime m_timecode_total; // Show/hide timer at left (total elapsed on resulting video preview) + }; #endif /* __VIDEO_H__ */ diff --git a/src/lib/util/options.h b/src/lib/util/options.h index 5edf64a9fcd..cf58bc67222 100644 --- a/src/lib/util/options.h +++ b/src/lib/util/options.h @@ -112,7 +112,7 @@ public: std::string m_defdata; // default data for this item std::string m_minimum; // minimum value std::string m_maximum; // maximum value - bool m_changed; // changed flag + bool m_changed; // changed flag }; // construction/destruction diff --git a/src/mame/arcade.lst b/src/mame/arcade.lst index 1b80928445f..b243e34acb7 100644 --- a/src/mame/arcade.lst +++ b/src/mame/arcade.lst @@ -382,7 +382,7 @@ hustlerb4 // bootleg frogger // GX392 (c) 1981 Konami froggers1 // (c) 1981 Sega froggers2 // 834-0068 (c) 1981 Sega -froggers3 // +froggers3 // froggermc // 800-3110 (c) 1981 Sega amidar // GX337 (c) 1982 Konami amidar1 // GX337 (c) 1981 Konami @@ -2108,7 +2108,7 @@ sboblbobl // bootleg sboblbobla // bootleg sboblboblb // bootleg sboblboblc // bootleg -sboblbobld // bootleg +sboblbobld // bootleg bublboblb // bootleg bub68705 // bootleg dland // bootleg @@ -5155,27 +5155,27 @@ shienryu // 1997.02 Shienryu (Warashi) vmahjong // 1997.02 Virtual Mahjong (Micronet) pclub2kc // 1997.02 Print Club Kome Kome Club pclub2fc // 1997.04 Print Club 2 Felix The Cat -pclub2pe // -pclub2wb // -pclub2pf // -pclub26w // -pclub27s // -pclubyo2 // +pclub2pe // +pclub2wb // +pclub2pf // +pclub26w // +pclub27s // +pclubyo2 // groovef // 1997.05 Groove on Fight (Atlus) nclubv3 // 1997.07 Name Club Ver. 3 -nclubv2 // -nameclub // +nclubv2 // +nameclub // pclb2elk // 1997.07 Print Club Custom pclub2 // 1997.09 Print Club 2 thunt // 1997.09 Puzzle & Action Treasure Hunt (Sega (Deniam License)) thuntk winterht // 1997.10 Winter Heat (Data East) prc297wi // 1997.10 Print Club 2 '97 Winter Ver -prc297wia // +prc297wia // prc298sp // 1997.10 Print Club 2 '98 Spring Ver -prc298su // -pclove // -pclove2 // +prc298su // +pclove // +pclove2 // cotton2 // 1997.11 Cotton 2 (Success) hanagumi // 1997.11 Sakura Taisen Hanagumi Taisen Columns findlove // 1997.12 Find Love (Daiki / FCF) @@ -6381,7 +6381,7 @@ charlien // MBR (c) 1994 Mitchell // MBV ?? // MBW ?? wcvol95 // MBX (c) 1993 Data East -wcvol95x // ? +wcvol95x // ? // MBY ?? backfire // MBZ (c) 1995 backfirea // MBZ (c) 1995 @@ -7709,7 +7709,7 @@ tnk3j // A5001 (c) 1985 athena // 'UP' (c) 1986 fitegolf // 'GU' (c) 1988 fitegolfu // 'GU' (c) 1988 -fitegolf2 // +fitegolf2 // countryc // A7004 'CC' (c) 1988 ikari // A5004 'IW' (c) 1986 ikaria // A5004 'IW' (c) 1986 @@ -8825,7 +8825,7 @@ rdft2a // (c) 1997 Seibu Kaihatsu (Metrotainment license) rdft2aa // (c) 1997 Seibu Kaihatsu (Dream Island license) rdft2j // (c) 1997 Seibu Kaihatsu rdft2ja // (c) 1997 Seibu Kaihatsu -rdft2it // (c) 1997 Seibu Kaihatsu +rdft2it // (c) 1997 Seibu Kaihatsu rdft2t // (c) 1997 Seibu Kaihatsu rdft2u // (c) 1997 Seibu Kaihatsu (Fabtek license) rdft2us // (c) 1997 Seibu Kaihatsu (Fabtek license) @@ -8974,7 +8974,7 @@ edfu // (c) 1991 (North America) edfbl // (c) 1991 64street // (c) 1991 64streetj // (c) 1991 (Japan) -64streetja // (c) 1991 (Japan) +64streetja // (c) 1991 (Japan) soldam // (c) 1992 soldamj // (c) 1992 (Japan) bigstrik // (c) 1992 @@ -9193,7 +9193,7 @@ thoop // (c) 1992 - Ref 922804/1 squash // (c) 1992 - Ref 922804/2 wrally // (c) 1993 - Ref 930705 wrallya // (c) 1993 - Ref 930705 -wrallyb // (c) 1993 - Ref 930217 +wrallyb // (c) 1993 - Ref 930217 wrallyat // (c) 1993 - Ref 930217 glass // (c) 1993 - Ref 931021 glass10 // (c) 1993 - Ref 931021 @@ -9303,8 +9303,8 @@ oedfight // (c) 1994 Kaneko bonkadv // (c) 1994 Kaneko gtmr // (c) 1994 Kaneko gtmra // (c) 1994 Kaneko -gtmrb // (c) 1994 Kaneko -gtmro // (c) 1994 Kaneko +gtmrb // (c) 1994 Kaneko +gtmro // (c) 1994 Kaneko gtmre // (c) 1994 Kaneko gtmrusa // (c) 1994 Kaneko (US) gtmr2 // (c) 1995 Kaneko @@ -9888,7 +9888,7 @@ spec2kh // (c) 2000 Yonatech // http://www.esdgame.co.kr/english/ multchmp // (c) 1999 (World) multchmpk // (c) 1998 (Korea) -multchmpa // (c) 1998 (World) +multchmpa // (c) 1998 (World) mchampdx // (c) 1999 ESD mchampdxa // (c) 1999 ESD mchampdxb // (c) 1999 ESD @@ -10567,7 +10567,7 @@ fastdraw_130 // (c) 1995 aplatoon // (c) 199? Nova? zortonbr // (c) 1993 Web Picmatic -crospuzl // +crospuzl // // Crystal System crysbios crysking // 2001 Brezzasoft. Crystal of the kings @@ -10770,7 +10770,7 @@ coolpool // (c) 1992 Catalina Games 9ballsht3 // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" 9ballshtc // (c) 1993 E-Scape EnterMedia + "marketed by Bundra Games" megaphx // (c) 1991 Dinamic / Inder -flagrall // ? +flagrall // ? gumbo // (c) 1994 Min Corp. mspuzzleg // (c) 1994 Min Corp. mspuzzle // (c) 1994 Min Corp. @@ -32732,4 +32732,4 @@ fi6845 fi8275 l9nibble // unknown Nibble game. -
\ No newline at end of file + diff --git a/src/mame/audio/zaccaria.h b/src/mame/audio/zaccaria.h index 1414b9d2959..ec717f04db3 100644 --- a/src/mame/audio/zaccaria.h +++ b/src/mame/audio/zaccaria.h @@ -132,4 +132,4 @@ protected: UINT8 m_host_command; }; -#endif // __AUDIO_ZACCARIA_H__
\ No newline at end of file +#endif // __AUDIO_ZACCARIA_H__ diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp index 4b64f9dae53..d794c1e98aa 100644 --- a/src/mame/drivers/1943.cpp +++ b/src/mame/drivers/1943.cpp @@ -786,9 +786,9 @@ ROM_START( 1943bj ) /* front background */ ROM_LOAD( "bm14.5f", 0x0000, 0x8000, CRC(4d3c6401) SHA1(ce4f6dbf8fa030ad45cbb5afd58df27fed2d4618) ) /* back background probably same gfx different layout */ - ROM_LOAD( "mkb07.8k", 0xc000, 0x4000, CRC(ae1b317f) SHA1(d311c198d77ec932d776427e2ebfffe90e5330c3) ) + ROM_LOAD( "mkb07.8k", 0xc000, 0x4000, CRC(ae1b317f) SHA1(d311c198d77ec932d776427e2ebfffe90e5330c3) ) ROM_CONTINUE( 0x8000, 0x4000 ) - + ROM_REGION( 0x0c00, "proms", 0 ) ROM_LOAD( "bm1.12a", 0x0000, 0x0100, CRC(74421f18) SHA1(5b8b59f6f4e5ad358611de50608f47f41a5b0e51) ) /* red component */ ROM_LOAD( "bm2.13a", 0x0100, 0x0100, CRC(ac27541f) SHA1(1796c4c9041dfe28e6319576f21df1dbcb8d12bf) ) /* green component */ diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp index 93b649814e9..7893c97536e 100644 --- a/src/mame/drivers/1945kiii.cpp +++ b/src/mame/drivers/1945kiii.cpp @@ -160,9 +160,8 @@ WRITE16_MEMBER(k3_state::k3_soundbanks_w) WRITE16_MEMBER(k3_state::flagrall_soundbanks_w) { - data &= mem_mask; - + // 0x0200 on startup // 0x0100 on startup @@ -311,13 +310,13 @@ static INPUT_PORTS_START( flagrall ) PORT_DIPSETTING( 0x0003, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 1C_2C ) ) PORT_DIPUNUSED_DIPLOC( 0x0004, IP_ACTIVE_LOW, "SW1:3" ) - PORT_DIPUNUSED_DIPLOC( 0x0008, IP_ACTIVE_LOW, "SW1:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0008, IP_ACTIVE_LOW, "SW1:4" ) PORT_DIPNAME( 0x0010, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:5") PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPNAME( 0x0020, 0x0020, "Dip Control" ) PORT_DIPLOCATION("SW1:6") PORT_DIPSETTING( 0x0020, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) + PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) PORT_DIPUNUSED_DIPLOC( 0x0040, IP_ACTIVE_LOW, "SW1:7" ) PORT_DIPNAME( 0x0080, 0x0080, "Picture Test" ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x0080, DEF_STR( Off ) ) @@ -331,13 +330,13 @@ static INPUT_PORTS_START( flagrall ) PORT_DIPNAME( 0x0400, 0x0400, "Bonus Type" ) PORT_DIPLOCATION("SW2:3") PORT_DIPSETTING ( 0x0400, "0" ) PORT_DIPSETTING( 0x0000, "1" ) - PORT_DIPUNUSED_DIPLOC( 0x0800, IP_ACTIVE_LOW, "SW2:4" ) + PORT_DIPUNUSED_DIPLOC( 0x0800, IP_ACTIVE_LOW, "SW2:4" ) PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x0000, DEF_STR( Very_Hard ) ) PORT_DIPSETTING( 0x1000, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x2000, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x3000, DEF_STR( Normal ) ) - PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW2:7" ) + PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW2:7" ) PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) @@ -440,7 +439,7 @@ ROM_START( flagrall ) ROM_LOAD32_BYTE( "5_u6.bin", 0x000001, 0x080000, CRC(1ac0bd0c) SHA1(ab71bb84e61f5c7168601695f332a8d4a30d9948) ) ROM_LOAD32_BYTE( "2_u7.bin", 0x000002, 0x080000, CRC(5f6db2b3) SHA1(84caa019d3b75be30a14d19ccc2f28e5e94028bd) ) ROM_LOAD32_BYTE( "6_u8.bin", 0x000003, 0x080000, CRC(79e4643c) SHA1(274f2741f39c63e32f49c6a1a72ded1263bdcdaa) ) - + ROM_LOAD32_BYTE( "3_u58.bin", 0x200000, 0x040000, CRC(c913df7d) SHA1(96e89ecb9e5f4d596d71d7ba35af7b2af4670342) ) ROM_LOAD32_BYTE( "4_u59.bin", 0x200001, 0x040000, CRC(cb192384) SHA1(329b4c1a4dc388d9f4ce063f9a54cbf3b967682a) ) ROM_LOAD32_BYTE( "7_u60.bin", 0x200002, 0x040000, CRC(f187a7bf) SHA1(f4ce9ac9fe376250fe426de6ee404fc7841ef08a) ) diff --git a/src/mame/drivers/amazonlf.cpp b/src/mame/drivers/amazonlf.cpp index 129af7c3631..5a5b170fb08 100644 --- a/src/mame/drivers/amazonlf.cpp +++ b/src/mame/drivers/amazonlf.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood /* - + uses ADC 'Amazon-LF' SoC, EISC CPU core - similar to crystal system? */ diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 881209946ff..51449676180 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -6,67 +6,67 @@ Next generation driver written in February 2016 by R. Belmont. Thanks to the original crew. - + Apple I has: - 6502 @ 1.023 MHz (~0.960 MHz with RAM refresh) - 4 or 8 KB RAM on-board - 256 byte Monitor ROM - No IRQs, no sound, dumb terminal video - 6820 PIA for keyboard / terminal interface - - ------------------------------------------------------------------- - - How to use cassettes: - The system has no error checking or checksums, and the cassette - has no header. - Therefore, you must know the details, and pass these to the - interface yourself. - - BASIC has no cassette handling. You must enter the monitor - with: CALL -151 - then when finished, re-enter BASIC with: E2B3R - - Examples: - - A machine-language program will typically be like this: - C100R (enter the interface) - 0300.0FFFR (enter the load and end addresses, then load the tape) - You start the tape. - When the prompt returns you stop the tape. - 0300R (run your program) - - - To Load Tape Basic: - C100R - E000.EFFFR - You start the tape. - When the prompt returns you stop the tape. - E000R (It must say 4C - if not, your tape is no good). - The BASIC prompt will appear - >@ - - - A BASIC program is split into two areas, one for the scratch pad, - and one for the program proper. - In BASIC you may have to adjust the allowed memory area, such as - LOMEM = 768 - Then, go to the monitor: CALL -151 - C100R (enter the interface) - 00A4.00FFR 0300.0FFFR (load the 2 parts) - You start the tape. - When the prompt returns you stop the tape. - E2B3R (back to BASIC) - You can LIST or RUN now. - - - Saving is almost the same, when you specify the address range, enter - W instead of R. The difficulty is finding out how long your program is. - - Insert a blank tape - C100R - 0300.0FFFW - Quickly press Record. - When the prompt returns, press Stop. + 6502 @ 1.023 MHz (~0.960 MHz with RAM refresh) + 4 or 8 KB RAM on-board + 256 byte Monitor ROM + No IRQs, no sound, dumb terminal video + 6820 PIA for keyboard / terminal interface + + ------------------------------------------------------------------- + + How to use cassettes: + The system has no error checking or checksums, and the cassette + has no header. + Therefore, you must know the details, and pass these to the + interface yourself. + + BASIC has no cassette handling. You must enter the monitor + with: CALL -151 + then when finished, re-enter BASIC with: E2B3R + + Examples: + + A machine-language program will typically be like this: + C100R (enter the interface) + 0300.0FFFR (enter the load and end addresses, then load the tape) + You start the tape. + When the prompt returns you stop the tape. + 0300R (run your program) + + + To Load Tape Basic: + C100R + E000.EFFFR + You start the tape. + When the prompt returns you stop the tape. + E000R (It must say 4C - if not, your tape is no good). + The BASIC prompt will appear + >@ + + + A BASIC program is split into two areas, one for the scratch pad, + and one for the program proper. + In BASIC you may have to adjust the allowed memory area, such as + LOMEM = 768 + Then, go to the monitor: CALL -151 + C100R (enter the interface) + 00A4.00FFR 0300.0FFFR (load the 2 parts) + You start the tape. + When the prompt returns you stop the tape. + E2B3R (back to BASIC) + You can LIST or RUN now. + + + Saving is almost the same, when you specify the address range, enter + W instead of R. The difficulty is finding out how long your program is. + + Insert a blank tape + C100R + 0300.0FFFW + Quickly press Record. + When the prompt returns, press Stop. **********************************************************************/ @@ -82,9 +82,9 @@ #include "softlist.h" -#define A1_CPU_TAG "maincpu" -#define A1_PIA_TAG "pia6821" -#define A1_BUS_TAG "a1bus" +#define A1_CPU_TAG "maincpu" +#define A1_PIA_TAG "pia6821" +#define A1_BUS_TAG "a1bus" #define A1_BASICRAM_TAG "basicram" class apple1_state : public driver_device @@ -146,20 +146,20 @@ private: static const UINT8 apple1_keymap[] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '=', '[', ']', ';', '\'', // KEY0 - ',', '.', '/', '\\', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', // KEY1 - 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '\r', '_', // KEY2 - ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '=', '[', ']', ';', '\'', // KEY0 + ',', '.', '/', '\\', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', // KEY1 + 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '\r', '_', // KEY2 + ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 - ')', '!', '@', '#', '$', '%', '^', '&', '*', '(', '_', '+', '[', ']', ':', '"', // KEY0 + shift + ')', '!', '@', '#', '$', '%', '^', '&', '*', '(', '_', '+', '[', ']', ':', '"', // KEY0 + shift '<', '>', '?', '\\', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', // KEY1 + shift 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '\r', '_', // KEY2 + shift - ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 + shift + ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 + shift - '0', '1', '\x00', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', '8', '9', '\x1f', '=', '\x1b', '\x1d', ';', '\'', // KEY0 + CTRL - ',', '.', '/', '\x1c', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0a', '\x0b', '\x0c', // KEY1 + CTRL - '\x0d', '\x0e', '\x0f', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1a', '\r', '_', // KEY2 + CTRL - ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 + CTRL + '0', '1', '\x00', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', '8', '9', '\x1f', '=', '\x1b', '\x1d', ';', '\'', // KEY0 + CTRL + ',', '.', '/', '\x1c', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x09', '\x0a', '\x0b', '\x0c', // KEY1 + CTRL + '\x0d', '\x0e', '\x0f', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1a', '\r', '_', // KEY2 + CTRL + ' ', '\x1b', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // KEY3 + CTRL }; @@ -236,7 +236,7 @@ void apple1_state::poll_keyboard() bool bKeypress = false; // handle special keys first: - if (special & 0x10) // RESET + if (special & 0x10) // RESET { m_reset_down = true; m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); @@ -248,7 +248,7 @@ void apple1_state::poll_keyboard() m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); } - if (special & 0x20) // CLEAR SCREEN + if (special & 0x20) // CLEAR SCREEN { m_clear_down = true; memset(m_vram, 0, sizeof(m_vram)); @@ -282,10 +282,10 @@ void apple1_state::poll_keyboard() { rawkey = (port * 16) + bit; m_lastports[port] |= (1 << bit); - port = 4; // force outer for loop to quit too + port = 4; // force outer for loop to quit too bKeypress = true; } - else // key up + else // key up { m_lastports[port] &= ~(1 << bit); } @@ -433,12 +433,12 @@ ADDRESS_MAP_END READ8_MEMBER(apple1_state::pia_keyboard_r) { - return m_transchar | 0x80; // bit 7 is wired high, similar-ish to the Apple II + return m_transchar | 0x80; // bit 7 is wired high, similar-ish to the Apple II } WRITE8_MEMBER(apple1_state::pia_display_w) { - data &= 0x7f; // D7 is ignored by the video h/w + data &= 0x7f; // D7 is ignored by the video h/w // ignore characters if CLEAR is down if (m_clear_down) @@ -624,4 +624,3 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */ COMP( 1976, apple1, 0, 0, apple1, apple1, driver_device, 0, "Apple Computer", "Apple I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) - diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp index 8cf7052f829..7727c74379f 100644 --- a/src/mame/drivers/apple2e.cpp +++ b/src/mame/drivers/apple2e.cpp @@ -2958,7 +2958,7 @@ static INPUT_PORTS_START( apple2ees ) PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('`') PORT_CHAR(0xbf) // inverted question mark + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('`') PORT_CHAR(0xbf) // inverted question mark PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('=') PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('\'') PORT_CHAR('?') @@ -2984,7 +2984,7 @@ static INPUT_PORTS_START( apple2ees ) PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_UP) PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0xc7) PORT_CHAR(0xa1) // c with cedilla / inverted exclamation point + PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0xc7) PORT_CHAR(0xa1) // c with cedilla / inverted exclamation point PORT_START("X7") PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_UNUSED) @@ -3557,14 +3557,14 @@ ROM_END ROM_START(apple2ees) ROM_REGION(0x2000,"gfx1",0) - ROM_LOAD( "341-0212-a.e9", 0x000000, 0x002000, CRC(bc5575ef) SHA1(aa20c257255ef552295d32a3f56ccbb52b8716c3) ) + ROM_LOAD( "341-0212-a.e9", 0x000000, 0x002000, CRC(bc5575ef) SHA1(aa20c257255ef552295d32a3f56ccbb52b8716c3) ) ROM_REGION(0x8000,"maincpu",0) ROM_LOAD ( "342-0135-b.64", 0x0000, 0x2000, CRC(e248835e) SHA1(523838c19c79f481fa02df56856da1ec3816d16e)) ROM_LOAD ( "342-0134-a.64", 0x2000, 0x2000, CRC(fc3d59d8) SHA1(8895a4b703f2184b673078f411f4089889b61c54)) ROM_REGION( 0x800, "keyboard", ROMREGION_ERASE00 ) - ROM_LOAD( "341-0211-a.f12", 0x000000, 0x000800, CRC(fac15d54) SHA1(abe019de22641b0647e829a1d4745759bdffe86a) ) + ROM_LOAD( "341-0211-a.f12", 0x000000, 0x000800, CRC(fac15d54) SHA1(abe019de22641b0647e829a1d4745759bdffe86a) ) ROM_END ROM_START(mprof3) diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp index 737afea4be2..3ee71615d5c 100644 --- a/src/mame/drivers/argox.cpp +++ b/src/mame/drivers/argox.cpp @@ -51,7 +51,7 @@ public: m_maincpu(*this, "maincpu") { } - DECLARE_DRIVER_INIT(os214); + DECLARE_DRIVER_INIT(os214); required_device<cpu_device> m_maincpu; }; @@ -76,9 +76,9 @@ DRIVER_INIT_MEMBER( os214_state, os214 ) } ROM_START( os214 ) - ROM_REGION( 0x080000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "u9_s2a2-4.03_argox_am.u9", 0x000000, 0x040000, CRC(3bd8b2b1) SHA1(546f9fd8d7e1f589f6e594a332a3429041b49eea) ) - ROM_LOAD16_BYTE( "u8_s2a2-4.03_argox_am.u8", 0x000001, 0x040000, CRC(d49f52af) SHA1(0ca5a70c6c3995f275226af26db965f6ba7ed123) ) + ROM_REGION( 0x080000, "maincpu", 0 ) + ROM_LOAD16_BYTE( "u9_s2a2-4.03_argox_am.u9", 0x000000, 0x040000, CRC(3bd8b2b1) SHA1(546f9fd8d7e1f589f6e594a332a3429041b49eea) ) + ROM_LOAD16_BYTE( "u8_s2a2-4.03_argox_am.u8", 0x000001, 0x040000, CRC(d49f52af) SHA1(0ca5a70c6c3995f275226af26db965f6ba7ed123) ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index 5f608b287c5..b9ab4d1a6e1 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -774,7 +774,7 @@ ROM_END /* Space Rocks (J.Estevez, Barcelona). Seems to be a legit spanish set, since there are documented cabs - registered in Spain. + registered in Spain. */ ROM_START( spcrocks ) ROM_REGION( 0x8000, "maincpu", 0 ) diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp index b3bef4ec1c6..a23016b3b04 100644 --- a/src/mame/drivers/blmbycar.cpp +++ b/src/mame/drivers/blmbycar.cpp @@ -329,7 +329,7 @@ MACHINE_START_MEMBER(blmbycar_state,blmbycar) { save_item(NAME(m_pot_wheel)); save_item(NAME(m_old_val)); - + membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } @@ -377,7 +377,7 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(blmbycar_state,watrball) { save_item(NAME(m_retvalue)); - + membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000); } diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp index f79a6e7c61a..a14e4eda207 100644 --- a/src/mame/drivers/bublbobl.cpp +++ b/src/mame/drivers/bublbobl.cpp @@ -1897,7 +1897,7 @@ GAME( 1986, boblbobl, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl GAME( 1986, sboblbobl, bublbobl, boblbobl, sboblbobl, bublbobl_state, bublbobl, ROT0, "bootleg (Datsu)", "Super Bobble Bobble (bootleg, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, sboblbobla, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, sboblboblb, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 3)", MACHINE_SUPPORTS_SAVE ) -GAME( 1986, sboblbobld, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 4)", MACHINE_SUPPORTS_SAVE ) +GAME( 1986, sboblbobld, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 4)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, sboblboblc, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bubble Bobble (bootleg)", MACHINE_SUPPORTS_SAVE ) // the title screen on this one isn't hacked GAME( 1986, bub68705, bublbobl, bub68705, bublbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Bubble Bobble (bootleg with 68705)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 8062af06612..30fc021028b 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -156,7 +156,7 @@ 0x000ac: Viewport center Y 0x00114: xxxxxxxx xxxxxxxx -------- -------- Framebuffer pixel read line count - -------- -------- xxxxxxxx xxxxxxxx Framebuffer pixel read pixel count + -------- -------- xxxxxxxx xxxxxxxx Framebuffer pixel read pixel count 0x00118: xxxxxxxx xxxxxxxx -------- -------- Framebuffer pixel read X pos -------- -------- xxxxxxxx xxxxxxxx Framebuffer pixel read Y pos @@ -2668,7 +2668,7 @@ void cobra_renderer::gfx_fifo_exec() case 0x0e0000: buffer = &m_overlay->pix32(y+i); break; case 0x000800: buffer = &m_zbuffer->pix32(y+i); break; case 0x000200: buffer = &m_stencil->pix32(y+i); break; - + default: { fatalerror("gfxfifo_exec: fb read from buffer %08X!\n", m_gfx_gram[0x80100/4]); diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index 928ccee913c..fa0d3dc8a56 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -582,7 +582,7 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) } else if (val == 0x02) { -// printf("Analog tests!\n"); +// printf("Analog tests!\n"); m_panel->xmit_char(54 | 0x80); m_panel->xmit_char(0); // Preset down m_panel->xmit_char(8 | 0x80); m_panel->xmit_char(0); // Compare down m_panel->xmit_char(8); m_panel->xmit_char(0); // Compare up @@ -595,7 +595,7 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) if (val < 20) val += shift; if (oldval == 0 && newval == 1) { - // printf("key pressed %d\n", val); + // printf("key pressed %d\n", val); m_panel->xmit_char(val); m_panel->xmit_char(0x00); } @@ -794,27 +794,27 @@ INPUT_PORTS_END static INPUT_PORTS_START( sq1 ) #if KEYBOARD_HACK PORT_START("KEY0") - PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 148) PORT_NAME("PITCH") // 148=PITCH (lo 1) - PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 149) PORT_NAME("CONTROL") // 149=CONTROL (hi 1) - PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 132) PORT_NAME("ENV1") // 132=ENV1 (lo 2) - PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 133) PORT_NAME("CLICK") // 133=CLICK (hi 2) - PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 182) PORT_NAME("LFO") // 182=LFO (lo 3) - PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 183) PORT_NAME("SONG") // 183=SONG (hi 3) - PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 134) PORT_NAME("FILTER") // 134=FILTER (lo 4) - PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 135) PORT_NAME("SEQ") // 135=SEQ (hi 4) - PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 142) PORT_NAME("ENV2") // 142=ENV2 (lo 5) - PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 143) PORT_NAME("EVENT") // 143=EVENT (hi 5) - PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 150) PORT_NAME("AMP") // 150=AMP (lo 6) - PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 151) PORT_NAME("PARAM") // 151=PARAM (hi 6) - PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 166) PORT_NAME("OUTPUT") // 166=OUTPUT (lo 7) - PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 167) PORT_NAME("MIX") // 167=MIX (hi 7) - PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 158) PORT_NAME("P. EFFECT") // 158=P.EFFECT (lo 8) - PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 159) PORT_NAME("S. EFFECT") // 159=S.EFFECT (hi 8) + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 148) PORT_NAME("PITCH") // 148=PITCH (lo 1) + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 149) PORT_NAME("CONTROL") // 149=CONTROL (hi 1) + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 132) PORT_NAME("ENV1") // 132=ENV1 (lo 2) + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 133) PORT_NAME("CLICK") // 133=CLICK (hi 2) + PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 182) PORT_NAME("LFO") // 182=LFO (lo 3) + PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 183) PORT_NAME("SONG") // 183=SONG (hi 3) + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 134) PORT_NAME("FILTER") // 134=FILTER (lo 4) + PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 135) PORT_NAME("SEQ") // 135=SEQ (hi 4) + PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 142) PORT_NAME("ENV2") // 142=ENV2 (lo 5) + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 143) PORT_NAME("EVENT") // 143=EVENT (hi 5) + PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 150) PORT_NAME("AMP") // 150=AMP (lo 6) + PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 151) PORT_NAME("PARAM") // 151=PARAM (hi 6) + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 166) PORT_NAME("OUTPUT") // 166=OUTPUT (lo 7) + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 167) PORT_NAME("MIX") // 167=MIX (hi 7) + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 158) PORT_NAME("P. EFFECT") // 158=P.EFFECT (lo 8) + PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 159) PORT_NAME("S. EFFECT") // 159=S.EFFECT (hi 8) PORT_START("KEY1") - PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 174) PORT_NAME("MIDI") // 174=MIDI (lo 9) - PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 175) PORT_NAME("SYSTEM") // 175=SYSTEM (hi 9) - PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 164) PORT_NAME("WAVE") // 164=WAVE (lo 0) - PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 165) PORT_NAME("LOCATE") // 165=LOCATE (hi 0) + PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 174) PORT_NAME("MIDI") // 174=MIDI (lo 9) + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 175) PORT_NAME("SYSTEM") // 175=SYSTEM (hi 9) + PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 164) PORT_NAME("WAVE") // 164=WAVE (lo 0) + PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 165) PORT_NAME("LOCATE") // 165=LOCATE (hi 0) PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 144) PORT_NAME("TRACK 1") // 144=Track 1 PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 160) PORT_NAME("TRACK 2") // 160=Track 2 PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 152) PORT_NAME("TRACK 3") // 152=Track 3 @@ -828,8 +828,8 @@ static INPUT_PORTS_START( sq1 ) PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 140) PORT_NAME("PROG DN") // 140=ProgDn PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 141) PORT_NAME("PROG UP") // 141=ProgUp PORT_START("KEY2") - PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 156) PORT_NAME("ROM/INT SELECT +") // 156=ROM/INT Select 189=track + - PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 157) PORT_NAME("ROM/INT SELECT -") // 157=ROM/INT Select 190=track - + PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 156) PORT_NAME("ROM/INT SELECT +") // 156=ROM/INT Select 189=track + + PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 157) PORT_NAME("ROM/INT SELECT -") // 157=ROM/INT Select 190=track - PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 180) PORT_NAME("SOUND SELECT") // 180=SOUND Select PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 181) PORT_NAME("SOUND EDIT") // 181=SOUND Edit PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') PORT_CHANGED_MEMBER(DEVICE_SELF, esq5505_state, key_stroke, 184) PORT_NAME("SEQ EDIT") // 184=SEQ Edit diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index 43bdd8337c8..45b4181c393 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -3,7 +3,7 @@ /****************************************************************************** Fidelity Electronics 6502 based board driver - + ****************************************************************************** Champion Sensory Chess Challenger (CSC) @@ -286,7 +286,7 @@ public: // devices/pointers optional_device<pia6821_device> m_6821pia; optional_device<generic_slot_device> m_cart; - + TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } @@ -309,7 +309,7 @@ public: DECLARE_WRITE8_MEMBER(sc12_control_w); DECLARE_READ8_MEMBER(sc12_input_r); DECLARE_READ8_MEMBER(sc12_cart_r); - + // 6080/6092/6093 (Excellence) DECLARE_INPUT_CHANGED_MEMBER(fexcelv_bankswitch); DECLARE_READ8_MEMBER(fexcelv_speech_r); @@ -331,7 +331,7 @@ void fidel6502_state::csc_prepare_display() { // 7442 0-8: led select, input mux m_inp_mux = 1 << m_led_select & 0x3ff; - + // 7442 9: speaker out m_speaker->level_w(m_inp_mux >> 9 & 1); @@ -374,7 +374,7 @@ WRITE8_MEMBER(fidel6502_state::csc_pia0_pb_w) // d1: TSI START line m_speech->start_w(data >> 1 & 1); - + // d4: lower TSI volume m_speech->set_output_gain(0, (data & 0x10) ? 0.5 : 1.0); } @@ -391,7 +391,7 @@ READ8_MEMBER(fidel6502_state::csc_pia0_pb_r) // d5: button row 8 (active low) // d6,d7: language switches data |= (~read_inputs(9) >> 3 & 0x20) | (~m_inp_matrix[9]->read() << 6 & 0xc0); - + return data; } @@ -520,7 +520,7 @@ WRITE8_MEMBER(fidel6502_state::fexcel_ttl_w) // a0-a2,d0: 74259(1) UINT8 mask = 1 << offset; m_led_select = (m_led_select & ~mask) | ((data & 1) ? mask : 0); - + // 74259 Q0-Q3: 7442 a0-a3 // 7442 0-8: led data, input mux UINT16 sel = 1 << (m_led_select & 0xf) & 0x3ff; @@ -536,7 +536,7 @@ WRITE8_MEMBER(fidel6502_state::fexcel_ttl_w) // a0-a2,d1: digit segment data (model 6093) m_7seg_data = (m_7seg_data & ~mask) | ((data & 2) ? mask : 0); UINT8 seg_data = BITSWAP8(m_7seg_data,0,1,3,2,7,5,6,4); - + // update display: 4 7seg leds, 2*8 chessboard leds for (int i = 0; i < 6; i++) m_display_state[i] = (led_sel >> i & 1) ? ((i < 2) ? led_data : seg_data) : 0; @@ -550,7 +550,7 @@ WRITE8_MEMBER(fidel6502_state::fexcel_ttl_w) { // a0-a2,d2: 74259(2) to speech board m_speech_data = (m_speech_data & ~mask) | ((data & 4) ? mask : 0); - + // 74259 Q6: TSI ROM A11 m_speech->force_update(); // update stream to now m_speech_bank = (m_speech_bank & ~1) | (m_speech_data >> 6 & 1); @@ -566,7 +566,7 @@ READ8_MEMBER(fidel6502_state::fexcel_ttl_r) { // a0-a2,d6: from speech board: language switches and TSI BUSY line, otherwise tied to VCC UINT8 d6 = (read_safe(m_inp_matrix[9], 0xff) >> offset & 1) ? 0x40 : 0; - + // a0-a2,d7: multiplexed inputs (active low) return d6 | ((read_inputs(9) >> offset & 1) ? 0 : 0x80); } diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 4d961477655..00cb94cc985 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -3,7 +3,7 @@ /****************************************************************************** Fidelity Electronics 68000 based board driver - + TODO: - how does dual-CPU work? - IRQ level/timing is unknown diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 7d0267af603..197b2845d5a 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -16,7 +16,7 @@ Chess pieces are required, but theoretically blindfold chess is possible. Chessboard artwork is provided for boards with pressure/magnet sensors. Read the official manual(s) on how to play. - + Keypad legend: - RE: Reset - CL: Clear @@ -29,17 +29,17 @@ - RV: Reverse - ST: Set/Stop - TM: Time - + Peripherals, compatible with various boards: - Fidelity Challenger Printer - thermal printer, MCU=? - + Program/data cartridges, for various boards, some cross-compatible: - CG6: Greatest Chess Games 1 - CAC: Challenger Advanced Chess - 8KB 101-1038A01 - CB9: Challenger Book Openings 1 - 8KB? - CB16: Challenger Book Openings 2 - 8+8KB 101-1042A01,02 - others are alt. titles of these? - + Board hardware descriptions below. Detailed RE work done by Kevin 'kevtris' Horton, except where noted @@ -534,7 +534,7 @@ public: DECLARE_WRITE8_MEMBER(vcc_ppi_portc_w); DECLARE_WRITE8_MEMBER(cc10_ppi_porta_w); TIMER_DEVICE_CALLBACK_MEMBER(beeper_off_callback); - + // BCC DECLARE_READ8_MEMBER(bcc_input_r); DECLARE_WRITE8_MEMBER(bcc_control_w); @@ -938,7 +938,7 @@ READ8_MEMBER(fidelz80_state::vsc_pio_portb_r) // d4: TSI BUSY line data |= (m_speech->busy_r()) ? 0 : 0x10; - + return data; } @@ -947,14 +947,14 @@ WRITE8_MEMBER(fidelz80_state::vsc_pio_portb_w) // d0,d1: input mux highest bits // d5: enable language switch m_inp_mux = (m_inp_mux & 0xff) | (data << 8 & 0x300) | (data << 5 & 0x400); - + // d7: TSI ROM A12 m_speech->force_update(); // update stream to now m_speech_bank = data >> 7 & 1; - + // d6: TSI START line m_speech->start_w(data >> 6 & 1); - + // d2: lower TSI volume m_speech->set_output_gain(0, (data & 4) ? 0.5 : 1.0); } diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index de2e1e47512..000078b8709 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -17,7 +17,7 @@ 1x MC1458P (u10)(sound) 1x TDA2003 (u8)(sound) 1x oscillator 10.000MHz (QZ1) - 1x oscillator 16.000000 (QZ2) + 1x oscillator 16.000000 (QZ2) ROMs: 1x AT27C020 (1) 2x M27C4001 (2,3) diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 4d5b3218085..b5f16e08b21 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -6763,7 +6763,7 @@ static const gfx_layout super9_charlayout = 32*8 /* every char takes 32 consecutive bytes */ }; -static const gfx_layout super9_tilelayout = // Green is OK. Red needs normal goldstar order... +static const gfx_layout super9_tilelayout = // Green is OK. Red needs normal goldstar order... { 8,32, /* 8*32 characters */ 256, /* 256 tiles */ @@ -8629,11 +8629,11 @@ ROM_END /* Cherry Gold I (bootleg) It runs in CB3e similar hardware... -1x TMPZ84C00AP-6 u15 8-bit Microprocessor -3x D71055C u30, u39, u40 Programmable Peripheral Interface -1x WF19054 u27 Programmable Sound Generator -1x SN76489AN u28 Digital Complex Sound Generator -1x oscillator unmarked Y1 +1x TMPZ84C00AP-6 u15 8-bit Microprocessor +3x D71055C u30, u39, u40 Programmable Peripheral Interface +1x WF19054 u27 Programmable Sound Generator +1x SN76489AN u28 Digital Complex Sound Generator +1x oscillator unmarked Y1 ROMs 1x D27256 1.u3 @@ -8660,7 +8660,7 @@ Others 1x battery 5,5V Notes -PCB is marked "REV.3" +PCB is marked "REV.3" */ ROM_START( chryglda ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -9268,7 +9268,7 @@ ROM_END /* Cherry Master I (CM1-1.01) - Sticker with "Cherry Master V4 -B-" on the PCB. + Sticker with "Cherry Master V4 -B-" on the PCB. Similar to cmasterb. Different program. 1x TMPZ84C00AP-6 u80 8-bit Microprocessor @@ -9296,7 +9296,7 @@ Others 1x pushbutton (SW6) 1x trimmer (volume)(VR1) 5x 8x2 switches DIP(SW1-SW5) -1x battery 5.5V(BT1) +1x battery 5.5V(BT1) */ ROM_START( cmasterg ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -12059,7 +12059,7 @@ ROM_END Lacks of Dyna copyright. Maybe bootleg. Not reels stop options. - Tried any input on the real hardware without luck. + Tried any input on the real hardware without luck. */ ROM_START( scmaster ) // all roms unique ROM_REGION( 0x10000, "maincpu", 0 ) @@ -13483,7 +13483,7 @@ DRIVER_INIT_MEMBER(cmaster_state, rp36c3) m_maincpu->space(AS_IO).install_read_handler(0x17, 0x17, read8_delegate(FUNC(cmaster_state::fixedval48_r),this)); } -DRIVER_INIT_MEMBER(cmaster_state, rp96sub) // 95 33 95 33 70 6C 70 6C... XORs seem ok. need bitswap and handler. +DRIVER_INIT_MEMBER(cmaster_state, rp96sub) // 95 33 95 33 70 6C 70 6C... XORs seem ok. need bitswap and handler. { int i; UINT8 *ROM = memregion("maincpu")->base(); @@ -13502,7 +13502,7 @@ DRIVER_INIT_MEMBER(cmaster_state, rp96sub) // 95 33 95 33 70 6C 70 6C... XORs se ROM[i] = x; } -// m_maincpu->space(AS_IO).install_read_handler(0x34, 0x34, read8_delegate(FUNC(cmaster_state::fixedvalb2_r),this)); +// m_maincpu->space(AS_IO).install_read_handler(0x34, 0x34, read8_delegate(FUNC(cmaster_state::fixedvalb2_r),this)); } diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp index d1bdabb186d..8269dfdb8ae 100644 --- a/src/mame/drivers/goupil.cpp +++ b/src/mame/drivers/goupil.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Jean-François DEL NERO +// copyright-holders:Jean-Francois DEL NERO /*************************************************************************** SMT Goupil G1 driver @@ -17,7 +17,7 @@ -> The internal Basic is working (-> 6800 0xC3 illegal opcode emulation needed). 02/04/2016 - Jean-François DEL NERO + Jean-Francois DEL NERO ****************************************************************************/ @@ -39,58 +39,58 @@ class goupil_g1_state : public driver_device { public: - goupil_g1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) - , m_acia(*this, "ef6850") - , m_ef9364(*this, "ef9364") - , m_maincpu(*this, "maincpu") - , m_via_video(*this, "m_via_video") - , m_via_keyb(*this, "m_via_keyb") - , m_via_modem(*this, "m_via_modem") - , m_fdc(*this, "fd1791") - , m_floppy0(*this, "fd1791:0") - , m_floppy1(*this, "fd1791:1") - , m_floppy(NULL) - { } - - DECLARE_WRITE8_MEMBER(via_video_pba_w); - DECLARE_WRITE8_MEMBER(via_video_pbb_w); - DECLARE_WRITE_LINE_MEMBER(via_video_ca2_w); - - DECLARE_READ8_MEMBER(kbd1_r); - DECLARE_READ8_MEMBER(kbd2_r); - DECLARE_READ8_MEMBER(shift_kb1_r); - DECLARE_READ8_MEMBER(shift_kb2_r); - DECLARE_READ8_MEMBER(ctrl_kb1_r); - DECLARE_READ8_MEMBER(ctrl_kb2_r); - - DECLARE_WRITE8_MEMBER(scanlines_kbd1_w); - DECLARE_WRITE8_MEMBER(scanlines_kbd2_w); - - DECLARE_READ_LINE_MEMBER(via_keyb_ca2_r); - - virtual void machine_start() override; - virtual void machine_reset() override; - - UINT8 m_row_kbd1; - UINT8 m_row_kbd2; - int old_state_ca2; - UINT8 via_video_pbb_data; - UINT8 cnttim; - UINT8 valkeyb; - TIMER_DEVICE_CALLBACK_MEMBER(goupil_scanline); + goupil_g1_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_acia(*this, "ef6850") + , m_ef9364(*this, "ef9364") + , m_maincpu(*this, "maincpu") + , m_via_video(*this, "m_via_video") + , m_via_keyb(*this, "m_via_keyb") + , m_via_modem(*this, "m_via_modem") + , m_fdc(*this, "fd1791") + , m_floppy0(*this, "fd1791:0") + , m_floppy1(*this, "fd1791:1") + , m_floppy(NULL) + { } + + DECLARE_WRITE8_MEMBER(via_video_pba_w); + DECLARE_WRITE8_MEMBER(via_video_pbb_w); + DECLARE_WRITE_LINE_MEMBER(via_video_ca2_w); + + DECLARE_READ8_MEMBER(kbd1_r); + DECLARE_READ8_MEMBER(kbd2_r); + DECLARE_READ8_MEMBER(shift_kb1_r); + DECLARE_READ8_MEMBER(shift_kb2_r); + DECLARE_READ8_MEMBER(ctrl_kb1_r); + DECLARE_READ8_MEMBER(ctrl_kb2_r); + + DECLARE_WRITE8_MEMBER(scanlines_kbd1_w); + DECLARE_WRITE8_MEMBER(scanlines_kbd2_w); + + DECLARE_READ_LINE_MEMBER(via_keyb_ca2_r); + + virtual void machine_start() override; + virtual void machine_reset() override; + + UINT8 m_row_kbd1; + UINT8 m_row_kbd2; + int old_state_ca2; + UINT8 via_video_pbb_data; + UINT8 cnttim; + UINT8 valkeyb; + TIMER_DEVICE_CALLBACK_MEMBER(goupil_scanline); private: - required_device<acia6850_device> m_acia; - required_device<ef9364_device> m_ef9364; - required_device<cpu_device> m_maincpu; - required_device<via6522_device> m_via_video; - required_device<via6522_device> m_via_keyb; - required_device<via6522_device> m_via_modem; - required_device<fd1791_t> m_fdc; - required_device<floppy_connector> m_floppy0; - required_device<floppy_connector> m_floppy1; - floppy_image_device *m_floppy; + required_device<acia6850_device> m_acia; + required_device<ef9364_device> m_ef9364; + required_device<cpu_device> m_maincpu; + required_device<via6522_device> m_via_video; + required_device<via6522_device> m_via_keyb; + required_device<via6522_device> m_via_modem; + required_device<fd1791_t> m_fdc; + required_device<floppy_connector> m_floppy0; + required_device<floppy_connector> m_floppy1; + floppy_image_device *m_floppy; }; /********************************** @@ -104,295 +104,295 @@ private: TIMER_DEVICE_CALLBACK_MEMBER( goupil_g1_state::goupil_scanline ) { - m_ef9364->update_scanline((UINT16)param); + m_ef9364->update_scanline((UINT16)param); } static ADDRESS_MAP_START(goupil_mem, AS_PROGRAM, 8, goupil_g1_state) - ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000,0x3fff) AM_RAM - AM_RANGE(0x4000,0x7fff) AM_RAM - AM_RANGE(0xC000,0xE3FF) AM_ROM AM_REGION("maincpu", 0x1000) // Basic ROM (BASIC 1 up to BASIC 9). + ADDRESS_MAP_UNMAP_HIGH + AM_RANGE(0x0000,0x3fff) AM_RAM + AM_RANGE(0x4000,0x7fff) AM_RAM + AM_RANGE(0xC000,0xE3FF) AM_ROM AM_REGION("maincpu", 0x1000) // Basic ROM (BASIC 1 up to BASIC 9). - AM_RANGE(0xe400,0xe7ff) AM_RAM - AM_RANGE(0xE800,0xE80F) AM_DEVREADWRITE("ef6850", acia6850_device, data_r, data_w) - AM_RANGE(0xE810,0xE81F) AM_DEVREADWRITE("m_via_video", via6522_device, read, write) + AM_RANGE(0xe400,0xe7ff) AM_RAM + AM_RANGE(0xE800,0xE80F) AM_DEVREADWRITE("ef6850", acia6850_device, data_r, data_w) + AM_RANGE(0xE810,0xE81F) AM_DEVREADWRITE("m_via_video", via6522_device, read, write) - AM_RANGE(0xE820,0xE820) AM_DEVREADWRITE("i8279_kb1", i8279_device, data_r, data_w ) - AM_RANGE(0xE821,0xE821) AM_DEVREADWRITE("i8279_kb1", i8279_device, status_r, cmd_w ) + AM_RANGE(0xE820,0xE820) AM_DEVREADWRITE("i8279_kb1", i8279_device, data_r, data_w ) + AM_RANGE(0xE821,0xE821) AM_DEVREADWRITE("i8279_kb1", i8279_device, status_r, cmd_w ) - AM_RANGE(0xE830,0xE830) AM_DEVREADWRITE("i8279_kb2", i8279_device, data_r, data_w ) - AM_RANGE(0xE831,0xE831) AM_DEVREADWRITE("i8279_kb2", i8279_device, status_r, cmd_w ) + AM_RANGE(0xE830,0xE830) AM_DEVREADWRITE("i8279_kb2", i8279_device, data_r, data_w ) + AM_RANGE(0xE831,0xE831) AM_DEVREADWRITE("i8279_kb2", i8279_device, status_r, cmd_w ) - AM_RANGE(0xE840,0xE84F) AM_DEVREADWRITE("m_via_keyb", via6522_device, read, write) + AM_RANGE(0xE840,0xE84F) AM_DEVREADWRITE("m_via_keyb", via6522_device, read, write) - AM_RANGE(0xE860,0xE86F) AM_DEVREADWRITE("m_via_modem", via6522_device, read, write) + AM_RANGE(0xE860,0xE86F) AM_DEVREADWRITE("m_via_modem", via6522_device, read, write) - AM_RANGE(0xe8f0,0xe8ff) AM_DEVREADWRITE("fd1791", fd1791_t, read, write) - //AM_RANGE(0xf08a,0xf08a) AM_READWRITE( fdc_sel0_r, fdc_sel0_w ) - //AM_RANGE(0xf08b,0xf08b) AM_READWRITE( fdc_sel1_r, fdc_sel1_w ) + AM_RANGE(0xe8f0,0xe8ff) AM_DEVREADWRITE("fd1791", fd1791_t, read, write) + //AM_RANGE(0xf08a,0xf08a) AM_READWRITE( fdc_sel0_r, fdc_sel0_w ) + //AM_RANGE(0xf08b,0xf08b) AM_READWRITE( fdc_sel1_r, fdc_sel1_w ) - AM_RANGE(0xf400,0xf7ff) AM_ROM AM_REGION("maincpu", 0x0800) // Modem (MOD 3) - AM_RANGE(0xf800,0xffff) AM_ROM AM_REGION("maincpu", 0x0000) // Monitor (MON 1 + MON 2) + AM_RANGE(0xf400,0xf7ff) AM_ROM AM_REGION("maincpu", 0x0800) // Modem (MOD 3) + AM_RANGE(0xf800,0xffff) AM_ROM AM_REGION("maincpu", 0x0000) // Monitor (MON 1 + MON 2) ADDRESS_MAP_END static ADDRESS_MAP_START( goupil_io, AS_IO, 8, goupil_g1_state) - ADDRESS_MAP_UNMAP_HIGH + ADDRESS_MAP_UNMAP_HIGH ADDRESS_MAP_END WRITE8_MEMBER( goupil_g1_state::scanlines_kbd1_w ) { - m_row_kbd1 = data; + m_row_kbd1 = data; } READ8_MEMBER( goupil_g1_state::ctrl_kb1_r ) { - char kbdrow[6]; - unsigned char data; - - kbdrow[0] = 'C'; - kbdrow[1] = 'T'; - kbdrow[2] = 'R'; - kbdrow[3] = '0'; - kbdrow[4] = 0; - - data = ioport(kbdrow)->read(); - if( data & 0x02 ) - return 1; - else - return 0; + char kbdrow[6]; + unsigned char data; + + kbdrow[0] = 'C'; + kbdrow[1] = 'T'; + kbdrow[2] = 'R'; + kbdrow[3] = '0'; + kbdrow[4] = 0; + + data = ioport(kbdrow)->read(); + if( data & 0x02 ) + return 1; + else + return 0; } READ8_MEMBER( goupil_g1_state::ctrl_kb2_r ) { - return 1; + return 1; } READ8_MEMBER( goupil_g1_state::shift_kb1_r ) { - char kbdrow[6]; - unsigned char data; - - kbdrow[0] = 'C'; - kbdrow[1] = 'T'; - kbdrow[2] = 'R'; - kbdrow[3] = '0'; - kbdrow[4] = 0; - - data = ioport(kbdrow)->read(); - if( data & 0x01 ) - return 1; - else - return 0; + char kbdrow[6]; + unsigned char data; + + kbdrow[0] = 'C'; + kbdrow[1] = 'T'; + kbdrow[2] = 'R'; + kbdrow[3] = '0'; + kbdrow[4] = 0; + + data = ioport(kbdrow)->read(); + if( data & 0x01 ) + return 1; + else + return 0; } READ8_MEMBER( goupil_g1_state::shift_kb2_r ) { - return 1; + return 1; } READ8_MEMBER( goupil_g1_state::kbd1_r ) { - char kbdrow[6]; - UINT8 data = 0xff; + char kbdrow[6]; + UINT8 data = 0xff; - kbdrow[0] = 'A'; - kbdrow[1] = 'X'; - kbdrow[2] = '0' + ( m_row_kbd1 & 7 ) ; - kbdrow[3] = 0; + kbdrow[0] = 'A'; + kbdrow[1] = 'X'; + kbdrow[2] = '0' + ( m_row_kbd1 & 7 ) ; + kbdrow[3] = 0; - data = ioport(kbdrow)->read(); + data = ioport(kbdrow)->read(); - return data; + return data; } WRITE8_MEMBER( goupil_g1_state::scanlines_kbd2_w ) { - m_row_kbd2 = data & 7; + m_row_kbd2 = data & 7; } READ_LINE_MEMBER( goupil_g1_state::via_keyb_ca2_r ) { - return 0; + return 0; } READ8_MEMBER( goupil_g1_state::kbd2_r ) { - char kbdrow[6]; - UINT8 data = 0xff; + char kbdrow[6]; + UINT8 data = 0xff; - kbdrow[0] = 'B'; - kbdrow[1] = 'X'; - kbdrow[2] = '0' + ( m_row_kbd2 & 7 ) ; - kbdrow[3] = 0; + kbdrow[0] = 'B'; + kbdrow[1] = 'X'; + kbdrow[2] = '0' + ( m_row_kbd2 & 7 ) ; + kbdrow[3] = 0; - data = ioport(kbdrow)->read(); + data = ioport(kbdrow)->read(); - return data; + return data; } /* Input ports */ static INPUT_PORTS_START( goupil_g1 ) - PORT_START("AX0") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') - PORT_START("AX1") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') - PORT_START("AX2") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('?') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') - PORT_START("AX3") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) - PORT_START("AX4") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR(':') PORT_CHAR('/') - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('.') - PORT_START("AX5") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(TAB)) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BS") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') - PORT_START("AX6") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0x00F9) PORT_CHAR('%') - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+') - PORT_START("AX7") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("CTR0") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) - - PORT_START("BX0") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("BX1") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("BX2") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("BX3") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') - PORT_START("BX4") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("BX5") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - 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("BX6") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') - PORT_START("BX7") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') - PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) - PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') + PORT_START("AX0") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') + PORT_START("AX1") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B') + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') + PORT_START("AX2") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('?') + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N') + PORT_START("AX3") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) + PORT_START("AX4") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR(':') PORT_CHAR('/') + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('.') + PORT_START("AX5") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("TAB") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(TAB)) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BS") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('_') + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') + PORT_START("AX6") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0x00F9) PORT_CHAR('%') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+') + PORT_START("AX7") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("CTR0") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2) + + PORT_START("BX0") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("BX1") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("BX2") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("BX3") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') + PORT_START("BX4") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("BX5") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + 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("BX6") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') + PORT_START("BX7") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') INPUT_PORTS_END static SLOT_INTERFACE_START( goupil_floppies ) - SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) + SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) SLOT_INTERFACE_END void goupil_g1_state::machine_start() { - std::string region_tag; + std::string region_tag; - m_floppy = NULL; - valkeyb = 0xFF; + m_floppy = NULL; + valkeyb = 0xFF; } void goupil_g1_state::machine_reset() @@ -401,108 +401,108 @@ void goupil_g1_state::machine_reset() WRITE8_MEMBER(goupil_g1_state::via_video_pba_w) { - #ifdef DBGMODE - printf("%s: write via_video_pba_w reg : 0x%X\n",machine().describe_context(),data); - #endif - m_ef9364->char_latch_w(data); + #ifdef DBGMODE + printf("%s: write via_video_pba_w reg : 0x%X\n",machine().describe_context(),data); + #endif + m_ef9364->char_latch_w(data); } WRITE8_MEMBER(goupil_g1_state::via_video_pbb_w) { - #ifdef DBGMODE - printf("%s: write via_video_pbb_w reg : 0x%X\n",machine().describe_context(),data); - #endif - via_video_pbb_data = data; + #ifdef DBGMODE + printf("%s: write via_video_pbb_w reg : 0x%X\n",machine().describe_context(),data); + #endif + via_video_pbb_data = data; } WRITE_LINE_MEMBER( goupil_g1_state::via_video_ca2_w ) { - if(old_state_ca2==0 && state==1) - { - m_ef9364->command_w(via_video_pbb_data&0xF); - } - old_state_ca2 = state; + if(old_state_ca2==0 && state==1) + { + m_ef9364->command_w(via_video_pbb_data&0xF); + } + old_state_ca2 = state; } static MACHINE_CONFIG_START( goupil_g1, goupil_g1_state ) - /* basic machine hardware */ - MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(goupil_mem) - MCFG_CPU_IO_MAP(goupil_io) - - /* sound hardware */ - // TODO ! - - MCFG_DEVICE_ADD ("ef6850", ACIA6850, 0) - - /* screen */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_UPDATE_DEVICE("ef9364", ef9364_device, screen_update) - - MCFG_SCREEN_SIZE((64*8), (16*(8+4))) - MCFG_SCREEN_VISIBLE_AREA(0, (64*8)-1, 0, (16*(8+4))-1) - MCFG_PALETTE_ADD("palette", 16) - - MCFG_DEVICE_ADD("ef9364", EF9364, VIDEO_CLOCK) - MCFG_EF9364_PALETTE("palette") - MCFG_EF9364_PAGES_CNT(1); - MCFG_TIMER_DRIVER_ADD_SCANLINE("goupil_sl", goupil_g1_state, goupil_scanline, "screen", 0, 10) - - MCFG_DEVICE_ADD("m_via_video", VIA6522, 0) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(goupil_g1_state, via_video_pba_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(goupil_g1_state, via_video_pbb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(goupil_g1_state, via_video_ca2_w)) - - MCFG_DEVICE_ADD("m_via_keyb", VIA6522, 0) - MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line)) - - MCFG_DEVICE_ADD("m_via_modem", VIA6522, 0) - MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line)) - - /* Floppy */ - MCFG_FD1791_ADD("fd1791", XTAL_8MHz ) - MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) - - MCFG_DEVICE_ADD("i8279_kb1", I8279, CPU_CLOCK) - MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd1_w)) // scan SL lines - MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd1_r)) // kbd RL lines - MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb1_r)) - MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb1_r)) - MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("m_via_keyb", via6522_device, write_ca1)) - - MCFG_DEVICE_ADD("i8279_kb2", I8279, CPU_CLOCK) - MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd2_w)) // scan SL lines - MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd2_r)) // kbd RL lines - MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb2_r)) - MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb2_r)) + /* basic machine hardware */ + MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK) + MCFG_CPU_PROGRAM_MAP(goupil_mem) + MCFG_CPU_IO_MAP(goupil_io) + + /* sound hardware */ + // TODO ! + + MCFG_DEVICE_ADD ("ef6850", ACIA6850, 0) + + /* screen */ + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_UPDATE_DEVICE("ef9364", ef9364_device, screen_update) + + MCFG_SCREEN_SIZE((64*8), (16*(8+4))) + MCFG_SCREEN_VISIBLE_AREA(0, (64*8)-1, 0, (16*(8+4))-1) + MCFG_PALETTE_ADD("palette", 16) + + MCFG_DEVICE_ADD("ef9364", EF9364, VIDEO_CLOCK) + MCFG_EF9364_PALETTE("palette") + MCFG_EF9364_PAGES_CNT(1); + MCFG_TIMER_DRIVER_ADD_SCANLINE("goupil_sl", goupil_g1_state, goupil_scanline, "screen", 0, 10) + + MCFG_DEVICE_ADD("m_via_video", VIA6522, 0) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(goupil_g1_state, via_video_pba_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(goupil_g1_state, via_video_pbb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(goupil_g1_state, via_video_ca2_w)) + + MCFG_DEVICE_ADD("m_via_keyb", VIA6522, 0) + MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line)) + + MCFG_DEVICE_ADD("m_via_modem", VIA6522, 0) + MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line)) + + /* Floppy */ + MCFG_FD1791_ADD("fd1791", XTAL_8MHz ) + MCFG_FLOPPY_DRIVE_ADD("fd1791:0", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats) + + MCFG_DEVICE_ADD("i8279_kb1", I8279, CPU_CLOCK) + MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd1_w)) // scan SL lines + MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd1_r)) // kbd RL lines + MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb1_r)) + MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb1_r)) + MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("m_via_keyb", via6522_device, write_ca1)) + + MCFG_DEVICE_ADD("i8279_kb2", I8279, CPU_CLOCK) + MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd2_w)) // scan SL lines + MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd2_r)) // kbd RL lines + MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb2_r)) + MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb2_r)) MACHINE_CONFIG_END /* ROM definition */ ROM_START( goupilg1 ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_DEFAULT_BIOS("v1_0") - - ROM_SYSTEM_BIOS(0, "v1_0", "Version 1.0") - ROMX_LOAD( "SMT_Goupil_G1_MON_1.bin", 0x0000, 0x0400, CRC(98B7BE69) SHA1(69E83FE78A43FCF2B08FB0BCEFB0D217A57B1ECB), ROM_BIOS(1) ) - ROM_LOAD ( "SMT_Goupil_G1_MON_2.bin", 0x0400, 0x0400, CRC(19386B81) SHA1(E52F63FD29D374319781E9677DE6D3FD61A3684C) ) - - ROM_LOAD( "SMT_Goupil_G1_MOD_3.bin", 0x0800, 0x0400, CRC(E662F152) SHA1(11B91C5737E7572A2C18472B66BBD16B485132D5) ) - - ROMX_LOAD( "SMT_Goupil_G1_Basic_1.bin", 0x1000, 0x0400, CRC(AD105B12) SHA1(631CD4B997F76B57BF2509E4BFF30B1595C8BD13), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_2.bin", 0x1400, 0x0400, CRC(0C5C309C) SHA1(F1CAB4B0F9191E53113790A95F1AB7108F9406A1), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_3.bin", 0x1800, 0x0400, CRC(1F1EB127) SHA1(DBBB880C79D515ACBFCB2BE9A4C96962F3E4EDEA), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_4.bin", 0x1C00, 0x0400, CRC(09BE48E4) SHA1(86CAE0D159583C1D572A5754F3BB6B4A2E479359), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_5.bin", 0x2000, 0x0400, CRC(BDEB395C) SHA1(32A50468F1CA772EE45A1F5C61C66F3ECC774074), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_6.bin", 0x2400, 0x0400, CRC(850A4000) SHA1(720F0BB3E45877835219B7E1D943EF4F19B9977D), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_7.bin", 0x2800, 0x0400, CRC(586C7670) SHA1(13E2E96B9F1A53555CE0D55F657CF3C6B96F10A0), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_8.bin", 0x2C00, 0x0400, CRC(33281300) SHA1(CE631FA8157A3F8869C5FEFE24B7F40E06696DF9), ROM_BIOS(1) ) - ROMX_LOAD( "SMT_Goupil_G1_Basic_9.bin", 0x3000, 0x0400, CRC(A3911201) SHA1(8623A0A2D83EB3A27A795030643C5C05A4350A9F), ROM_BIOS(1) ) - - ROM_REGION( 0x400, "ef9364", 0 ) - ROM_LOAD( "SMT_Goupil_G1_Charset.bin", 0x0000, 0x0400, CRC(8B6DA54B) SHA1(AC2204600F45C6DD0DF1E759B62ED25928F02A12) ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_DEFAULT_BIOS("v1_0") + + ROM_SYSTEM_BIOS(0, "v1_0", "Version 1.0") + ROMX_LOAD( "SMT_Goupil_G1_MON_1.bin", 0x0000, 0x0400, CRC(98B7BE69) SHA1(69E83FE78A43FCF2B08FB0BCEFB0D217A57B1ECB), ROM_BIOS(1) ) + ROM_LOAD ( "SMT_Goupil_G1_MON_2.bin", 0x0400, 0x0400, CRC(19386B81) SHA1(E52F63FD29D374319781E9677DE6D3FD61A3684C) ) + + ROM_LOAD( "SMT_Goupil_G1_MOD_3.bin", 0x0800, 0x0400, CRC(E662F152) SHA1(11B91C5737E7572A2C18472B66BBD16B485132D5) ) + + ROMX_LOAD( "SMT_Goupil_G1_Basic_1.bin", 0x1000, 0x0400, CRC(AD105B12) SHA1(631CD4B997F76B57BF2509E4BFF30B1595C8BD13), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_2.bin", 0x1400, 0x0400, CRC(0C5C309C) SHA1(F1CAB4B0F9191E53113790A95F1AB7108F9406A1), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_3.bin", 0x1800, 0x0400, CRC(1F1EB127) SHA1(DBBB880C79D515ACBFCB2BE9A4C96962F3E4EDEA), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_4.bin", 0x1C00, 0x0400, CRC(09BE48E4) SHA1(86CAE0D159583C1D572A5754F3BB6B4A2E479359), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_5.bin", 0x2000, 0x0400, CRC(BDEB395C) SHA1(32A50468F1CA772EE45A1F5C61C66F3ECC774074), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_6.bin", 0x2400, 0x0400, CRC(850A4000) SHA1(720F0BB3E45877835219B7E1D943EF4F19B9977D), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_7.bin", 0x2800, 0x0400, CRC(586C7670) SHA1(13E2E96B9F1A53555CE0D55F657CF3C6B96F10A0), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_8.bin", 0x2C00, 0x0400, CRC(33281300) SHA1(CE631FA8157A3F8869C5FEFE24B7F40E06696DF9), ROM_BIOS(1) ) + ROMX_LOAD( "SMT_Goupil_G1_Basic_9.bin", 0x3000, 0x0400, CRC(A3911201) SHA1(8623A0A2D83EB3A27A795030643C5C05A4350A9F), ROM_BIOS(1) ) + + ROM_REGION( 0x400, "ef9364", 0 ) + ROM_LOAD( "SMT_Goupil_G1_Charset.bin", 0x0000, 0x0400, CRC(8B6DA54B) SHA1(AC2204600F45C6DD0DF1E759B62ED25928F02A12) ) ROM_END /* Driver */ diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index a201672c98f..ffa4a7e0b24 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -669,7 +669,7 @@ MACHINE_CONFIG_END Coleco Zodiac - The Astrology Computer * TMS1100 MP3435 (no decap) * 8-digit 7seg display, 12 other LEDs, 1-bit sound - + As the name suggests, this is an astrologic calculator. Refer to the (very extensive) manual on how to use it. @@ -858,7 +858,7 @@ void cqback_state::prepare_display() UINT16 seg = m_o; if (m_r & 0x200) seg = (m_o << 7 & 0x300) | (m_o & 0xf9); - + set_display_segmask(0x1ff, 0xff); display_matrix(11, 9, seg, m_r & 0x1ff); } @@ -1351,7 +1351,7 @@ MACHINE_CONFIG_END Conic Electronic Football II * TMS1100 MP1181 (no decap) * 9-digit LED grid, 1-bit sound - + This is a clone of Coleco's Quarterback, similar at hardware-level too. It was also sold by Tandy under the same title. @@ -1378,7 +1378,7 @@ void cnfball2_state::prepare_display() UINT16 seg = m_o; if (~m_r & 2) seg = (m_o << 7 & 0x300) | (m_o & 0xf9); - + set_display_segmask(0x1ff, 0xff); display_matrix(11, 9, seg, m_r >> 1 & 0x1ff); } @@ -1390,7 +1390,7 @@ WRITE16_MEMBER(cnfball2_state::write_r) // R8-R10: input mux m_inp_mux = data >> 8 & 7; - + // R1-R10: select digit/segment m_r = data; prepare_display(); @@ -4397,7 +4397,7 @@ MACHINE_CONFIG_END Featuring The Electronic Dive-Control Center * TMS1100 M34038-NLL (die labeled 1100E, M34038) * 11 LEDs, 4-bit sound - + This is a board game. The electronic accessory is the emulated part here. ***************************************************************************/ diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 7f83f001fe3..a8fb77fa17c 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -79,7 +79,7 @@ public: m_io_key1(*this , "KEY1"), m_io_key2(*this , "KEY2"), m_io_key3(*this , "KEY3"), - m_t15(*this , "t15") + m_t15(*this , "t15") { } UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -101,9 +101,9 @@ public: DECLARE_WRITE8_MEMBER(pa_w); - DECLARE_WRITE_LINE_MEMBER(t15_irq_w); - DECLARE_WRITE_LINE_MEMBER(t15_flg_w); - DECLARE_WRITE_LINE_MEMBER(t15_sts_w); + DECLARE_WRITE_LINE_MEMBER(t15_irq_w); + DECLARE_WRITE_LINE_MEMBER(t15_flg_w); + DECLARE_WRITE_LINE_MEMBER(t15_sts_w); private: required_device<hp_5061_3001_cpu_device> m_lpu; @@ -113,7 +113,7 @@ private: required_ioport m_io_key1; required_ioport m_io_key2; required_ioport m_io_key3; - required_device<hp_taco_device> m_t15; + required_device<hp_taco_device> m_t15; void set_video_mar(UINT16 mar); void video_fill_buff(bool buff_idx); @@ -150,8 +150,8 @@ private: UINT8 m_kb_scancode; UINT16 m_kb_status; - // State of PPU I/O - UINT8 m_ppu_pa; + // State of PPU I/O + UINT8 m_ppu_pa; }; static INPUT_PORTS_START(hp9845b) @@ -332,13 +332,13 @@ void hp9845b_state::machine_reset() m_video_frame = 0; m_irl_pending = 0; - m_irh_pending = 0; + m_irh_pending = 0; memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state)); m_kb_scancode = 0x7f; m_kb_status = 0; - m_ppu_pa = 0; + m_ppu_pa = 0; } void hp9845b_state::set_video_mar(UINT16 mar) @@ -593,13 +593,13 @@ WRITE16_MEMBER(hp9845b_state::kb_irq_clear_w) WRITE8_MEMBER(hp9845b_state::pa_w) { - m_ppu_pa = data; + m_ppu_pa = data; // TODO: handle sts & flg if (data == 15) { - // RHS tape drive (T15) - m_ppu->status_w(m_t15->sts_r()); - m_ppu->flag_w(m_t15->flg_r()); + // RHS tape drive (T15) + m_ppu->status_w(m_t15->sts_r()); + m_ppu->flag_w(m_t15->flg_r()); } else { m_ppu->status_w(0); m_ppu->flag_w(0); @@ -608,26 +608,26 @@ WRITE8_MEMBER(hp9845b_state::pa_w) WRITE_LINE_MEMBER(hp9845b_state::t15_irq_w) { - if (state) { - BIT_SET(m_irh_pending , 7); - } else { - BIT_CLR(m_irh_pending , 7); - } - update_irq(); + if (state) { + BIT_SET(m_irh_pending , 7); + } else { + BIT_CLR(m_irh_pending , 7); + } + update_irq(); } WRITE_LINE_MEMBER(hp9845b_state::t15_flg_w) { - if (m_ppu_pa == 15) { - m_ppu->flag_w(state); - } + if (m_ppu_pa == 15) { + m_ppu->flag_w(state); + } } WRITE_LINE_MEMBER(hp9845b_state::t15_sts_w) { - if (m_ppu_pa == 15) { - m_ppu->status_w(state); - } + if (m_ppu_pa == 15) { + m_ppu->status_w(state); + } } static MACHINE_CONFIG_START( hp9845a, hp9845_state ) @@ -678,9 +678,9 @@ static ADDRESS_MAP_START(ppu_io_map , AS_IO , 16 , hp9845b_state) // PA = 0, IC = 3 // Keyboard status input & keyboard interrupt clear AM_RANGE(HP_MAKE_IOADDR(0 , 3) , HP_MAKE_IOADDR(0 , 3)) AM_READWRITE(kb_status_r , kb_irq_clear_w) - // PA = 15, IC = 0..3 - // Right-hand side tape drive (T15) - AM_RANGE(HP_MAKE_IOADDR(15 , 0) , HP_MAKE_IOADDR(15 , 3)) AM_DEVREADWRITE("t15" , hp_taco_device , reg_r , reg_w) + // PA = 15, IC = 0..3 + // Right-hand side tape drive (T15) + AM_RANGE(HP_MAKE_IOADDR(15 , 0) , HP_MAKE_IOADDR(15 , 3)) AM_DEVREADWRITE("t15" , hp_taco_device , reg_r , reg_w) ADDRESS_MAP_END static MACHINE_CONFIG_START( hp9845b, hp9845b_state ) @@ -706,11 +706,11 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state ) // Actual keyboard refresh rate should be KEY_SCAN_OSCILLATOR / 128 (2560 Hz) MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp9845b_state , kb_scan , attotime::from_hz(100)) - // Tape controller - MCFG_DEVICE_ADD("t15" , HP_TACO , 4000000) - MCFG_TACO_IRQ_HANDLER(WRITELINE(hp9845b_state , t15_irq_w)) - MCFG_TACO_FLG_HANDLER(WRITELINE(hp9845b_state , t15_flg_w)) - MCFG_TACO_STS_HANDLER(WRITELINE(hp9845b_state , t15_sts_w)) + // Tape controller + MCFG_DEVICE_ADD("t15" , HP_TACO , 4000000) + MCFG_TACO_IRQ_HANDLER(WRITELINE(hp9845b_state , t15_irq_w)) + MCFG_TACO_FLG_HANDLER(WRITELINE(hp9845b_state , t15_flg_w)) + MCFG_TACO_STS_HANDLER(WRITELINE(hp9845b_state , t15_sts_w)) MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845b_rom") MACHINE_CONFIG_END diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index d8dd8401ba7..5351f5f1b79 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -100,7 +100,7 @@ public: UINT32 screen_update_jangou(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(cvsd_bit_timer_callback); DECLARE_WRITE_LINE_MEMBER(jngolady_vclk_cb); - + std::unique_ptr<bitmap_ind16> m_tmp_bitmap; }; @@ -846,7 +846,7 @@ static MACHINE_CONFIG_START( jangou, jangou_state ) MCFG_CPU_IO_MAP(cpu1_io) MCFG_JANGOU_BLITTER_ADD("blitter", MASTER_CLOCK/4) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/4,320,0,256,264,16,240) // assume same as nightgal.cpp diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp index 0dddfd432c8..2cc76c0f2c3 100644 --- a/src/mame/drivers/k28.cpp +++ b/src/mame/drivers/k28.cpp @@ -8,12 +8,12 @@ * MM5445N VFD driver, 9-digit alphanumeric display same as snmath * 2*TMS6100 (32KB VSM) * SC-01-A speech chip - + 3 models exist: - 7-230: darkblue case, toy-ish looks - 7-231: gray case, hardware is the same - 7-232: this one is completely different hw --> driver tispeak.cpp - + TODO: - external module support (no dumps yet) - SC-01 frog speech is why this driver is marked NOT_WORKING @@ -83,7 +83,7 @@ public: DECLARE_WRITE8_MEMBER(mcu_p2_w); DECLARE_WRITE8_MEMBER(mcu_prog_w); DECLARE_READ8_MEMBER(mcu_t1_r); - + DECLARE_INPUT_CHANGED_MEMBER(power_on); void power_off(); @@ -140,7 +140,7 @@ void k28_state::machine_reset() { m_power_on = true; m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE); - + // the game relies on reading the on-button as pressed when it's turned on m_onbutton_timer->adjust(attotime::from_msec(250)); } @@ -274,13 +274,13 @@ WRITE8_MEMBER(k28_state::mcu_p0_w) // d0-d2: input mux high bits m_inp_mux = (m_inp_mux & 0xf) | (~data << 4 & 0x70); m_phoneme = (m_phoneme & 0xf) | (data << 4 & 0x30); - + // d3: SC-01 strobe, latch phoneme on rising edge int strobe = data >> 3 & 1; if (!strobe && m_speech_strobe) m_speech->write(space, 0, m_phoneme); m_speech_strobe = strobe; - + // d5: VFD driver data enable m_vfd_data_enable = ~data >> 5 & 1; if (m_vfd_data_enable) @@ -299,18 +299,18 @@ WRITE8_MEMBER(k28_state::mcu_p0_w) READ8_MEMBER(k28_state::mcu_p1_r) { UINT8 data = 0; - + // multiplexed inputs (active low) for (int i = 0; i < 7; i++) if (m_inp_mux >> i & 1) { data |= m_inp_matrix[i]->read(); - + // force press on-button at boot if (i == 5 && m_onbutton_timer->enabled()) data |= 1; } - + return data ^ 0xff; } @@ -326,7 +326,7 @@ WRITE8_MEMBER(k28_state::mcu_p2_w) m_vfd_data_in = data & 1; if (m_vfd_data_enable) m_vfd_shiftreg = (m_vfd_shiftreg & U64(~1)) | m_vfd_data_in; - + // d0-d3: VSM data, input mux and SC-01 phoneme lower nibble m_tms6100->add_w(space, 0, data); m_inp_mux = (m_inp_mux & ~0xf) | (~data & 0xf); @@ -339,19 +339,19 @@ WRITE8_MEMBER(k28_state::mcu_prog_w) int state = (data) ? 1 : 0; bool rise = state == 1 && !m_vfd_clock; m_vfd_clock = state; - + // on rising edge if (rise) { // leading 1 triggers shift start if (m_vfd_shiftcount == 0 && ~m_vfd_shiftreg & 1) return; - + // output shiftreg on 35th clock if (m_vfd_shiftcount == 35) { m_vfd_shiftcount = 0; - + // output 0-15: digit segment data UINT16 seg_data = (UINT16)(m_vfd_shiftreg >> 19); seg_data = BITSWAP16(seg_data,0,1,13,9,10,12,14,8,3,4,5,2,15,11,6,7); @@ -360,7 +360,7 @@ WRITE8_MEMBER(k28_state::mcu_prog_w) UINT16 digit_sel = (UINT16)(m_vfd_shiftreg >> 10) & 0x1ff; set_display_segmask(0x1ff, 0x3fff); display_matrix(16, 9, seg_data, digit_sel); - + // output 25: power-off request on falling edge if (~m_vfd_shiftreg & m_vfd_shiftreg_out & 0x200) power_off(); diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index ed4f0f1f05f..33bbf1c4f2d 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -214,7 +214,7 @@ - Bet distribution (1, 2, 3, 4, 5~10) - Omake (bonus) distribution (games total, win games, loss games) - + Pressing the Bookkeeping key once more, you exit the mode and go back to the game. @@ -437,7 +437,7 @@ ADDRESS_MAP_END /* 00h W --> bankswitching reg... - + 10h W --> 00's \ 11h W --> 02 8f 20 91... > V9938 OK 13h W --> / @@ -810,7 +810,7 @@ ROM_END /* Pyon Pyon Jump. Ver 1.40. - 199?, Success / Taiyo Jidoki. + 199?, Success / Taiyo Jidoki. */ ROM_START( ppj ) ROM_REGION( 0x08000, "maincpu", 0 ) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index 08ae31888d9..8344b68e9e3 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -2,18 +2,18 @@ // copyright-holders:Curt Coder, Ales Dlabac /*************************************************************************** - Sord m.5 - - http://www.retropc.net/mm/m5/ - http://www.museo8bits.es/wiki/index.php/Sord_M5 not working - http://k5.web.klfree.net/content/view/10/11/ not working - http://k5.web.klfree.net/images/stories/sord/m5heap.htm not working - http://k5.klfree.net/index.php?option=com_content&task=view&id=5&Itemid=3 - http://k5.klfree.net/index.php?option=com_content&task=view&id=10&Itemid=11 - http://k5.klfree.net/index.php?option=com_content&task=view&id=14&Itemid=3 - http://www.dlabi.cz/?s=sord - https://www.facebook.com/groups/59667560188/ - http://www.oldcomp.cz/viewtopic.php?f=103&t=1164 + Sord m.5 + + http://www.retropc.net/mm/m5/ + http://www.museo8bits.es/wiki/index.php/Sord_M5 not working + http://k5.web.klfree.net/content/view/10/11/ not working + http://k5.web.klfree.net/images/stories/sord/m5heap.htm not working + http://k5.klfree.net/index.php?option=com_content&task=view&id=5&Itemid=3 + http://k5.klfree.net/index.php?option=com_content&task=view&id=10&Itemid=11 + http://k5.klfree.net/index.php?option=com_content&task=view&id=14&Itemid=3 + http://www.dlabi.cz/?s=sord + https://www.facebook.com/groups/59667560188/ + http://www.oldcomp.cz/viewtopic.php?f=103&t=1164 ****************************************************************************/ @@ -21,34 +21,34 @@ TODO: - - fd5 floppy - - SI-5 serial interface (8251, ROM) - - ramdisk for KRX Memory expansion - - rewrite fd5 floppy as unpluggable device - - move dipswitch declaration to softwarelist file? - - 64krx: get windows ROM version with cpm & ramdisk support (Stuchlik S.E.I. version) + - fd5 floppy + - SI-5 serial interface (8251, ROM) + - ramdisk for KRX Memory expansion + - rewrite fd5 floppy as unpluggable device + - move dipswitch declaration to softwarelist file? + - 64krx: get windows ROM version with cpm & ramdisk support (Stuchlik S.E.I. version) - - brno mod: make the dsk image writeable - - brno mod: in console version lost data on RAMDISK after soft reset - - brno mod: add support for lzr floppy disc format - - brno mod: include basic-i + - brno mod: make the dsk image writeable + - brno mod: in console version lost data on RAMDISK after soft reset + - brno mod: add support for lzr floppy disc format + - brno mod: include basic-i CHANGELOG: 10.02.2016 - - fixed bug: crash if rom card was only cart - - fixed bug: when em-5 selected monitor rom wasn't paged in - - brno mod: spin motor on upon restart - - brno mod: windowed boot as default rom - - brno mod: fixed bug: tape command in menu now works + - fixed bug: crash if rom card was only cart + - fixed bug: when em-5 selected monitor rom wasn't paged in + - brno mod: spin motor on upon restart + - brno mod: windowed boot as default rom + - brno mod: fixed bug: tape command in menu now works 05.02.2016 - - added BRNO modification - 1024kB Ramdisk + CP/M support - - 32/64KB RAM expansions EM-5, 64KBI, 64KBF, 64KRX - - since now own version of rom and slot handlers - - 2 slots for carts + - added BRNO modification - 1024kB Ramdisk + CP/M support + - 32/64KB RAM expansions EM-5, 64KBI, 64KBF, 64KRX + - since now own version of rom and slot handlers + - 2 slots for carts ****************************************************************************** @@ -58,12 +58,12 @@ Controlling (paging) of homebrew 64KB RAM carts ================================================ Used ports: -EM-64, 64KBI: OUT 6CH,00H - enables ROM - OUT 6CH,01H - enables RAM -64KBF: OUT 30H,00000xxxB - enables RAM or ROM, see bellow -64KRD, 64KRX: OUT 7FH,00000000B - enables RAM - OUT 7FH,11111111B - enables ROM - OUT 7FH,xxxxxxxxB - enables RAM and ROM, see bellow +EM-64, 64KBI: OUT 6CH,00H - enables ROM + OUT 6CH,01H - enables RAM +64KBF: OUT 30H,00000xxxB - enables RAM or ROM, see bellow +64KRD, 64KRX: OUT 7FH,00000000B - enables RAM + OUT 7FH,11111111B - enables ROM + OUT 7FH,xxxxxxxxB - enables RAM and ROM, see bellow =========================================================================================================================== @@ -78,93 +78,93 @@ RAM/ROM modes of 64KBF version 2C cart ------------------------------------------ Memory paging is done by using "OUT &30,mod". -MODE READ WRITE +MODE READ WRITE ---------------------------------------------------------------------- - 00 8 KB MON + 20 KB BF + 36 KB RAM 28 KB DIS + 36 KB RAM - 01 64 KB RAM 64 KB RAM - 02 8 KB MON + 56 KB RAM 64 KB RAM - 03 64 KB RAM 28 KB DIS + 36 KB RAM - 04 64 KB RAM 16 KB DIS + 48 KB RAM - 05 8 KB MON + 20 KB BF + 36 KB RAM 64 KB RAM - 06 8 KB MON + 20 KB DIS + 36 KB RAM 64 KB RAM - 07 64 KB DIS 64 KB DIS - + 00 8 KB MON + 20 KB BF + 36 KB RAM 28 KB DIS + 36 KB RAM + 01 64 KB RAM 64 KB RAM + 02 8 KB MON + 56 KB RAM 64 KB RAM + 03 64 KB RAM 28 KB DIS + 36 KB RAM + 04 64 KB RAM 16 KB DIS + 48 KB RAM + 05 8 KB MON + 20 KB BF + 36 KB RAM 64 KB RAM + 06 8 KB MON + 20 KB DIS + 36 KB RAM 64 KB RAM + 07 64 KB DIS 64 KB DIS + Version LZR ( 2C ) ================ +------------+ -|////////////| READ ONLY AREA +|////////////| READ ONLY AREA +------------+ -|\\\\\\\\\\\\| WRITE ONLY AREA +|\\\\\\\\\\\\| WRITE ONLY AREA +------------+ -|XXXXXXXXXXXX| R&W AREA +|XXXXXXXXXXXX| R&W AREA +------------+ -| | DISABLED R&W +| | DISABLED R&W +------------+ - 0 0 0 1 1 2 2 2 3 3 4 4 4 5 5 6 6 -kB 0 4 8 2 6 0 4 8 2 6 0 4 8 2 6 0 4 - +-------+-------------------+ -ROM |MONITOR| BASIC-F | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -RAM | | | | | | | | | - +-------+-------+-------+-------+-------+-------+-------+-------+ + 0 0 0 1 1 2 2 2 3 3 4 4 4 5 5 6 6 +kB 0 4 8 2 6 0 4 8 2 6 0 4 8 2 6 0 4 + +-------+-------------------+ +ROM |MONITOR| BASIC-F | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +RAM | | | | | | | | | + +-------+-------+-------+-------+-------+-------+-------+-------+ CART | | | | | | | | | - +-------+-------+-------+-------+-------+-------+-------+-------+ + +-------+-------+-------+-------+-------+-------+-------+-------+ Mode - +-------+-------------------+ - |///////|///////////////////| - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M0 | | | | |XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - | | | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M1 |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - |///////| | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M2 |\\\\\\\|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - | | | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M3 |///////|///////|///////|///|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - | | | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M4 |///////|///////|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - |///////|///////////////////| - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M5 |\\\\\\\|\\\\\\\|\\\\\\\|\\\|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+-------+-------+-------+-------+-------+ - - +-------+-------------------+ - |///////| | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M6 |\\\\\\\|\\\\\\\|\\\\\\\|\\\|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +-------+-------+-------+---+---+-------+-------+-------+-------+ - |///////|///////|///| - +-------+-------+---+ - - +-------+-------------------+ - | | | - +-------+-------+-------+---+---+-------+-------+-------+-------+ -M7 | | | | | | | | | - +-------+-------+-------+-------+-------+-------+-------+-------+ - |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| - +---------------------------------------------------------------+ + +-------+-------------------+ + |///////|///////////////////| + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M0 | | | | |XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + | | | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M1 |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + |///////| | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M2 |\\\\\\\|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + | | | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M3 |///////|///////|///////|///|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + | | | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M4 |///////|///////|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + |///////|///////////////////| + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M5 |\\\\\\\|\\\\\\\|\\\\\\\|\\\|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+-------+-------+-------+-------+-------+ + + +-------+-------------------+ + |///////| | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M6 |\\\\\\\|\\\\\\\|\\\\\\\|\\\|XXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +-------+-------+-------+---+---+-------+-------+-------+-------+ + |///////|///////|///| + +-------+-------+---+ + + +-------+-------------------+ + | | | + +-------+-------+-------+---+---+-------+-------+-------+-------+ +M7 | | | | | | | | | + +-------+-------+-------+-------+-------+-------+-------+-------+ + |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| + +---------------------------------------------------------------+ =========================================================================================================== @@ -181,9 +181,9 @@ C000 | DRAM | +----------+ +----------+ | | | EPROM 16K| | EPROM 16K| | | | 4 | | 6 | 7FFF +----------+ +----------+ +----------+ +----------+ - | SRAM | -7000 +----------+ +----------+ - | | + | SRAM | +7000 +----------+ +----------+ + | | 6000 | | +----------+ | | | | 5000 | | | EPROM 8K | @@ -213,12 +213,12 @@ Switching between 4,5 and 6,7 is provided by hw switch, selecting ROM/RAM mode h using OUT (7FH),A, where each bit of A means 8KB memory chunk ( state: 0=RAM, 1=ROM, bit: 0=1, 1=2, 2=3, 3=always SRAM, 4=4, 5=5, 6=6, 7=7 ). - + */ /* ************************************************************* -* BRNO MOD * +* BRNO MOD * ************************************************************* HW and SW was originally created by Pavel Brychta with help of Jiri Kubin and L. Novak This driver mod was implemented by Ales Dlabac with great help of Pavel Brychta. Without him this would never happen @@ -230,7 +230,7 @@ Whole Sord's address area (0000-FFFF) is divided to 16 4kB banks. To this 16 ban you can map any of possible 256 ramdisc blocks what allows user to have 1024kB large ramdisc. Of course to be able to realise this is necessary page out all roms -As pagination port MMU(page select) is used. +As pagination port MMU(page select) is used. For RAM write protection port CASEN is used. 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM(this is not implemented) For ROM page out port RAMEN is used. 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible) @@ -243,20 +243,20 @@ a. SORD system variables and stack c. Area where the first sector of 1st track is loaded, simultaneously is reserved for Hook program d. Reserved for memory tests and ramdisk mapping(pagination). After boot is used as buffer for cursor position, type of floppy and so on. Area consists of: - + 7FFFH .... bootloader version 7FFEH .... identification byte of floppy - is transferred from EPROM, it might be changed by SETUP 7FFDH .... number of last Ramdisk segment of RAM -7FFBH .... address of cursor in VRAM in 40 columns CRT. For 80 columns CRT both bytes are zero +7FFBH .... address of cursor in VRAM in 40 columns CRT. For 80 columns CRT both bytes are zero 7FF9H .... X,Y cursor actual position for 40 columns CRTs. In case of 80 columns CRT both bytes are zero 7203H .... Actual memory bank buffer - + System floppy disk header on track 00 of 1st sector - byte 0-1 ... system disk identification SY - byte 2 ... # of physical sectors for BIOS or DOS plus # of segments for DIR - byte 3-4 ... Start address for loading of BIOS or DOS - byte 5 ... # of bytes for possible HOOK program - byte 6- ... HOOK program, or either BIOS or DOS + byte 0-1 ... system disk identification SY + byte 2 ... # of physical sectors for BIOS or DOS plus # of segments for DIR + byte 3-4 ... Start address for loading of BIOS or DOS + byte 5 ... # of bytes for possible HOOK program + byte 6- ... HOOK program, or either BIOS or DOS In case of HOOK, bytes 8 and 9 contains characters 'H' and 'O' for HOOK testing @@ -266,9 +266,9 @@ Few other notes: Floppy formats as follows: - A: Ramdisk 1024kB, 8 sectors, - B: Floppy format "Heat Magnolia" SingleSide SingleDensity , 40 tracks, 9 sectors, 512 sec. length, 128 dirs, offset 3, 166kB - C: Floppy format "Robotron aka PC1715", DS DD, 80 tracks, 5 sectors, 1024 sec. length, 128 dirs, offset 2, 780kB + A: Ramdisk 1024kB, 8 sectors, + B: Floppy format "Heat Magnolia" SingleSide SingleDensity , 40 tracks, 9 sectors, 512 sec. length, 128 dirs, offset 3, 166kB + C: Floppy format "Robotron aka PC1715", DS DD, 80 tracks, 5 sectors, 1024 sec. length, 128 dirs, offset 2, 780kB **********************************************************************************************************************************/ @@ -498,19 +498,18 @@ READ8_MEMBER( m5_state::mem64KBI_r ) //in 0x6c WRITE8_MEMBER( m5_state::mem64KBI_w ) //out 0x6c { - if (m_ram_type != MEM64KBI) return; address_space &program = m_maincpu->space(AS_PROGRAM); std::string region_tag; m_cart_rom = memregion(region_tag.assign(m_cart_ram->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); memory_region *ram_region=memregion(region_tag.assign(m_cart_ram->tag()).append(":ram").c_str()); - + if (m_ram_mode == BIT(data, 0)) return; - + m_ram_mode = BIT(data, 0); - + //if 32kb only mode don't map top ram if (m_ram_mode && (m_DIPS->read() & 4) != 4) { @@ -520,7 +519,7 @@ WRITE8_MEMBER( m5_state::mem64KBI_w ) //out 0x6c { program.install_rom(0x0000, 0x1fff, memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x1fff); - + //if AUTOSTART is on don't load any ROM cart if (m_cart && (m_DIPS->read() & 2) != 2) { @@ -530,7 +529,7 @@ WRITE8_MEMBER( m5_state::mem64KBI_w ) //out 0x6c else program.unmap_readwrite(0x2000, 0x3fff); } - + logerror("64KBI: ROM %s", m_ram_mode == 0 ? "enabled\n" : "disabled\n"); } @@ -544,49 +543,49 @@ WRITE8_MEMBER( m5_state::mem64KBF_w ) //out 0x30 address_space &program = m_maincpu->space(AS_PROGRAM); std::string region_tag; - m_cart_rom = memregion(region_tag.assign(m_cart_ram->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); //ROM region of the cart - memory_region *ram_region=memregion(region_tag.assign(m_cart_ram->tag()).append(":ram").c_str()); //RAM region of the cart + m_cart_rom = memregion(region_tag.assign(m_cart_ram->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); //ROM region of the cart + memory_region *ram_region=memregion(region_tag.assign(m_cart_ram->tag()).append(":ram").c_str()); //RAM region of the cart memory_region *rom_region=memregion(region_tag.assign(m_cart->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); //region where clasic ROM cartridge resides - + if (m_ram_mode == data) return; m_ram_mode = data; - + switch(m_ram_mode) { - case 0: + case 0: program.unmap_write(0x0000, 0x6fff); membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank2r")->set_base(m_cart_rom->base()); membank("bank3r")->set_base(m_cart_rom->base()+0x2000); membank("bank4r")->set_base(m_cart_rom->base()+0x4000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 1: program.install_write_bank(0x0000,0x1fff,"bank1w"); program.install_write_bank(0x2000,0x3fff,"bank2w"); program.install_write_bank(0x4000,0x5fff,"bank3w"); program.install_write_bank(0x6000,0x6fff,"bank4w"); - membank("bank1r")->set_base(ram_region->base()+0x0000); membank("bank1w")->set_base(ram_region->base()+0x0000); - membank("bank2r")->set_base(ram_region->base()+0x2000); membank("bank2w")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank1r")->set_base(ram_region->base()+0x0000); membank("bank1w")->set_base(ram_region->base()+0x0000); + membank("bank2r")->set_base(ram_region->base()+0x2000); membank("bank2w")->set_base(ram_region->base()+0x2000); + membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 2: program.install_write_bank(0x0000,0x1fff,"bank1w"); program.install_write_bank(0x2000,0x3fff,"bank2w"); program.install_write_bank(0x4000,0x5fff,"bank3w"); program.install_write_bank(0x6000,0x6fff,"bank4w"); - membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); - membank("bank2r")->set_base(ram_region->base()+0x2000); membank("bank2w")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); + membank("bank2r")->set_base(ram_region->base()+0x2000); membank("bank2w")->set_base(ram_region->base()+0x2000); + membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 3: program.unmap_write(0x0000, 0x6fff); @@ -594,8 +593,8 @@ WRITE8_MEMBER( m5_state::mem64KBF_w ) //out 0x30 membank("bank2r")->set_base(ram_region->base()+0x2000); membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank4r")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 4: program.unmap_write(0x0000, 0x3fff); @@ -603,34 +602,34 @@ WRITE8_MEMBER( m5_state::mem64KBF_w ) //out 0x30 program.install_write_bank(0x6000,0x6fff,"bank4w"); membank("bank1r")->set_base(ram_region->base()+0x0000); membank("bank2r")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank3r")->set_base(ram_region->base()+0x4000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 5: program.install_write_bank(0x0000,0x1fff,"bank1w"); program.install_write_bank(0x2000,0x3fff,"bank2w"); program.install_write_bank(0x4000,0x5fff,"bank3w"); program.install_write_bank(0x6000,0x6fff,"bank4w"); - membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); - membank("bank2r")->set_base(m_cart_rom->base()); membank("bank2w")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(m_cart_rom->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(m_cart_rom->base()+0x4000); membank("bank4w")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); + membank("bank2r")->set_base(m_cart_rom->base()); membank("bank2w")->set_base(ram_region->base()+0x2000); + membank("bank3r")->set_base(m_cart_rom->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(m_cart_rom->base()+0x4000); membank("bank4w")->set_base(ram_region->base()+0x6000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 6: program.install_write_bank(0x0000,0x1fff,"bank1w"); program.install_write_bank(0x2000,0x3fff,"bank2w"); program.install_write_bank(0x4000,0x5fff,"bank3w"); program.install_write_bank(0x6000,0x6fff,"bank4w"); - membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); - membank("bank2r")->set_base(rom_region->base()+0x0000); membank("bank2w")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(rom_region->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(rom_region->base()+0x4000); membank("bank4w")->set_base(ram_region->base()+0x6000); - membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); - membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); + membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()+0x0000); + membank("bank2r")->set_base(rom_region->base()+0x0000); membank("bank2w")->set_base(ram_region->base()+0x2000); + membank("bank3r")->set_base(rom_region->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(rom_region->base()+0x4000); membank("bank4w")->set_base(ram_region->base()+0x6000); + membank("bank5r")->set_base(ram_region->base()+0x8000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case 7: //probably this won't work - it should redirect rw to another ram module program.install_write_bank(0x0000,0x1fff,"bank1w"); @@ -638,16 +637,16 @@ WRITE8_MEMBER( m5_state::mem64KBF_w ) //out 0x30 program.install_write_bank(0x4000,0x5fff,"bank3w"); program.install_write_bank(0x6000,0x6fff,"bank4w"); program.install_readwrite_bank(0x7000,0x7fff,"sram"); - membank("bank1r")->set_base(rom_region->base()+0x0000); membank("bank1w")->set_base(rom_region->base()+0x0000); - membank("bank2r")->set_base(rom_region->base()+0x2000); membank("bank2w")->set_base(rom_region->base()+0x2000); - membank("bank3r")->set_base(rom_region->base()+0x4000); membank("bank3w")->set_base(rom_region->base()+0x4000); - membank("bank4r")->set_base(rom_region->base()+0x6000); membank("bank4w")->set_base(rom_region->base()+0x6000); + membank("bank1r")->set_base(rom_region->base()+0x0000); membank("bank1w")->set_base(rom_region->base()+0x0000); + membank("bank2r")->set_base(rom_region->base()+0x2000); membank("bank2w")->set_base(rom_region->base()+0x2000); + membank("bank3r")->set_base(rom_region->base()+0x4000); membank("bank3w")->set_base(rom_region->base()+0x4000); + membank("bank4r")->set_base(rom_region->base()+0x6000); membank("bank4w")->set_base(rom_region->base()+0x6000); membank("sram")->set_base(rom_region->base()+0x7000); - membank("bank5r")->set_base(rom_region->base()+0x8000); membank("bank5w")->set_base(rom_region->base()+0x8000); - membank("bank6r")->set_base(rom_region->base()+0xc000); membank("bank6w")->set_base(rom_region->base()+0xc000); + membank("bank5r")->set_base(rom_region->base()+0x8000); membank("bank5w")->set_base(rom_region->base()+0x8000); + membank("bank6r")->set_base(rom_region->base()+0xc000); membank("bank6w")->set_base(rom_region->base()+0xc000); break; } - + logerror("64KBF RAM mode set to %d\n", m_ram_mode); } @@ -657,7 +656,6 @@ WRITE8_MEMBER( m5_state::mem64KBF_w ) //out 0x30 WRITE8_MEMBER( m5_state::mem64KRX_w ) //out 0x7f { - if (m_ram_type != MEM64KRX) return; if (m_ram_mode == data) return; @@ -665,22 +663,22 @@ WRITE8_MEMBER( m5_state::mem64KRX_w ) //out 0x7f std::string region_tag; m_cart_rom = memregion(region_tag.assign(m_cart_ram->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); memory_region *ram_region=memregion(region_tag.assign(m_cart_ram->tag()).append(":ram").c_str()); - + m_ram_mode = data; - BIT(m_ram_mode, 0) ? membank("bank1r")->set_base(memregion(Z80_TAG)->base()) : membank("bank1r")->set_base(ram_region->base()); - BIT(m_ram_mode, 1) ? membank("bank2r")->set_base(m_cart_rom->base()) : membank("bank2r")->set_base(ram_region->base()+0x2000); - BIT(m_ram_mode, 2) ? membank("bank3r")->set_base(m_cart_rom->base()+0x2000) : membank("bank3r")->set_base(ram_region->base()+0x4000); + BIT(m_ram_mode, 0) ? membank("bank1r")->set_base(memregion(Z80_TAG)->base()) : membank("bank1r")->set_base(ram_region->base()); + BIT(m_ram_mode, 1) ? membank("bank2r")->set_base(m_cart_rom->base()) : membank("bank2r")->set_base(ram_region->base()+0x2000); + BIT(m_ram_mode, 2) ? membank("bank3r")->set_base(m_cart_rom->base()+0x2000) : membank("bank3r")->set_base(ram_region->base()+0x4000); if ((m_DIPS->read() & 0x01)) { - BIT(m_ram_mode, 4) ? membank("bank5r")->set_base(m_cart_rom->base()+0x6000) : membank("bank5r")->set_base(ram_region->base()+0x8000); - BIT(m_ram_mode, 5) ? membank("bank6r")->set_base(m_cart_rom->base()+0xa000) : membank("bank6r")->set_base(ram_region->base()+0xc000); + BIT(m_ram_mode, 4) ? membank("bank5r")->set_base(m_cart_rom->base()+0x6000) : membank("bank5r")->set_base(ram_region->base()+0x8000); + BIT(m_ram_mode, 5) ? membank("bank6r")->set_base(m_cart_rom->base()+0xa000) : membank("bank6r")->set_base(ram_region->base()+0xc000); } else { - BIT(m_ram_mode, 6) ? membank("bank5r")->set_base(m_cart_rom->base()+0xe000) : membank("bank5r")->set_base(ram_region->base()+0x8000); - BIT(m_ram_mode, 7) ? membank("bank6r")->set_base(m_cart_rom->base()+0x12000): membank("bank6r")->set_base(ram_region->base()+0xc000); + BIT(m_ram_mode, 6) ? membank("bank5r")->set_base(m_cart_rom->base()+0xe000) : membank("bank5r")->set_base(ram_region->base()+0x8000); + BIT(m_ram_mode, 7) ? membank("bank6r")->set_base(m_cart_rom->base()+0x12000): membank("bank6r")->set_base(ram_region->base()+0xc000); } //if KRX ROM is paged out page in cart ROM if any @@ -705,10 +703,10 @@ WRITE8_MEMBER( m5_state::mem64KRX_w ) //out 0x7f static ADDRESS_MAP_START( m5_mem, AS_PROGRAM, 8, m5_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x1fff) AM_READ_BANK("bank1r") AM_WRITE_BANK("bank1w") //monitor rom(bios) - AM_RANGE(0x2000, 0x3fff) AM_READ_BANK("bank2r") AM_WRITE_BANK("bank2w") - AM_RANGE(0x4000, 0x5fff) AM_READ_BANK("bank3r") AM_WRITE_BANK("bank3w") - AM_RANGE(0x6000, 0x6fff) AM_READ_BANK("bank4r") AM_WRITE_BANK("bank4w") - AM_RANGE(0x7000, 0x7fff) AM_RAM //4kb internal RAM + AM_RANGE(0x2000, 0x3fff) AM_READ_BANK("bank2r") AM_WRITE_BANK("bank2w") + AM_RANGE(0x4000, 0x5fff) AM_READ_BANK("bank3r") AM_WRITE_BANK("bank3w") + AM_RANGE(0x6000, 0x6fff) AM_READ_BANK("bank4r") AM_WRITE_BANK("bank4w") + AM_RANGE(0x7000, 0x7fff) AM_RAM //4kb internal RAM AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank5r") AM_WRITE_BANK("bank5w") AM_RANGE(0xc000, 0xffff) AM_READ_BANK("bank6r") AM_WRITE_BANK("bank6w") ADDRESS_MAP_END @@ -864,7 +862,7 @@ static INPUT_PORTS_START( m5 ) PORT_DIPNAME(0x01, 0x01, "KRX: BASIC[on]/MSX[off]") //switching between BASIC and MSX ROMs which share same address area PORT_DIPSETTING( 0x00, DEF_STR( Off )) PORT_DIPSETTING( 0x01, DEF_STR( On )) - PORT_DIPNAME(0x02, 0x00, "KBI: AUTOSTART") //pages out cart and starts loading from tape + PORT_DIPNAME(0x02, 0x00, "KBI: AUTOSTART") //pages out cart and starts loading from tape PORT_DIPSETTING( 0x00, DEF_STR( Off )) PORT_DIPSETTING( 0x02, DEF_STR( On )) PORT_DIPNAME(0x04, 0x00, "KBI: 32kb only") //compatible with em-5 @@ -1051,25 +1049,24 @@ static ADDRESS_MAP_START( brno_io, AS_IO, 8, brno_state ) AM_RANGE(0x37, 0x37) AM_READ_PORT("JOY") AM_RANGE(0x40, 0x40) AM_MIRROR(0x0f) AM_DEVWRITE("cent_data_out", output_latch_device, write) AM_RANGE(0x50, 0x50) AM_MIRROR(0x0f) AM_READWRITE(sts_r, com_w) -// AM_RANGE(0x60, 0x63) // SIO - AM_RANGE(0x64, 0x67) AM_READWRITE(mmu_r, mmu_w) // MMU - page select (ramdisk memory paging) - AM_RANGE(0x68, 0x6b) AM_READWRITE(ramsel_r, ramsel_w) // CASEN 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM - AM_RANGE(0x6c, 0x6f) AM_READWRITE(romsel_r, romsel_w) // RAMEN 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible) -// AM_RANGE(0x70, 0x73) AM_MIRROR(0x04) AM_DEVREADWRITE(I8255A_TAG, i8255_device, read, write) // PIO - AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE(WD2797_TAG, wd_fdc_t, read, write) // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data - AM_RANGE(0x7c, 0x7c) AM_READWRITE(fd_r, fd_w) // drive select +// AM_RANGE(0x60, 0x63) // SIO + AM_RANGE(0x64, 0x67) AM_READWRITE(mmu_r, mmu_w) // MMU - page select (ramdisk memory paging) + AM_RANGE(0x68, 0x6b) AM_READWRITE(ramsel_r, ramsel_w) // CASEN 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM + AM_RANGE(0x6c, 0x6f) AM_READWRITE(romsel_r, romsel_w) // RAMEN 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible) +// AM_RANGE(0x70, 0x73) AM_MIRROR(0x04) AM_DEVREADWRITE(I8255A_TAG, i8255_device, read, write) // PIO + AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE(WD2797_TAG, wd_fdc_t, read, write) // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data + AM_RANGE(0x7c, 0x7c) AM_READWRITE(fd_r, fd_w) // drive select ADDRESS_MAP_END READ8_MEMBER( brno_state::mmu_r ) { - return 0; + return 0; } WRITE8_MEMBER( brno_state::mmu_w ) { - m_ramcpu = m_maincpu->state_int(Z80_B); m_rambank = ~data; //m_maincpu->state_int(Z80_A); m_rammap[m_ramcpu >> 4]=m_rambank; @@ -1096,13 +1093,13 @@ WRITE8_MEMBER( brno_state::mmu_w ) } //logerror("RAMdisk page change(CPURAM<=BANK): &%02X00<=%02X at address &%04X\n",m_ramcpu,m_rambank,m_maincpu->state_int(Z80_PC)-2); - + } READ8_MEMBER( brno_state::ramsel_r ) { - return m_ramen; + return m_ramen; } @@ -1120,7 +1117,7 @@ WRITE8_MEMBER( brno_state::ramsel_w ) //out 6b READ8_MEMBER( brno_state::romsel_r ) { - return m_romen; + return m_romen; } WRITE8_MEMBER( brno_state::romsel_w ) //out 6c @@ -1129,13 +1126,13 @@ WRITE8_MEMBER( brno_state::romsel_w ) //out 6c if (!data) { - program.install_rom(0x0000, 0x3fff, memregion(Z80_TAG)->base()); + program.install_rom(0x0000, 0x3fff, memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x3fff); m_romen=true; } else - { + { program.install_readwrite_bank(0x0000, 0x0fff, "bank1"); program.install_readwrite_bank(0x1000, 0x1fff, "bank2"); program.install_readwrite_bank(0x2000, 0x2fff, "bank3"); @@ -1146,7 +1143,7 @@ WRITE8_MEMBER( brno_state::romsel_w ) //out 6c m_romen=false; } - + logerror("RAMEN change: out (&6c),%x\n",data); } @@ -1166,9 +1163,9 @@ WRITE8_MEMBER( brno_state::fd_w ) floppy_image_device *floppy; m_floppy = NULL; int disk = 0; - - - floppy = m_floppy0->get_device(); + + + floppy = m_floppy0->get_device(); if (floppy) { if(BIT(data,0)) @@ -1181,7 +1178,7 @@ WRITE8_MEMBER( brno_state::fd_w ) floppy->mon_w(1); } } - floppy = m_floppy1->get_device(); + floppy = m_floppy1->get_device(); if (floppy) { if(BIT(data,1)) @@ -1193,15 +1190,15 @@ WRITE8_MEMBER( brno_state::fd_w ) { floppy->mon_w(1); } - } + } m_fdc->set_floppy(m_floppy); if (m_floppy) { m_floppy->set_rpm(300); m_floppy->mon_w(0); - logerror("Select floppy %d\n", disk); - } + logerror("Select floppy %d\n", disk); + } } @@ -1231,7 +1228,7 @@ void m5_state::machine_start() save_item(NAME(m_intra)); save_item(NAME(m_ibfa)); save_item(NAME(m_obfa)); - + } void m5_state::machine_reset() @@ -1240,16 +1237,16 @@ void m5_state::machine_reset() std::string region_tag; //is ram/rom cart plugged in? - if (m_cart1->exists()) + if (m_cart1->exists()) { - if (m_cart1->get_type() > 0) + if (m_cart1->get_type() > 0) m_cart_ram=m_cart1; else m_cart=m_cart1; } - if (m_cart2->exists()) + if (m_cart2->exists()) { - if (m_cart2->get_type() > 0) + if (m_cart2->get_type() > 0) m_cart_ram=m_cart2; else m_cart=m_cart2; @@ -1259,7 +1256,7 @@ void m5_state::machine_reset() { membank("bank1r")->set_base(memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x1fff); - // program.unmap_readwrite(0x2000, 0x6fff); //if you uncomment this line Sord starts cassette loading but it is not correct on real hw + // program.unmap_readwrite(0x2000, 0x6fff); //if you uncomment this line Sord starts cassette loading but it is not correct on real hw program.unmap_readwrite(0x8000, 0xffff); return; } @@ -1271,12 +1268,12 @@ void m5_state::machine_reset() m_cart_rom = memregion(region_tag.assign(m_cart_ram->tag()).append(M5SLOT_ROM_REGION_TAG).c_str()); memory_region *ram_region=memregion(region_tag.assign(m_cart_ram->tag()).append(":ram").c_str()); - + switch (m_ram_type) { case EM_5: program.install_rom(0x0000, 0x1fff, memregion(Z80_TAG)->base()); - program.unmap_write(0x0000, 0x1fff); + program.unmap_write(0x0000, 0x1fff); program.install_readwrite_handler(0x8000, 0xffff, read8_delegate(FUNC(m5_cart_slot_device::read_ram),(m5_cart_slot_device*)m_cart_ram), write8_delegate(FUNC(m5_cart_slot_device::write_ram),(m5_cart_slot_device*)m_cart_ram)); if (m_cart) { @@ -1286,7 +1283,7 @@ void m5_state::machine_reset() break; case MEM64KBI: program.install_rom(0x0000, 0x1fff, memregion(Z80_TAG)->base()); - program.unmap_write(0x0000, 0x1fff); + program.unmap_write(0x0000, 0x1fff); program.install_ram(0x8000, 0xffff, ram_region->base()+0x8000); //if AUTOSTART is on then page out cart and start tape loading @@ -1297,7 +1294,7 @@ void m5_state::machine_reset() } else program.unmap_readwrite(0x2000, 0x6fff); //monitor rom is testing this area for 0xFFs otherwise thinks there is some ROM cart plugged in - + break; case MEM64KBF: program.unmap_write(0x0000, 0x6fff); @@ -1309,11 +1306,11 @@ void m5_state::machine_reset() membank("bank6r")->set_base(ram_region->base()+0xc000); membank("bank6w")->set_base(ram_region->base()+0xc000); break; case MEM64KRX: - membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()); - membank("bank2r")->set_base(m_cart_rom->base()); membank("bank2w")->set_base(ram_region->base()+0x2000); - membank("bank3r")->set_base(m_cart_rom->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); - membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); - + membank("bank1r")->set_base(memregion(Z80_TAG)->base()); membank("bank1w")->set_base(ram_region->base()); + membank("bank2r")->set_base(m_cart_rom->base()); membank("bank2w")->set_base(ram_region->base()+0x2000); + membank("bank3r")->set_base(m_cart_rom->base()+0x2000); membank("bank3w")->set_base(ram_region->base()+0x4000); + membank("bank4r")->set_base(ram_region->base()+0x6000); membank("bank4w")->set_base(ram_region->base()+0x6000); + //page in BASIC or MSX if ((m_DIPS->read() & 0x01)) { @@ -1322,7 +1319,7 @@ void m5_state::machine_reset() } else { - membank("bank5r")->set_base(m_cart_rom->base()+0xe000); membank("bank5w")->set_base(ram_region->base()+0x8000); + membank("bank5r")->set_base(m_cart_rom->base()+0xe000); membank("bank5w")->set_base(ram_region->base()+0x8000); membank("bank6r")->set_base(m_cart_rom->base()+0x12000); membank("bank6w")->set_base(ram_region->base()+0xc000); } break; @@ -1330,7 +1327,7 @@ void m5_state::machine_reset() program.unmap_readwrite(0x8000, 0xffff); } //I don't have idea what to do with savestates, please someone take care of it - //m_cart_ram->save_ram(); + //m_cart_ram->save_ram(); } else //ram cart wasn't found so if rom cart present install it @@ -1340,8 +1337,8 @@ void m5_state::machine_reset() program.unmap_write(0x0000, 0x1fff); program.install_read_handler(0x2000, 0x6fff, read8_delegate(FUNC(m5_cart_slot_device::read_rom),(m5_cart_slot_device*)m_cart)); program.unmap_write(0x2000, 0x6fff); - } - m_ram_mode=0; + } + m_ram_mode=0; } @@ -1352,25 +1349,24 @@ void brno_state::machine_start() void brno_state::machine_reset() { - /* enable ROM1+ROM2 */ address_space &program = m_maincpu->space(AS_PROGRAM); - + program.install_rom(0x0000, 0x3fff, memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x3fff); //is ram/rom cart plugged in? - if (m_cart1->exists()) + if (m_cart1->exists()) { - if (m_cart1->get_type() > 0) + if (m_cart1->get_type() > 0) m_cart_ram=m_cart1; else m_cart=m_cart1; } if (m_cart2->exists()) { - if (m_cart2->get_type() > 0) + if (m_cart2->get_type() > 0) m_cart_ram=m_cart2; else m_cart=m_cart2; @@ -1380,11 +1376,11 @@ void brno_state::machine_reset() { program.install_read_handler(0x2000, 0x6fff, read8_delegate(FUNC(m5_cart_slot_device::read_rom),(m5_cart_slot_device*)m_cart)); program.unmap_write(0x2000, 0x6fff); - } + } m_romen=true; m_ramen=false; - + floppy_image_device *floppy = NULL; floppy = m_floppy0->get_device(); m_fdc->set_floppy(floppy); @@ -1491,14 +1487,14 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED_CLASS( brno, m5, brno_state ) - + // basic machine hardware MCFG_CPU_MODIFY(Z80_TAG) MCFG_CPU_PROGRAM_MAP(m5_mem_brno) MCFG_CPU_IO_MAP(brno_io) -// MCFG_CPU_CONFIG(m5_daisy_chain) - - +// MCFG_CPU_CONFIG(m5_daisy_chain) + + //remove devices used for fd5 floppy MCFG_DEVICE_REMOVE(Z80_FD5_TAG) MCFG_DEVICE_REMOVE(I8255A_TAG) @@ -1520,7 +1516,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( brno, m5, brno_state ) MCFG_FLOPPY_DRIVE_SOUND(true) // only one floppy drive //MCFG_DEVICE_REMOVE(WD2797_TAG":1") - + //MCFG_SNAPSHOT_ADD("snapshot", brno_state, brno, "rmd", 0) // software list @@ -1601,7 +1597,7 @@ DRIVER_INIT_MEMBER(m5_state,pal) DRIVER_INIT_MEMBER(brno_state,brno) { -// logerror("Driver init entered\n" ); +// logerror("Driver init entered\n" ); } diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp index bed3ec42e7d..707c3628dcb 100644 --- a/src/mame/drivers/megasys1.cpp +++ b/src/mame/drivers/megasys1.cpp @@ -134,8 +134,7 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? < MACHINE_RESET_MEMBER(megasys1_state,megasys1) { - - m_ignore_oki_status = 1; /* ignore oki status due 'protection' */ + m_ignore_oki_status = 1; /* ignore oki status due 'protection' */ m_ip_latched = 0x0006; /* reset protection - some games expect this initial read without sending anything */ m_mcu_hs = 0; } @@ -274,8 +273,8 @@ WRITE16_MEMBER(megasys1_state::ip_select_w) // TO MCU case 2 : m_ip_latched = m_io_p2->read(); break; case 3 : m_ip_latched = m_io_dsw1->read(); break; case 4 : m_ip_latched = m_io_dsw2->read(); break; - case 5 : m_ip_latched = 0x0d; break; // startup check? - case 6 : m_ip_latched = 0x06; break; // sent before each other command + case 5 : m_ip_latched = 0x0d; break; // startup check? + case 6 : m_ip_latched = 0x06; break; // sent before each other command default: return; // get out if it wasn't a valid request } diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index f438e37dea9..b1d8307f3e8 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -1503,20 +1503,20 @@ ROM_START( bigappg ) ROM_END ROM_START( misdraw ) - ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "2131-16_u5-2.u5", 0x0000, 0x8000, CRC(fc756320) SHA1(6b810c57ed1be844a04a6081d727e182509604b4) ) /* 2131-16 U5-2 081889 */ + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD( "2131-16_u5-2.u5", 0x0000, 0x8000, CRC(fc756320) SHA1(6b810c57ed1be844a04a6081d727e182509604b4) ) /* 2131-16 U5-2 081889 */ - ROM_REGION( 0x6000, "gfx1", 0 ) - ROM_LOAD( "u39.u39", 0x0000, 0x2000, CRC(0f09d19b) SHA1(1f98559d5bad7c84d92ecea5a6df9429914a47f0) ) - ROM_LOAD( "u38.u38", 0x2000, 0x2000, CRC(8210a48d) SHA1(9af3e8ac8dcf1e548c4ba3ca8096e48dbb3b4700) ) - ROM_LOAD( "u37.u37", 0x4000, 0x2000, CRC(34ca07d5) SHA1(3656b3eb78dd6ea06cf323a08fc3f949a01b76a3) ) + ROM_REGION( 0x6000, "gfx1", 0 ) + ROM_LOAD( "u39.u39", 0x0000, 0x2000, CRC(0f09d19b) SHA1(1f98559d5bad7c84d92ecea5a6df9429914a47f0) ) + ROM_LOAD( "u38.u38", 0x2000, 0x2000, CRC(8210a48d) SHA1(9af3e8ac8dcf1e548c4ba3ca8096e48dbb3b4700) ) + ROM_LOAD( "u37.u37", 0x4000, 0x2000, CRC(34ca07d5) SHA1(3656b3eb78dd6ea06cf323a08fc3f949a01b76a3) ) - ROM_REGION( 0x2000, "gfx2", 0 ) - ROM_LOAD( "haip_u40.u40", 0x0000, 0x2000, CRC(ac4983b8) SHA1(a552a15f813c331de67eaae2ed42cc037b26c5bd) ) + ROM_REGION( 0x2000, "gfx2", 0 ) + ROM_LOAD( "haip_u40.u40", 0x0000, 0x2000, CRC(ac4983b8) SHA1(a552a15f813c331de67eaae2ed42cc037b26c5bd) ) - ROM_REGION( 0x0800, "cpunvram", ROMREGION_ERASEFF ) - // this contains CODE, the game jumps there on startup - ROM_LOAD( "crt-209_2131-16", 0x0000, 0x0800, CRC(34729437) SHA1(f097a1a97d8078d7d6a6af85be416b1d1d09c7f2) ) /* 2816 EEPROM in Z80 epoxy CPU module */ + ROM_REGION( 0x0800, "cpunvram", ROMREGION_ERASEFF ) + // this contains CODE, the game jumps there on startup + ROM_LOAD( "crt-209_2131-16", 0x0000, 0x0800, CRC(34729437) SHA1(f097a1a97d8078d7d6a6af85be416b1d1d09c7f2) ) /* 2816 EEPROM in Z80 epoxy CPU module */ ROM_END ROM_START( dodgectya ) diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp index d53c83c3085..e5f527337c9 100644 --- a/src/mame/drivers/namcops2.cpp +++ b/src/mame/drivers/namcops2.cpp @@ -1466,10 +1466,10 @@ ROM_START( wanganmr ) SYSTEM246_BIOS ROM_REGION(0x840000, "key", ROMREGION_ERASE00) - ROM_LOAD( "wmr1vera.ic002", 0x000000, 0x800000, CRC(b431936b) SHA1(e2c543936cb5689a432662a69d0042c6179a3728) ) - ROM_LOAD( "wmr1vera_spr.ic002", 0x800000, 0x040000, CRC(b8b7539c) SHA1(f415bdc8e3ebf3b0c3d0d7607b894440e89b0fe7) ) + ROM_LOAD( "wmr1vera.ic002", 0x000000, 0x800000, CRC(b431936b) SHA1(e2c543936cb5689a432662a69d0042c6179a3728) ) + ROM_LOAD( "wmr1vera_spr.ic002", 0x800000, 0x040000, CRC(b8b7539c) SHA1(f415bdc8e3ebf3b0c3d0d7607b894440e89b0fe7) ) - DISK_REGION("dvd") // actually single-track CD-ROM + DISK_REGION("dvd") // actually single-track CD-ROM DISK_IMAGE_READONLY( "wmr1-a", 0, SHA1(02feab4380dcc2dd95c85b209192f858bafc721e) ) ROM_END diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp index f89a14f0f38..1cd257859ca 100644 --- a/src/mame/drivers/nibble.cpp +++ b/src/mame/drivers/nibble.cpp @@ -11,9 +11,9 @@ ************************************************************************** - + Specs: - + 1x UM6845 (U67). 1x AY38910A/p (U75). @@ -148,11 +148,11 @@ void nibble_state::machine_reset() *************************/ static ADDRESS_MAP_START( nibble_map, AS_PROGRAM, 8, nibble_state ) -// ADDRESS_MAP_GLOBAL_MASK(0x3fff) +// ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0xbfff) AM_ROM - AM_RANGE(0xc000, 0xc3ff) AM_WRITE(nibble_videoram_w) AM_SHARE("videoram") // placeholder -// AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("crtc", mc6845_device, address_w) -// AM_RANGE(0xff02, 0xff03) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) + AM_RANGE(0xc000, 0xc3ff) AM_WRITE(nibble_videoram_w) AM_SHARE("videoram") // placeholder +// AM_RANGE(0xff00, 0xff01) AM_DEVWRITE("crtc", mc6845_device, address_w) +// AM_RANGE(0xff02, 0xff03) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp index 38a3a3953f9..8bf1a91f83b 100644 --- a/src/mame/drivers/nightgal.cpp +++ b/src/mame/drivers/nightgal.cpp @@ -14,7 +14,7 @@ TODO: - Fix Sweet Gal/Sexy Gal layer clearances; - NMI origin for Sexy Gal / Night Gal Summer - unemulated WAIT pin for Z80, MCU asserts it when accessing communication RAM - + *******************************************************************************************/ #include "emu.h" @@ -218,7 +218,7 @@ READ8_MEMBER(nightgal_state::royalqn_nsc_blit_r) { if(offset == 2) m_subcpu->set_input_line(0, CLEAR_LINE ); - + return m_blit_raw_data[offset]; } @@ -230,10 +230,10 @@ TIMER_CALLBACK_MEMBER(nightgal_state::z80_wait_ack_cb) void nightgal_state::z80_wait_assert_cb() { m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE); - + // Note: cycles_to_attotime requires z80 context to work, calling for example m_subcpu as context gives a x4 cycle boost in z80 terms (reads execute_cycles_to_clocks() from NCS?) even if they runs at same speed basically. // TODO: needs a getter that tells a given CPU how many cycles requires an executing opcode for the r/w operation, which stacks with wait state penalty for accessing this specific area. - machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(4), timer_expired_delegate(FUNC(nightgal_state::z80_wait_ack_cb),this)); + machine().scheduler().timer_set(m_maincpu->cycles_to_attotime(4), timer_expired_delegate(FUNC(nightgal_state::z80_wait_ack_cb),this)); } READ8_MEMBER(nightgal_state::royalqn_comm_r) @@ -344,7 +344,7 @@ static ADDRESS_MAP_START( sexygal_nsc_map, AS_PROGRAM, 8, nightgal_state ) AM_RANGE(0x0081, 0x0083) AM_READ(royalqn_nsc_blit_r) AM_RANGE(0x0080, 0x0086) AM_DEVWRITE("blitter", jangou_blitter_device, alt_process_w) AM_RANGE(0x00a0, 0x00af) AM_DEVWRITE("blitter", jangou_blitter_device, vregs_w) - AM_RANGE(0x00b0, 0x00b0) AM_DEVWRITE("blitter", jangou_blitter_device, bltflip_w) + AM_RANGE(0x00b0, 0x00b0) AM_DEVWRITE("blitter", jangou_blitter_device, bltflip_w) AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x2c00) AM_READWRITE(royalqn_comm_r, royalqn_comm_w) AM_SHARE("comms_ram") AM_RANGE(0xc000, 0xdfff) AM_MIRROR(0x2000) AM_ROM AM_REGION("subrom", 0) @@ -382,7 +382,7 @@ static ADDRESS_MAP_START( royalqn_nsc_map, AS_PROGRAM, 8, nightgal_state ) AM_RANGE(0x0081, 0x0083) AM_READ(royalqn_nsc_blit_r) AM_RANGE(0x0080, 0x0086) AM_DEVWRITE("blitter", jangou_blitter_device, process_w) AM_RANGE(0x00a0, 0x00af) AM_DEVWRITE("blitter", jangou_blitter_device, vregs_w) - AM_RANGE(0x00b0, 0x00b0) AM_DEVWRITE("blitter", jangou_blitter_device, bltflip_w) + AM_RANGE(0x00b0, 0x00b0) AM_DEVWRITE("blitter", jangou_blitter_device, bltflip_w) AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x2c00) AM_READWRITE(royalqn_comm_r,royalqn_comm_w) AM_RANGE(0x4000, 0x4000) AM_NOP @@ -626,7 +626,7 @@ static INPUT_PORTS_START( sexygal ) PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_START("BLIT_PORT") PORT_DIPNAME( 0x01, 0x01, "BLIT_PORT" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 4c227651f3b..eb9ddc30f94 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -23,7 +23,7 @@ * The NoteTaker used the BitBlt graphical operation (from SmallTalk-76) to do most graphical functions, in order to fit the SmallTalk code and programs within 256K of RAM[2]. The actual BitBlt code lives in ROM[3]. * As far as I am aware, no media (world disks/boot disks) for the NoteTaker have survived (except maybe the two disks at Xerox Museum at PARC), but an incomplete dump of the Smalltalk-76 'world' which was used to bootstrap Smalltalk-78 originally did survive on the Alto disks at CHM - + * see http://bitsavers.informatik.uni-stuttgart.de/pdf/xerox/notetaker for additional information * see http://xeroxalto.computerhistory.org/Filene/Smalltalk-76/ for the smalltalk-76 dump * see http://xeroxalto.computerhistory.org/Indigo/BasicDisks/Smalltalk14.bfs!1_/ for more notetaker/smalltalk related files, including SmallTalk-80 files based on the notetaker smalltalk-78 @@ -35,7 +35,7 @@ * [4] http://xeroxalto.computerhistory.org/Filene/Smalltalk-76/ * [5] http://bitsavers.trailing-edge.com/pdf/xerox/notetaker/memos/19790118_NoteTaker_System_Manual.pdf * MISSING DUMP for 8741? Keyboard MCU which does row-column scanning and mouse-related stuff - + TODO: everything below. * figure out the correct memory maps for the 256kB of shared ram, and what part of ram constitutes the framebuffer * figure out how the emulation-cpu boots and where its 4k of local ram maps to @@ -53,7 +53,7 @@ WIP: According to [3] and [5] the format is double density/MFM, 128 bytes per sector, 16 sectors per track, 1 or 2 sided, for 170K or 340K per disk. Drive spins at 300RPM. According to the schematics, we're missing an 82s147 DISKSEP.PROM used as a data separator * we're missing a dump of the 82s126 SETMEMRQ PROM used to handle memory arbitration between the crtc and the rest of the system, but the equations are on the schematic and I'm planning to regenerate the prom contents from that, see ROM_LOAD section - + DONE: * i/o cpu i/o area needs the memory map worked out per the schematics - done */ @@ -87,7 +87,7 @@ public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); // basic io DECLARE_WRITE16_MEMBER(IPConReg_w); - + // uarts DECLARE_READ16_MEMBER(ReadKeyData_r); DECLARE_READ16_MEMBER(ReadOPStatus_r); @@ -108,7 +108,7 @@ public: //variables UINT8 m_BootSeqDone; UINT8 m_DisableROM; - + // overrides virtual void machine_reset() override; }; @@ -346,14 +346,14 @@ static ADDRESS_MAP_START(notetaker_iocpu_io, AS_IO, 16, notetaker_state) ADDRESS_MAP_END /* iopic8259 interrupts: -irq0 parity error (parity error syndrome data will be in fffdx/fffex) - currently ignored -irq1 IPSysInt (interrupt triggered by the emulator cpu) -irq2 DiskInt (interrupt triggered by the IRQ or DRQ pins from the WD1791) -irq3 EIAInt (interrupt triggered by the datareceived pin from the eiauart) -irq4 OddInt (interrupt triggered by the O/E Odd/Even pin from the crt5027) -irq5 ADCInt (interrupt triggered at the ADCSpd rate interrupt from 74c161 counter on the disk/display module to indicate adc conversion finished) -irq6 KbdInt (interrupt triggered by the datareceived pin from the kbduart) -irq7 VSync (interrupt from the VSYN VSync pin from the crt5027) +irq0 parity error (parity error syndrome data will be in fffdx/fffex) - currently ignored +irq1 IPSysInt (interrupt triggered by the emulator cpu) +irq2 DiskInt (interrupt triggered by the IRQ or DRQ pins from the WD1791) +irq3 EIAInt (interrupt triggered by the datareceived pin from the eiauart) +irq4 OddInt (interrupt triggered by the O/E Odd/Even pin from the crt5027) +irq5 ADCInt (interrupt triggered at the ADCSpd rate interrupt from 74c161 counter on the disk/display module to indicate adc conversion finished) +irq6 KbdInt (interrupt triggered by the datareceived pin from the kbduart) +irq7 VSync (interrupt from the VSYN VSync pin from the crt5027) */ /* writes during boot of io roms v2.0: @@ -490,12 +490,12 @@ ROM_START( notetakr ) ||\------ WCtr.2 |\------- WCtr.1 \-------- WCtr.0 (MSB) - + Data: 0123 |\\\- N/C (zero?) \---- SetMemRq - + Equation: SETMEMRQ == ( ((Rctr == 0) && ((Wctr == 0)||(Wctr == 4)||(Wctr == 8))) ||((Rctr == 4) && ((Wctr == 4)||(Wctr == 8)||(Wctr == 12))) diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index 233da503224..5dd5191318b 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -72,12 +72,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(overdriv_state::overdriv_cpuA_scanline) { const int timer_threshold = 168; // fwiw matches 0 on mask ROM check, so IF it's a timer irq then should be close ... int scanline = param; - + m_fake_timer ++; - + // TODO: irqs routines are TOO slow right now, it ends up firing spurious irqs for whatever reason (shared ram fighting?) // this is a temporary solution to get rid of deprecat lib and the crashes, but also makes the game timer to be too slow. - // Update: gameplay is actually too fast compared to timer, first attract mode shouldn't even surpass first blue car on right. + // Update: gameplay is actually too fast compared to timer, first attract mode shouldn't even surpass first blue car on right. if(scanline == 256) // vblank-out irq { // m_screen->frame_number() & 1 @@ -245,7 +245,7 @@ WRITE8_MEMBER(overdriv_state::sound_ack_w) static ADDRESS_MAP_START( overdriv_sound_map, AS_PROGRAM, 8, overdriv_state ) AM_RANGE(0x0000, 0x0000) AM_WRITE(sound_ack_w) // 0x012 read during explosions - // 0x180 + // 0x180 AM_RANGE(0x0200, 0x0201) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write) AM_RANGE(0x0400, 0x042f) AM_DEVREADWRITE("k053260_1", k053260_device, read, write) AM_RANGE(0x0600, 0x062f) AM_DEVREADWRITE("k053260_2", k053260_device, read, write) @@ -320,7 +320,7 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state ) MCFG_CPU_ADD("sub", M68000, XTAL_24MHz/2) /* 12 MHz */ MCFG_CPU_PROGRAM_MAP(overdriv_slave_map) - //MCFG_CPU_VBLANK_INT_DRIVER("screen", overdriv_state, cpuB_interrupt) + //MCFG_CPU_VBLANK_INT_DRIVER("screen", overdriv_state, cpuB_interrupt) /* IRQ 5 and 6 are generated by the main CPU. */ /* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */ diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index 413cf8651b2..d9ae018a63a 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -1832,7 +1832,7 @@ ROM_START( slapfighb3 ) ROM_LOAD( "sf_col19.bin", 0x0200, 0x0100, CRC(5cbf9fbf) SHA1(abfa58fa4e44ebc56f2e0fac9bcc36164c845fa3) ) ROM_END -/* +/* Guardian 1986 Taito Corporation @@ -1924,7 +1924,7 @@ A68_02 & 06 to 09 - 27256 EPROM A68_14 - Motorola MC68705P5 Micro-Controller (protected). Clock 3.000MHz [36/12] X - Unpopulated socket -*/ +*/ ROM_START( grdian ) ROM_REGION( 0x18000, "maincpu", 0 ) /* Region 0 - main cpu code */ diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index 0e35f023e59..dfea2270900 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -4648,7 +4648,7 @@ ROM_START( fitegolfu ) /* Later US version containing enhancements to make the ROM_LOAD( "pal20l8a.6r", 0x0400, 0x0144, CRC(0f011673) SHA1(383e6f6e78daec9c874d5b48378111ca60f5ed64) ) ROM_END - + ROM_START( fitegolf2 ) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 1a823eabcc1..0c72d2e9814 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -3259,7 +3259,7 @@ ROM_START( nclubv2 ) ROM_LOAD16_WORD_SWAP( "nclubv2.ic24", 0x0600000, 0x0200000, CRC(1b7637de) SHA1(43c3094f60a6582298a45bad923fef57e98c5b2b) ) // OK ROM_LOAD16_WORD_SWAP( "nclubv2.ic26", 0x0a00000, 0x0200000, CRC(630be99d) SHA1(ac7fbaae98b126fad5228b0ebffa91a0f0a94516) ) // OK ROM_LOAD16_WORD_SWAP( "nclubv2.ic28", 0x0e00000, 0x0200000, CRC(1a3ca5e2) SHA1(4d3aed51d29c54e71175d828f648c9feb813ac04) ) // OK - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) // preconfigured to 1 player ROM_LOAD( "nclubv2.nv", 0x0000, 0x0080, CRC(96d55fa9) SHA1(b3c821d6cd4ed52d0e20565e12a06d8f81a08dbc) ) ROM_END diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index 8a1a8239d37..00b0ce9a496 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -1356,10 +1356,10 @@ READ16_MEMBER(segas1x_bootleg_state::ddcrew_c41006_r) WRITE16_MEMBER(segas1x_bootleg_state::ddcrewbl_spritebank_w) { -// printf("banking write %08x: %04x (%04x %04x)\n", space.device().safe_pc(), offset*2, data&mem_mask, mem_mask); +// printf("banking write %08x: %04x (%04x %04x)\n", space.device().safe_pc(), offset*2, data&mem_mask, mem_mask); data &= mem_mask; -// offset &= 0x7; +// offset &= 0x7; offset += 4; int maxbanks = memregion("sprites")->bytes() / 0x40000; @@ -1384,7 +1384,7 @@ static ADDRESS_MAP_START(ddcrewbl_map, AS_PROGRAM, 16, segas1x_bootleg_state) AM_RANGE(0xC00000, 0xC00001) AM_WRITENOP // vdp leftovers maybe? AM_RANGE(0xC00004, 0xC00005) AM_WRITENOP AM_RANGE(0xC00006, 0xC00007) AM_WRITENOP - + AM_RANGE(0xC40000, 0xC40001) AM_READ(ddcrew_c41006_r) AM_RANGE(0xC40002, 0xC40003) AM_READ(ddcrew_c41006_r) @@ -1394,7 +1394,7 @@ static ADDRESS_MAP_START(ddcrewbl_map, AS_PROGRAM, 16, segas1x_bootleg_state) AM_RANGE(0xC41006, 0xC41007) AM_READ(ddcrew_c41006_r) - + AM_RANGE(0xC44000, 0xC44001) AM_WRITENOP AM_RANGE(0xc46600, 0xc46601) AM_WRITE(sys18_refreshenable_w) @@ -1413,7 +1413,7 @@ static ADDRESS_MAP_START(ddcrewbl_map, AS_PROGRAM, 16, segas1x_bootleg_state) AM_RANGE(0xC46064, 0xC46065) AM_WRITENOP AM_RANGE(0xC46070, 0xC46071) AM_WRITENOP - + AM_RANGE(0xffc000, 0xffffff) AM_RAM // ok ADDRESS_MAP_END diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp index 74d97ffeffb..c8bbdfd0171 100644 --- a/src/mame/drivers/ticalc1x.cpp +++ b/src/mame/drivers/ticalc1x.cpp @@ -716,7 +716,7 @@ WRITE16_MEMBER(lilprof78_state::write_r) UINT16 r = (data & 7) | (data << 1 & 0x1f0); set_display_segmask(0x1ff, 0x7f); display_matrix(7, 9, seg, r, false); - + // 3rd digit A/G(equals sign) is from O7 m_display_state[3] = (r != 0 && m_o & 0x80) ? 0x41 : 0; diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 68fd7e966bf..68cae4eb3ce 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -377,7 +377,7 @@ K28 modules: - Expansion Module 4: VSM: 16KB CM62217 - Expansion Module 5: VSM: 16KB CM62218* - Expansion Module 6: VSM: 16KB CM62219 - + note: these won't work on the 1981 version(s) ---------------------------------------------------------------------------- @@ -682,7 +682,7 @@ WRITE16_MEMBER(tispeak_state::k28_write_r) // R0: TMS5100 PDC pin m_tms5100->pdc_w(data & 1); - + // R5: input mux high bit m_inp_mux = (m_inp_mux & 0xff) | (data << 3 & 0x100); diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 4c2f0be06f2..d4a3210a1a4 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -2023,11 +2023,11 @@ WRITE64_MEMBER(viper_state::unk_serial_w) if (m_unk_serial_bit_w == 8) { - if ((m_unk_serial_cmd & 0x80) == 0) // register read + if ((m_unk_serial_cmd & 0x80) == 0) // register read { int reg = m_unk_serial_cmd & 0x7f; UINT8 data = m_unk_serial_regs[reg]; - + m_unk_serial_data_r = ((data & 0x1) << 7) | ((data & 0x2) << 5) | ((data & 0x4) << 3) | ((data & 0x8) << 1) | ((data & 0x10) >> 1) | ((data & 0x20) >> 3) | ((data & 0x40) >> 5) | ((data & 0x80) >> 7); printf("unk_serial read reg %02X: %04X\n", reg, data); @@ -2035,7 +2035,7 @@ WRITE64_MEMBER(viper_state::unk_serial_w) } if (m_unk_serial_bit_w == 16) { - if (m_unk_serial_cmd & 0x80) // register write + if (m_unk_serial_cmd & 0x80) // register write { int reg = m_unk_serial_cmd & 0x7f; m_unk_serial_regs[reg] = m_unk_serial_data; @@ -2538,7 +2538,7 @@ ROM_START(sscopefh) VIPER_BIOS ROM_REGION(0x28, "ds2430", ROMREGION_ERASE00) /* DS2430 */ - + ROM_REGION(0x2000, "m48t58", ROMREGION_ERASE00) /* M48T58 Timekeeper NVRAM */ DISK_REGION( "ata:0:hdd:image" ) @@ -2572,7 +2572,7 @@ ROM_START(thrild2a) //* DISK_IMAGE( "a41a02", 0, SHA1(bbb71e23bddfa07dfa30b6565a35befd82b055b8) ) ROM_END -ROM_START(thrild2ab) +ROM_START(thrild2ab) VIPER_BIOS ROM_REGION(0x28, "ds2430", ROMREGION_ERASE00) /* DS2430 */ @@ -2585,7 +2585,7 @@ ROM_START(thrild2ab) DISK_IMAGE( "a41a02_alt", 0, SHA1(7a9cfdab7000765ffdd9198b209f7a74741248f2) ) ROM_END -ROM_START(thrild2ac) +ROM_START(thrild2ac) VIPER_BIOS ROM_REGION(0x28, "ds2430", ROMREGION_ERASE00) /* DS2430 */ diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index af7b6f120f4..4abc3c4f64c 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -64,7 +64,7 @@ public: DECLARE_MACHINE_RESET(blmbycar); DECLARE_MACHINE_START(watrball); DECLARE_MACHINE_RESET(watrball); - + UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); }; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index a3ae64203f5..f00434e7201 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -18,7 +18,7 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_mainram(*this, "mainram") { } - + /* devices */ required_device<cpu_device> m_maincpu; @@ -54,7 +54,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - + TILE_GET_INFO_MEMBER(get_tile_info_screen0); TILE_GET_INFO_MEMBER(get_tile_info_screen1); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index 9b5d82b0c00..16e346889e3 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -20,7 +20,7 @@ #define SCREEN_TAG "screen" //brno mod #define WD2797_TAG "5f" -#define RAMDISK "ramdisk" +#define RAMDISK "ramdisk" class m5_state : public driver_device @@ -96,7 +96,7 @@ public: UINT8 m_ram_mode; UINT8 m_ram_type; memory_region *m_cart_rom; - m5_cart_slot_device *m_cart_ram, *m_cart; + m5_cart_slot_device *m_cart_ram, *m_cart; // floppy state for fd5 UINT8 m_fd5_data; @@ -110,17 +110,17 @@ public: class brno_state : public m5_state { -public: +public: brno_state(const machine_config &mconfig, device_type type, const char *tag) : m5_state(mconfig, type, tag), - + m_fdc(*this, WD2797_TAG), m_floppy0(*this, WD2797_TAG":0"), m_floppy1(*this, WD2797_TAG":1") - // m_ramdisk(*this, RAMDISK) + // m_ramdisk(*this, RAMDISK) { } - + required_device<wd2797_t> m_fdc; required_device<floppy_connector> m_floppy0; optional_device<floppy_connector> m_floppy1; @@ -140,14 +140,14 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); -// DECLARE_WRITE_LINE_MEMBER( wd2797_intrq_w ); -// DECLARE_WRITE_LINE_MEMBER( wd2797_drq_w ); -// DECLARE_WRITE_LINE_MEMBER( wd2797_index_callback); +// DECLARE_WRITE_LINE_MEMBER( wd2797_intrq_w ); +// DECLARE_WRITE_LINE_MEMBER( wd2797_drq_w ); +// DECLARE_WRITE_LINE_MEMBER( wd2797_index_callback); //required_device<ram_device> m_ramdisk; DECLARE_DRIVER_INIT(brno); DECLARE_SNAPSHOT_LOAD_MEMBER( brno ); -// DECLARE_DEVICE_IMAGE_LOAD_MEMBER(m5_cart); +// DECLARE_DEVICE_IMAGE_LOAD_MEMBER(m5_cart); virtual void machine_start() override; @@ -157,9 +157,9 @@ public: UINT8 m_ramcpu; //where Ramdisk bank is mapped bool m_romen; bool m_ramen; - - UINT8 m_rammap[16]; // memory map + + UINT8 m_rammap[16]; // memory map }; #endif diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 9b5cc1b2cd2..dcace237863 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -62,7 +62,7 @@ public: //INTERRUPT_GEN_MEMBER(cpuB_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(overdriv_cpuA_scanline); int m_fake_timer; - + K051316_CB_MEMBER(zoom_callback_1); K051316_CB_MEMBER(zoom_callback_2); K053246_CB_MEMBER(sprite_callback); diff --git a/src/mame/layout/esq2by16.lay b/src/mame/layout/esq2by16.lay index 1861b335476..7e0564e0a5b 100644 --- a/src/mame/layout/esq2by16.lay +++ b/src/mame/layout/esq2by16.lay @@ -60,921 +60,921 @@ <backdrop element="background"> <bounds left="0" top="0" right="300" bottom="120" /> </backdrop> - <bezel name="rLed_0" element="rLeds"> <bounds x="200" y="0" width="5" height="3" /> </bezel> - <bezel name="rLed_8" element="rLeds"> <bounds x="200" y="20" width="5" height="3" /> </bezel> - <bezel name="rLed_9" element="rLeds"> <bounds x="240" y="0" width="5" height="3" /> </bezel> - <bezel name="rLed_1" element="rLeds"> <bounds x="240" y="20" width="5" height="3" /> </bezel> - <bezel name="rLed_2" element="rLeds"> <bounds x="260" y="00" width="5" height="3" /> </bezel> - <bezel name="rLed_3" element="rLeds"> <bounds x="270" y="00" width="5" height="3" /> </bezel> - <bezel name="rLed_4" element="rLeds"> <bounds x="280" y="00" width="5" height="3" /> </bezel> - <bezel name="rLed_5" element="rLeds"> <bounds x="290" y="00" width="5" height="3" /> </bezel> - <bezel name="rLed_10" element="rLeds"> <bounds x="260" y="10" width="5" height="3" /> </bezel> - <bezel name="rLed_11" element="rLeds"> <bounds x="270" y="10" width="5" height="3" /> </bezel> - <bezel name="rLed_12" element="rLeds"> <bounds x="280" y="10" width="5" height="3" /> </bezel> - <bezel name="rLed_13" element="rLeds"> <bounds x="290" y="10" width="5" height="3" /> </bezel> + <bezel name="rLed_0" element="rLeds"> <bounds x="200" y="0" width="5" height="3" /> </bezel> + <bezel name="rLed_8" element="rLeds"> <bounds x="200" y="20" width="5" height="3" /> </bezel> + <bezel name="rLed_9" element="rLeds"> <bounds x="240" y="0" width="5" height="3" /> </bezel> + <bezel name="rLed_1" element="rLeds"> <bounds x="240" y="20" width="5" height="3" /> </bezel> + <bezel name="rLed_2" element="rLeds"> <bounds x="260" y="00" width="5" height="3" /> </bezel> + <bezel name="rLed_3" element="rLeds"> <bounds x="270" y="00" width="5" height="3" /> </bezel> + <bezel name="rLed_4" element="rLeds"> <bounds x="280" y="00" width="5" height="3" /> </bezel> + <bezel name="rLed_5" element="rLeds"> <bounds x="290" y="00" width="5" height="3" /> </bezel> + <bezel name="rLed_10" element="rLeds"> <bounds x="260" y="10" width="5" height="3" /> </bezel> + <bezel name="rLed_11" element="rLeds"> <bounds x="270" y="10" width="5" height="3" /> </bezel> + <bezel name="rLed_12" element="rLeds"> <bounds x="280" y="10" width="5" height="3" /> </bezel> + <bezel name="rLed_13" element="rLeds"> <bounds x="290" y="10" width="5" height="3" /> </bezel> - <bezel name="rLed_6" element="rLeds"> <bounds x="260" y="20" width="5" height="3" /> </bezel> - <bezel name="rLed_7" element="rLeds"> <bounds x="270" y="20" width="5" height="3" /> </bezel> - <bezel name="rLed_14" element="rLeds"> <bounds x="280" y="20" width="5" height="3" /> </bezel> - <bezel name="rLed_15" element="rLeds"> <bounds x="290" y="20" width="5" height="3" /> </bezel> - <bezel name="pg_3000" element="Page3" state="0"> <bounds x=" 0" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3001" element="Page3" state="0"> <bounds x=" 0" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3002" element="Page3" state="0"> <bounds x=" 0" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3003" element="Page3" state="0"> <bounds x=" 0" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3004" element="Page3" state="0"> <bounds x=" 0" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3005" element="Page3" state="0"> <bounds x=" 0" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3006" element="Page3" state="0"> <bounds x=" 0" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3007" element="Page3" state="0"> <bounds x=" 6" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3008" element="Page3" state="0"> <bounds x=" 6" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3009" element="Page3" state="0"> <bounds x=" 6" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3010" element="Page3" state="0"> <bounds x=" 6" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3011" element="Page3" state="0"> <bounds x=" 6" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3012" element="Page3" state="0"> <bounds x=" 6" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3013" element="Page3" state="0"> <bounds x=" 6" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3014" element="Page3" state="0"> <bounds x=" 12" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3015" element="Page3" state="0"> <bounds x=" 12" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3016" element="Page3" state="0"> <bounds x=" 12" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3017" element="Page3" state="0"> <bounds x=" 12" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3018" element="Page3" state="0"> <bounds x=" 12" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3019" element="Page3" state="0"> <bounds x=" 12" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3020" element="Page3" state="0"> <bounds x=" 12" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3021" element="Page3" state="0"> <bounds x=" 18" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3022" element="Page3" state="0"> <bounds x=" 18" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3023" element="Page3" state="0"> <bounds x=" 18" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3024" element="Page3" state="0"> <bounds x=" 18" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3025" element="Page3" state="0"> <bounds x=" 18" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3026" element="Page3" state="0"> <bounds x=" 18" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3027" element="Page3" state="0"> <bounds x=" 18" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3028" element="Page3" state="0"> <bounds x=" 24" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3029" element="Page3" state="0"> <bounds x=" 24" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3030" element="Page3" state="0"> <bounds x=" 24" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3031" element="Page3" state="0"> <bounds x=" 24" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3032" element="Page3" state="0"> <bounds x=" 24" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3033" element="Page3" state="0"> <bounds x=" 24" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3034" element="Page3" state="0"> <bounds x=" 24" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3035" element="Page3" state="0"> <bounds x=" 30" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3036" element="Page3" state="0"> <bounds x=" 30" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3037" element="Page3" state="0"> <bounds x=" 30" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3038" element="Page3" state="0"> <bounds x=" 30" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3039" element="Page3" state="0"> <bounds x=" 30" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3040" element="Page3" state="0"> <bounds x=" 30" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3041" element="Page3" state="0"> <bounds x=" 30" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3042" element="Page3" state="0"> <bounds x=" 36" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3043" element="Page3" state="0"> <bounds x=" 36" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3044" element="Page3" state="0"> <bounds x=" 36" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3045" element="Page3" state="0"> <bounds x=" 36" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3046" element="Page3" state="0"> <bounds x=" 36" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3047" element="Page3" state="0"> <bounds x=" 36" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3048" element="Page3" state="0"> <bounds x=" 36" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3049" element="Page3" state="0"> <bounds x=" 42" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3050" element="Page3" state="0"> <bounds x=" 42" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3051" element="Page3" state="0"> <bounds x=" 42" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3052" element="Page3" state="0"> <bounds x=" 42" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3053" element="Page3" state="0"> <bounds x=" 42" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3054" element="Page3" state="0"> <bounds x=" 42" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3055" element="Page3" state="0"> <bounds x=" 42" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3056" element="Page3" state="0"> <bounds x=" 48" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3057" element="Page3" state="0"> <bounds x=" 48" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3058" element="Page3" state="0"> <bounds x=" 48" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3059" element="Page3" state="0"> <bounds x=" 48" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3060" element="Page3" state="0"> <bounds x=" 48" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3061" element="Page3" state="0"> <bounds x=" 48" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3062" element="Page3" state="0"> <bounds x=" 48" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3063" element="Page3" state="0"> <bounds x=" 54" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3064" element="Page3" state="0"> <bounds x=" 54" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3065" element="Page3" state="0"> <bounds x=" 54" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3066" element="Page3" state="0"> <bounds x=" 54" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3067" element="Page3" state="0"> <bounds x=" 54" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3068" element="Page3" state="0"> <bounds x=" 54" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3069" element="Page3" state="0"> <bounds x=" 54" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3070" element="Page3" state="0"> <bounds x=" 60" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3071" element="Page3" state="0"> <bounds x=" 60" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3072" element="Page3" state="0"> <bounds x=" 60" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3073" element="Page3" state="0"> <bounds x=" 60" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3074" element="Page3" state="0"> <bounds x=" 60" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3075" element="Page3" state="0"> <bounds x=" 60" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3076" element="Page3" state="0"> <bounds x=" 60" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3077" element="Page3" state="0"> <bounds x=" 66" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3078" element="Page3" state="0"> <bounds x=" 66" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3079" element="Page3" state="0"> <bounds x=" 66" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3080" element="Page3" state="0"> <bounds x=" 66" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3081" element="Page3" state="0"> <bounds x=" 66" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3082" element="Page3" state="0"> <bounds x=" 66" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3083" element="Page3" state="0"> <bounds x=" 66" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3084" element="Page3" state="0"> <bounds x=" 72" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3085" element="Page3" state="0"> <bounds x=" 72" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3086" element="Page3" state="0"> <bounds x=" 72" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3087" element="Page3" state="0"> <bounds x=" 72" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3088" element="Page3" state="0"> <bounds x=" 72" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3089" element="Page3" state="0"> <bounds x=" 72" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3090" element="Page3" state="0"> <bounds x=" 72" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3091" element="Page3" state="0"> <bounds x=" 78" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3092" element="Page3" state="0"> <bounds x=" 78" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3093" element="Page3" state="0"> <bounds x=" 78" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3094" element="Page3" state="0"> <bounds x=" 78" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3095" element="Page3" state="0"> <bounds x=" 78" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3096" element="Page3" state="0"> <bounds x=" 78" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3097" element="Page3" state="0"> <bounds x=" 78" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3098" element="Page3" state="0"> <bounds x=" 84" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3099" element="Page3" state="0"> <bounds x=" 84" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3100" element="Page3" state="0"> <bounds x=" 84" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3101" element="Page3" state="0"> <bounds x=" 84" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3102" element="Page3" state="0"> <bounds x=" 84" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3103" element="Page3" state="0"> <bounds x=" 84" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3104" element="Page3" state="0"> <bounds x=" 84" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3105" element="Page3" state="0"> <bounds x=" 90" y=" 0" width="5" height="1" /> </bezel> - <bezel name="pg_3106" element="Page3" state="0"> <bounds x=" 90" y=" 1" width="5" height="1" /> </bezel> - <bezel name="pg_3107" element="Page3" state="0"> <bounds x=" 90" y=" 2" width="5" height="1" /> </bezel> - <bezel name="pg_3108" element="Page3" state="0"> <bounds x=" 90" y=" 3" width="5" height="1" /> </bezel> - <bezel name="pg_3109" element="Page3" state="0"> <bounds x=" 90" y=" 4" width="5" height="1" /> </bezel> - <bezel name="pg_3110" element="Page3" state="0"> <bounds x=" 90" y=" 5" width="5" height="1" /> </bezel> - <bezel name="pg_3111" element="Page3" state="0"> <bounds x=" 90" y=" 6" width="5" height="1" /> </bezel> - <bezel name="pg_3112" element="Page3" state="0"> <bounds x=" 0" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3113" element="Page3" state="0"> <bounds x=" 0" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3114" element="Page3" state="0"> <bounds x=" 0" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3115" element="Page3" state="0"> <bounds x=" 0" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3116" element="Page3" state="0"> <bounds x=" 0" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3117" element="Page3" state="0"> <bounds x=" 0" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3118" element="Page3" state="0"> <bounds x=" 0" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3119" element="Page3" state="0"> <bounds x=" 6" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3120" element="Page3" state="0"> <bounds x=" 6" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3121" element="Page3" state="0"> <bounds x=" 6" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3122" element="Page3" state="0"> <bounds x=" 6" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3123" element="Page3" state="0"> <bounds x=" 6" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3124" element="Page3" state="0"> <bounds x=" 6" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3125" element="Page3" state="0"> <bounds x=" 6" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3126" element="Page3" state="0"> <bounds x=" 12" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3127" element="Page3" state="0"> <bounds x=" 12" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3128" element="Page3" state="0"> <bounds x=" 12" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3129" element="Page3" state="0"> <bounds x=" 12" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3130" element="Page3" state="0"> <bounds x=" 12" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3131" element="Page3" state="0"> <bounds x=" 12" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3132" element="Page3" state="0"> <bounds x=" 12" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3133" element="Page3" state="0"> <bounds x=" 18" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3134" element="Page3" state="0"> <bounds x=" 18" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3135" element="Page3" state="0"> <bounds x=" 18" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3136" element="Page3" state="0"> <bounds x=" 18" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3137" element="Page3" state="0"> <bounds x=" 18" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3138" element="Page3" state="0"> <bounds x=" 18" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3139" element="Page3" state="0"> <bounds x=" 18" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3140" element="Page3" state="0"> <bounds x=" 24" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3141" element="Page3" state="0"> <bounds x=" 24" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3142" element="Page3" state="0"> <bounds x=" 24" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3143" element="Page3" state="0"> <bounds x=" 24" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3144" element="Page3" state="0"> <bounds x=" 24" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3145" element="Page3" state="0"> <bounds x=" 24" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3146" element="Page3" state="0"> <bounds x=" 24" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3147" element="Page3" state="0"> <bounds x=" 30" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3148" element="Page3" state="0"> <bounds x=" 30" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3149" element="Page3" state="0"> <bounds x=" 30" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3150" element="Page3" state="0"> <bounds x=" 30" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3151" element="Page3" state="0"> <bounds x=" 30" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3152" element="Page3" state="0"> <bounds x=" 30" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3153" element="Page3" state="0"> <bounds x=" 30" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3154" element="Page3" state="0"> <bounds x=" 36" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3155" element="Page3" state="0"> <bounds x=" 36" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3156" element="Page3" state="0"> <bounds x=" 36" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3157" element="Page3" state="0"> <bounds x=" 36" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3158" element="Page3" state="0"> <bounds x=" 36" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3159" element="Page3" state="0"> <bounds x=" 36" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3160" element="Page3" state="0"> <bounds x=" 36" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3161" element="Page3" state="0"> <bounds x=" 42" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3162" element="Page3" state="0"> <bounds x=" 42" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3163" element="Page3" state="0"> <bounds x=" 42" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3164" element="Page3" state="0"> <bounds x=" 42" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3165" element="Page3" state="0"> <bounds x=" 42" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3166" element="Page3" state="0"> <bounds x=" 42" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3167" element="Page3" state="0"> <bounds x=" 42" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3168" element="Page3" state="0"> <bounds x=" 48" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3169" element="Page3" state="0"> <bounds x=" 48" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3170" element="Page3" state="0"> <bounds x=" 48" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3171" element="Page3" state="0"> <bounds x=" 48" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3172" element="Page3" state="0"> <bounds x=" 48" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3173" element="Page3" state="0"> <bounds x=" 48" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3174" element="Page3" state="0"> <bounds x=" 48" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3175" element="Page3" state="0"> <bounds x=" 54" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3176" element="Page3" state="0"> <bounds x=" 54" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3177" element="Page3" state="0"> <bounds x=" 54" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3178" element="Page3" state="0"> <bounds x=" 54" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3179" element="Page3" state="0"> <bounds x=" 54" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3180" element="Page3" state="0"> <bounds x=" 54" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3181" element="Page3" state="0"> <bounds x=" 54" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3182" element="Page3" state="0"> <bounds x=" 60" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3183" element="Page3" state="0"> <bounds x=" 60" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3184" element="Page3" state="0"> <bounds x=" 60" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3185" element="Page3" state="0"> <bounds x=" 60" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3186" element="Page3" state="0"> <bounds x=" 60" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3187" element="Page3" state="0"> <bounds x=" 60" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3188" element="Page3" state="0"> <bounds x=" 60" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3189" element="Page3" state="0"> <bounds x=" 66" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3190" element="Page3" state="0"> <bounds x=" 66" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3191" element="Page3" state="0"> <bounds x=" 66" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3192" element="Page3" state="0"> <bounds x=" 66" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3193" element="Page3" state="0"> <bounds x=" 66" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3194" element="Page3" state="0"> <bounds x=" 66" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3195" element="Page3" state="0"> <bounds x=" 66" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3196" element="Page3" state="0"> <bounds x=" 72" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3197" element="Page3" state="0"> <bounds x=" 72" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3198" element="Page3" state="0"> <bounds x=" 72" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3199" element="Page3" state="0"> <bounds x=" 72" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3200" element="Page3" state="0"> <bounds x=" 72" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3201" element="Page3" state="0"> <bounds x=" 72" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3202" element="Page3" state="0"> <bounds x=" 72" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3203" element="Page3" state="0"> <bounds x=" 78" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3204" element="Page3" state="0"> <bounds x=" 78" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3205" element="Page3" state="0"> <bounds x=" 78" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3206" element="Page3" state="0"> <bounds x=" 78" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3207" element="Page3" state="0"> <bounds x=" 78" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3208" element="Page3" state="0"> <bounds x=" 78" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3209" element="Page3" state="0"> <bounds x=" 78" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3210" element="Page3" state="0"> <bounds x=" 84" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3211" element="Page3" state="0"> <bounds x=" 84" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3212" element="Page3" state="0"> <bounds x=" 84" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3213" element="Page3" state="0"> <bounds x=" 84" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3214" element="Page3" state="0"> <bounds x=" 84" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3215" element="Page3" state="0"> <bounds x=" 84" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3216" element="Page3" state="0"> <bounds x=" 84" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_3217" element="Page3" state="0"> <bounds x=" 90" y=" 10" width="5" height="1" /> </bezel> - <bezel name="pg_3218" element="Page3" state="0"> <bounds x=" 90" y=" 11" width="5" height="1" /> </bezel> - <bezel name="pg_3219" element="Page3" state="0"> <bounds x=" 90" y=" 12" width="5" height="1" /> </bezel> - <bezel name="pg_3220" element="Page3" state="0"> <bounds x=" 90" y=" 13" width="5" height="1" /> </bezel> - <bezel name="pg_3221" element="Page3" state="0"> <bounds x=" 90" y=" 14" width="5" height="1" /> </bezel> - <bezel name="pg_3222" element="Page3" state="0"> <bounds x=" 90" y=" 15" width="5" height="1" /> </bezel> - <bezel name="pg_3223" element="Page3" state="0"> <bounds x=" 90" y=" 16" width="5" height="1" /> </bezel> + <bezel name="rLed_6" element="rLeds"> <bounds x="260" y="20" width="5" height="3" /> </bezel> + <bezel name="rLed_7" element="rLeds"> <bounds x="270" y="20" width="5" height="3" /> </bezel> + <bezel name="rLed_14" element="rLeds"> <bounds x="280" y="20" width="5" height="3" /> </bezel> + <bezel name="rLed_15" element="rLeds"> <bounds x="290" y="20" width="5" height="3" /> </bezel> + <bezel name="pg_3000" element="Page3" state="0"> <bounds x=" 0" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3001" element="Page3" state="0"> <bounds x=" 0" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3002" element="Page3" state="0"> <bounds x=" 0" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3003" element="Page3" state="0"> <bounds x=" 0" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3004" element="Page3" state="0"> <bounds x=" 0" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3005" element="Page3" state="0"> <bounds x=" 0" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3006" element="Page3" state="0"> <bounds x=" 0" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3007" element="Page3" state="0"> <bounds x=" 6" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3008" element="Page3" state="0"> <bounds x=" 6" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3009" element="Page3" state="0"> <bounds x=" 6" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3010" element="Page3" state="0"> <bounds x=" 6" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3011" element="Page3" state="0"> <bounds x=" 6" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3012" element="Page3" state="0"> <bounds x=" 6" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3013" element="Page3" state="0"> <bounds x=" 6" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3014" element="Page3" state="0"> <bounds x=" 12" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3015" element="Page3" state="0"> <bounds x=" 12" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3016" element="Page3" state="0"> <bounds x=" 12" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3017" element="Page3" state="0"> <bounds x=" 12" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3018" element="Page3" state="0"> <bounds x=" 12" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3019" element="Page3" state="0"> <bounds x=" 12" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3020" element="Page3" state="0"> <bounds x=" 12" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3021" element="Page3" state="0"> <bounds x=" 18" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3022" element="Page3" state="0"> <bounds x=" 18" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3023" element="Page3" state="0"> <bounds x=" 18" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3024" element="Page3" state="0"> <bounds x=" 18" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3025" element="Page3" state="0"> <bounds x=" 18" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3026" element="Page3" state="0"> <bounds x=" 18" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3027" element="Page3" state="0"> <bounds x=" 18" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3028" element="Page3" state="0"> <bounds x=" 24" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3029" element="Page3" state="0"> <bounds x=" 24" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3030" element="Page3" state="0"> <bounds x=" 24" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3031" element="Page3" state="0"> <bounds x=" 24" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3032" element="Page3" state="0"> <bounds x=" 24" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3033" element="Page3" state="0"> <bounds x=" 24" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3034" element="Page3" state="0"> <bounds x=" 24" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3035" element="Page3" state="0"> <bounds x=" 30" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3036" element="Page3" state="0"> <bounds x=" 30" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3037" element="Page3" state="0"> <bounds x=" 30" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3038" element="Page3" state="0"> <bounds x=" 30" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3039" element="Page3" state="0"> <bounds x=" 30" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3040" element="Page3" state="0"> <bounds x=" 30" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3041" element="Page3" state="0"> <bounds x=" 30" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3042" element="Page3" state="0"> <bounds x=" 36" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3043" element="Page3" state="0"> <bounds x=" 36" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3044" element="Page3" state="0"> <bounds x=" 36" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3045" element="Page3" state="0"> <bounds x=" 36" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3046" element="Page3" state="0"> <bounds x=" 36" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3047" element="Page3" state="0"> <bounds x=" 36" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3048" element="Page3" state="0"> <bounds x=" 36" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3049" element="Page3" state="0"> <bounds x=" 42" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3050" element="Page3" state="0"> <bounds x=" 42" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3051" element="Page3" state="0"> <bounds x=" 42" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3052" element="Page3" state="0"> <bounds x=" 42" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3053" element="Page3" state="0"> <bounds x=" 42" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3054" element="Page3" state="0"> <bounds x=" 42" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3055" element="Page3" state="0"> <bounds x=" 42" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3056" element="Page3" state="0"> <bounds x=" 48" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3057" element="Page3" state="0"> <bounds x=" 48" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3058" element="Page3" state="0"> <bounds x=" 48" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3059" element="Page3" state="0"> <bounds x=" 48" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3060" element="Page3" state="0"> <bounds x=" 48" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3061" element="Page3" state="0"> <bounds x=" 48" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3062" element="Page3" state="0"> <bounds x=" 48" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3063" element="Page3" state="0"> <bounds x=" 54" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3064" element="Page3" state="0"> <bounds x=" 54" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3065" element="Page3" state="0"> <bounds x=" 54" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3066" element="Page3" state="0"> <bounds x=" 54" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3067" element="Page3" state="0"> <bounds x=" 54" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3068" element="Page3" state="0"> <bounds x=" 54" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3069" element="Page3" state="0"> <bounds x=" 54" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3070" element="Page3" state="0"> <bounds x=" 60" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3071" element="Page3" state="0"> <bounds x=" 60" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3072" element="Page3" state="0"> <bounds x=" 60" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3073" element="Page3" state="0"> <bounds x=" 60" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3074" element="Page3" state="0"> <bounds x=" 60" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3075" element="Page3" state="0"> <bounds x=" 60" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3076" element="Page3" state="0"> <bounds x=" 60" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3077" element="Page3" state="0"> <bounds x=" 66" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3078" element="Page3" state="0"> <bounds x=" 66" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3079" element="Page3" state="0"> <bounds x=" 66" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3080" element="Page3" state="0"> <bounds x=" 66" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3081" element="Page3" state="0"> <bounds x=" 66" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3082" element="Page3" state="0"> <bounds x=" 66" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3083" element="Page3" state="0"> <bounds x=" 66" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3084" element="Page3" state="0"> <bounds x=" 72" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3085" element="Page3" state="0"> <bounds x=" 72" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3086" element="Page3" state="0"> <bounds x=" 72" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3087" element="Page3" state="0"> <bounds x=" 72" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3088" element="Page3" state="0"> <bounds x=" 72" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3089" element="Page3" state="0"> <bounds x=" 72" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3090" element="Page3" state="0"> <bounds x=" 72" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3091" element="Page3" state="0"> <bounds x=" 78" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3092" element="Page3" state="0"> <bounds x=" 78" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3093" element="Page3" state="0"> <bounds x=" 78" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3094" element="Page3" state="0"> <bounds x=" 78" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3095" element="Page3" state="0"> <bounds x=" 78" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3096" element="Page3" state="0"> <bounds x=" 78" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3097" element="Page3" state="0"> <bounds x=" 78" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3098" element="Page3" state="0"> <bounds x=" 84" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3099" element="Page3" state="0"> <bounds x=" 84" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3100" element="Page3" state="0"> <bounds x=" 84" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3101" element="Page3" state="0"> <bounds x=" 84" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3102" element="Page3" state="0"> <bounds x=" 84" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3103" element="Page3" state="0"> <bounds x=" 84" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3104" element="Page3" state="0"> <bounds x=" 84" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3105" element="Page3" state="0"> <bounds x=" 90" y=" 0" width="5" height="1" /> </bezel> + <bezel name="pg_3106" element="Page3" state="0"> <bounds x=" 90" y=" 1" width="5" height="1" /> </bezel> + <bezel name="pg_3107" element="Page3" state="0"> <bounds x=" 90" y=" 2" width="5" height="1" /> </bezel> + <bezel name="pg_3108" element="Page3" state="0"> <bounds x=" 90" y=" 3" width="5" height="1" /> </bezel> + <bezel name="pg_3109" element="Page3" state="0"> <bounds x=" 90" y=" 4" width="5" height="1" /> </bezel> + <bezel name="pg_3110" element="Page3" state="0"> <bounds x=" 90" y=" 5" width="5" height="1" /> </bezel> + <bezel name="pg_3111" element="Page3" state="0"> <bounds x=" 90" y=" 6" width="5" height="1" /> </bezel> + <bezel name="pg_3112" element="Page3" state="0"> <bounds x=" 0" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3113" element="Page3" state="0"> <bounds x=" 0" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3114" element="Page3" state="0"> <bounds x=" 0" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3115" element="Page3" state="0"> <bounds x=" 0" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3116" element="Page3" state="0"> <bounds x=" 0" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3117" element="Page3" state="0"> <bounds x=" 0" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3118" element="Page3" state="0"> <bounds x=" 0" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3119" element="Page3" state="0"> <bounds x=" 6" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3120" element="Page3" state="0"> <bounds x=" 6" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3121" element="Page3" state="0"> <bounds x=" 6" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3122" element="Page3" state="0"> <bounds x=" 6" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3123" element="Page3" state="0"> <bounds x=" 6" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3124" element="Page3" state="0"> <bounds x=" 6" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3125" element="Page3" state="0"> <bounds x=" 6" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3126" element="Page3" state="0"> <bounds x=" 12" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3127" element="Page3" state="0"> <bounds x=" 12" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3128" element="Page3" state="0"> <bounds x=" 12" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3129" element="Page3" state="0"> <bounds x=" 12" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3130" element="Page3" state="0"> <bounds x=" 12" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3131" element="Page3" state="0"> <bounds x=" 12" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3132" element="Page3" state="0"> <bounds x=" 12" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3133" element="Page3" state="0"> <bounds x=" 18" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3134" element="Page3" state="0"> <bounds x=" 18" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3135" element="Page3" state="0"> <bounds x=" 18" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3136" element="Page3" state="0"> <bounds x=" 18" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3137" element="Page3" state="0"> <bounds x=" 18" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3138" element="Page3" state="0"> <bounds x=" 18" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3139" element="Page3" state="0"> <bounds x=" 18" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3140" element="Page3" state="0"> <bounds x=" 24" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3141" element="Page3" state="0"> <bounds x=" 24" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3142" element="Page3" state="0"> <bounds x=" 24" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3143" element="Page3" state="0"> <bounds x=" 24" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3144" element="Page3" state="0"> <bounds x=" 24" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3145" element="Page3" state="0"> <bounds x=" 24" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3146" element="Page3" state="0"> <bounds x=" 24" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3147" element="Page3" state="0"> <bounds x=" 30" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3148" element="Page3" state="0"> <bounds x=" 30" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3149" element="Page3" state="0"> <bounds x=" 30" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3150" element="Page3" state="0"> <bounds x=" 30" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3151" element="Page3" state="0"> <bounds x=" 30" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3152" element="Page3" state="0"> <bounds x=" 30" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3153" element="Page3" state="0"> <bounds x=" 30" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3154" element="Page3" state="0"> <bounds x=" 36" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3155" element="Page3" state="0"> <bounds x=" 36" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3156" element="Page3" state="0"> <bounds x=" 36" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3157" element="Page3" state="0"> <bounds x=" 36" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3158" element="Page3" state="0"> <bounds x=" 36" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3159" element="Page3" state="0"> <bounds x=" 36" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3160" element="Page3" state="0"> <bounds x=" 36" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3161" element="Page3" state="0"> <bounds x=" 42" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3162" element="Page3" state="0"> <bounds x=" 42" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3163" element="Page3" state="0"> <bounds x=" 42" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3164" element="Page3" state="0"> <bounds x=" 42" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3165" element="Page3" state="0"> <bounds x=" 42" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3166" element="Page3" state="0"> <bounds x=" 42" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3167" element="Page3" state="0"> <bounds x=" 42" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3168" element="Page3" state="0"> <bounds x=" 48" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3169" element="Page3" state="0"> <bounds x=" 48" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3170" element="Page3" state="0"> <bounds x=" 48" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3171" element="Page3" state="0"> <bounds x=" 48" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3172" element="Page3" state="0"> <bounds x=" 48" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3173" element="Page3" state="0"> <bounds x=" 48" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3174" element="Page3" state="0"> <bounds x=" 48" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3175" element="Page3" state="0"> <bounds x=" 54" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3176" element="Page3" state="0"> <bounds x=" 54" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3177" element="Page3" state="0"> <bounds x=" 54" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3178" element="Page3" state="0"> <bounds x=" 54" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3179" element="Page3" state="0"> <bounds x=" 54" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3180" element="Page3" state="0"> <bounds x=" 54" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3181" element="Page3" state="0"> <bounds x=" 54" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3182" element="Page3" state="0"> <bounds x=" 60" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3183" element="Page3" state="0"> <bounds x=" 60" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3184" element="Page3" state="0"> <bounds x=" 60" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3185" element="Page3" state="0"> <bounds x=" 60" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3186" element="Page3" state="0"> <bounds x=" 60" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3187" element="Page3" state="0"> <bounds x=" 60" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3188" element="Page3" state="0"> <bounds x=" 60" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3189" element="Page3" state="0"> <bounds x=" 66" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3190" element="Page3" state="0"> <bounds x=" 66" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3191" element="Page3" state="0"> <bounds x=" 66" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3192" element="Page3" state="0"> <bounds x=" 66" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3193" element="Page3" state="0"> <bounds x=" 66" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3194" element="Page3" state="0"> <bounds x=" 66" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3195" element="Page3" state="0"> <bounds x=" 66" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3196" element="Page3" state="0"> <bounds x=" 72" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3197" element="Page3" state="0"> <bounds x=" 72" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3198" element="Page3" state="0"> <bounds x=" 72" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3199" element="Page3" state="0"> <bounds x=" 72" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3200" element="Page3" state="0"> <bounds x=" 72" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3201" element="Page3" state="0"> <bounds x=" 72" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3202" element="Page3" state="0"> <bounds x=" 72" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3203" element="Page3" state="0"> <bounds x=" 78" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3204" element="Page3" state="0"> <bounds x=" 78" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3205" element="Page3" state="0"> <bounds x=" 78" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3206" element="Page3" state="0"> <bounds x=" 78" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3207" element="Page3" state="0"> <bounds x=" 78" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3208" element="Page3" state="0"> <bounds x=" 78" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3209" element="Page3" state="0"> <bounds x=" 78" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3210" element="Page3" state="0"> <bounds x=" 84" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3211" element="Page3" state="0"> <bounds x=" 84" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3212" element="Page3" state="0"> <bounds x=" 84" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3213" element="Page3" state="0"> <bounds x=" 84" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3214" element="Page3" state="0"> <bounds x=" 84" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3215" element="Page3" state="0"> <bounds x=" 84" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3216" element="Page3" state="0"> <bounds x=" 84" y=" 16" width="5" height="1" /> </bezel> + <bezel name="pg_3217" element="Page3" state="0"> <bounds x=" 90" y=" 10" width="5" height="1" /> </bezel> + <bezel name="pg_3218" element="Page3" state="0"> <bounds x=" 90" y=" 11" width="5" height="1" /> </bezel> + <bezel name="pg_3219" element="Page3" state="0"> <bounds x=" 90" y=" 12" width="5" height="1" /> </bezel> + <bezel name="pg_3220" element="Page3" state="0"> <bounds x=" 90" y=" 13" width="5" height="1" /> </bezel> + <bezel name="pg_3221" element="Page3" state="0"> <bounds x=" 90" y=" 14" width="5" height="1" /> </bezel> + <bezel name="pg_3222" element="Page3" state="0"> <bounds x=" 90" y=" 15" width="5" height="1" /> </bezel> + <bezel name="pg_3223" element="Page3" state="0"> <bounds x=" 90" y=" 16" width="5" height="1" /> </bezel> - <bezel name="pg_2000" element="Page2" state="0"> <bounds x=" 0" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2001" element="Page2" state="0"> <bounds x=" 0" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2002" element="Page2" state="0"> <bounds x=" 0" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2003" element="Page2" state="0"> <bounds x=" 0" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2004" element="Page2" state="0"> <bounds x=" 0" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2005" element="Page2" state="0"> <bounds x=" 0" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2006" element="Page2" state="0"> <bounds x=" 0" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2007" element="Page2" state="0"> <bounds x=" 6" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2008" element="Page2" state="0"> <bounds x=" 6" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2009" element="Page2" state="0"> <bounds x=" 6" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2010" element="Page2" state="0"> <bounds x=" 6" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2011" element="Page2" state="0"> <bounds x=" 6" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2012" element="Page2" state="0"> <bounds x=" 6" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2013" element="Page2" state="0"> <bounds x=" 6" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2014" element="Page2" state="0"> <bounds x=" 12" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2015" element="Page2" state="0"> <bounds x=" 12" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2016" element="Page2" state="0"> <bounds x=" 12" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2017" element="Page2" state="0"> <bounds x=" 12" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2018" element="Page2" state="0"> <bounds x=" 12" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2019" element="Page2" state="0"> <bounds x=" 12" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2020" element="Page2" state="0"> <bounds x=" 12" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2021" element="Page2" state="0"> <bounds x=" 18" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2022" element="Page2" state="0"> <bounds x=" 18" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2023" element="Page2" state="0"> <bounds x=" 18" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2024" element="Page2" state="0"> <bounds x=" 18" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2025" element="Page2" state="0"> <bounds x=" 18" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2026" element="Page2" state="0"> <bounds x=" 18" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2027" element="Page2" state="0"> <bounds x=" 18" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2028" element="Page2" state="0"> <bounds x=" 24" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2029" element="Page2" state="0"> <bounds x=" 24" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2030" element="Page2" state="0"> <bounds x=" 24" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2031" element="Page2" state="0"> <bounds x=" 24" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2032" element="Page2" state="0"> <bounds x=" 24" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2033" element="Page2" state="0"> <bounds x=" 24" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2034" element="Page2" state="0"> <bounds x=" 24" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2035" element="Page2" state="0"> <bounds x=" 30" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2036" element="Page2" state="0"> <bounds x=" 30" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2037" element="Page2" state="0"> <bounds x=" 30" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2038" element="Page2" state="0"> <bounds x=" 30" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2039" element="Page2" state="0"> <bounds x=" 30" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2040" element="Page2" state="0"> <bounds x=" 30" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2041" element="Page2" state="0"> <bounds x=" 30" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2042" element="Page2" state="0"> <bounds x=" 36" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2043" element="Page2" state="0"> <bounds x=" 36" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2044" element="Page2" state="0"> <bounds x=" 36" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2045" element="Page2" state="0"> <bounds x=" 36" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2046" element="Page2" state="0"> <bounds x=" 36" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2047" element="Page2" state="0"> <bounds x=" 36" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2048" element="Page2" state="0"> <bounds x=" 36" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2049" element="Page2" state="0"> <bounds x=" 42" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2050" element="Page2" state="0"> <bounds x=" 42" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2051" element="Page2" state="0"> <bounds x=" 42" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2052" element="Page2" state="0"> <bounds x=" 42" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2053" element="Page2" state="0"> <bounds x=" 42" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2054" element="Page2" state="0"> <bounds x=" 42" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2055" element="Page2" state="0"> <bounds x=" 42" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2056" element="Page2" state="0"> <bounds x=" 48" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2057" element="Page2" state="0"> <bounds x=" 48" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2058" element="Page2" state="0"> <bounds x=" 48" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2059" element="Page2" state="0"> <bounds x=" 48" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2060" element="Page2" state="0"> <bounds x=" 48" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2061" element="Page2" state="0"> <bounds x=" 48" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2062" element="Page2" state="0"> <bounds x=" 48" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2063" element="Page2" state="0"> <bounds x=" 54" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2064" element="Page2" state="0"> <bounds x=" 54" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2065" element="Page2" state="0"> <bounds x=" 54" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2066" element="Page2" state="0"> <bounds x=" 54" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2067" element="Page2" state="0"> <bounds x=" 54" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2068" element="Page2" state="0"> <bounds x=" 54" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2069" element="Page2" state="0"> <bounds x=" 54" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2070" element="Page2" state="0"> <bounds x=" 60" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2071" element="Page2" state="0"> <bounds x=" 60" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2072" element="Page2" state="0"> <bounds x=" 60" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2073" element="Page2" state="0"> <bounds x=" 60" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2074" element="Page2" state="0"> <bounds x=" 60" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2075" element="Page2" state="0"> <bounds x=" 60" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2076" element="Page2" state="0"> <bounds x=" 60" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2077" element="Page2" state="0"> <bounds x=" 66" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2078" element="Page2" state="0"> <bounds x=" 66" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2079" element="Page2" state="0"> <bounds x=" 66" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2080" element="Page2" state="0"> <bounds x=" 66" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2081" element="Page2" state="0"> <bounds x=" 66" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2082" element="Page2" state="0"> <bounds x=" 66" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2083" element="Page2" state="0"> <bounds x=" 66" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2084" element="Page2" state="0"> <bounds x=" 72" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2085" element="Page2" state="0"> <bounds x=" 72" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2086" element="Page2" state="0"> <bounds x=" 72" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2087" element="Page2" state="0"> <bounds x=" 72" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2088" element="Page2" state="0"> <bounds x=" 72" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2089" element="Page2" state="0"> <bounds x=" 72" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2090" element="Page2" state="0"> <bounds x=" 72" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2091" element="Page2" state="0"> <bounds x=" 78" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2092" element="Page2" state="0"> <bounds x=" 78" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2093" element="Page2" state="0"> <bounds x=" 78" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2094" element="Page2" state="0"> <bounds x=" 78" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2095" element="Page2" state="0"> <bounds x=" 78" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2096" element="Page2" state="0"> <bounds x=" 78" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2097" element="Page2" state="0"> <bounds x=" 78" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2098" element="Page2" state="0"> <bounds x=" 84" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2099" element="Page2" state="0"> <bounds x=" 84" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2100" element="Page2" state="0"> <bounds x=" 84" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2101" element="Page2" state="0"> <bounds x=" 84" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2102" element="Page2" state="0"> <bounds x=" 84" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2103" element="Page2" state="0"> <bounds x=" 84" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2104" element="Page2" state="0"> <bounds x=" 84" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2105" element="Page2" state="0"> <bounds x=" 90" y=" 20" width="5" height="1" /> </bezel> - <bezel name="pg_2106" element="Page2" state="0"> <bounds x=" 90" y=" 21" width="5" height="1" /> </bezel> - <bezel name="pg_2107" element="Page2" state="0"> <bounds x=" 90" y=" 22" width="5" height="1" /> </bezel> - <bezel name="pg_2108" element="Page2" state="0"> <bounds x=" 90" y=" 23" width="5" height="1" /> </bezel> - <bezel name="pg_2109" element="Page2" state="0"> <bounds x=" 90" y=" 24" width="5" height="1" /> </bezel> - <bezel name="pg_2110" element="Page2" state="0"> <bounds x=" 90" y=" 25" width="5" height="1" /> </bezel> - <bezel name="pg_2111" element="Page2" state="0"> <bounds x=" 90" y=" 26" width="5" height="1" /> </bezel> - <bezel name="pg_2112" element="Page2" state="0"> <bounds x=" 0" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2113" element="Page2" state="0"> <bounds x=" 0" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2114" element="Page2" state="0"> <bounds x=" 0" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2115" element="Page2" state="0"> <bounds x=" 0" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2116" element="Page2" state="0"> <bounds x=" 0" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2117" element="Page2" state="0"> <bounds x=" 0" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2118" element="Page2" state="0"> <bounds x=" 0" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2119" element="Page2" state="0"> <bounds x=" 6" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2120" element="Page2" state="0"> <bounds x=" 6" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2121" element="Page2" state="0"> <bounds x=" 6" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2122" element="Page2" state="0"> <bounds x=" 6" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2123" element="Page2" state="0"> <bounds x=" 6" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2124" element="Page2" state="0"> <bounds x=" 6" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2125" element="Page2" state="0"> <bounds x=" 6" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2126" element="Page2" state="0"> <bounds x=" 12" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2127" element="Page2" state="0"> <bounds x=" 12" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2128" element="Page2" state="0"> <bounds x=" 12" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2129" element="Page2" state="0"> <bounds x=" 12" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2130" element="Page2" state="0"> <bounds x=" 12" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2131" element="Page2" state="0"> <bounds x=" 12" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2132" element="Page2" state="0"> <bounds x=" 12" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2133" element="Page2" state="0"> <bounds x=" 18" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2134" element="Page2" state="0"> <bounds x=" 18" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2135" element="Page2" state="0"> <bounds x=" 18" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2136" element="Page2" state="0"> <bounds x=" 18" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2137" element="Page2" state="0"> <bounds x=" 18" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2138" element="Page2" state="0"> <bounds x=" 18" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2139" element="Page2" state="0"> <bounds x=" 18" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2140" element="Page2" state="0"> <bounds x=" 24" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2141" element="Page2" state="0"> <bounds x=" 24" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2142" element="Page2" state="0"> <bounds x=" 24" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2143" element="Page2" state="0"> <bounds x=" 24" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2144" element="Page2" state="0"> <bounds x=" 24" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2145" element="Page2" state="0"> <bounds x=" 24" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2146" element="Page2" state="0"> <bounds x=" 24" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2147" element="Page2" state="0"> <bounds x=" 30" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2148" element="Page2" state="0"> <bounds x=" 30" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2149" element="Page2" state="0"> <bounds x=" 30" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2150" element="Page2" state="0"> <bounds x=" 30" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2151" element="Page2" state="0"> <bounds x=" 30" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2152" element="Page2" state="0"> <bounds x=" 30" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2153" element="Page2" state="0"> <bounds x=" 30" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2154" element="Page2" state="0"> <bounds x=" 36" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2155" element="Page2" state="0"> <bounds x=" 36" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2156" element="Page2" state="0"> <bounds x=" 36" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2157" element="Page2" state="0"> <bounds x=" 36" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2158" element="Page2" state="0"> <bounds x=" 36" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2159" element="Page2" state="0"> <bounds x=" 36" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2160" element="Page2" state="0"> <bounds x=" 36" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2161" element="Page2" state="0"> <bounds x=" 42" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2162" element="Page2" state="0"> <bounds x=" 42" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2163" element="Page2" state="0"> <bounds x=" 42" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2164" element="Page2" state="0"> <bounds x=" 42" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2165" element="Page2" state="0"> <bounds x=" 42" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2166" element="Page2" state="0"> <bounds x=" 42" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2167" element="Page2" state="0"> <bounds x=" 42" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2168" element="Page2" state="0"> <bounds x=" 48" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2169" element="Page2" state="0"> <bounds x=" 48" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2170" element="Page2" state="0"> <bounds x=" 48" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2171" element="Page2" state="0"> <bounds x=" 48" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2172" element="Page2" state="0"> <bounds x=" 48" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2173" element="Page2" state="0"> <bounds x=" 48" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2174" element="Page2" state="0"> <bounds x=" 48" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2175" element="Page2" state="0"> <bounds x=" 54" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2176" element="Page2" state="0"> <bounds x=" 54" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2177" element="Page2" state="0"> <bounds x=" 54" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2178" element="Page2" state="0"> <bounds x=" 54" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2179" element="Page2" state="0"> <bounds x=" 54" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2180" element="Page2" state="0"> <bounds x=" 54" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2181" element="Page2" state="0"> <bounds x=" 54" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2182" element="Page2" state="0"> <bounds x=" 60" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2183" element="Page2" state="0"> <bounds x=" 60" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2184" element="Page2" state="0"> <bounds x=" 60" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2185" element="Page2" state="0"> <bounds x=" 60" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2186" element="Page2" state="0"> <bounds x=" 60" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2187" element="Page2" state="0"> <bounds x=" 60" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2188" element="Page2" state="0"> <bounds x=" 60" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2189" element="Page2" state="0"> <bounds x=" 66" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2190" element="Page2" state="0"> <bounds x=" 66" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2191" element="Page2" state="0"> <bounds x=" 66" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2192" element="Page2" state="0"> <bounds x=" 66" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2193" element="Page2" state="0"> <bounds x=" 66" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2194" element="Page2" state="0"> <bounds x=" 66" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2195" element="Page2" state="0"> <bounds x=" 66" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2196" element="Page2" state="0"> <bounds x=" 72" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2197" element="Page2" state="0"> <bounds x=" 72" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2198" element="Page2" state="0"> <bounds x=" 72" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2199" element="Page2" state="0"> <bounds x=" 72" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2200" element="Page2" state="0"> <bounds x=" 72" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2201" element="Page2" state="0"> <bounds x=" 72" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2202" element="Page2" state="0"> <bounds x=" 72" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2203" element="Page2" state="0"> <bounds x=" 78" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2204" element="Page2" state="0"> <bounds x=" 78" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2205" element="Page2" state="0"> <bounds x=" 78" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2206" element="Page2" state="0"> <bounds x=" 78" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2207" element="Page2" state="0"> <bounds x=" 78" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2208" element="Page2" state="0"> <bounds x=" 78" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2209" element="Page2" state="0"> <bounds x=" 78" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2210" element="Page2" state="0"> <bounds x=" 84" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2211" element="Page2" state="0"> <bounds x=" 84" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2212" element="Page2" state="0"> <bounds x=" 84" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2213" element="Page2" state="0"> <bounds x=" 84" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2214" element="Page2" state="0"> <bounds x=" 84" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2215" element="Page2" state="0"> <bounds x=" 84" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2216" element="Page2" state="0"> <bounds x=" 84" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_2217" element="Page2" state="0"> <bounds x=" 90" y=" 30" width="5" height="1" /> </bezel> - <bezel name="pg_2218" element="Page2" state="0"> <bounds x=" 90" y=" 31" width="5" height="1" /> </bezel> - <bezel name="pg_2219" element="Page2" state="0"> <bounds x=" 90" y=" 32" width="5" height="1" /> </bezel> - <bezel name="pg_2220" element="Page2" state="0"> <bounds x=" 90" y=" 33" width="5" height="1" /> </bezel> - <bezel name="pg_2221" element="Page2" state="0"> <bounds x=" 90" y=" 34" width="5" height="1" /> </bezel> - <bezel name="pg_2222" element="Page2" state="0"> <bounds x=" 90" y=" 35" width="5" height="1" /> </bezel> - <bezel name="pg_2223" element="Page2" state="0"> <bounds x=" 90" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2000" element="Page2" state="0"> <bounds x=" 0" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2001" element="Page2" state="0"> <bounds x=" 0" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2002" element="Page2" state="0"> <bounds x=" 0" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2003" element="Page2" state="0"> <bounds x=" 0" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2004" element="Page2" state="0"> <bounds x=" 0" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2005" element="Page2" state="0"> <bounds x=" 0" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2006" element="Page2" state="0"> <bounds x=" 0" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2007" element="Page2" state="0"> <bounds x=" 6" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2008" element="Page2" state="0"> <bounds x=" 6" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2009" element="Page2" state="0"> <bounds x=" 6" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2010" element="Page2" state="0"> <bounds x=" 6" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2011" element="Page2" state="0"> <bounds x=" 6" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2012" element="Page2" state="0"> <bounds x=" 6" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2013" element="Page2" state="0"> <bounds x=" 6" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2014" element="Page2" state="0"> <bounds x=" 12" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2015" element="Page2" state="0"> <bounds x=" 12" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2016" element="Page2" state="0"> <bounds x=" 12" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2017" element="Page2" state="0"> <bounds x=" 12" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2018" element="Page2" state="0"> <bounds x=" 12" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2019" element="Page2" state="0"> <bounds x=" 12" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2020" element="Page2" state="0"> <bounds x=" 12" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2021" element="Page2" state="0"> <bounds x=" 18" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2022" element="Page2" state="0"> <bounds x=" 18" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2023" element="Page2" state="0"> <bounds x=" 18" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2024" element="Page2" state="0"> <bounds x=" 18" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2025" element="Page2" state="0"> <bounds x=" 18" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2026" element="Page2" state="0"> <bounds x=" 18" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2027" element="Page2" state="0"> <bounds x=" 18" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2028" element="Page2" state="0"> <bounds x=" 24" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2029" element="Page2" state="0"> <bounds x=" 24" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2030" element="Page2" state="0"> <bounds x=" 24" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2031" element="Page2" state="0"> <bounds x=" 24" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2032" element="Page2" state="0"> <bounds x=" 24" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2033" element="Page2" state="0"> <bounds x=" 24" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2034" element="Page2" state="0"> <bounds x=" 24" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2035" element="Page2" state="0"> <bounds x=" 30" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2036" element="Page2" state="0"> <bounds x=" 30" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2037" element="Page2" state="0"> <bounds x=" 30" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2038" element="Page2" state="0"> <bounds x=" 30" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2039" element="Page2" state="0"> <bounds x=" 30" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2040" element="Page2" state="0"> <bounds x=" 30" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2041" element="Page2" state="0"> <bounds x=" 30" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2042" element="Page2" state="0"> <bounds x=" 36" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2043" element="Page2" state="0"> <bounds x=" 36" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2044" element="Page2" state="0"> <bounds x=" 36" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2045" element="Page2" state="0"> <bounds x=" 36" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2046" element="Page2" state="0"> <bounds x=" 36" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2047" element="Page2" state="0"> <bounds x=" 36" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2048" element="Page2" state="0"> <bounds x=" 36" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2049" element="Page2" state="0"> <bounds x=" 42" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2050" element="Page2" state="0"> <bounds x=" 42" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2051" element="Page2" state="0"> <bounds x=" 42" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2052" element="Page2" state="0"> <bounds x=" 42" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2053" element="Page2" state="0"> <bounds x=" 42" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2054" element="Page2" state="0"> <bounds x=" 42" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2055" element="Page2" state="0"> <bounds x=" 42" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2056" element="Page2" state="0"> <bounds x=" 48" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2057" element="Page2" state="0"> <bounds x=" 48" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2058" element="Page2" state="0"> <bounds x=" 48" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2059" element="Page2" state="0"> <bounds x=" 48" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2060" element="Page2" state="0"> <bounds x=" 48" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2061" element="Page2" state="0"> <bounds x=" 48" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2062" element="Page2" state="0"> <bounds x=" 48" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2063" element="Page2" state="0"> <bounds x=" 54" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2064" element="Page2" state="0"> <bounds x=" 54" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2065" element="Page2" state="0"> <bounds x=" 54" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2066" element="Page2" state="0"> <bounds x=" 54" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2067" element="Page2" state="0"> <bounds x=" 54" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2068" element="Page2" state="0"> <bounds x=" 54" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2069" element="Page2" state="0"> <bounds x=" 54" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2070" element="Page2" state="0"> <bounds x=" 60" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2071" element="Page2" state="0"> <bounds x=" 60" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2072" element="Page2" state="0"> <bounds x=" 60" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2073" element="Page2" state="0"> <bounds x=" 60" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2074" element="Page2" state="0"> <bounds x=" 60" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2075" element="Page2" state="0"> <bounds x=" 60" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2076" element="Page2" state="0"> <bounds x=" 60" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2077" element="Page2" state="0"> <bounds x=" 66" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2078" element="Page2" state="0"> <bounds x=" 66" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2079" element="Page2" state="0"> <bounds x=" 66" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2080" element="Page2" state="0"> <bounds x=" 66" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2081" element="Page2" state="0"> <bounds x=" 66" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2082" element="Page2" state="0"> <bounds x=" 66" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2083" element="Page2" state="0"> <bounds x=" 66" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2084" element="Page2" state="0"> <bounds x=" 72" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2085" element="Page2" state="0"> <bounds x=" 72" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2086" element="Page2" state="0"> <bounds x=" 72" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2087" element="Page2" state="0"> <bounds x=" 72" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2088" element="Page2" state="0"> <bounds x=" 72" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2089" element="Page2" state="0"> <bounds x=" 72" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2090" element="Page2" state="0"> <bounds x=" 72" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2091" element="Page2" state="0"> <bounds x=" 78" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2092" element="Page2" state="0"> <bounds x=" 78" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2093" element="Page2" state="0"> <bounds x=" 78" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2094" element="Page2" state="0"> <bounds x=" 78" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2095" element="Page2" state="0"> <bounds x=" 78" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2096" element="Page2" state="0"> <bounds x=" 78" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2097" element="Page2" state="0"> <bounds x=" 78" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2098" element="Page2" state="0"> <bounds x=" 84" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2099" element="Page2" state="0"> <bounds x=" 84" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2100" element="Page2" state="0"> <bounds x=" 84" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2101" element="Page2" state="0"> <bounds x=" 84" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2102" element="Page2" state="0"> <bounds x=" 84" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2103" element="Page2" state="0"> <bounds x=" 84" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2104" element="Page2" state="0"> <bounds x=" 84" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2105" element="Page2" state="0"> <bounds x=" 90" y=" 20" width="5" height="1" /> </bezel> + <bezel name="pg_2106" element="Page2" state="0"> <bounds x=" 90" y=" 21" width="5" height="1" /> </bezel> + <bezel name="pg_2107" element="Page2" state="0"> <bounds x=" 90" y=" 22" width="5" height="1" /> </bezel> + <bezel name="pg_2108" element="Page2" state="0"> <bounds x=" 90" y=" 23" width="5" height="1" /> </bezel> + <bezel name="pg_2109" element="Page2" state="0"> <bounds x=" 90" y=" 24" width="5" height="1" /> </bezel> + <bezel name="pg_2110" element="Page2" state="0"> <bounds x=" 90" y=" 25" width="5" height="1" /> </bezel> + <bezel name="pg_2111" element="Page2" state="0"> <bounds x=" 90" y=" 26" width="5" height="1" /> </bezel> + <bezel name="pg_2112" element="Page2" state="0"> <bounds x=" 0" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2113" element="Page2" state="0"> <bounds x=" 0" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2114" element="Page2" state="0"> <bounds x=" 0" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2115" element="Page2" state="0"> <bounds x=" 0" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2116" element="Page2" state="0"> <bounds x=" 0" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2117" element="Page2" state="0"> <bounds x=" 0" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2118" element="Page2" state="0"> <bounds x=" 0" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2119" element="Page2" state="0"> <bounds x=" 6" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2120" element="Page2" state="0"> <bounds x=" 6" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2121" element="Page2" state="0"> <bounds x=" 6" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2122" element="Page2" state="0"> <bounds x=" 6" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2123" element="Page2" state="0"> <bounds x=" 6" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2124" element="Page2" state="0"> <bounds x=" 6" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2125" element="Page2" state="0"> <bounds x=" 6" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2126" element="Page2" state="0"> <bounds x=" 12" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2127" element="Page2" state="0"> <bounds x=" 12" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2128" element="Page2" state="0"> <bounds x=" 12" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2129" element="Page2" state="0"> <bounds x=" 12" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2130" element="Page2" state="0"> <bounds x=" 12" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2131" element="Page2" state="0"> <bounds x=" 12" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2132" element="Page2" state="0"> <bounds x=" 12" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2133" element="Page2" state="0"> <bounds x=" 18" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2134" element="Page2" state="0"> <bounds x=" 18" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2135" element="Page2" state="0"> <bounds x=" 18" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2136" element="Page2" state="0"> <bounds x=" 18" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2137" element="Page2" state="0"> <bounds x=" 18" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2138" element="Page2" state="0"> <bounds x=" 18" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2139" element="Page2" state="0"> <bounds x=" 18" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2140" element="Page2" state="0"> <bounds x=" 24" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2141" element="Page2" state="0"> <bounds x=" 24" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2142" element="Page2" state="0"> <bounds x=" 24" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2143" element="Page2" state="0"> <bounds x=" 24" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2144" element="Page2" state="0"> <bounds x=" 24" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2145" element="Page2" state="0"> <bounds x=" 24" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2146" element="Page2" state="0"> <bounds x=" 24" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2147" element="Page2" state="0"> <bounds x=" 30" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2148" element="Page2" state="0"> <bounds x=" 30" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2149" element="Page2" state="0"> <bounds x=" 30" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2150" element="Page2" state="0"> <bounds x=" 30" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2151" element="Page2" state="0"> <bounds x=" 30" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2152" element="Page2" state="0"> <bounds x=" 30" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2153" element="Page2" state="0"> <bounds x=" 30" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2154" element="Page2" state="0"> <bounds x=" 36" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2155" element="Page2" state="0"> <bounds x=" 36" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2156" element="Page2" state="0"> <bounds x=" 36" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2157" element="Page2" state="0"> <bounds x=" 36" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2158" element="Page2" state="0"> <bounds x=" 36" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2159" element="Page2" state="0"> <bounds x=" 36" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2160" element="Page2" state="0"> <bounds x=" 36" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2161" element="Page2" state="0"> <bounds x=" 42" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2162" element="Page2" state="0"> <bounds x=" 42" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2163" element="Page2" state="0"> <bounds x=" 42" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2164" element="Page2" state="0"> <bounds x=" 42" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2165" element="Page2" state="0"> <bounds x=" 42" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2166" element="Page2" state="0"> <bounds x=" 42" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2167" element="Page2" state="0"> <bounds x=" 42" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2168" element="Page2" state="0"> <bounds x=" 48" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2169" element="Page2" state="0"> <bounds x=" 48" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2170" element="Page2" state="0"> <bounds x=" 48" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2171" element="Page2" state="0"> <bounds x=" 48" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2172" element="Page2" state="0"> <bounds x=" 48" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2173" element="Page2" state="0"> <bounds x=" 48" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2174" element="Page2" state="0"> <bounds x=" 48" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2175" element="Page2" state="0"> <bounds x=" 54" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2176" element="Page2" state="0"> <bounds x=" 54" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2177" element="Page2" state="0"> <bounds x=" 54" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2178" element="Page2" state="0"> <bounds x=" 54" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2179" element="Page2" state="0"> <bounds x=" 54" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2180" element="Page2" state="0"> <bounds x=" 54" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2181" element="Page2" state="0"> <bounds x=" 54" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2182" element="Page2" state="0"> <bounds x=" 60" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2183" element="Page2" state="0"> <bounds x=" 60" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2184" element="Page2" state="0"> <bounds x=" 60" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2185" element="Page2" state="0"> <bounds x=" 60" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2186" element="Page2" state="0"> <bounds x=" 60" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2187" element="Page2" state="0"> <bounds x=" 60" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2188" element="Page2" state="0"> <bounds x=" 60" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2189" element="Page2" state="0"> <bounds x=" 66" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2190" element="Page2" state="0"> <bounds x=" 66" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2191" element="Page2" state="0"> <bounds x=" 66" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2192" element="Page2" state="0"> <bounds x=" 66" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2193" element="Page2" state="0"> <bounds x=" 66" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2194" element="Page2" state="0"> <bounds x=" 66" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2195" element="Page2" state="0"> <bounds x=" 66" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2196" element="Page2" state="0"> <bounds x=" 72" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2197" element="Page2" state="0"> <bounds x=" 72" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2198" element="Page2" state="0"> <bounds x=" 72" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2199" element="Page2" state="0"> <bounds x=" 72" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2200" element="Page2" state="0"> <bounds x=" 72" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2201" element="Page2" state="0"> <bounds x=" 72" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2202" element="Page2" state="0"> <bounds x=" 72" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2203" element="Page2" state="0"> <bounds x=" 78" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2204" element="Page2" state="0"> <bounds x=" 78" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2205" element="Page2" state="0"> <bounds x=" 78" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2206" element="Page2" state="0"> <bounds x=" 78" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2207" element="Page2" state="0"> <bounds x=" 78" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2208" element="Page2" state="0"> <bounds x=" 78" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2209" element="Page2" state="0"> <bounds x=" 78" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2210" element="Page2" state="0"> <bounds x=" 84" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2211" element="Page2" state="0"> <bounds x=" 84" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2212" element="Page2" state="0"> <bounds x=" 84" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2213" element="Page2" state="0"> <bounds x=" 84" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2214" element="Page2" state="0"> <bounds x=" 84" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2215" element="Page2" state="0"> <bounds x=" 84" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2216" element="Page2" state="0"> <bounds x=" 84" y=" 36" width="5" height="1" /> </bezel> + <bezel name="pg_2217" element="Page2" state="0"> <bounds x=" 90" y=" 30" width="5" height="1" /> </bezel> + <bezel name="pg_2218" element="Page2" state="0"> <bounds x=" 90" y=" 31" width="5" height="1" /> </bezel> + <bezel name="pg_2219" element="Page2" state="0"> <bounds x=" 90" y=" 32" width="5" height="1" /> </bezel> + <bezel name="pg_2220" element="Page2" state="0"> <bounds x=" 90" y=" 33" width="5" height="1" /> </bezel> + <bezel name="pg_2221" element="Page2" state="0"> <bounds x=" 90" y=" 34" width="5" height="1" /> </bezel> + <bezel name="pg_2222" element="Page2" state="0"> <bounds x=" 90" y=" 35" width="5" height="1" /> </bezel> + <bezel name="pg_2223" element="Page2" state="0"> <bounds x=" 90" y=" 36" width="5" height="1" /> </bezel> - <bezel name="pg_1000" element="Page1" state="0"> <bounds x=" 0" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1001" element="Page1" state="0"> <bounds x=" 0" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1002" element="Page1" state="0"> <bounds x=" 0" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1003" element="Page1" state="0"> <bounds x=" 0" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1004" element="Page1" state="0"> <bounds x=" 0" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1005" element="Page1" state="0"> <bounds x=" 0" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1006" element="Page1" state="0"> <bounds x=" 0" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1007" element="Page1" state="0"> <bounds x=" 6" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1008" element="Page1" state="0"> <bounds x=" 6" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1009" element="Page1" state="0"> <bounds x=" 6" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1010" element="Page1" state="0"> <bounds x=" 6" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1011" element="Page1" state="0"> <bounds x=" 6" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1012" element="Page1" state="0"> <bounds x=" 6" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1013" element="Page1" state="0"> <bounds x=" 6" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1014" element="Page1" state="0"> <bounds x=" 12" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1015" element="Page1" state="0"> <bounds x=" 12" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1016" element="Page1" state="0"> <bounds x=" 12" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1017" element="Page1" state="0"> <bounds x=" 12" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1018" element="Page1" state="0"> <bounds x=" 12" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1019" element="Page1" state="0"> <bounds x=" 12" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1020" element="Page1" state="0"> <bounds x=" 12" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1021" element="Page1" state="0"> <bounds x=" 18" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1022" element="Page1" state="0"> <bounds x=" 18" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1023" element="Page1" state="0"> <bounds x=" 18" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1024" element="Page1" state="0"> <bounds x=" 18" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1025" element="Page1" state="0"> <bounds x=" 18" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1026" element="Page1" state="0"> <bounds x=" 18" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1027" element="Page1" state="0"> <bounds x=" 18" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1028" element="Page1" state="0"> <bounds x=" 24" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1029" element="Page1" state="0"> <bounds x=" 24" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1030" element="Page1" state="0"> <bounds x=" 24" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1031" element="Page1" state="0"> <bounds x=" 24" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1032" element="Page1" state="0"> <bounds x=" 24" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1033" element="Page1" state="0"> <bounds x=" 24" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1034" element="Page1" state="0"> <bounds x=" 24" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1035" element="Page1" state="0"> <bounds x=" 30" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1036" element="Page1" state="0"> <bounds x=" 30" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1037" element="Page1" state="0"> <bounds x=" 30" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1038" element="Page1" state="0"> <bounds x=" 30" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1039" element="Page1" state="0"> <bounds x=" 30" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1040" element="Page1" state="0"> <bounds x=" 30" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1041" element="Page1" state="0"> <bounds x=" 30" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1042" element="Page1" state="0"> <bounds x=" 36" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1043" element="Page1" state="0"> <bounds x=" 36" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1044" element="Page1" state="0"> <bounds x=" 36" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1045" element="Page1" state="0"> <bounds x=" 36" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1046" element="Page1" state="0"> <bounds x=" 36" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1047" element="Page1" state="0"> <bounds x=" 36" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1048" element="Page1" state="0"> <bounds x=" 36" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1049" element="Page1" state="0"> <bounds x=" 42" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1050" element="Page1" state="0"> <bounds x=" 42" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1051" element="Page1" state="0"> <bounds x=" 42" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1052" element="Page1" state="0"> <bounds x=" 42" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1053" element="Page1" state="0"> <bounds x=" 42" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1054" element="Page1" state="0"> <bounds x=" 42" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1055" element="Page1" state="0"> <bounds x=" 42" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1056" element="Page1" state="0"> <bounds x=" 48" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1057" element="Page1" state="0"> <bounds x=" 48" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1058" element="Page1" state="0"> <bounds x=" 48" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1059" element="Page1" state="0"> <bounds x=" 48" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1060" element="Page1" state="0"> <bounds x=" 48" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1061" element="Page1" state="0"> <bounds x=" 48" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1062" element="Page1" state="0"> <bounds x=" 48" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1063" element="Page1" state="0"> <bounds x=" 54" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1064" element="Page1" state="0"> <bounds x=" 54" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1065" element="Page1" state="0"> <bounds x=" 54" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1066" element="Page1" state="0"> <bounds x=" 54" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1067" element="Page1" state="0"> <bounds x=" 54" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1068" element="Page1" state="0"> <bounds x=" 54" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1069" element="Page1" state="0"> <bounds x=" 54" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1070" element="Page1" state="0"> <bounds x=" 60" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1071" element="Page1" state="0"> <bounds x=" 60" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1072" element="Page1" state="0"> <bounds x=" 60" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1073" element="Page1" state="0"> <bounds x=" 60" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1074" element="Page1" state="0"> <bounds x=" 60" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1075" element="Page1" state="0"> <bounds x=" 60" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1076" element="Page1" state="0"> <bounds x=" 60" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1077" element="Page1" state="0"> <bounds x=" 66" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1078" element="Page1" state="0"> <bounds x=" 66" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1079" element="Page1" state="0"> <bounds x=" 66" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1080" element="Page1" state="0"> <bounds x=" 66" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1081" element="Page1" state="0"> <bounds x=" 66" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1082" element="Page1" state="0"> <bounds x=" 66" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1083" element="Page1" state="0"> <bounds x=" 66" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1084" element="Page1" state="0"> <bounds x=" 72" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1085" element="Page1" state="0"> <bounds x=" 72" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1086" element="Page1" state="0"> <bounds x=" 72" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1087" element="Page1" state="0"> <bounds x=" 72" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1088" element="Page1" state="0"> <bounds x=" 72" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1089" element="Page1" state="0"> <bounds x=" 72" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1090" element="Page1" state="0"> <bounds x=" 72" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1091" element="Page1" state="0"> <bounds x=" 78" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1092" element="Page1" state="0"> <bounds x=" 78" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1093" element="Page1" state="0"> <bounds x=" 78" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1094" element="Page1" state="0"> <bounds x=" 78" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1095" element="Page1" state="0"> <bounds x=" 78" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1096" element="Page1" state="0"> <bounds x=" 78" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1097" element="Page1" state="0"> <bounds x=" 78" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1098" element="Page1" state="0"> <bounds x=" 84" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1099" element="Page1" state="0"> <bounds x=" 84" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1100" element="Page1" state="0"> <bounds x=" 84" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1101" element="Page1" state="0"> <bounds x=" 84" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1102" element="Page1" state="0"> <bounds x=" 84" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1103" element="Page1" state="0"> <bounds x=" 84" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1104" element="Page1" state="0"> <bounds x=" 84" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1105" element="Page1" state="0"> <bounds x=" 90" y=" 40" width="5" height="1" /> </bezel> - <bezel name="pg_1106" element="Page1" state="0"> <bounds x=" 90" y=" 41" width="5" height="1" /> </bezel> - <bezel name="pg_1107" element="Page1" state="0"> <bounds x=" 90" y=" 42" width="5" height="1" /> </bezel> - <bezel name="pg_1108" element="Page1" state="0"> <bounds x=" 90" y=" 43" width="5" height="1" /> </bezel> - <bezel name="pg_1109" element="Page1" state="0"> <bounds x=" 90" y=" 44" width="5" height="1" /> </bezel> - <bezel name="pg_1110" element="Page1" state="0"> <bounds x=" 90" y=" 45" width="5" height="1" /> </bezel> - <bezel name="pg_1111" element="Page1" state="0"> <bounds x=" 90" y=" 46" width="5" height="1" /> </bezel> - <bezel name="pg_1112" element="Page1" state="0"> <bounds x=" 0" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1113" element="Page1" state="0"> <bounds x=" 0" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1114" element="Page1" state="0"> <bounds x=" 0" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1115" element="Page1" state="0"> <bounds x=" 0" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1116" element="Page1" state="0"> <bounds x=" 0" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1117" element="Page1" state="0"> <bounds x=" 0" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1118" element="Page1" state="0"> <bounds x=" 0" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1119" element="Page1" state="0"> <bounds x=" 6" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1120" element="Page1" state="0"> <bounds x=" 6" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1121" element="Page1" state="0"> <bounds x=" 6" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1122" element="Page1" state="0"> <bounds x=" 6" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1123" element="Page1" state="0"> <bounds x=" 6" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1124" element="Page1" state="0"> <bounds x=" 6" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1125" element="Page1" state="0"> <bounds x=" 6" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1126" element="Page1" state="0"> <bounds x=" 12" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1127" element="Page1" state="0"> <bounds x=" 12" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1128" element="Page1" state="0"> <bounds x=" 12" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1129" element="Page1" state="0"> <bounds x=" 12" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1130" element="Page1" state="0"> <bounds x=" 12" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1131" element="Page1" state="0"> <bounds x=" 12" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1132" element="Page1" state="0"> <bounds x=" 12" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1133" element="Page1" state="0"> <bounds x=" 18" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1134" element="Page1" state="0"> <bounds x=" 18" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1135" element="Page1" state="0"> <bounds x=" 18" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1136" element="Page1" state="0"> <bounds x=" 18" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1137" element="Page1" state="0"> <bounds x=" 18" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1138" element="Page1" state="0"> <bounds x=" 18" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1139" element="Page1" state="0"> <bounds x=" 18" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1140" element="Page1" state="0"> <bounds x=" 24" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1141" element="Page1" state="0"> <bounds x=" 24" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1142" element="Page1" state="0"> <bounds x=" 24" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1143" element="Page1" state="0"> <bounds x=" 24" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1144" element="Page1" state="0"> <bounds x=" 24" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1145" element="Page1" state="0"> <bounds x=" 24" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1146" element="Page1" state="0"> <bounds x=" 24" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1147" element="Page1" state="0"> <bounds x=" 30" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1148" element="Page1" state="0"> <bounds x=" 30" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1149" element="Page1" state="0"> <bounds x=" 30" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1150" element="Page1" state="0"> <bounds x=" 30" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1151" element="Page1" state="0"> <bounds x=" 30" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1152" element="Page1" state="0"> <bounds x=" 30" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1153" element="Page1" state="0"> <bounds x=" 30" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1154" element="Page1" state="0"> <bounds x=" 36" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1155" element="Page1" state="0"> <bounds x=" 36" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1156" element="Page1" state="0"> <bounds x=" 36" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1157" element="Page1" state="0"> <bounds x=" 36" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1158" element="Page1" state="0"> <bounds x=" 36" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1159" element="Page1" state="0"> <bounds x=" 36" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1160" element="Page1" state="0"> <bounds x=" 36" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1161" element="Page1" state="0"> <bounds x=" 42" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1162" element="Page1" state="0"> <bounds x=" 42" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1163" element="Page1" state="0"> <bounds x=" 42" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1164" element="Page1" state="0"> <bounds x=" 42" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1165" element="Page1" state="0"> <bounds x=" 42" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1166" element="Page1" state="0"> <bounds x=" 42" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1167" element="Page1" state="0"> <bounds x=" 42" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1168" element="Page1" state="0"> <bounds x=" 48" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1169" element="Page1" state="0"> <bounds x=" 48" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1170" element="Page1" state="0"> <bounds x=" 48" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1171" element="Page1" state="0"> <bounds x=" 48" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1172" element="Page1" state="0"> <bounds x=" 48" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1173" element="Page1" state="0"> <bounds x=" 48" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1174" element="Page1" state="0"> <bounds x=" 48" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1175" element="Page1" state="0"> <bounds x=" 54" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1176" element="Page1" state="0"> <bounds x=" 54" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1177" element="Page1" state="0"> <bounds x=" 54" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1178" element="Page1" state="0"> <bounds x=" 54" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1179" element="Page1" state="0"> <bounds x=" 54" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1180" element="Page1" state="0"> <bounds x=" 54" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1181" element="Page1" state="0"> <bounds x=" 54" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1182" element="Page1" state="0"> <bounds x=" 60" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1183" element="Page1" state="0"> <bounds x=" 60" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1184" element="Page1" state="0"> <bounds x=" 60" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1185" element="Page1" state="0"> <bounds x=" 60" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1186" element="Page1" state="0"> <bounds x=" 60" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1187" element="Page1" state="0"> <bounds x=" 60" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1188" element="Page1" state="0"> <bounds x=" 60" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1189" element="Page1" state="0"> <bounds x=" 66" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1190" element="Page1" state="0"> <bounds x=" 66" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1191" element="Page1" state="0"> <bounds x=" 66" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1192" element="Page1" state="0"> <bounds x=" 66" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1193" element="Page1" state="0"> <bounds x=" 66" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1194" element="Page1" state="0"> <bounds x=" 66" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1195" element="Page1" state="0"> <bounds x=" 66" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1196" element="Page1" state="0"> <bounds x=" 72" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1197" element="Page1" state="0"> <bounds x=" 72" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1198" element="Page1" state="0"> <bounds x=" 72" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1199" element="Page1" state="0"> <bounds x=" 72" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1200" element="Page1" state="0"> <bounds x=" 72" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1201" element="Page1" state="0"> <bounds x=" 72" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1202" element="Page1" state="0"> <bounds x=" 72" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1203" element="Page1" state="0"> <bounds x=" 78" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1204" element="Page1" state="0"> <bounds x=" 78" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1205" element="Page1" state="0"> <bounds x=" 78" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1206" element="Page1" state="0"> <bounds x=" 78" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1207" element="Page1" state="0"> <bounds x=" 78" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1208" element="Page1" state="0"> <bounds x=" 78" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1209" element="Page1" state="0"> <bounds x=" 78" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1210" element="Page1" state="0"> <bounds x=" 84" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1211" element="Page1" state="0"> <bounds x=" 84" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1212" element="Page1" state="0"> <bounds x=" 84" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1213" element="Page1" state="0"> <bounds x=" 84" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1214" element="Page1" state="0"> <bounds x=" 84" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1215" element="Page1" state="0"> <bounds x=" 84" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1216" element="Page1" state="0"> <bounds x=" 84" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_1217" element="Page1" state="0"> <bounds x=" 90" y=" 50" width="5" height="1" /> </bezel> - <bezel name="pg_1218" element="Page1" state="0"> <bounds x=" 90" y=" 51" width="5" height="1" /> </bezel> - <bezel name="pg_1219" element="Page1" state="0"> <bounds x=" 90" y=" 52" width="5" height="1" /> </bezel> - <bezel name="pg_1220" element="Page1" state="0"> <bounds x=" 90" y=" 53" width="5" height="1" /> </bezel> - <bezel name="pg_1221" element="Page1" state="0"> <bounds x=" 90" y=" 54" width="5" height="1" /> </bezel> - <bezel name="pg_1222" element="Page1" state="0"> <bounds x=" 90" y=" 55" width="5" height="1" /> </bezel> - <bezel name="pg_1223" element="Page1" state="0"> <bounds x=" 90" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1000" element="Page1" state="0"> <bounds x=" 0" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1001" element="Page1" state="0"> <bounds x=" 0" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1002" element="Page1" state="0"> <bounds x=" 0" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1003" element="Page1" state="0"> <bounds x=" 0" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1004" element="Page1" state="0"> <bounds x=" 0" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1005" element="Page1" state="0"> <bounds x=" 0" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1006" element="Page1" state="0"> <bounds x=" 0" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1007" element="Page1" state="0"> <bounds x=" 6" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1008" element="Page1" state="0"> <bounds x=" 6" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1009" element="Page1" state="0"> <bounds x=" 6" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1010" element="Page1" state="0"> <bounds x=" 6" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1011" element="Page1" state="0"> <bounds x=" 6" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1012" element="Page1" state="0"> <bounds x=" 6" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1013" element="Page1" state="0"> <bounds x=" 6" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1014" element="Page1" state="0"> <bounds x=" 12" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1015" element="Page1" state="0"> <bounds x=" 12" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1016" element="Page1" state="0"> <bounds x=" 12" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1017" element="Page1" state="0"> <bounds x=" 12" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1018" element="Page1" state="0"> <bounds x=" 12" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1019" element="Page1" state="0"> <bounds x=" 12" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1020" element="Page1" state="0"> <bounds x=" 12" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1021" element="Page1" state="0"> <bounds x=" 18" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1022" element="Page1" state="0"> <bounds x=" 18" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1023" element="Page1" state="0"> <bounds x=" 18" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1024" element="Page1" state="0"> <bounds x=" 18" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1025" element="Page1" state="0"> <bounds x=" 18" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1026" element="Page1" state="0"> <bounds x=" 18" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1027" element="Page1" state="0"> <bounds x=" 18" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1028" element="Page1" state="0"> <bounds x=" 24" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1029" element="Page1" state="0"> <bounds x=" 24" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1030" element="Page1" state="0"> <bounds x=" 24" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1031" element="Page1" state="0"> <bounds x=" 24" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1032" element="Page1" state="0"> <bounds x=" 24" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1033" element="Page1" state="0"> <bounds x=" 24" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1034" element="Page1" state="0"> <bounds x=" 24" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1035" element="Page1" state="0"> <bounds x=" 30" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1036" element="Page1" state="0"> <bounds x=" 30" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1037" element="Page1" state="0"> <bounds x=" 30" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1038" element="Page1" state="0"> <bounds x=" 30" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1039" element="Page1" state="0"> <bounds x=" 30" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1040" element="Page1" state="0"> <bounds x=" 30" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1041" element="Page1" state="0"> <bounds x=" 30" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1042" element="Page1" state="0"> <bounds x=" 36" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1043" element="Page1" state="0"> <bounds x=" 36" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1044" element="Page1" state="0"> <bounds x=" 36" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1045" element="Page1" state="0"> <bounds x=" 36" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1046" element="Page1" state="0"> <bounds x=" 36" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1047" element="Page1" state="0"> <bounds x=" 36" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1048" element="Page1" state="0"> <bounds x=" 36" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1049" element="Page1" state="0"> <bounds x=" 42" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1050" element="Page1" state="0"> <bounds x=" 42" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1051" element="Page1" state="0"> <bounds x=" 42" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1052" element="Page1" state="0"> <bounds x=" 42" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1053" element="Page1" state="0"> <bounds x=" 42" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1054" element="Page1" state="0"> <bounds x=" 42" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1055" element="Page1" state="0"> <bounds x=" 42" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1056" element="Page1" state="0"> <bounds x=" 48" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1057" element="Page1" state="0"> <bounds x=" 48" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1058" element="Page1" state="0"> <bounds x=" 48" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1059" element="Page1" state="0"> <bounds x=" 48" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1060" element="Page1" state="0"> <bounds x=" 48" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1061" element="Page1" state="0"> <bounds x=" 48" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1062" element="Page1" state="0"> <bounds x=" 48" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1063" element="Page1" state="0"> <bounds x=" 54" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1064" element="Page1" state="0"> <bounds x=" 54" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1065" element="Page1" state="0"> <bounds x=" 54" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1066" element="Page1" state="0"> <bounds x=" 54" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1067" element="Page1" state="0"> <bounds x=" 54" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1068" element="Page1" state="0"> <bounds x=" 54" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1069" element="Page1" state="0"> <bounds x=" 54" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1070" element="Page1" state="0"> <bounds x=" 60" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1071" element="Page1" state="0"> <bounds x=" 60" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1072" element="Page1" state="0"> <bounds x=" 60" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1073" element="Page1" state="0"> <bounds x=" 60" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1074" element="Page1" state="0"> <bounds x=" 60" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1075" element="Page1" state="0"> <bounds x=" 60" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1076" element="Page1" state="0"> <bounds x=" 60" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1077" element="Page1" state="0"> <bounds x=" 66" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1078" element="Page1" state="0"> <bounds x=" 66" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1079" element="Page1" state="0"> <bounds x=" 66" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1080" element="Page1" state="0"> <bounds x=" 66" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1081" element="Page1" state="0"> <bounds x=" 66" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1082" element="Page1" state="0"> <bounds x=" 66" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1083" element="Page1" state="0"> <bounds x=" 66" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1084" element="Page1" state="0"> <bounds x=" 72" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1085" element="Page1" state="0"> <bounds x=" 72" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1086" element="Page1" state="0"> <bounds x=" 72" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1087" element="Page1" state="0"> <bounds x=" 72" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1088" element="Page1" state="0"> <bounds x=" 72" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1089" element="Page1" state="0"> <bounds x=" 72" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1090" element="Page1" state="0"> <bounds x=" 72" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1091" element="Page1" state="0"> <bounds x=" 78" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1092" element="Page1" state="0"> <bounds x=" 78" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1093" element="Page1" state="0"> <bounds x=" 78" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1094" element="Page1" state="0"> <bounds x=" 78" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1095" element="Page1" state="0"> <bounds x=" 78" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1096" element="Page1" state="0"> <bounds x=" 78" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1097" element="Page1" state="0"> <bounds x=" 78" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1098" element="Page1" state="0"> <bounds x=" 84" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1099" element="Page1" state="0"> <bounds x=" 84" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1100" element="Page1" state="0"> <bounds x=" 84" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1101" element="Page1" state="0"> <bounds x=" 84" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1102" element="Page1" state="0"> <bounds x=" 84" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1103" element="Page1" state="0"> <bounds x=" 84" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1104" element="Page1" state="0"> <bounds x=" 84" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1105" element="Page1" state="0"> <bounds x=" 90" y=" 40" width="5" height="1" /> </bezel> + <bezel name="pg_1106" element="Page1" state="0"> <bounds x=" 90" y=" 41" width="5" height="1" /> </bezel> + <bezel name="pg_1107" element="Page1" state="0"> <bounds x=" 90" y=" 42" width="5" height="1" /> </bezel> + <bezel name="pg_1108" element="Page1" state="0"> <bounds x=" 90" y=" 43" width="5" height="1" /> </bezel> + <bezel name="pg_1109" element="Page1" state="0"> <bounds x=" 90" y=" 44" width="5" height="1" /> </bezel> + <bezel name="pg_1110" element="Page1" state="0"> <bounds x=" 90" y=" 45" width="5" height="1" /> </bezel> + <bezel name="pg_1111" element="Page1" state="0"> <bounds x=" 90" y=" 46" width="5" height="1" /> </bezel> + <bezel name="pg_1112" element="Page1" state="0"> <bounds x=" 0" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1113" element="Page1" state="0"> <bounds x=" 0" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1114" element="Page1" state="0"> <bounds x=" 0" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1115" element="Page1" state="0"> <bounds x=" 0" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1116" element="Page1" state="0"> <bounds x=" 0" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1117" element="Page1" state="0"> <bounds x=" 0" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1118" element="Page1" state="0"> <bounds x=" 0" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1119" element="Page1" state="0"> <bounds x=" 6" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1120" element="Page1" state="0"> <bounds x=" 6" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1121" element="Page1" state="0"> <bounds x=" 6" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1122" element="Page1" state="0"> <bounds x=" 6" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1123" element="Page1" state="0"> <bounds x=" 6" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1124" element="Page1" state="0"> <bounds x=" 6" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1125" element="Page1" state="0"> <bounds x=" 6" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1126" element="Page1" state="0"> <bounds x=" 12" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1127" element="Page1" state="0"> <bounds x=" 12" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1128" element="Page1" state="0"> <bounds x=" 12" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1129" element="Page1" state="0"> <bounds x=" 12" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1130" element="Page1" state="0"> <bounds x=" 12" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1131" element="Page1" state="0"> <bounds x=" 12" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1132" element="Page1" state="0"> <bounds x=" 12" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1133" element="Page1" state="0"> <bounds x=" 18" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1134" element="Page1" state="0"> <bounds x=" 18" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1135" element="Page1" state="0"> <bounds x=" 18" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1136" element="Page1" state="0"> <bounds x=" 18" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1137" element="Page1" state="0"> <bounds x=" 18" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1138" element="Page1" state="0"> <bounds x=" 18" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1139" element="Page1" state="0"> <bounds x=" 18" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1140" element="Page1" state="0"> <bounds x=" 24" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1141" element="Page1" state="0"> <bounds x=" 24" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1142" element="Page1" state="0"> <bounds x=" 24" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1143" element="Page1" state="0"> <bounds x=" 24" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1144" element="Page1" state="0"> <bounds x=" 24" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1145" element="Page1" state="0"> <bounds x=" 24" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1146" element="Page1" state="0"> <bounds x=" 24" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1147" element="Page1" state="0"> <bounds x=" 30" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1148" element="Page1" state="0"> <bounds x=" 30" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1149" element="Page1" state="0"> <bounds x=" 30" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1150" element="Page1" state="0"> <bounds x=" 30" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1151" element="Page1" state="0"> <bounds x=" 30" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1152" element="Page1" state="0"> <bounds x=" 30" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1153" element="Page1" state="0"> <bounds x=" 30" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1154" element="Page1" state="0"> <bounds x=" 36" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1155" element="Page1" state="0"> <bounds x=" 36" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1156" element="Page1" state="0"> <bounds x=" 36" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1157" element="Page1" state="0"> <bounds x=" 36" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1158" element="Page1" state="0"> <bounds x=" 36" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1159" element="Page1" state="0"> <bounds x=" 36" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1160" element="Page1" state="0"> <bounds x=" 36" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1161" element="Page1" state="0"> <bounds x=" 42" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1162" element="Page1" state="0"> <bounds x=" 42" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1163" element="Page1" state="0"> <bounds x=" 42" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1164" element="Page1" state="0"> <bounds x=" 42" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1165" element="Page1" state="0"> <bounds x=" 42" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1166" element="Page1" state="0"> <bounds x=" 42" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1167" element="Page1" state="0"> <bounds x=" 42" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1168" element="Page1" state="0"> <bounds x=" 48" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1169" element="Page1" state="0"> <bounds x=" 48" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1170" element="Page1" state="0"> <bounds x=" 48" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1171" element="Page1" state="0"> <bounds x=" 48" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1172" element="Page1" state="0"> <bounds x=" 48" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1173" element="Page1" state="0"> <bounds x=" 48" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1174" element="Page1" state="0"> <bounds x=" 48" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1175" element="Page1" state="0"> <bounds x=" 54" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1176" element="Page1" state="0"> <bounds x=" 54" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1177" element="Page1" state="0"> <bounds x=" 54" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1178" element="Page1" state="0"> <bounds x=" 54" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1179" element="Page1" state="0"> <bounds x=" 54" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1180" element="Page1" state="0"> <bounds x=" 54" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1181" element="Page1" state="0"> <bounds x=" 54" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1182" element="Page1" state="0"> <bounds x=" 60" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1183" element="Page1" state="0"> <bounds x=" 60" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1184" element="Page1" state="0"> <bounds x=" 60" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1185" element="Page1" state="0"> <bounds x=" 60" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1186" element="Page1" state="0"> <bounds x=" 60" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1187" element="Page1" state="0"> <bounds x=" 60" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1188" element="Page1" state="0"> <bounds x=" 60" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1189" element="Page1" state="0"> <bounds x=" 66" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1190" element="Page1" state="0"> <bounds x=" 66" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1191" element="Page1" state="0"> <bounds x=" 66" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1192" element="Page1" state="0"> <bounds x=" 66" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1193" element="Page1" state="0"> <bounds x=" 66" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1194" element="Page1" state="0"> <bounds x=" 66" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1195" element="Page1" state="0"> <bounds x=" 66" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1196" element="Page1" state="0"> <bounds x=" 72" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1197" element="Page1" state="0"> <bounds x=" 72" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1198" element="Page1" state="0"> <bounds x=" 72" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1199" element="Page1" state="0"> <bounds x=" 72" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1200" element="Page1" state="0"> <bounds x=" 72" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1201" element="Page1" state="0"> <bounds x=" 72" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1202" element="Page1" state="0"> <bounds x=" 72" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1203" element="Page1" state="0"> <bounds x=" 78" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1204" element="Page1" state="0"> <bounds x=" 78" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1205" element="Page1" state="0"> <bounds x=" 78" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1206" element="Page1" state="0"> <bounds x=" 78" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1207" element="Page1" state="0"> <bounds x=" 78" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1208" element="Page1" state="0"> <bounds x=" 78" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1209" element="Page1" state="0"> <bounds x=" 78" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1210" element="Page1" state="0"> <bounds x=" 84" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1211" element="Page1" state="0"> <bounds x=" 84" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1212" element="Page1" state="0"> <bounds x=" 84" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1213" element="Page1" state="0"> <bounds x=" 84" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1214" element="Page1" state="0"> <bounds x=" 84" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1215" element="Page1" state="0"> <bounds x=" 84" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1216" element="Page1" state="0"> <bounds x=" 84" y=" 56" width="5" height="1" /> </bezel> + <bezel name="pg_1217" element="Page1" state="0"> <bounds x=" 90" y=" 50" width="5" height="1" /> </bezel> + <bezel name="pg_1218" element="Page1" state="0"> <bounds x=" 90" y=" 51" width="5" height="1" /> </bezel> + <bezel name="pg_1219" element="Page1" state="0"> <bounds x=" 90" y=" 52" width="5" height="1" /> </bezel> + <bezel name="pg_1220" element="Page1" state="0"> <bounds x=" 90" y=" 53" width="5" height="1" /> </bezel> + <bezel name="pg_1221" element="Page1" state="0"> <bounds x=" 90" y=" 54" width="5" height="1" /> </bezel> + <bezel name="pg_1222" element="Page1" state="0"> <bounds x=" 90" y=" 55" width="5" height="1" /> </bezel> + <bezel name="pg_1223" element="Page1" state="0"> <bounds x=" 90" y=" 56" width="5" height="1" /> </bezel> - <bezel name="pg_4000" element="Page4" state="0"> <bounds x=" 0" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4001" element="Page4" state="0"> <bounds x=" 0" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4002" element="Page4" state="0"> <bounds x=" 0" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4003" element="Page4" state="0"> <bounds x=" 0" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4004" element="Page4" state="0"> <bounds x=" 0" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4005" element="Page4" state="0"> <bounds x=" 0" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4006" element="Page4" state="0"> <bounds x=" 0" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4007" element="Page4" state="0"> <bounds x=" 6" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4008" element="Page4" state="0"> <bounds x=" 6" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4009" element="Page4" state="0"> <bounds x=" 6" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4010" element="Page4" state="0"> <bounds x=" 6" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4011" element="Page4" state="0"> <bounds x=" 6" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4012" element="Page4" state="0"> <bounds x=" 6" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4013" element="Page4" state="0"> <bounds x=" 6" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4014" element="Page4" state="0"> <bounds x=" 12" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4015" element="Page4" state="0"> <bounds x=" 12" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4016" element="Page4" state="0"> <bounds x=" 12" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4017" element="Page4" state="0"> <bounds x=" 12" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4018" element="Page4" state="0"> <bounds x=" 12" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4019" element="Page4" state="0"> <bounds x=" 12" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4020" element="Page4" state="0"> <bounds x=" 12" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4021" element="Page4" state="0"> <bounds x=" 18" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4022" element="Page4" state="0"> <bounds x=" 18" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4023" element="Page4" state="0"> <bounds x=" 18" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4024" element="Page4" state="0"> <bounds x=" 18" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4025" element="Page4" state="0"> <bounds x=" 18" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4026" element="Page4" state="0"> <bounds x=" 18" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4027" element="Page4" state="0"> <bounds x=" 18" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4028" element="Page4" state="0"> <bounds x=" 24" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4029" element="Page4" state="0"> <bounds x=" 24" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4030" element="Page4" state="0"> <bounds x=" 24" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4031" element="Page4" state="0"> <bounds x=" 24" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4032" element="Page4" state="0"> <bounds x=" 24" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4033" element="Page4" state="0"> <bounds x=" 24" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4034" element="Page4" state="0"> <bounds x=" 24" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4035" element="Page4" state="0"> <bounds x=" 30" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4036" element="Page4" state="0"> <bounds x=" 30" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4037" element="Page4" state="0"> <bounds x=" 30" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4038" element="Page4" state="0"> <bounds x=" 30" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4039" element="Page4" state="0"> <bounds x=" 30" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4040" element="Page4" state="0"> <bounds x=" 30" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4041" element="Page4" state="0"> <bounds x=" 30" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4042" element="Page4" state="0"> <bounds x=" 36" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4043" element="Page4" state="0"> <bounds x=" 36" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4044" element="Page4" state="0"> <bounds x=" 36" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4045" element="Page4" state="0"> <bounds x=" 36" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4046" element="Page4" state="0"> <bounds x=" 36" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4047" element="Page4" state="0"> <bounds x=" 36" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4048" element="Page4" state="0"> <bounds x=" 36" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4049" element="Page4" state="0"> <bounds x=" 42" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4050" element="Page4" state="0"> <bounds x=" 42" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4051" element="Page4" state="0"> <bounds x=" 42" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4052" element="Page4" state="0"> <bounds x=" 42" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4053" element="Page4" state="0"> <bounds x=" 42" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4054" element="Page4" state="0"> <bounds x=" 42" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4055" element="Page4" state="0"> <bounds x=" 42" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4056" element="Page4" state="0"> <bounds x=" 48" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4057" element="Page4" state="0"> <bounds x=" 48" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4058" element="Page4" state="0"> <bounds x=" 48" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4059" element="Page4" state="0"> <bounds x=" 48" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4060" element="Page4" state="0"> <bounds x=" 48" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4061" element="Page4" state="0"> <bounds x=" 48" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4062" element="Page4" state="0"> <bounds x=" 48" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4063" element="Page4" state="0"> <bounds x=" 54" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4064" element="Page4" state="0"> <bounds x=" 54" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4065" element="Page4" state="0"> <bounds x=" 54" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4066" element="Page4" state="0"> <bounds x=" 54" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4067" element="Page4" state="0"> <bounds x=" 54" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4068" element="Page4" state="0"> <bounds x=" 54" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4069" element="Page4" state="0"> <bounds x=" 54" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4070" element="Page4" state="0"> <bounds x=" 60" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4071" element="Page4" state="0"> <bounds x=" 60" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4072" element="Page4" state="0"> <bounds x=" 60" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4073" element="Page4" state="0"> <bounds x=" 60" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4074" element="Page4" state="0"> <bounds x=" 60" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4075" element="Page4" state="0"> <bounds x=" 60" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4076" element="Page4" state="0"> <bounds x=" 60" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4077" element="Page4" state="0"> <bounds x=" 66" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4078" element="Page4" state="0"> <bounds x=" 66" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4079" element="Page4" state="0"> <bounds x=" 66" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4080" element="Page4" state="0"> <bounds x=" 66" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4081" element="Page4" state="0"> <bounds x=" 66" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4082" element="Page4" state="0"> <bounds x=" 66" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4083" element="Page4" state="0"> <bounds x=" 66" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4084" element="Page4" state="0"> <bounds x=" 72" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4085" element="Page4" state="0"> <bounds x=" 72" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4086" element="Page4" state="0"> <bounds x=" 72" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4087" element="Page4" state="0"> <bounds x=" 72" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4088" element="Page4" state="0"> <bounds x=" 72" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4089" element="Page4" state="0"> <bounds x=" 72" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4090" element="Page4" state="0"> <bounds x=" 72" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4091" element="Page4" state="0"> <bounds x=" 78" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4092" element="Page4" state="0"> <bounds x=" 78" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4093" element="Page4" state="0"> <bounds x=" 78" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4094" element="Page4" state="0"> <bounds x=" 78" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4095" element="Page4" state="0"> <bounds x=" 78" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4096" element="Page4" state="0"> <bounds x=" 78" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4097" element="Page4" state="0"> <bounds x=" 78" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4098" element="Page4" state="0"> <bounds x=" 84" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4099" element="Page4" state="0"> <bounds x=" 84" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4100" element="Page4" state="0"> <bounds x=" 84" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4101" element="Page4" state="0"> <bounds x=" 84" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4102" element="Page4" state="0"> <bounds x=" 84" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4103" element="Page4" state="0"> <bounds x=" 84" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4104" element="Page4" state="0"> <bounds x=" 84" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4105" element="Page4" state="0"> <bounds x=" 90" y=" 80" width="5" height="1" /> </bezel> - <bezel name="pg_4106" element="Page4" state="0"> <bounds x=" 90" y=" 81" width="5" height="1" /> </bezel> - <bezel name="pg_4107" element="Page4" state="0"> <bounds x=" 90" y=" 82" width="5" height="1" /> </bezel> - <bezel name="pg_4108" element="Page4" state="0"> <bounds x=" 90" y=" 83" width="5" height="1" /> </bezel> - <bezel name="pg_4109" element="Page4" state="0"> <bounds x=" 90" y=" 84" width="5" height="1" /> </bezel> - <bezel name="pg_4110" element="Page4" state="0"> <bounds x=" 90" y=" 85" width="5" height="1" /> </bezel> - <bezel name="pg_4111" element="Page4" state="0"> <bounds x=" 90" y=" 86" width="5" height="1" /> </bezel> - <bezel name="pg_4112" element="Page4" state="0"> <bounds x=" 0" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4113" element="Page4" state="0"> <bounds x=" 0" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4114" element="Page4" state="0"> <bounds x=" 0" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4115" element="Page4" state="0"> <bounds x=" 0" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4116" element="Page4" state="0"> <bounds x=" 0" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4117" element="Page4" state="0"> <bounds x=" 0" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4118" element="Page4" state="0"> <bounds x=" 0" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4119" element="Page4" state="0"> <bounds x=" 6" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4120" element="Page4" state="0"> <bounds x=" 6" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4121" element="Page4" state="0"> <bounds x=" 6" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4122" element="Page4" state="0"> <bounds x=" 6" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4123" element="Page4" state="0"> <bounds x=" 6" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4124" element="Page4" state="0"> <bounds x=" 6" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4125" element="Page4" state="0"> <bounds x=" 6" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4126" element="Page4" state="0"> <bounds x=" 12" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4127" element="Page4" state="0"> <bounds x=" 12" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4128" element="Page4" state="0"> <bounds x=" 12" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4129" element="Page4" state="0"> <bounds x=" 12" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4130" element="Page4" state="0"> <bounds x=" 12" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4131" element="Page4" state="0"> <bounds x=" 12" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4132" element="Page4" state="0"> <bounds x=" 12" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4133" element="Page4" state="0"> <bounds x=" 18" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4134" element="Page4" state="0"> <bounds x=" 18" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4135" element="Page4" state="0"> <bounds x=" 18" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4136" element="Page4" state="0"> <bounds x=" 18" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4137" element="Page4" state="0"> <bounds x=" 18" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4138" element="Page4" state="0"> <bounds x=" 18" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4139" element="Page4" state="0"> <bounds x=" 18" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4140" element="Page4" state="0"> <bounds x=" 24" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4141" element="Page4" state="0"> <bounds x=" 24" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4142" element="Page4" state="0"> <bounds x=" 24" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4143" element="Page4" state="0"> <bounds x=" 24" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4144" element="Page4" state="0"> <bounds x=" 24" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4145" element="Page4" state="0"> <bounds x=" 24" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4146" element="Page4" state="0"> <bounds x=" 24" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4147" element="Page4" state="0"> <bounds x=" 30" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4148" element="Page4" state="0"> <bounds x=" 30" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4149" element="Page4" state="0"> <bounds x=" 30" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4150" element="Page4" state="0"> <bounds x=" 30" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4151" element="Page4" state="0"> <bounds x=" 30" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4152" element="Page4" state="0"> <bounds x=" 30" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4153" element="Page4" state="0"> <bounds x=" 30" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4154" element="Page4" state="0"> <bounds x=" 36" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4155" element="Page4" state="0"> <bounds x=" 36" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4156" element="Page4" state="0"> <bounds x=" 36" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4157" element="Page4" state="0"> <bounds x=" 36" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4158" element="Page4" state="0"> <bounds x=" 36" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4159" element="Page4" state="0"> <bounds x=" 36" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4160" element="Page4" state="0"> <bounds x=" 36" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4161" element="Page4" state="0"> <bounds x=" 42" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4162" element="Page4" state="0"> <bounds x=" 42" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4163" element="Page4" state="0"> <bounds x=" 42" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4164" element="Page4" state="0"> <bounds x=" 42" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4165" element="Page4" state="0"> <bounds x=" 42" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4166" element="Page4" state="0"> <bounds x=" 42" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4167" element="Page4" state="0"> <bounds x=" 42" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4168" element="Page4" state="0"> <bounds x=" 48" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4169" element="Page4" state="0"> <bounds x=" 48" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4170" element="Page4" state="0"> <bounds x=" 48" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4171" element="Page4" state="0"> <bounds x=" 48" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4172" element="Page4" state="0"> <bounds x=" 48" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4173" element="Page4" state="0"> <bounds x=" 48" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4174" element="Page4" state="0"> <bounds x=" 48" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4175" element="Page4" state="0"> <bounds x=" 54" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4176" element="Page4" state="0"> <bounds x=" 54" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4177" element="Page4" state="0"> <bounds x=" 54" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4178" element="Page4" state="0"> <bounds x=" 54" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4179" element="Page4" state="0"> <bounds x=" 54" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4180" element="Page4" state="0"> <bounds x=" 54" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4181" element="Page4" state="0"> <bounds x=" 54" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4182" element="Page4" state="0"> <bounds x=" 60" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4183" element="Page4" state="0"> <bounds x=" 60" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4184" element="Page4" state="0"> <bounds x=" 60" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4185" element="Page4" state="0"> <bounds x=" 60" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4186" element="Page4" state="0"> <bounds x=" 60" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4187" element="Page4" state="0"> <bounds x=" 60" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4188" element="Page4" state="0"> <bounds x=" 60" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4189" element="Page4" state="0"> <bounds x=" 66" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4190" element="Page4" state="0"> <bounds x=" 66" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4191" element="Page4" state="0"> <bounds x=" 66" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4192" element="Page4" state="0"> <bounds x=" 66" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4193" element="Page4" state="0"> <bounds x=" 66" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4194" element="Page4" state="0"> <bounds x=" 66" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4195" element="Page4" state="0"> <bounds x=" 66" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4196" element="Page4" state="0"> <bounds x=" 72" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4197" element="Page4" state="0"> <bounds x=" 72" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4198" element="Page4" state="0"> <bounds x=" 72" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4199" element="Page4" state="0"> <bounds x=" 72" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4200" element="Page4" state="0"> <bounds x=" 72" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4201" element="Page4" state="0"> <bounds x=" 72" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4202" element="Page4" state="0"> <bounds x=" 72" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4203" element="Page4" state="0"> <bounds x=" 78" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4204" element="Page4" state="0"> <bounds x=" 78" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4205" element="Page4" state="0"> <bounds x=" 78" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4206" element="Page4" state="0"> <bounds x=" 78" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4207" element="Page4" state="0"> <bounds x=" 78" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4208" element="Page4" state="0"> <bounds x=" 78" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4209" element="Page4" state="0"> <bounds x=" 78" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4210" element="Page4" state="0"> <bounds x=" 84" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4211" element="Page4" state="0"> <bounds x=" 84" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4212" element="Page4" state="0"> <bounds x=" 84" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4213" element="Page4" state="0"> <bounds x=" 84" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4214" element="Page4" state="0"> <bounds x=" 84" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4215" element="Page4" state="0"> <bounds x=" 84" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4216" element="Page4" state="0"> <bounds x=" 84" y=" 96" width="5" height="1" /> </bezel> - <bezel name="pg_4217" element="Page4" state="0"> <bounds x=" 90" y=" 90" width="5" height="1" /> </bezel> - <bezel name="pg_4218" element="Page4" state="0"> <bounds x=" 90" y=" 91" width="5" height="1" /> </bezel> - <bezel name="pg_4219" element="Page4" state="0"> <bounds x=" 90" y=" 92" width="5" height="1" /> </bezel> - <bezel name="pg_4220" element="Page4" state="0"> <bounds x=" 90" y=" 93" width="5" height="1" /> </bezel> - <bezel name="pg_4221" element="Page4" state="0"> <bounds x=" 90" y=" 94" width="5" height="1" /> </bezel> - <bezel name="pg_4222" element="Page4" state="0"> <bounds x=" 90" y=" 95" width="5" height="1" /> </bezel> - <bezel name="pg_4223" element="Page4" state="0"> <bounds x=" 90" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4000" element="Page4" state="0"> <bounds x=" 0" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4001" element="Page4" state="0"> <bounds x=" 0" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4002" element="Page4" state="0"> <bounds x=" 0" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4003" element="Page4" state="0"> <bounds x=" 0" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4004" element="Page4" state="0"> <bounds x=" 0" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4005" element="Page4" state="0"> <bounds x=" 0" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4006" element="Page4" state="0"> <bounds x=" 0" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4007" element="Page4" state="0"> <bounds x=" 6" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4008" element="Page4" state="0"> <bounds x=" 6" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4009" element="Page4" state="0"> <bounds x=" 6" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4010" element="Page4" state="0"> <bounds x=" 6" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4011" element="Page4" state="0"> <bounds x=" 6" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4012" element="Page4" state="0"> <bounds x=" 6" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4013" element="Page4" state="0"> <bounds x=" 6" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4014" element="Page4" state="0"> <bounds x=" 12" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4015" element="Page4" state="0"> <bounds x=" 12" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4016" element="Page4" state="0"> <bounds x=" 12" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4017" element="Page4" state="0"> <bounds x=" 12" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4018" element="Page4" state="0"> <bounds x=" 12" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4019" element="Page4" state="0"> <bounds x=" 12" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4020" element="Page4" state="0"> <bounds x=" 12" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4021" element="Page4" state="0"> <bounds x=" 18" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4022" element="Page4" state="0"> <bounds x=" 18" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4023" element="Page4" state="0"> <bounds x=" 18" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4024" element="Page4" state="0"> <bounds x=" 18" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4025" element="Page4" state="0"> <bounds x=" 18" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4026" element="Page4" state="0"> <bounds x=" 18" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4027" element="Page4" state="0"> <bounds x=" 18" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4028" element="Page4" state="0"> <bounds x=" 24" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4029" element="Page4" state="0"> <bounds x=" 24" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4030" element="Page4" state="0"> <bounds x=" 24" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4031" element="Page4" state="0"> <bounds x=" 24" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4032" element="Page4" state="0"> <bounds x=" 24" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4033" element="Page4" state="0"> <bounds x=" 24" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4034" element="Page4" state="0"> <bounds x=" 24" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4035" element="Page4" state="0"> <bounds x=" 30" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4036" element="Page4" state="0"> <bounds x=" 30" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4037" element="Page4" state="0"> <bounds x=" 30" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4038" element="Page4" state="0"> <bounds x=" 30" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4039" element="Page4" state="0"> <bounds x=" 30" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4040" element="Page4" state="0"> <bounds x=" 30" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4041" element="Page4" state="0"> <bounds x=" 30" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4042" element="Page4" state="0"> <bounds x=" 36" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4043" element="Page4" state="0"> <bounds x=" 36" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4044" element="Page4" state="0"> <bounds x=" 36" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4045" element="Page4" state="0"> <bounds x=" 36" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4046" element="Page4" state="0"> <bounds x=" 36" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4047" element="Page4" state="0"> <bounds x=" 36" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4048" element="Page4" state="0"> <bounds x=" 36" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4049" element="Page4" state="0"> <bounds x=" 42" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4050" element="Page4" state="0"> <bounds x=" 42" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4051" element="Page4" state="0"> <bounds x=" 42" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4052" element="Page4" state="0"> <bounds x=" 42" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4053" element="Page4" state="0"> <bounds x=" 42" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4054" element="Page4" state="0"> <bounds x=" 42" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4055" element="Page4" state="0"> <bounds x=" 42" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4056" element="Page4" state="0"> <bounds x=" 48" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4057" element="Page4" state="0"> <bounds x=" 48" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4058" element="Page4" state="0"> <bounds x=" 48" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4059" element="Page4" state="0"> <bounds x=" 48" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4060" element="Page4" state="0"> <bounds x=" 48" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4061" element="Page4" state="0"> <bounds x=" 48" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4062" element="Page4" state="0"> <bounds x=" 48" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4063" element="Page4" state="0"> <bounds x=" 54" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4064" element="Page4" state="0"> <bounds x=" 54" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4065" element="Page4" state="0"> <bounds x=" 54" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4066" element="Page4" state="0"> <bounds x=" 54" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4067" element="Page4" state="0"> <bounds x=" 54" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4068" element="Page4" state="0"> <bounds x=" 54" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4069" element="Page4" state="0"> <bounds x=" 54" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4070" element="Page4" state="0"> <bounds x=" 60" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4071" element="Page4" state="0"> <bounds x=" 60" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4072" element="Page4" state="0"> <bounds x=" 60" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4073" element="Page4" state="0"> <bounds x=" 60" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4074" element="Page4" state="0"> <bounds x=" 60" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4075" element="Page4" state="0"> <bounds x=" 60" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4076" element="Page4" state="0"> <bounds x=" 60" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4077" element="Page4" state="0"> <bounds x=" 66" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4078" element="Page4" state="0"> <bounds x=" 66" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4079" element="Page4" state="0"> <bounds x=" 66" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4080" element="Page4" state="0"> <bounds x=" 66" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4081" element="Page4" state="0"> <bounds x=" 66" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4082" element="Page4" state="0"> <bounds x=" 66" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4083" element="Page4" state="0"> <bounds x=" 66" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4084" element="Page4" state="0"> <bounds x=" 72" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4085" element="Page4" state="0"> <bounds x=" 72" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4086" element="Page4" state="0"> <bounds x=" 72" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4087" element="Page4" state="0"> <bounds x=" 72" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4088" element="Page4" state="0"> <bounds x=" 72" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4089" element="Page4" state="0"> <bounds x=" 72" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4090" element="Page4" state="0"> <bounds x=" 72" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4091" element="Page4" state="0"> <bounds x=" 78" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4092" element="Page4" state="0"> <bounds x=" 78" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4093" element="Page4" state="0"> <bounds x=" 78" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4094" element="Page4" state="0"> <bounds x=" 78" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4095" element="Page4" state="0"> <bounds x=" 78" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4096" element="Page4" state="0"> <bounds x=" 78" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4097" element="Page4" state="0"> <bounds x=" 78" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4098" element="Page4" state="0"> <bounds x=" 84" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4099" element="Page4" state="0"> <bounds x=" 84" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4100" element="Page4" state="0"> <bounds x=" 84" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4101" element="Page4" state="0"> <bounds x=" 84" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4102" element="Page4" state="0"> <bounds x=" 84" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4103" element="Page4" state="0"> <bounds x=" 84" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4104" element="Page4" state="0"> <bounds x=" 84" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4105" element="Page4" state="0"> <bounds x=" 90" y=" 80" width="5" height="1" /> </bezel> + <bezel name="pg_4106" element="Page4" state="0"> <bounds x=" 90" y=" 81" width="5" height="1" /> </bezel> + <bezel name="pg_4107" element="Page4" state="0"> <bounds x=" 90" y=" 82" width="5" height="1" /> </bezel> + <bezel name="pg_4108" element="Page4" state="0"> <bounds x=" 90" y=" 83" width="5" height="1" /> </bezel> + <bezel name="pg_4109" element="Page4" state="0"> <bounds x=" 90" y=" 84" width="5" height="1" /> </bezel> + <bezel name="pg_4110" element="Page4" state="0"> <bounds x=" 90" y=" 85" width="5" height="1" /> </bezel> + <bezel name="pg_4111" element="Page4" state="0"> <bounds x=" 90" y=" 86" width="5" height="1" /> </bezel> + <bezel name="pg_4112" element="Page4" state="0"> <bounds x=" 0" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4113" element="Page4" state="0"> <bounds x=" 0" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4114" element="Page4" state="0"> <bounds x=" 0" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4115" element="Page4" state="0"> <bounds x=" 0" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4116" element="Page4" state="0"> <bounds x=" 0" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4117" element="Page4" state="0"> <bounds x=" 0" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4118" element="Page4" state="0"> <bounds x=" 0" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4119" element="Page4" state="0"> <bounds x=" 6" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4120" element="Page4" state="0"> <bounds x=" 6" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4121" element="Page4" state="0"> <bounds x=" 6" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4122" element="Page4" state="0"> <bounds x=" 6" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4123" element="Page4" state="0"> <bounds x=" 6" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4124" element="Page4" state="0"> <bounds x=" 6" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4125" element="Page4" state="0"> <bounds x=" 6" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4126" element="Page4" state="0"> <bounds x=" 12" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4127" element="Page4" state="0"> <bounds x=" 12" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4128" element="Page4" state="0"> <bounds x=" 12" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4129" element="Page4" state="0"> <bounds x=" 12" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4130" element="Page4" state="0"> <bounds x=" 12" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4131" element="Page4" state="0"> <bounds x=" 12" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4132" element="Page4" state="0"> <bounds x=" 12" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4133" element="Page4" state="0"> <bounds x=" 18" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4134" element="Page4" state="0"> <bounds x=" 18" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4135" element="Page4" state="0"> <bounds x=" 18" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4136" element="Page4" state="0"> <bounds x=" 18" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4137" element="Page4" state="0"> <bounds x=" 18" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4138" element="Page4" state="0"> <bounds x=" 18" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4139" element="Page4" state="0"> <bounds x=" 18" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4140" element="Page4" state="0"> <bounds x=" 24" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4141" element="Page4" state="0"> <bounds x=" 24" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4142" element="Page4" state="0"> <bounds x=" 24" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4143" element="Page4" state="0"> <bounds x=" 24" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4144" element="Page4" state="0"> <bounds x=" 24" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4145" element="Page4" state="0"> <bounds x=" 24" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4146" element="Page4" state="0"> <bounds x=" 24" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4147" element="Page4" state="0"> <bounds x=" 30" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4148" element="Page4" state="0"> <bounds x=" 30" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4149" element="Page4" state="0"> <bounds x=" 30" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4150" element="Page4" state="0"> <bounds x=" 30" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4151" element="Page4" state="0"> <bounds x=" 30" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4152" element="Page4" state="0"> <bounds x=" 30" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4153" element="Page4" state="0"> <bounds x=" 30" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4154" element="Page4" state="0"> <bounds x=" 36" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4155" element="Page4" state="0"> <bounds x=" 36" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4156" element="Page4" state="0"> <bounds x=" 36" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4157" element="Page4" state="0"> <bounds x=" 36" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4158" element="Page4" state="0"> <bounds x=" 36" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4159" element="Page4" state="0"> <bounds x=" 36" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4160" element="Page4" state="0"> <bounds x=" 36" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4161" element="Page4" state="0"> <bounds x=" 42" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4162" element="Page4" state="0"> <bounds x=" 42" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4163" element="Page4" state="0"> <bounds x=" 42" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4164" element="Page4" state="0"> <bounds x=" 42" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4165" element="Page4" state="0"> <bounds x=" 42" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4166" element="Page4" state="0"> <bounds x=" 42" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4167" element="Page4" state="0"> <bounds x=" 42" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4168" element="Page4" state="0"> <bounds x=" 48" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4169" element="Page4" state="0"> <bounds x=" 48" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4170" element="Page4" state="0"> <bounds x=" 48" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4171" element="Page4" state="0"> <bounds x=" 48" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4172" element="Page4" state="0"> <bounds x=" 48" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4173" element="Page4" state="0"> <bounds x=" 48" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4174" element="Page4" state="0"> <bounds x=" 48" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4175" element="Page4" state="0"> <bounds x=" 54" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4176" element="Page4" state="0"> <bounds x=" 54" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4177" element="Page4" state="0"> <bounds x=" 54" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4178" element="Page4" state="0"> <bounds x=" 54" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4179" element="Page4" state="0"> <bounds x=" 54" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4180" element="Page4" state="0"> <bounds x=" 54" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4181" element="Page4" state="0"> <bounds x=" 54" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4182" element="Page4" state="0"> <bounds x=" 60" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4183" element="Page4" state="0"> <bounds x=" 60" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4184" element="Page4" state="0"> <bounds x=" 60" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4185" element="Page4" state="0"> <bounds x=" 60" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4186" element="Page4" state="0"> <bounds x=" 60" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4187" element="Page4" state="0"> <bounds x=" 60" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4188" element="Page4" state="0"> <bounds x=" 60" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4189" element="Page4" state="0"> <bounds x=" 66" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4190" element="Page4" state="0"> <bounds x=" 66" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4191" element="Page4" state="0"> <bounds x=" 66" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4192" element="Page4" state="0"> <bounds x=" 66" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4193" element="Page4" state="0"> <bounds x=" 66" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4194" element="Page4" state="0"> <bounds x=" 66" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4195" element="Page4" state="0"> <bounds x=" 66" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4196" element="Page4" state="0"> <bounds x=" 72" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4197" element="Page4" state="0"> <bounds x=" 72" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4198" element="Page4" state="0"> <bounds x=" 72" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4199" element="Page4" state="0"> <bounds x=" 72" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4200" element="Page4" state="0"> <bounds x=" 72" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4201" element="Page4" state="0"> <bounds x=" 72" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4202" element="Page4" state="0"> <bounds x=" 72" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4203" element="Page4" state="0"> <bounds x=" 78" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4204" element="Page4" state="0"> <bounds x=" 78" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4205" element="Page4" state="0"> <bounds x=" 78" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4206" element="Page4" state="0"> <bounds x=" 78" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4207" element="Page4" state="0"> <bounds x=" 78" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4208" element="Page4" state="0"> <bounds x=" 78" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4209" element="Page4" state="0"> <bounds x=" 78" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4210" element="Page4" state="0"> <bounds x=" 84" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4211" element="Page4" state="0"> <bounds x=" 84" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4212" element="Page4" state="0"> <bounds x=" 84" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4213" element="Page4" state="0"> <bounds x=" 84" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4214" element="Page4" state="0"> <bounds x=" 84" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4215" element="Page4" state="0"> <bounds x=" 84" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4216" element="Page4" state="0"> <bounds x=" 84" y=" 96" width="5" height="1" /> </bezel> + <bezel name="pg_4217" element="Page4" state="0"> <bounds x=" 90" y=" 90" width="5" height="1" /> </bezel> + <bezel name="pg_4218" element="Page4" state="0"> <bounds x=" 90" y=" 91" width="5" height="1" /> </bezel> + <bezel name="pg_4219" element="Page4" state="0"> <bounds x=" 90" y=" 92" width="5" height="1" /> </bezel> + <bezel name="pg_4220" element="Page4" state="0"> <bounds x=" 90" y=" 93" width="5" height="1" /> </bezel> + <bezel name="pg_4221" element="Page4" state="0"> <bounds x=" 90" y=" 94" width="5" height="1" /> </bezel> + <bezel name="pg_4222" element="Page4" state="0"> <bounds x=" 90" y=" 95" width="5" height="1" /> </bezel> + <bezel name="pg_4223" element="Page4" state="0"> <bounds x=" 90" y=" 96" width="5" height="1" /> </bezel> </view> </mamelayout> diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp index f4c0b69129b..6e703df17ff 100644 --- a/src/mame/machine/315-5838_317-0229_comp.cpp +++ b/src/mame/machine/315-5838_317-0229_comp.cpp @@ -4,31 +4,31 @@ 315-5838 - Decathlete (ST-V) 317-0229 - Dead or Alive (Model 2A) - 317-0229 - Name Club / Name Club Ver 2 (ST-V) (tested as RCDD2 in the service menu!) - 317-0231 - Print Club Love Love / Print Club Love Love Ver 2 (ST-V) + 317-0229 - Name Club / Name Club Ver 2 (ST-V) (tested as RCDD2 in the service menu!) + 317-0231 - Print Club Love Love / Print Club Love Love Ver 2 (ST-V) - Several Print Club (ST-V) carts have - an unpopulated space marked '317-0229' on the PCB + Several Print Club (ST-V) carts have + an unpopulated space marked '317-0229' on the PCB Package Type: TQFP100 Decathlete accesses the chip at 2 different addresses, however, I don't think there - are 2 channels / sets of registers, instead the 2nd set of addresses are just a - mirror that allows access to a different set of source roms; the tables etc. are - re-uploaded before every transfer. + are 2 channels / sets of registers, instead the 2nd set of addresses are just a + mirror that allows access to a different set of source roms; the tables etc. are + re-uploaded before every transfer. Dead of Alive has the source data in RAM, not ROM. This is similar to how some 5881 games were set up, with the ST-V versions decrypting data directly from ROM and the Model 2 ones using a RAM source buffer. - Decathlete decompresses all graphic data with the chip. + Decathlete decompresses all graphic data with the chip. - The Name Club games use the chip for decompressing data for the printer (full size - versions of the graphics?) + The Name Club games use the chip for decompressing data for the printer (full size + versions of the graphics?) - Print Club Love Love decrypts some start up code/data required for booting. + Print Club Love Love decrypts some start up code/data required for booting. - Dead or Alive decrypts a string that is checked on startup, nothing else. + Dead or Alive decrypts a string that is checked on startup, nothing else. Looking at the values read I don't think there is any address based encryption, for example many blocks where you'd expect a zero fill start with repeating patterns diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index e9b23fa2685..f98d70f9b12 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -9,7 +9,7 @@ //#define VERBOSE -const device_type ESQ2x16_SQ1 = &device_creator<esq2x16_sq1_t>; +const device_type ESQ2x16_SQ1 = &device_creator<esq2x16_sq1_t>; // --- SQ1 - Parduz -------------------------------------------------------------------------------------------------------------------------- static MACHINE_CONFIG_FRAGMENT(esq2x16) @@ -19,147 +19,147 @@ MACHINE_CONFIG_END /*! \file font5x7.h \brief Graphic LCD Font (Ascii Characters). */ //***************************************************************************** // -// File Name : 'font5x7.h' -// Title : Graphic LCD Font (Ascii Charaters) -// Author : Pascal Stang -// Date : 10/19/2001 -// Revised : 10/19/2001 -// Version : 0.1 -// Target MCU : Atmel AVR -// Editor Tabs : 4 +// File Name : 'font5x7.h' +// Title : Graphic LCD Font (Ascii Charaters) +// Author : Pascal Stang +// Date : 10/19/2001 +// Revised : 10/19/2001 +// Version : 0.1 +// Target MCU : Atmel AVR +// Editor Tabs : 4 // //***************************************************************************** // standard ascii 5x7 font // defines ascii characters 0x20-0x7F (32-127) static unsigned char Font5x7[][5] = { - {0x00, 0x00, 0x08, 0x00, 0x00}, // _Undef_ 0x00 - dots for debug purposes - {0x01, 0x00, 0x00, 0x00, 0x40}, // _Undef_ 0x01 - dots for debug purposes - {0x02, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x02 - {0x03, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x03 - {0x04, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x04 - {0x05, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x05 - {0x06, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x06 - {0x07, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x07 - {0x20, 0x70, 0x3F, 0x00, 0x00}, // Croma 0x08 - {0x20, 0x70, 0x3F, 0x02, 0x0C}, // Croma 0x09 - {0x20, 0x70, 0x3F, 0x05, 0x0A}, // Croma 0x0A - {0x20, 0x70, 0x3F, 0x15, 0x2A}, // Croma 0x0B - {0x20, 0x50, 0x50, 0x3F, 0x00}, // Croma 0x0C - {0x0D, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0D - {0x0E, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0E - {0x0F, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0F - {0x10, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x10 - {0x11, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x11 - {0x12, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x12 - {0x13, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x13 - {0x14, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x14 - {0x15, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x15 - {0x16, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x16 - {0x17, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x17 - {0x18, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x18 - {0x19, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x19 - {0x1A, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1A - {0x1B, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1B - {0x1C, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1C - {0x1D, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1D - {0x1E, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1E - {0x1F, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1F - {0x00, 0x00, 0x00, 0x00, 0x00}, // (space) 0x20 - {0x00, 0x00, 0x5F, 0x00, 0x00}, // ! 0x21 - {0x00, 0x07, 0x00, 0x07, 0x00}, // " 0x22 - {0x14, 0x7F, 0x14, 0x7F, 0x14}, // # 0x23 - {0x24, 0x2A, 0x7F, 0x2A, 0x12}, // $ 0x24 - {0x23, 0x13, 0x08, 0x64, 0x62}, // % 0x25 - {0x36, 0x49, 0x55, 0x22, 0x50}, // & 0x26 - {0x00, 0x05, 0x03, 0x00, 0x00}, // ' 0x27 - {0x00, 0x1C, 0x22, 0x41, 0x00}, // ( 0x28 - {0x00, 0x41, 0x22, 0x1C, 0x00}, // ) 0x29 - {0x08, 0x2A, 0x1C, 0x2A, 0x08}, // * 0x2A - {0x08, 0x08, 0x3E, 0x08, 0x08}, // + 0x2B - {0x00, 0x50, 0x30, 0x00, 0x00}, // , 0x2C - {0x08, 0x08, 0x08, 0x08, 0x08}, // - 0x2D - {0x00, 0x60, 0x60, 0x00, 0x00}, // . 0x2E - {0x20, 0x10, 0x08, 0x04, 0x02}, // / 0x2F - {0x3E, 0x51, 0x49, 0x45, 0x3E}, // 0 0x30 - {0x00, 0x42, 0x7F, 0x40, 0x00}, // 1 0x31 - {0x42, 0x61, 0x51, 0x49, 0x46}, // 2 0x32 - {0x21, 0x41, 0x45, 0x4B, 0x31}, // 3 0x33 - {0x18, 0x14, 0x12, 0x7F, 0x10}, // 4 0x34 - {0x27, 0x45, 0x45, 0x45, 0x39}, // 5 0x35 - {0x3C, 0x4A, 0x49, 0x49, 0x30}, // 6 0x36 - {0x01, 0x71, 0x09, 0x05, 0x03}, // 7 0x37 - {0x36, 0x49, 0x49, 0x49, 0x36}, // 8 0x38 - {0x06, 0x49, 0x49, 0x29, 0x1E}, // 9 0x39 - {0x00, 0x36, 0x36, 0x00, 0x00}, // : 0x3A - {0x00, 0x56, 0x36, 0x00, 0x00}, // ; 0x3B - {0x00, 0x08, 0x14, 0x22, 0x41}, // < 0x3C - {0x14, 0x14, 0x14, 0x14, 0x14}, // = 0x3D - {0x41, 0x22, 0x14, 0x08, 0x00}, // > 0x3E - {0x02, 0x01, 0x51, 0x09, 0x06}, // ? 0x3F - {0x32, 0x49, 0x79, 0x41, 0x3E}, // @ 0x40 - {0x7E, 0x11, 0x11, 0x11, 0x7E}, // A 0x41 - {0x7F, 0x49, 0x49, 0x49, 0x36}, // B 0x42 - {0x3E, 0x41, 0x41, 0x41, 0x22}, // C 0x43 - {0x7F, 0x41, 0x41, 0x22, 0x1C}, // D 0x44 - {0x7F, 0x49, 0x49, 0x49, 0x41}, // E 0x45 - {0x7F, 0x09, 0x09, 0x01, 0x01}, // F 0x46 - {0x3E, 0x41, 0x41, 0x51, 0x32}, // G 0x47 - {0x7F, 0x08, 0x08, 0x08, 0x7F}, // H 0x48 - {0x00, 0x41, 0x7F, 0x41, 0x00}, // I 0x49 - {0x20, 0x40, 0x41, 0x3F, 0x01}, // J 0x4A - {0x7F, 0x08, 0x14, 0x22, 0x41}, // K 0x4B - {0x7F, 0x40, 0x40, 0x40, 0x40}, // L 0x4C - {0x7F, 0x02, 0x04, 0x02, 0x7F}, // M 0x4D - {0x7F, 0x04, 0x08, 0x10, 0x7F}, // N 0x4E - {0x3E, 0x41, 0x41, 0x41, 0x3E}, // O 0x4F - {0x7F, 0x09, 0x09, 0x09, 0x06}, // P 0x50 - {0x3E, 0x41, 0x51, 0x21, 0x5E}, // Q 0x51 - {0x7F, 0x09, 0x19, 0x29, 0x46}, // R 0x52 - {0x46, 0x49, 0x49, 0x49, 0x31}, // S 0x53 - {0x01, 0x01, 0x7F, 0x01, 0x01}, // T 0x54 - {0x3F, 0x40, 0x40, 0x40, 0x3F}, // U 0x55 - {0x1F, 0x20, 0x40, 0x20, 0x1F}, // V 0x56 - {0x7F, 0x20, 0x18, 0x20, 0x7F}, // W 0x57 - {0x63, 0x14, 0x08, 0x14, 0x63}, // X 0x58 - {0x03, 0x04, 0x78, 0x04, 0x03}, // Y 0x59 - {0x61, 0x51, 0x49, 0x45, 0x43}, // Z 0x5A - {0x00, 0x00, 0x7F, 0x41, 0x41}, // [ 0x5B - {0x02, 0x04, 0x08, 0x10, 0x20}, // \ 0x5C - {0x41, 0x41, 0x7F, 0x00, 0x00}, // ] 0x5D - {0x04, 0x02, 0x01, 0x02, 0x04}, // ^ 0x5E - {0x40, 0x40, 0x40, 0x40, 0x40}, // _ 0x5F - {0x00, 0x01, 0x02, 0x04, 0x00}, // ` 0x60 - {0x20, 0x54, 0x54, 0x54, 0x78}, // a 0x61 - {0x7F, 0x48, 0x44, 0x44, 0x38}, // b 0x62 - {0x38, 0x44, 0x44, 0x44, 0x20}, // c 0x63 - {0x38, 0x44, 0x44, 0x48, 0x7F}, // d 0x64 - {0x38, 0x54, 0x54, 0x54, 0x18}, // e 0x65 - {0x08, 0x7E, 0x09, 0x01, 0x02}, // f 0x66 - {0x08, 0x14, 0x54, 0x54, 0x3C}, // g 0x67 - {0x7F, 0x08, 0x04, 0x04, 0x78}, // h 0x68 - {0x00, 0x44, 0x7D, 0x40, 0x00}, // i 0x69 - {0x20, 0x40, 0x44, 0x3D, 0x00}, // j 0x6A - {0x00, 0x7F, 0x10, 0x28, 0x44}, // k 0x6B - {0x00, 0x41, 0x7F, 0x40, 0x00}, // l 0x6C - {0x7C, 0x04, 0x18, 0x04, 0x78}, // m 0x6D - {0x7C, 0x08, 0x04, 0x04, 0x78}, // n 0x6E - {0x38, 0x44, 0x44, 0x44, 0x38}, // o 0x6F - {0x7C, 0x14, 0x14, 0x14, 0x08}, // p 0x70 - {0x08, 0x14, 0x14, 0x18, 0x7C}, // q 0x71 - {0x7C, 0x08, 0x04, 0x04, 0x08}, // r 0x72 - {0x48, 0x54, 0x54, 0x54, 0x20}, // s 0x73 - {0x04, 0x3F, 0x44, 0x40, 0x20}, // t 0x74 - {0x3C, 0x40, 0x40, 0x20, 0x7C}, // u 0x75 - {0x1C, 0x20, 0x40, 0x20, 0x1C}, // v 0x76 - {0x3C, 0x40, 0x30, 0x40, 0x3C}, // w 0x77 - {0x44, 0x28, 0x10, 0x28, 0x44}, // x 0x78 - {0x0C, 0x50, 0x50, 0x50, 0x3C}, // y 0x79 - {0x44, 0x64, 0x54, 0x4C, 0x44}, // z 0x7A - {0x00, 0x08, 0x36, 0x41, 0x00}, // { 0x7B - {0x00, 0x00, 0x7F, 0x00, 0x00}, // | 0x7C - {0x00, 0x41, 0x36, 0x08, 0x00}, // } 0x7D - {0x08, 0x08, 0x2A, 0x1C, 0x08}, // -> 0x7E - {0x08, 0x1C, 0x2A, 0x08, 0x08} // <- 0x7F + {0x00, 0x00, 0x08, 0x00, 0x00}, // _Undef_ 0x00 - dots for debug purposes + {0x01, 0x00, 0x00, 0x00, 0x40}, // _Undef_ 0x01 - dots for debug purposes + {0x02, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x02 + {0x03, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x03 + {0x04, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x04 + {0x05, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x05 + {0x06, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x06 + {0x07, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x07 + {0x20, 0x70, 0x3F, 0x00, 0x00}, // Croma 0x08 + {0x20, 0x70, 0x3F, 0x02, 0x0C}, // Croma 0x09 + {0x20, 0x70, 0x3F, 0x05, 0x0A}, // Croma 0x0A + {0x20, 0x70, 0x3F, 0x15, 0x2A}, // Croma 0x0B + {0x20, 0x50, 0x50, 0x3F, 0x00}, // Croma 0x0C + {0x0D, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0D + {0x0E, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0E + {0x0F, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x0F + {0x10, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x10 + {0x11, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x11 + {0x12, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x12 + {0x13, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x13 + {0x14, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x14 + {0x15, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x15 + {0x16, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x16 + {0x17, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x17 + {0x18, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x18 + {0x19, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x19 + {0x1A, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1A + {0x1B, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1B + {0x1C, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1C + {0x1D, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1D + {0x1E, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1E + {0x1F, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x1F + {0x00, 0x00, 0x00, 0x00, 0x00}, // (space) 0x20 + {0x00, 0x00, 0x5F, 0x00, 0x00}, // ! 0x21 + {0x00, 0x07, 0x00, 0x07, 0x00}, // " 0x22 + {0x14, 0x7F, 0x14, 0x7F, 0x14}, // # 0x23 + {0x24, 0x2A, 0x7F, 0x2A, 0x12}, // $ 0x24 + {0x23, 0x13, 0x08, 0x64, 0x62}, // % 0x25 + {0x36, 0x49, 0x55, 0x22, 0x50}, // & 0x26 + {0x00, 0x05, 0x03, 0x00, 0x00}, // ' 0x27 + {0x00, 0x1C, 0x22, 0x41, 0x00}, // ( 0x28 + {0x00, 0x41, 0x22, 0x1C, 0x00}, // ) 0x29 + {0x08, 0x2A, 0x1C, 0x2A, 0x08}, // * 0x2A + {0x08, 0x08, 0x3E, 0x08, 0x08}, // + 0x2B + {0x00, 0x50, 0x30, 0x00, 0x00}, // , 0x2C + {0x08, 0x08, 0x08, 0x08, 0x08}, // - 0x2D + {0x00, 0x60, 0x60, 0x00, 0x00}, // . 0x2E + {0x20, 0x10, 0x08, 0x04, 0x02}, // / 0x2F + {0x3E, 0x51, 0x49, 0x45, 0x3E}, // 0 0x30 + {0x00, 0x42, 0x7F, 0x40, 0x00}, // 1 0x31 + {0x42, 0x61, 0x51, 0x49, 0x46}, // 2 0x32 + {0x21, 0x41, 0x45, 0x4B, 0x31}, // 3 0x33 + {0x18, 0x14, 0x12, 0x7F, 0x10}, // 4 0x34 + {0x27, 0x45, 0x45, 0x45, 0x39}, // 5 0x35 + {0x3C, 0x4A, 0x49, 0x49, 0x30}, // 6 0x36 + {0x01, 0x71, 0x09, 0x05, 0x03}, // 7 0x37 + {0x36, 0x49, 0x49, 0x49, 0x36}, // 8 0x38 + {0x06, 0x49, 0x49, 0x29, 0x1E}, // 9 0x39 + {0x00, 0x36, 0x36, 0x00, 0x00}, // : 0x3A + {0x00, 0x56, 0x36, 0x00, 0x00}, // ; 0x3B + {0x00, 0x08, 0x14, 0x22, 0x41}, // < 0x3C + {0x14, 0x14, 0x14, 0x14, 0x14}, // = 0x3D + {0x41, 0x22, 0x14, 0x08, 0x00}, // > 0x3E + {0x02, 0x01, 0x51, 0x09, 0x06}, // ? 0x3F + {0x32, 0x49, 0x79, 0x41, 0x3E}, // @ 0x40 + {0x7E, 0x11, 0x11, 0x11, 0x7E}, // A 0x41 + {0x7F, 0x49, 0x49, 0x49, 0x36}, // B 0x42 + {0x3E, 0x41, 0x41, 0x41, 0x22}, // C 0x43 + {0x7F, 0x41, 0x41, 0x22, 0x1C}, // D 0x44 + {0x7F, 0x49, 0x49, 0x49, 0x41}, // E 0x45 + {0x7F, 0x09, 0x09, 0x01, 0x01}, // F 0x46 + {0x3E, 0x41, 0x41, 0x51, 0x32}, // G 0x47 + {0x7F, 0x08, 0x08, 0x08, 0x7F}, // H 0x48 + {0x00, 0x41, 0x7F, 0x41, 0x00}, // I 0x49 + {0x20, 0x40, 0x41, 0x3F, 0x01}, // J 0x4A + {0x7F, 0x08, 0x14, 0x22, 0x41}, // K 0x4B + {0x7F, 0x40, 0x40, 0x40, 0x40}, // L 0x4C + {0x7F, 0x02, 0x04, 0x02, 0x7F}, // M 0x4D + {0x7F, 0x04, 0x08, 0x10, 0x7F}, // N 0x4E + {0x3E, 0x41, 0x41, 0x41, 0x3E}, // O 0x4F + {0x7F, 0x09, 0x09, 0x09, 0x06}, // P 0x50 + {0x3E, 0x41, 0x51, 0x21, 0x5E}, // Q 0x51 + {0x7F, 0x09, 0x19, 0x29, 0x46}, // R 0x52 + {0x46, 0x49, 0x49, 0x49, 0x31}, // S 0x53 + {0x01, 0x01, 0x7F, 0x01, 0x01}, // T 0x54 + {0x3F, 0x40, 0x40, 0x40, 0x3F}, // U 0x55 + {0x1F, 0x20, 0x40, 0x20, 0x1F}, // V 0x56 + {0x7F, 0x20, 0x18, 0x20, 0x7F}, // W 0x57 + {0x63, 0x14, 0x08, 0x14, 0x63}, // X 0x58 + {0x03, 0x04, 0x78, 0x04, 0x03}, // Y 0x59 + {0x61, 0x51, 0x49, 0x45, 0x43}, // Z 0x5A + {0x00, 0x00, 0x7F, 0x41, 0x41}, // [ 0x5B + {0x02, 0x04, 0x08, 0x10, 0x20}, // \ 0x5C + {0x41, 0x41, 0x7F, 0x00, 0x00}, // ] 0x5D + {0x04, 0x02, 0x01, 0x02, 0x04}, // ^ 0x5E + {0x40, 0x40, 0x40, 0x40, 0x40}, // _ 0x5F + {0x00, 0x01, 0x02, 0x04, 0x00}, // ` 0x60 + {0x20, 0x54, 0x54, 0x54, 0x78}, // a 0x61 + {0x7F, 0x48, 0x44, 0x44, 0x38}, // b 0x62 + {0x38, 0x44, 0x44, 0x44, 0x20}, // c 0x63 + {0x38, 0x44, 0x44, 0x48, 0x7F}, // d 0x64 + {0x38, 0x54, 0x54, 0x54, 0x18}, // e 0x65 + {0x08, 0x7E, 0x09, 0x01, 0x02}, // f 0x66 + {0x08, 0x14, 0x54, 0x54, 0x3C}, // g 0x67 + {0x7F, 0x08, 0x04, 0x04, 0x78}, // h 0x68 + {0x00, 0x44, 0x7D, 0x40, 0x00}, // i 0x69 + {0x20, 0x40, 0x44, 0x3D, 0x00}, // j 0x6A + {0x00, 0x7F, 0x10, 0x28, 0x44}, // k 0x6B + {0x00, 0x41, 0x7F, 0x40, 0x00}, // l 0x6C + {0x7C, 0x04, 0x18, 0x04, 0x78}, // m 0x6D + {0x7C, 0x08, 0x04, 0x04, 0x78}, // n 0x6E + {0x38, 0x44, 0x44, 0x44, 0x38}, // o 0x6F + {0x7C, 0x14, 0x14, 0x14, 0x08}, // p 0x70 + {0x08, 0x14, 0x14, 0x18, 0x7C}, // q 0x71 + {0x7C, 0x08, 0x04, 0x04, 0x08}, // r 0x72 + {0x48, 0x54, 0x54, 0x54, 0x20}, // s 0x73 + {0x04, 0x3F, 0x44, 0x40, 0x20}, // t 0x74 + {0x3C, 0x40, 0x40, 0x20, 0x7C}, // u 0x75 + {0x1C, 0x20, 0x40, 0x20, 0x1C}, // v 0x76 + {0x3C, 0x40, 0x30, 0x40, 0x3C}, // w 0x77 + {0x44, 0x28, 0x10, 0x28, 0x44}, // x 0x78 + {0x0C, 0x50, 0x50, 0x50, 0x3C}, // y 0x79 + {0x44, 0x64, 0x54, 0x4C, 0x44}, // z 0x7A + {0x00, 0x08, 0x36, 0x41, 0x00}, // { 0x7B + {0x00, 0x00, 0x7F, 0x00, 0x00}, // | 0x7C + {0x00, 0x41, 0x36, 0x08, 0x00}, // } 0x7D + {0x08, 0x08, 0x2A, 0x1C, 0x08}, // -> 0x7E + {0x08, 0x1C, 0x2A, 0x08, 0x08} // <- 0x7F }; //-------------------------------------------------------------------------------------------------------------------------------------------- machine_config_constructor esq2x16_sq1_t::device_mconfig_additions() const @@ -174,11 +174,11 @@ void esq2x16_sq1_t::write_char(int data) // Non-ASCII codes that needs to be treated as ASCII characters if ( - data == 0x08 || - data == 0x09 || - data == 0x0A || - data == 0x0B || - data == 0x0C + data == 0x08 || + data == 0x09 || + data == 0x0A || + data == 0x0B || + data == 0x0C ) data = '^'; // musical notes // Resolve here 2-Bytes commands: the command was saved previously @@ -221,14 +221,14 @@ void esq2x16_sq1_t::write_char(int data) case 0x8E: case 0x8F: // LED OFF, ON, BLINK - LedState = m_LcdCommand & 0x03; + LedState = m_LcdCommand & 0x03; if ( - DisplayCode >= 16 || // Out of bounds - DisplayCode == 6 || // non-existent - DisplayCode == 7 || // non-existent - DisplayCode == 14 || // non-existent - DisplayCode == 15 // non-existent - ) + DisplayCode >= 16 || // Out of bounds + DisplayCode == 6 || // non-existent + DisplayCode == 7 || // non-existent + DisplayCode == 14 || // non-existent + DisplayCode == 15 // non-existent + ) { #ifdef VERBOSE printf("LCD %02X: Led %02d does'nt exist - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage); @@ -236,11 +236,11 @@ void esq2x16_sq1_t::write_char(int data) } else { - if (m_leds[DisplayCode] != LedState) + if (m_leds[DisplayCode] != LedState) { m_leds[DisplayCode] = LedState; - m_ledsDirty[DisplayCode] = 1; - } + m_ledsDirty[DisplayCode] = 1; + } update_display(); } m_LcdCommand = 0; @@ -255,26 +255,26 @@ void esq2x16_sq1_t::write_char(int data) return; break; } - + if ((data >= 0x20) && (data <= 0x7f)) { #ifdef VERBOSE printf("LCD %02X: \"%c\" - pos=%02X (%d)\n", DisplayCode, data, m_lcdPos, m_lcdPage); #endif m_lcdpg[m_lcdPage][m_lcdPos++] = DisplayCode; - if (m_lcdPos > 31) m_lcdPos = 31; + if (m_lcdPos > 31) m_lcdPos = 31; update_display(); return; } - + if (DisplayCode >= 0x80) { switch (DisplayCode) { // Known 2-bytes command - case 0x87: // Go To - case 0x88: // Save Cursor Position - case 0x89: // Restore Cursor Position + case 0x87: // Go To + case 0x88: // Save Cursor Position + case 0x89: // Restore Cursor Position // Save the command for the next byte m_LcdCommand = DisplayCode; return; @@ -354,19 +354,19 @@ void esq2x16_sq1_t::update_display() for (int led = 0; led < 16; led++) { if (m_ledsDirty[led]) { - machine().output().set_indexed_value("rLed_", led, m_leds[led]); - m_ledsDirty[led] = 0; - } + machine().output().set_indexed_value("rLed_", led, m_leds[led]); + m_ledsDirty[led] = 0; + } } for (int page = 0; page < 4; page++) { for (int pos = 0; pos < 32; pos++) { - // stealed from tecnbras.cpp and modified + // stealed from tecnbras.cpp and modified for (int rr=0; rr<7; rr++) { lcdCharRow = RotateLcdChar(m_lcdpg[page][pos],rr); - machine().output().set_indexed_value("pg_", (page+1)*1000 + pos*7 + rr, 0x1F & lcdCharRow); + machine().output().set_indexed_value("pg_", (page+1)*1000 + pos*7 + rr, 0x1F & lcdCharRow); } } } @@ -377,7 +377,7 @@ void esq2x16_sq1_t::device_reset() //lcd_reset(); m_lcdPage = m_lcdSavedPos = m_lcdPos = m_LcdCommand = 0; memset(m_leds, 0, sizeof(m_leds)); - memset(m_lcdpg, 1, sizeof(m_lcdpg)); // Set to 1 for debug: to see what "pages" are set to 0 from the firmware + memset(m_lcdpg, 1, sizeof(m_lcdpg)); // Set to 1 for debug: to see what "pages" are set to 0 from the firmware } //-------------------------------------------------------------------------------------------------------------------------------------------- void esq2x16_sq1_t::lcd_reset() diff --git a/src/mame/machine/gaelco2.cpp b/src/mame/machine/gaelco2.cpp index 0ac284242d7..099520b2813 100644 --- a/src/mame/machine/gaelco2.cpp +++ b/src/mame/machine/gaelco2.cpp @@ -291,7 +291,7 @@ static UINT32 rol(UINT32 x, unsigned int c) { return (x << c) | (x >> (32 - c)); } - + static UINT16 get_lo(UINT32 x) { return ((x & 0x00000010) << 1) | @@ -308,7 +308,7 @@ static UINT16 get_lo(UINT32 x) ((x & 0x00044000) >> 5) | ((x & 0x00000020) >> 1); } - + static UINT16 get_hi(UINT32 x) { return ((x & 0x00001400) >> 0) | @@ -327,7 +327,7 @@ static UINT16 get_hi(UINT32 x) ((x & 0x00000080) >> 4) | ((x & 0x00000100) >> 1); } - + static UINT16 get_out(UINT16 x) { return ((x & 0xc840) << 0) | @@ -343,7 +343,7 @@ static UINT16 get_out(UINT16 x) ((x & 0x2000) >> 6) | ((x & 0x0020) >> 2); } - + UINT16 mangle(UINT32 x) { UINT16 a = get_lo(x); diff --git a/src/mame/machine/pc9801_kbd.h b/src/mame/machine/pc9801_kbd.h index e776e2b238e..6de22f9fe94 100644 --- a/src/mame/machine/pc9801_kbd.h +++ b/src/mame/machine/pc9801_kbd.h @@ -55,7 +55,7 @@ protected: UINT8 m_rx_buf[0x80]; UINT8 m_keyb_tx; UINT8 m_keyb_rx; - bool m_key_avail; + bool m_key_avail; }; diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 8c60a20d60a..999a086d466 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -422,7 +422,7 @@ WRITE8_MEMBER( trs80_state::trs80m4_e9_w ) EEh 9600 FFh 19200 Note: this may be a COM5016 dual baud rate generator, or may be an equivalent circuit embedded in the gate array ASIC on the trs80 model 4 - */ + */ static const int baud_clock[]={ 800, 1200, 1760, 2152, 2400, 4800, 9600, 19200, 28800, 32000, 38400, 57600, 76800, 115200, 153600, 307200 }; m_ay31015->set_receiver_clock(baud_clock[data & 0x0f]); diff --git a/src/mame/video/galpanic.cpp b/src/mame/video/galpanic.cpp index cf33cb88bdd..94e23bfe38f 100644 --- a/src/mame/video/galpanic.cpp +++ b/src/mame/video/galpanic.cpp @@ -8,7 +8,7 @@ void galpanic_state::video_start() { m_screen->register_screen_bitmap(m_bitmap); - + save_item(NAME(m_bitmap)); } diff --git a/src/mame/video/megasys1.cpp b/src/mame/video/megasys1.cpp index 7e04cec112d..f140b29d717 100644 --- a/src/mame/video/megasys1.cpp +++ b/src/mame/video/megasys1.cpp @@ -893,7 +893,7 @@ void megasys1_state::megasys1_priority_create() { const UINT8 *color_prom = memregion("proms")->base(); int pri_code, offset, i, order; - + /* convert PROM to something we can use */ for (pri_code = 0; pri_code < 0x10 ; pri_code++) // 16 priority codes diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp index 29b77cd52e5..2894092ac30 100644 --- a/src/osd/modules/osdwindow.cpp +++ b/src/osd/modules/osdwindow.cpp @@ -60,4 +60,4 @@ osd_renderer* osd_renderer::make_for_type(int mode, osd_window* window, int extr default: return nullptr; } -}
\ No newline at end of file +} diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h index 5d9d7977968..6081d47c010 100644 --- a/src/osd/modules/osdwindow.h +++ b/src/osd/modules/osdwindow.h @@ -192,8 +192,8 @@ public: render_primitive_list *m_primlist; osd_window_config m_win_config; - int m_index; - osd_window *m_main; + int m_index; + osd_window *m_main; protected: int m_prescale; }; @@ -241,11 +241,11 @@ public: protected: /* Internal flags */ static const int FI_CHANGED = 0x010000; - bool m_sliders_dirty; + bool m_sliders_dirty; private: - osd_window *m_window; - int m_flags; + osd_window *m_window; + int m_flags; }; diff --git a/src/osd/modules/render/bgfx/blendreader.cpp b/src/osd/modules/render/bgfx/blendreader.cpp index 45020a08027..f96f20a4ba8 100644 --- a/src/osd/modules/render/bgfx/blendreader.cpp +++ b/src/osd/modules/render/bgfx/blendreader.cpp @@ -11,41 +11,41 @@ #include "blendreader.h" const blend_reader::string_to_enum blend_reader::EQUATION_NAMES[blend_reader::EQUATION_COUNT] = { - { "add", BGFX_STATE_BLEND_EQUATION_ADD }, - { "sub", BGFX_STATE_BLEND_EQUATION_SUB }, - { "subtract", BGFX_STATE_BLEND_EQUATION_SUB }, - { "revSub", BGFX_STATE_BLEND_EQUATION_REVSUB }, - { "revSubtract", BGFX_STATE_BLEND_EQUATION_REVSUB }, - { "min", BGFX_STATE_BLEND_EQUATION_MIN }, - { "max", BGFX_STATE_BLEND_EQUATION_MAX } + { "add", BGFX_STATE_BLEND_EQUATION_ADD }, + { "sub", BGFX_STATE_BLEND_EQUATION_SUB }, + { "subtract", BGFX_STATE_BLEND_EQUATION_SUB }, + { "revSub", BGFX_STATE_BLEND_EQUATION_REVSUB }, + { "revSubtract", BGFX_STATE_BLEND_EQUATION_REVSUB }, + { "min", BGFX_STATE_BLEND_EQUATION_MIN }, + { "max", BGFX_STATE_BLEND_EQUATION_MAX } }; const blend_reader::string_to_enum blend_reader::FUNCTION_NAMES[blend_reader::FUNCTION_COUNT] = { - { "0", BGFX_STATE_BLEND_ZERO }, - { "zero", BGFX_STATE_BLEND_ZERO }, - { "1", BGFX_STATE_BLEND_ONE }, - { "one", BGFX_STATE_BLEND_ONE }, - { "srcColor", BGFX_STATE_BLEND_SRC_COLOR }, - { "1-srcColor", BGFX_STATE_BLEND_INV_SRC_COLOR }, - { "invSrcColor", BGFX_STATE_BLEND_INV_SRC_COLOR }, - { "dstColor", BGFX_STATE_BLEND_DST_COLOR }, - { "1-dstColor", BGFX_STATE_BLEND_INV_DST_COLOR }, - { "invDstColor", BGFX_STATE_BLEND_INV_DST_COLOR }, - { "srcAlpha", BGFX_STATE_BLEND_SRC_ALPHA }, - { "1-srcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA }, - { "invSrcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA }, - { "dstAlpha", BGFX_STATE_BLEND_DST_ALPHA }, - { "1-dstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA }, - { "invDstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA } + { "0", BGFX_STATE_BLEND_ZERO }, + { "zero", BGFX_STATE_BLEND_ZERO }, + { "1", BGFX_STATE_BLEND_ONE }, + { "one", BGFX_STATE_BLEND_ONE }, + { "srcColor", BGFX_STATE_BLEND_SRC_COLOR }, + { "1-srcColor", BGFX_STATE_BLEND_INV_SRC_COLOR }, + { "invSrcColor", BGFX_STATE_BLEND_INV_SRC_COLOR }, + { "dstColor", BGFX_STATE_BLEND_DST_COLOR }, + { "1-dstColor", BGFX_STATE_BLEND_INV_DST_COLOR }, + { "invDstColor", BGFX_STATE_BLEND_INV_DST_COLOR }, + { "srcAlpha", BGFX_STATE_BLEND_SRC_ALPHA }, + { "1-srcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA }, + { "invSrcAlpha", BGFX_STATE_BLEND_INV_SRC_ALPHA }, + { "dstAlpha", BGFX_STATE_BLEND_DST_ALPHA }, + { "1-dstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA }, + { "invDstAlpha", BGFX_STATE_BLEND_INV_DST_ALPHA } }; uint64_t blend_reader::read_from_value(const Value& value) { - uint64_t equation = get_enum_from_value(value, "equation", BGFX_STATE_BLEND_EQUATION_ADD, EQUATION_NAMES, EQUATION_COUNT); - uint64_t srccolor = get_enum_from_value(value, "srcColor", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT); - uint64_t dstcolor = get_enum_from_value(value, "dstColor", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT); - uint64_t srcalpha = get_enum_from_value(value, "srcAlpha", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT); - uint64_t dstalpha = get_enum_from_value(value, "dstAlpha", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT); + uint64_t equation = get_enum_from_value(value, "equation", BGFX_STATE_BLEND_EQUATION_ADD, EQUATION_NAMES, EQUATION_COUNT); + uint64_t srccolor = get_enum_from_value(value, "srcColor", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT); + uint64_t dstcolor = get_enum_from_value(value, "dstColor", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT); + uint64_t srcalpha = get_enum_from_value(value, "srcAlpha", BGFX_STATE_BLEND_ONE, FUNCTION_NAMES, FUNCTION_COUNT); + uint64_t dstalpha = get_enum_from_value(value, "dstAlpha", BGFX_STATE_BLEND_ZERO, FUNCTION_NAMES, FUNCTION_COUNT); - return BGFX_STATE_BLEND_EQUATION(equation) | BGFX_STATE_BLEND_FUNC_SEPARATE(srccolor, dstcolor, srcalpha, dstalpha); + return BGFX_STATE_BLEND_EQUATION(equation) | BGFX_STATE_BLEND_FUNC_SEPARATE(srccolor, dstcolor, srcalpha, dstalpha); } diff --git a/src/osd/modules/render/bgfx/blendreader.h b/src/osd/modules/render/bgfx/blendreader.h index 6dd16ae5d88..732ab47b1da 100644 --- a/src/osd/modules/render/bgfx/blendreader.h +++ b/src/osd/modules/render/bgfx/blendreader.h @@ -19,13 +19,13 @@ using namespace rapidjson; class blend_reader : public state_reader { public: - static uint64_t read_from_value(const Value& value); + static uint64_t read_from_value(const Value& value); private: - static const int EQUATION_COUNT = 7; - static const string_to_enum EQUATION_NAMES[EQUATION_COUNT]; - static const int FUNCTION_COUNT = 16; - static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT]; + static const int EQUATION_COUNT = 7; + static const string_to_enum EQUATION_NAMES[EQUATION_COUNT]; + static const int FUNCTION_COUNT = 16; + static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT]; }; -#endif // __DRAWBGFX_BLEND_READER__
\ No newline at end of file +#endif // __DRAWBGFX_BLEND_READER__ diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h index c34b1830681..7721bbaf74b 100644 --- a/src/osd/modules/render/bgfx/chain.h +++ b/src/osd/modules/render/bgfx/chain.h @@ -22,17 +22,17 @@ class render_primitive; class bgfx_chain { public: - bgfx_chain(std::string name, std::string author, std::vector<bgfx_slider*> sliders, std::vector<bgfx_parameter*> params, std::vector<bgfx_chain_entry*> entries); - ~bgfx_chain(); + bgfx_chain(std::string name, std::string author, std::vector<bgfx_slider*> sliders, std::vector<bgfx_parameter*> params, std::vector<bgfx_chain_entry*> entries); + ~bgfx_chain(); - void submit(render_primitive* prim, int view); + void submit(render_primitive* prim, int view); private: - std::string m_name; - std::string m_author; - std::vector<bgfx_slider*> m_sliders; - std::vector<bgfx_parameter*> m_params; - std::vector<bgfx_chain_entry*> m_entries; + std::string m_name; + std::string m_author; + std::vector<bgfx_slider*> m_sliders; + std::vector<bgfx_parameter*> m_params; + std::vector<bgfx_chain_entry*> m_entries; }; -#endif // __DRAWBGFX_CHAIN__
\ No newline at end of file +#endif // __DRAWBGFX_CHAIN__ diff --git a/src/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h index d607dd4ec7d..83a615d28a5 100644 --- a/src/osd/modules/render/bgfx/chainentry.h +++ b/src/osd/modules/render/bgfx/chainentry.h @@ -27,19 +27,19 @@ class bgfx_target; class bgfx_chain_entry { public: - bgfx_chain_entry(std::string name, bgfx_effect* effect, std::vector<bgfx_input_pair>& inputs, bgfx_target* output); - ~bgfx_chain_entry(); + bgfx_chain_entry(std::string name, bgfx_effect* effect, std::vector<bgfx_input_pair>& inputs, bgfx_target* output); + ~bgfx_chain_entry(); - void submit(render_primitive* prim, int view); + void submit(render_primitive* prim, int view); - // Getters - std::string name() const { return m_name; } + // Getters + std::string name() const { return m_name; } private: - std::string m_name; - bgfx_effect* m_effect; - std::vector<bgfx_input_pair> m_inputs; - bgfx_target* m_output; + std::string m_name; + bgfx_effect* m_effect; + std::vector<bgfx_input_pair> m_inputs; + bgfx_target* m_output; }; -#endif // __DRAWBGFX_CHAIN_ENTRY__
\ No newline at end of file +#endif // __DRAWBGFX_CHAIN_ENTRY__ diff --git a/src/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp index 39338359e81..ef9322782ee 100644 --- a/src/osd/modules/render/bgfx/chainentryreader.cpp +++ b/src/osd/modules/render/bgfx/chainentryreader.cpp @@ -20,7 +20,7 @@ bgfx_chain_entry* chain_entry_reader::read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects) { - validate_parameters(value); + validate_parameters(value); bgfx_effect* effect = effects.effect(value["effect"].GetString()); @@ -53,4 +53,4 @@ void chain_entry_reader::validate_parameters(const Value& value) assert(value["shader"].IsString()); assert(value.HasMember("output")); assert(value["output"].IsString()); -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/chainentryreader.h b/src/osd/modules/render/bgfx/chainentryreader.h index 8aeb1b402de..09001a6ea70 100644 --- a/src/osd/modules/render/bgfx/chainentryreader.h +++ b/src/osd/modules/render/bgfx/chainentryreader.h @@ -21,10 +21,10 @@ class effect_manager; class chain_entry_reader : public state_reader { public: - static bgfx_chain_entry* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects); + static bgfx_chain_entry* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects); private: - static void validate_parameters(const Value& value); + static void validate_parameters(const Value& value); }; -#endif // __DRAWBGFX_CHAIN_ENTRY_READER__
\ No newline at end of file +#endif // __DRAWBGFX_CHAIN_ENTRY_READER__ diff --git a/src/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp index 8a69e007872..2498e8206b6 100644 --- a/src/osd/modules/render/bgfx/chainreader.cpp +++ b/src/osd/modules/render/bgfx/chainreader.cpp @@ -20,7 +20,7 @@ bgfx_chain* chain_reader::read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height) { - validate_parameters(value); + validate_parameters(value); std::string name = value["name"].GetString(); std::string author = value["author"].GetString(); @@ -92,4 +92,4 @@ void chain_reader::validate_parameters(const Value& value) assert(value.HasMember("author")); assert(value["author"].IsString()); assert(value.HasMember("passes")); -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/chainreader.h b/src/osd/modules/render/bgfx/chainreader.h index 6e803516189..fb5dccf0d1c 100644 --- a/src/osd/modules/render/bgfx/chainreader.h +++ b/src/osd/modules/render/bgfx/chainreader.h @@ -21,10 +21,10 @@ class effect_manager; class chain_reader : public state_reader { public: - static bgfx_chain* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height); + static bgfx_chain* read_from_value(const Value& value, texture_manager& textures, target_manager& targets, effect_manager& effects, uint32_t screen_width, uint32_t screen_height); private: - static void validate_parameters(const Value& value); + static void validate_parameters(const Value& value); }; -#endif // __DRAWBGFX_CHAIN_READER__
\ No newline at end of file +#endif // __DRAWBGFX_CHAIN_READER__ diff --git a/src/osd/modules/render/bgfx/cullreader.cpp b/src/osd/modules/render/bgfx/cullreader.cpp index 0890d731583..593e712fecb 100644 --- a/src/osd/modules/render/bgfx/cullreader.cpp +++ b/src/osd/modules/render/bgfx/cullreader.cpp @@ -11,12 +11,12 @@ #include "cullreader.h" const cull_reader::string_to_enum cull_reader::MODE_NAMES[cull_reader::MODE_COUNT] = { - { "none", 0 }, - { "cw", BGFX_STATE_CULL_CW }, - { "ccw", BGFX_STATE_CULL_CCW } + { "none", 0 }, + { "cw", BGFX_STATE_CULL_CW }, + { "ccw", BGFX_STATE_CULL_CCW } }; uint64_t cull_reader::read_from_value(const Value& value) { - return get_enum_from_value(value, "mode", BGFX_STATE_CULL_CCW, MODE_NAMES, MODE_COUNT); + return get_enum_from_value(value, "mode", BGFX_STATE_CULL_CCW, MODE_NAMES, MODE_COUNT); } diff --git a/src/osd/modules/render/bgfx/cullreader.h b/src/osd/modules/render/bgfx/cullreader.h index 432ed494cf2..5c521a108a2 100644 --- a/src/osd/modules/render/bgfx/cullreader.h +++ b/src/osd/modules/render/bgfx/cullreader.h @@ -15,11 +15,11 @@ class cull_reader : public state_reader { public: - static uint64_t read_from_value(const Value& value); + static uint64_t read_from_value(const Value& value); private: - static const int MODE_COUNT = 3; - static const string_to_enum MODE_NAMES[MODE_COUNT]; + static const int MODE_COUNT = 3; + static const string_to_enum MODE_NAMES[MODE_COUNT]; }; -#endif // __DRAWBGFX_CULL_READER__
\ No newline at end of file +#endif // __DRAWBGFX_CULL_READER__ diff --git a/src/osd/modules/render/bgfx/depthreader.cpp b/src/osd/modules/render/bgfx/depthreader.cpp index 077137159fe..cdcfa1b2046 100644 --- a/src/osd/modules/render/bgfx/depthreader.cpp +++ b/src/osd/modules/render/bgfx/depthreader.cpp @@ -11,26 +11,26 @@ #include "depthreader.h" const depth_reader::string_to_enum depth_reader::FUNCTION_NAMES[depth_reader::FUNCTION_COUNT] = { - { "never", BGFX_STATE_DEPTH_TEST_NEVER }, - { "less", BGFX_STATE_DEPTH_TEST_LESS }, - { "equal", BGFX_STATE_DEPTH_TEST_EQUAL }, - { "lequal", BGFX_STATE_DEPTH_TEST_LEQUAL }, - { "greater", BGFX_STATE_DEPTH_TEST_GREATER }, - { "notequal", BGFX_STATE_DEPTH_TEST_NOTEQUAL }, - { "gequal", BGFX_STATE_DEPTH_TEST_GEQUAL }, - { "always", BGFX_STATE_DEPTH_TEST_ALWAYS } + { "never", BGFX_STATE_DEPTH_TEST_NEVER }, + { "less", BGFX_STATE_DEPTH_TEST_LESS }, + { "equal", BGFX_STATE_DEPTH_TEST_EQUAL }, + { "lequal", BGFX_STATE_DEPTH_TEST_LEQUAL }, + { "greater", BGFX_STATE_DEPTH_TEST_GREATER }, + { "notequal", BGFX_STATE_DEPTH_TEST_NOTEQUAL }, + { "gequal", BGFX_STATE_DEPTH_TEST_GEQUAL }, + { "always", BGFX_STATE_DEPTH_TEST_ALWAYS } }; uint64_t depth_reader::read_from_value(const Value& value) { - uint64_t write_enable = 0; - if (value.HasMember("writeEnable")) - { - assert(value["writeEnable"].IsBool()); - write_enable = value["writeEnable"].GetBool() ? BGFX_STATE_DEPTH_WRITE: 0; - } + uint64_t write_enable = 0; + if (value.HasMember("writeEnable")) + { + assert(value["writeEnable"].IsBool()); + write_enable = value["writeEnable"].GetBool() ? BGFX_STATE_DEPTH_WRITE: 0; + } - uint64_t function = get_enum_from_value(value, "function", BGFX_STATE_DEPTH_TEST_ALWAYS, FUNCTION_NAMES, FUNCTION_COUNT); + uint64_t function = get_enum_from_value(value, "function", BGFX_STATE_DEPTH_TEST_ALWAYS, FUNCTION_NAMES, FUNCTION_COUNT); - return write_enable | function; + return write_enable | function; } diff --git a/src/osd/modules/render/bgfx/depthreader.h b/src/osd/modules/render/bgfx/depthreader.h index 5b2fc4e374c..761a1653323 100644 --- a/src/osd/modules/render/bgfx/depthreader.h +++ b/src/osd/modules/render/bgfx/depthreader.h @@ -15,11 +15,11 @@ class depth_reader : public state_reader { public: - static uint64_t read_from_value(const Value& value); + static uint64_t read_from_value(const Value& value); private: - static const int FUNCTION_COUNT = 8; - static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT]; + static const int FUNCTION_COUNT = 8; + static const string_to_enum FUNCTION_NAMES[FUNCTION_COUNT]; }; -#endif // __DRAWBGFX_DEPTH_READER__
\ No newline at end of file +#endif // __DRAWBGFX_DEPTH_READER__ diff --git a/src/osd/modules/render/bgfx/effect.cpp b/src/osd/modules/render/bgfx/effect.cpp index bf6ccb963c5..98bf317a50c 100644 --- a/src/osd/modules/render/bgfx/effect.cpp +++ b/src/osd/modules/render/bgfx/effect.cpp @@ -9,24 +9,24 @@ #include "effect.h" bgfx_effect::bgfx_effect(uint64_t state, bgfx::ShaderHandle vertex_shader, bgfx::ShaderHandle fragment_shader, std::vector<bgfx_uniform*> uniforms) - : m_state(state) + : m_state(state) { - m_program_handle = bgfx::createProgram(vertex_shader, fragment_shader, false); + m_program_handle = bgfx::createProgram(vertex_shader, fragment_shader, false); - for (int i = 0; i < uniforms.size(); i++) - { - m_uniforms[uniforms[i]->name()] = uniforms[i]; - } + for (int i = 0; i < uniforms.size(); i++) + { + m_uniforms[uniforms[i]->name()] = uniforms[i]; + } } bgfx_effect::~bgfx_effect() { - for (std::pair<std::string, bgfx_uniform*> uniform : m_uniforms) - { - delete uniform.second; - } - m_uniforms.clear(); - bgfx::destroyProgram(m_program_handle); + for (std::pair<std::string, bgfx_uniform*> uniform : m_uniforms) + { + delete uniform.second; + } + m_uniforms.clear(); + bgfx::destroyProgram(m_program_handle); } void bgfx_effect::submit(int view) @@ -35,18 +35,18 @@ void bgfx_effect::submit(int view) { (uniform_pair.second)->upload(); } - bgfx::setState(m_state); - bgfx::submit(view, m_program_handle); + bgfx::setState(m_state); + bgfx::submit(view, m_program_handle); } bgfx_uniform* bgfx_effect::uniform(std::string name) { - std::map<std::string, bgfx_uniform*>::iterator iter = m_uniforms.find(name); + std::map<std::string, bgfx_uniform*>::iterator iter = m_uniforms.find(name); - if (iter != m_uniforms.end()) - { - return iter->second; - } + if (iter != m_uniforms.end()) + { + return iter->second; + } - return nullptr; -}
\ No newline at end of file + return nullptr; +} diff --git a/src/osd/modules/render/bgfx/effect.h b/src/osd/modules/render/bgfx/effect.h index e87f418022e..2bbc4b8fda9 100644 --- a/src/osd/modules/render/bgfx/effect.h +++ b/src/osd/modules/render/bgfx/effect.h @@ -22,19 +22,19 @@ class bgfx_effect { public: - bgfx_effect(uint64_t state, bgfx::ShaderHandle vertexShader, bgfx::ShaderHandle fragmentShader, std::vector<bgfx_uniform*> uniforms); - ~bgfx_effect(); + bgfx_effect(uint64_t state, bgfx::ShaderHandle vertexShader, bgfx::ShaderHandle fragmentShader, std::vector<bgfx_uniform*> uniforms); + ~bgfx_effect(); - void submit(int view); + void submit(int view); - // Getters - bgfx_uniform* uniform(std::string name); - bgfx::ProgramHandle get_program() const { return m_program_handle; } + // Getters + bgfx_uniform* uniform(std::string name); + bgfx::ProgramHandle get_program() const { return m_program_handle; } private: - uint64_t m_state; - bgfx::ProgramHandle m_program_handle; - std::map<std::string, bgfx_uniform*> m_uniforms; + uint64_t m_state; + bgfx::ProgramHandle m_program_handle; + std::map<std::string, bgfx_uniform*> m_uniforms; }; -#endif // __DRAWBGFX_EFFECT__
\ No newline at end of file +#endif // __DRAWBGFX_EFFECT__ diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp index ea35020ad85..dc2550354f2 100644 --- a/src/osd/modules/render/bgfx/effectmanager.cpp +++ b/src/osd/modules/render/bgfx/effectmanager.cpp @@ -25,22 +25,22 @@ using namespace rapidjson; effect_manager::~effect_manager() { - for (std::pair<std::string, bgfx_effect*> effect : m_effects) - { + for (std::pair<std::string, bgfx_effect*> effect : m_effects) + { delete effect.second; - } - m_effects.clear(); + } + m_effects.clear(); } bgfx_effect* effect_manager::effect(std::string name) { - std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name); - if (iter != m_effects.end()) - { - return iter->second; - } + std::map<std::string, bgfx_effect*>::iterator iter = m_effects.find(name); + if (iter != m_effects.end()) + { + return iter->second; + } - return load_effect(name); + return load_effect(name); } bgfx_effect* effect_manager::load_effect(std::string name) { @@ -60,7 +60,7 @@ bgfx_effect* effect_manager::load_effect(std::string name) { document.Parse<0>(data); bgfx_effect* effect = effect_reader::read_from_value(m_shaders, document); - m_effects[name] = effect; + m_effects[name] = effect; - return effect; + return effect; } diff --git a/src/osd/modules/render/bgfx/effectmanager.h b/src/osd/modules/render/bgfx/effectmanager.h index e86b24669ad..e3d1666d26e 100644 --- a/src/osd/modules/render/bgfx/effectmanager.h +++ b/src/osd/modules/render/bgfx/effectmanager.h @@ -25,17 +25,17 @@ class bgfx_effect; class effect_manager { public: - effect_manager(shader_manager& shaders) : m_shaders(shaders) { } - ~effect_manager(); + effect_manager(shader_manager& shaders) : m_shaders(shaders) { } + ~effect_manager(); - // Getters - bgfx_effect* effect(std::string name); + // Getters + bgfx_effect* effect(std::string name); private: - bgfx_effect* load_effect(std::string name); + bgfx_effect* load_effect(std::string name); - shader_manager& m_shaders; - std::map<std::string, bgfx_effect*> m_effects; + shader_manager& m_shaders; + std::map<std::string, bgfx_effect*> m_effects; }; -#endif // __DRAWBGFX_EFFECT_MANAGER__
\ No newline at end of file +#endif // __DRAWBGFX_EFFECT_MANAGER__ diff --git a/src/osd/modules/render/bgfx/effectreader.cpp b/src/osd/modules/render/bgfx/effectreader.cpp index 978c004337f..63a6a925a64 100644 --- a/src/osd/modules/render/bgfx/effectreader.cpp +++ b/src/osd/modules/render/bgfx/effectreader.cpp @@ -24,54 +24,54 @@ bgfx_effect* effect_reader::read_from_value(shader_manager& shaders, const Value& value) { - validate_parameters(value); + validate_parameters(value); - uint64_t blend = blend_reader::read_from_value(value["blend"]); - uint64_t depth = depth_reader::read_from_value(value["depth"]); - uint64_t cull = cull_reader::read_from_value(value["cull"]); - uint64_t write = write_reader::read_from_value(value["write"]); + uint64_t blend = blend_reader::read_from_value(value["blend"]); + uint64_t depth = depth_reader::read_from_value(value["depth"]); + uint64_t cull = cull_reader::read_from_value(value["cull"]); + uint64_t write = write_reader::read_from_value(value["write"]); - std::vector<bgfx_uniform*> uniforms; - const Value& uniform_array = value["uniforms"]; - for (UINT32 i = 0; i < uniform_array.Size(); i++) - { - uniforms.push_back(uniform_reader::read_from_value(uniform_array[i])); - } + std::vector<bgfx_uniform*> uniforms; + const Value& uniform_array = value["uniforms"]; + for (UINT32 i = 0; i < uniform_array.Size(); i++) + { + uniforms.push_back(uniform_reader::read_from_value(uniform_array[i])); + } - std::string vertex_name(value["vertex"].GetString()); + std::string vertex_name(value["vertex"].GetString()); bgfx::ShaderHandle vertex_shader = shaders.shader(vertex_name); std::string fragment_name(""); if (value.HasMember("fragment")) { - fragment_name = value["fragment"].GetString(); + fragment_name = value["fragment"].GetString(); } else if (value.HasMember("pixel")) { - fragment_name = value["pixel"].GetString(); + fragment_name = value["pixel"].GetString(); } bgfx::ShaderHandle fragment_shader = shaders.shader(fragment_name); - return new bgfx_effect(blend | depth | cull | write, vertex_shader, fragment_shader, uniforms); + return new bgfx_effect(blend | depth | cull | write, vertex_shader, fragment_shader, uniforms); } void effect_reader::validate_parameters(const Value& value) { - assert(value.HasMember("blend")); - assert(value.HasMember("depth")); - assert(value.HasMember("cull")); - assert(value.HasMember("write")); - assert(value.HasMember("vertex")); - assert(value["vertex"].IsString()); - assert(value.HasMember("fragment") || value.HasMember("pixel")); - if (value.HasMember("fragment")) - { - assert(value["fragment"].IsString()); + assert(value.HasMember("blend")); + assert(value.HasMember("depth")); + assert(value.HasMember("cull")); + assert(value.HasMember("write")); + assert(value.HasMember("vertex")); + assert(value["vertex"].IsString()); + assert(value.HasMember("fragment") || value.HasMember("pixel")); + if (value.HasMember("fragment")) + { + assert(value["fragment"].IsString()); } - if (value.HasMember("pixel")) - { - assert(value["pixel"].IsString()); + if (value.HasMember("pixel")) + { + assert(value["pixel"].IsString()); } - assert(value.HasMember("uniforms")); - assert(value["uniforms"].IsArray()); -}
\ No newline at end of file + assert(value.HasMember("uniforms")); + assert(value["uniforms"].IsArray()); +} diff --git a/src/osd/modules/render/bgfx/effectreader.h b/src/osd/modules/render/bgfx/effectreader.h index cc0c3ea69e5..a48500131e0 100644 --- a/src/osd/modules/render/bgfx/effectreader.h +++ b/src/osd/modules/render/bgfx/effectreader.h @@ -19,10 +19,10 @@ class shader_manager; class effect_reader : public state_reader { public: - static bgfx_effect* read_from_value(shader_manager& shaders, const Value& value); + static bgfx_effect* read_from_value(shader_manager& shaders, const Value& value); private: - static void validate_parameters(const Value& value); + static void validate_parameters(const Value& value); }; -#endif // __DRAWBGFX_EFFECT_READER__
\ No newline at end of file +#endif // __DRAWBGFX_EFFECT_READER__ diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp index bcebb755ab6..e28372db3ce 100644 --- a/src/osd/modules/render/bgfx/inputpair.cpp +++ b/src/osd/modules/render/bgfx/inputpair.cpp @@ -23,4 +23,4 @@ bgfx_input_pair::bgfx_input_pair(int index, std::string sampler, bgfx_texture* t void bgfx_input_pair::bind(bgfx_effect *effect) { bgfx::setTexture(m_index, effect->uniform(m_sampler)->handle(), m_texture->handle()); -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h index 2cab7ff2363..196165c69f4 100644 --- a/src/osd/modules/render/bgfx/inputpair.h +++ b/src/osd/modules/render/bgfx/inputpair.h @@ -24,14 +24,14 @@ class bgfx_texture; class bgfx_input_pair { public: - bgfx_input_pair(int index, std::string sampler, bgfx_texture* texture); + bgfx_input_pair(int index, std::string sampler, bgfx_texture* texture); void bind(bgfx_effect *effect); private: - int m_index; - std::string m_sampler; - bgfx_texture* m_texture; + int m_index; + std::string m_sampler; + bgfx_texture* m_texture; }; -#endif // __DRAWBGFX_INPUT_PAIR__
\ No newline at end of file +#endif // __DRAWBGFX_INPUT_PAIR__ diff --git a/src/osd/modules/render/bgfx/parameter.h b/src/osd/modules/render/bgfx/parameter.h index 76defb439c4..b31b25d8a75 100644 --- a/src/osd/modules/render/bgfx/parameter.h +++ b/src/osd/modules/render/bgfx/parameter.h @@ -27,8 +27,8 @@ public: PARAM_FRAME_MASK }; - bgfx_parameter(std::string name, parameter_type type, int period); - ~bgfx_parameter(); + bgfx_parameter(std::string name, parameter_type type, int period); + ~bgfx_parameter(); void frame(); bool active(); @@ -40,4 +40,4 @@ private: UINT32 m_frame; }; -#endif // __DRAWBGFX_PARAMETER__
\ No newline at end of file +#endif // __DRAWBGFX_PARAMETER__ diff --git a/src/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp index f1391ec761e..39a995a1489 100644 --- a/src/osd/modules/render/bgfx/paramreader.cpp +++ b/src/osd/modules/render/bgfx/paramreader.cpp @@ -13,12 +13,12 @@ #include "parameter.h" const parameter_reader::string_to_enum parameter_reader::TYPE_NAMES[parameter_reader::TYPE_COUNT] = { - { "frame_mask", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK) } + { "frame_mask", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK) } }; bgfx_parameter* parameter_reader::read_from_value(const Value& value) { - validate_parameters(value); + validate_parameters(value); std::string name = value["name"].GetString(); bgfx_parameter::parameter_type type = bgfx_parameter::parameter_type(get_enum_from_value(value, "type", uint64_t(bgfx_parameter::parameter_type::PARAM_FRAME_MASK), TYPE_NAMES, TYPE_COUNT)); @@ -35,4 +35,4 @@ void parameter_reader::validate_parameters(const Value& value) assert(value["type"].IsString()); assert(value.HasMember("period")); assert(value["period"].IsDouble()); -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/paramreader.h b/src/osd/modules/render/bgfx/paramreader.h index 12df9185dfc..4b31db52528 100644 --- a/src/osd/modules/render/bgfx/paramreader.h +++ b/src/osd/modules/render/bgfx/paramreader.h @@ -18,13 +18,13 @@ class bgfx_parameter; class parameter_reader : public state_reader { public: - static bgfx_parameter* read_from_value(const Value& value); + static bgfx_parameter* read_from_value(const Value& value); private: - static void validate_parameters(const Value& value); + static void validate_parameters(const Value& value); - static const int TYPE_COUNT = 1; - static const string_to_enum TYPE_NAMES[TYPE_COUNT]; + static const int TYPE_COUNT = 1; + static const string_to_enum TYPE_NAMES[TYPE_COUNT]; }; -#endif // __DRAWBGFX_PARAM_READER__
\ No newline at end of file +#endif // __DRAWBGFX_PARAM_READER__ diff --git a/src/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp index 20821721ea8..f7e7b30e7ec 100644 --- a/src/osd/modules/render/bgfx/shadermanager.cpp +++ b/src/osd/modules/render/bgfx/shadermanager.cpp @@ -20,22 +20,22 @@ shader_manager::~shader_manager() { - for (std::pair<std::string, bgfx::ShaderHandle> shader : m_shaders) - { - bgfx::destroyShader(shader.second); - } - m_shaders.clear(); + for (std::pair<std::string, bgfx::ShaderHandle> shader : m_shaders) + { + bgfx::destroyShader(shader.second); + } + m_shaders.clear(); } bgfx::ShaderHandle shader_manager::shader(std::string name) { - std::map<std::string, bgfx::ShaderHandle>::iterator iter = m_shaders.find(name); - if (iter != m_shaders.end()) - { - return iter->second; - } + std::map<std::string, bgfx::ShaderHandle>::iterator iter = m_shaders.find(name); + if (iter != m_shaders.end()) + { + return iter->second; + } - return load_shader(name); + return load_shader(name); } bgfx::ShaderHandle shader_manager::load_shader(std::string name) { @@ -65,9 +65,9 @@ bgfx::ShaderHandle shader_manager::load_shader(std::string name) { bgfx::ShaderHandle handle = bgfx::createShader(load_mem(shader_path + name + ".bin")); - m_shaders[name] = handle; + m_shaders[name] = handle; - return handle; + return handle; } const bgfx::Memory* shader_manager::load_mem(std::string name) { diff --git a/src/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h index a3dbb425088..5cc971ca829 100644 --- a/src/osd/modules/render/bgfx/shadermanager.h +++ b/src/osd/modules/render/bgfx/shadermanager.h @@ -21,17 +21,17 @@ class shader_manager { public: - shader_manager() {} - ~shader_manager(); + shader_manager() {} + ~shader_manager(); - // Getters - bgfx::ShaderHandle shader(std::string name); + // Getters + bgfx::ShaderHandle shader(std::string name); private: - bgfx::ShaderHandle load_shader(std::string name); - static const bgfx::Memory* load_mem(std::string name); + bgfx::ShaderHandle load_shader(std::string name); + static const bgfx::Memory* load_mem(std::string name); - std::map<std::string, bgfx::ShaderHandle> m_shaders; + std::map<std::string, bgfx::ShaderHandle> m_shaders; }; -#endif // __DRAWBGFX_SHADER_MANAGER__
\ No newline at end of file +#endif // __DRAWBGFX_SHADER_MANAGER__ diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h index 6c3054d7cc2..efff831a4da 100644 --- a/src/osd/modules/render/bgfx/slider.h +++ b/src/osd/modules/render/bgfx/slider.h @@ -31,8 +31,8 @@ public: SLIDER_VEC2 }; - bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max); - ~bgfx_slider(); + bgfx_slider(slider_type type, std::string name, std::string description, void *defaults, void *min, void *max); + ~bgfx_slider(); static size_t size(slider_type type); static size_t storage_size(slider_type type); @@ -41,9 +41,9 @@ protected: slider_type m_type; std::string m_name; std::string m_description; - char* m_data; - char* m_min; - char* m_max; + char* m_data; + char* m_min; + char* m_max; }; -#endif // __DRAWBGFX_SLIDER__
\ No newline at end of file +#endif // __DRAWBGFX_SLIDER__ diff --git a/src/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp index 7bd2d8c59fa..2cd56d52457 100644 --- a/src/osd/modules/render/bgfx/sliderreader.cpp +++ b/src/osd/modules/render/bgfx/sliderreader.cpp @@ -13,16 +13,16 @@ #include "slider.h" const slider_reader::string_to_enum slider_reader::TYPE_NAMES[slider_reader::TYPE_COUNT] = { - { "bool", uint64_t(bgfx_slider::slider_type::SLIDER_BOOL) }, - { "float", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT) }, - { "int", uint64_t(bgfx_slider::slider_type::SLIDER_INT) }, - { "color", uint64_t(bgfx_slider::slider_type::SLIDER_COLOR) }, - { "vec2", uint64_t(bgfx_slider::slider_type::SLIDER_VEC2) } + { "bool", uint64_t(bgfx_slider::slider_type::SLIDER_BOOL) }, + { "float", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT) }, + { "int", uint64_t(bgfx_slider::slider_type::SLIDER_INT) }, + { "color", uint64_t(bgfx_slider::slider_type::SLIDER_COLOR) }, + { "vec2", uint64_t(bgfx_slider::slider_type::SLIDER_VEC2) } }; bgfx_slider* slider_reader::read_from_value(const Value& value) { - validate_parameters(value); + validate_parameters(value); bgfx_slider::slider_type type = bgfx_slider::slider_type(get_enum_from_value(value, "type", uint64_t(bgfx_slider::slider_type::SLIDER_FLOAT), TYPE_NAMES, TYPE_COUNT)); std::string name = value["name"].GetString(); @@ -71,4 +71,4 @@ void slider_reader::validate_parameters(const Value& value) assert(value.HasMember("text")); assert(value["text"].IsString()); assert(value.HasMember("default")); -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/bgfx/sliderreader.h b/src/osd/modules/render/bgfx/sliderreader.h index 9253b9b9130..9140fded836 100644 --- a/src/osd/modules/render/bgfx/sliderreader.h +++ b/src/osd/modules/render/bgfx/sliderreader.h @@ -18,14 +18,14 @@ class bgfx_slider; class slider_reader : public state_reader { public: - static bgfx_slider* read_from_value(const Value& value); + static bgfx_slider* read_from_value(const Value& value); private: static void get_values(const Value& value, std::string name, float* values); - static void validate_parameters(const Value& value); + static void validate_parameters(const Value& value); - static const int TYPE_COUNT = 5; - static const string_to_enum TYPE_NAMES[TYPE_COUNT]; + static const int TYPE_COUNT = 5; + static const string_to_enum TYPE_NAMES[TYPE_COUNT]; }; -#endif // __DRAWBGFX_SLIDER_READER__
\ No newline at end of file +#endif // __DRAWBGFX_SLIDER_READER__ diff --git a/src/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp index 2f222b19bdf..93fb021be5c 100644 --- a/src/osd/modules/render/bgfx/statereader.cpp +++ b/src/osd/modules/render/bgfx/statereader.cpp @@ -2,77 +2,77 @@ uint64_t state_reader::get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count) { - if (value.HasMember(name.c_str())) - { - assert(value[name.c_str()].IsString()); - return get_param_from_string(value[name.c_str()].GetString(), enums, count); - } - else - { - return default_value; - } + if (value.HasMember(name.c_str())) + { + assert(value[name.c_str()].IsString()); + return get_param_from_string(value[name.c_str()].GetString(), enums, count); + } + else + { + return default_value; + } } uint64_t state_reader::get_param_from_string(std::string value, const string_to_enum* enums, const int count) { - for (int i = 0; i < count; i++) - { - if (value == enums[i].m_string) - { - return enums[i].m_enum; - } - } - assert(false); - return 0; + for (int i = 0; i < count; i++) + { + if (value == enums[i].m_string) + { + return enums[i].m_enum; + } + } + assert(false); + return 0; } void state_reader::validate_array_parameter(const Value& value, std::string typeName, std::string paramName, const int count) { - const char* name = paramName.c_str(); - if (value.HasMember(name)) - { - assert(value[name].IsArray()); - assert(value[name].Size() == count); - } + const char* name = paramName.c_str(); + if (value.HasMember(name)) + { + assert(value[name].IsArray()); + assert(value[name].Size() == count); + } } void state_reader::validate_double_parameter(const Value& value, std::string typeName, std::string name) { - if (value.HasMember(name.c_str())) - { - assert(value[name.c_str()].IsDouble()); - } + if (value.HasMember(name.c_str())) + { + assert(value[name.c_str()].IsDouble()); + } } void state_reader::validate_string_parameter(const Value& value, std::string typeName, std::string name) { - if (value.HasMember(name.c_str())) - { - assert(value[name.c_str()].IsString()); - } + if (value.HasMember(name.c_str())) + { + assert(value[name.c_str()].IsString()); + } } void state_reader::validate_boolean_parameter(const Value& value, std::string typeName, std::string name) { - if (value.HasMember(name.c_str())) - { - assert(value[name.c_str()].IsBool()); - } + if (value.HasMember(name.c_str())) + { + assert(value[name.c_str()].IsBool()); + } } bool state_reader::get_bool(const Value& value, const std::string name, const bool default_value) { - if (value.HasMember(name.c_str())) - { - return value[name.c_str()].GetBool(); - } - return default_value; + if (value.HasMember(name.c_str())) + { + return value[name.c_str()].GetBool(); + } + return default_value; } void state_reader::get_float(const Value& value, const std::string name, float* out, float* default_value, int count) { - if (value.HasMember(name.c_str())) - { + if (value.HasMember(name.c_str())) + { if (count == 1) { *out = (float) value[name.c_str()].GetDouble(); @@ -82,26 +82,26 @@ void state_reader::get_float(const Value& value, const std::string name, float* { get_vec_values(value[name.c_str()], out, count); } - } - for (int def = 0; def < count; def++) - { + } + for (int def = 0; def < count; def++) + { out[def] = default_value[def]; } } void state_reader::get_vec_values(const Value& value_array, float* data, const unsigned int count) { - for (unsigned int i = 0; i < count && i < value_array.Size(); i++) - { - data[i] = (float) value_array[i].GetDouble(); - } + for (unsigned int i = 0; i < count && i < value_array.Size(); i++) + { + data[i] = (float) value_array[i].GetDouble(); + } } std::string state_reader::get_string(const Value& value, const std::string name, const std::string default_value) { - if (value.HasMember(name.c_str())) - { - return std::string(value[name.c_str()].GetString()); - } - return default_value; + if (value.HasMember(name.c_str())) + { + return std::string(value[name.c_str()].GetString()); + } + return default_value; } diff --git a/src/osd/modules/render/bgfx/statereader.h b/src/osd/modules/render/bgfx/statereader.h index 57edea1d28e..d32cf52c817 100644 --- a/src/osd/modules/render/bgfx/statereader.h +++ b/src/osd/modules/render/bgfx/statereader.h @@ -13,26 +13,26 @@ using namespace rapidjson; class state_reader { protected: - struct string_to_enum - { - std::string m_string; - const UINT64 m_enum; - }; + struct string_to_enum + { + std::string m_string; + const UINT64 m_enum; + }; - static void validate_array_parameter(const Value& value, std::string type_name, std::string name, const int count); - static void validate_double_parameter(const Value& value, std::string type_name, std::string name); - static void validate_string_parameter(const Value& value, std::string type_name, std::string name); - static void validate_boolean_parameter(const Value& value, std::string type_name, std::string name); + static void validate_array_parameter(const Value& value, std::string type_name, std::string name, const int count); + static void validate_double_parameter(const Value& value, std::string type_name, std::string name); + static void validate_string_parameter(const Value& value, std::string type_name, std::string name); + static void validate_boolean_parameter(const Value& value, std::string type_name, std::string name); - static bool get_bool(const Value& value, const std::string name, const bool default_value); - static void get_float(const Value& value, const std::string name, float* out, float* default_value, const int count = 1); - static std::string get_string(const Value& value, const std::string name, const std::string default_value); + static bool get_bool(const Value& value, const std::string name, const bool default_value); + static void get_float(const Value& value, const std::string name, float* out, float* default_value, const int count = 1); + static std::string get_string(const Value& value, const std::string name, const std::string default_value); - static uint64_t get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count); - static uint64_t get_param_from_string(std::string value, const string_to_enum* enums, const int count); + static uint64_t get_enum_from_value(const Value& value, std::string name, const uint64_t default_value, const string_to_enum* enums, const int count); + static uint64_t get_param_from_string(std::string value, const string_to_enum* enums, const int count); private: - static void get_vec_values(const Value& value_array, float* data, const unsigned int count); + static void get_vec_values(const Value& value_array, float* data, const unsigned int count); }; -#endif // __DRAWBGFX_STATE_READER__
\ No newline at end of file +#endif // __DRAWBGFX_STATE_READER__ diff --git a/src/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h index 099288cbec1..d4cea313464 100644 --- a/src/osd/modules/render/bgfx/target.h +++ b/src/osd/modules/render/bgfx/target.h @@ -16,15 +16,15 @@ class bgfx_target : public bgfx_texture { public: - bgfx_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false); - bgfx_target(std::string name, void *handle, uint32_t width, uint32_t height); - virtual ~bgfx_target(); + bgfx_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false); + bgfx_target(std::string name, void *handle, uint32_t width, uint32_t height); + virtual ~bgfx_target(); - // Getters - bgfx::FrameBufferHandle target() const { return m_target; } + // Getters + bgfx::FrameBufferHandle target() const { return m_target; } private: bgfx::FrameBufferHandle m_target; }; -#endif // __DRAWBGFX_TARGET__
\ No newline at end of file +#endif // __DRAWBGFX_TARGET__ diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp index 88bf6a9d96f..930fbf1bfe0 100644 --- a/src/osd/modules/render/bgfx/targetmanager.cpp +++ b/src/osd/modules/render/bgfx/targetmanager.cpp @@ -16,11 +16,11 @@ target_manager::~target_manager() { - for (std::pair<std::string, bgfx_target*> target : m_targets) - { + for (std::pair<std::string, bgfx_target*> target : m_targets) + { delete target.second; - } - m_targets.clear(); + } + m_targets.clear(); } bgfx_target* target_manager::create_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter) @@ -45,11 +45,11 @@ bgfx_target* target_manager::create_target(std::string name, void *handle, uint3 bgfx_target* target_manager::target(std::string name) { - std::map<std::string, bgfx_target*>::iterator iter = m_targets.find(name); - if (iter != m_targets.end()) - { - return iter->second; - } + std::map<std::string, bgfx_target*>::iterator iter = m_targets.find(name); + if (iter != m_targets.end()) + { + return iter->second; + } - return nullptr; + return nullptr; } diff --git a/src/osd/modules/render/bgfx/targetmanager.h b/src/osd/modules/render/bgfx/targetmanager.h index 9cc957d1c38..0d5f6f5f020 100644 --- a/src/osd/modules/render/bgfx/targetmanager.h +++ b/src/osd/modules/render/bgfx/targetmanager.h @@ -25,20 +25,20 @@ class bgfx_target; class target_manager { public: - target_manager(texture_manager& textures) : m_textures(textures) { } - ~target_manager(); + target_manager(texture_manager& textures) : m_textures(textures) { } + ~target_manager(); bgfx_target* create_target(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, bool filter = false); bgfx_target* create_target(std::string name, void *handle, uint32_t width, uint32_t height); - // Getters - bgfx_target* target(std::string name); + // Getters + bgfx_target* target(std::string name); private: - bgfx_target* create_target(std::string name); + bgfx_target* create_target(std::string name); - std::map<std::string, bgfx_target*> m_targets; - texture_manager& m_textures; + std::map<std::string, bgfx_target*> m_targets; + texture_manager& m_textures; }; -#endif // __DRAWBGFX_TARGET_MANAGER__
\ No newline at end of file +#endif // __DRAWBGFX_TARGET_MANAGER__ diff --git a/src/osd/modules/render/bgfx/texture.h b/src/osd/modules/render/bgfx/texture.h index 833ab230917..2fc3a596ddc 100644 --- a/src/osd/modules/render/bgfx/texture.h +++ b/src/osd/modules/render/bgfx/texture.h @@ -18,22 +18,22 @@ class bgfx_texture { public: - bgfx_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP); - virtual ~bgfx_texture(); + bgfx_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP); + virtual ~bgfx_texture(); - // Getters - std::string name() const { return m_name; } - bgfx::TextureFormat::Enum format() const { return m_format; } - uint32_t width() const { return m_width; } - uint32_t height() const { return m_height; } - bgfx::TextureHandle handle() const { return m_handle; } + // Getters + std::string name() const { return m_name; } + bgfx::TextureFormat::Enum format() const { return m_format; } + uint32_t width() const { return m_width; } + uint32_t height() const { return m_height; } + bgfx::TextureHandle handle() const { return m_handle; } protected: - std::string m_name; - bgfx::TextureFormat::Enum m_format; - uint32_t m_width; - uint32_t m_height; - bgfx::TextureHandle m_handle; + std::string m_name; + bgfx::TextureFormat::Enum m_format; + uint32_t m_width; + uint32_t m_height; + bgfx::TextureHandle m_handle; }; -#endif // __DRAWBGFX_TEXTURE__
\ No newline at end of file +#endif // __DRAWBGFX_TEXTURE__ diff --git a/src/osd/modules/render/bgfx/texturemanager.cpp b/src/osd/modules/render/bgfx/texturemanager.cpp index bb8f49494da..4a8cdd5d934 100644 --- a/src/osd/modules/render/bgfx/texturemanager.cpp +++ b/src/osd/modules/render/bgfx/texturemanager.cpp @@ -16,11 +16,11 @@ texture_manager::~texture_manager() { - for (std::pair<std::string, bgfx_texture*> texture : m_textures) - { + for (std::pair<std::string, bgfx_texture*> texture : m_textures) + { delete texture.second; - } - m_textures.clear(); + } + m_textures.clear(); } void texture_manager::add_texture(std::string name, bgfx_texture* texture) @@ -37,11 +37,11 @@ bgfx_texture* texture_manager::create_texture(std::string name, bgfx::TextureFor bgfx_texture* texture_manager::texture(std::string name) { - std::map<std::string, bgfx_texture*>::iterator iter = m_textures.find(name); - if (iter != m_textures.end()) - { - return iter->second; - } + std::map<std::string, bgfx_texture*>::iterator iter = m_textures.find(name); + if (iter != m_textures.end()) + { + return iter->second; + } - return nullptr; + return nullptr; } diff --git a/src/osd/modules/render/bgfx/texturemanager.h b/src/osd/modules/render/bgfx/texturemanager.h index 627e6689fa9..69608c03616 100644 --- a/src/osd/modules/render/bgfx/texturemanager.h +++ b/src/osd/modules/render/bgfx/texturemanager.h @@ -23,19 +23,19 @@ class bgfx_texture; class texture_manager { public: - texture_manager() { } - ~texture_manager(); + texture_manager() { } + ~texture_manager(); bgfx_texture* create_texture(std::string name, bgfx::TextureFormat::Enum format, uint32_t width, uint32_t height, void* data = nullptr, uint32_t flags = BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP); void add_texture(std::string name, bgfx_texture* texture); - // Getters - bgfx_texture* texture(std::string name); + // Getters + bgfx_texture* texture(std::string name); private: - bgfx_texture* create_texture(std::string name); + bgfx_texture* create_texture(std::string name); - std::map<std::string, bgfx_texture*> m_textures; + std::map<std::string, bgfx_texture*> m_textures; }; -#endif // __DRAWBGFX_TEXTURE_MANAGER__
\ No newline at end of file +#endif // __DRAWBGFX_TEXTURE_MANAGER__ diff --git a/src/osd/modules/render/bgfx/uniform.cpp b/src/osd/modules/render/bgfx/uniform.cpp index 632af6bd3b8..2898c27a5b8 100644 --- a/src/osd/modules/render/bgfx/uniform.cpp +++ b/src/osd/modules/render/bgfx/uniform.cpp @@ -10,73 +10,73 @@ #include <cstring> bgfx_uniform::bgfx_uniform(std::string name, bgfx::UniformType::Enum type) - : m_name(name) - , m_type(type) + : m_name(name) + , m_type(type) { - m_handle = bgfx::createUniform(m_name.c_str(), m_type); - m_data_size = get_size_for_type(type); - if (m_data_size > 0) - { - m_data = new uint8_t[m_data_size]; - } + m_handle = bgfx::createUniform(m_name.c_str(), m_type); + m_data_size = get_size_for_type(type); + if (m_data_size > 0) + { + m_data = new uint8_t[m_data_size]; + } } bgfx_uniform::~bgfx_uniform() { - bgfx::destroyUniform(m_handle); - delete [] m_data; + bgfx::destroyUniform(m_handle); + delete [] m_data; } void bgfx_uniform::upload() { if (m_type != bgfx::UniformType::Int1) // Avoid samplers; set separately! - bgfx::setUniform(m_handle, m_data); + bgfx::setUniform(m_handle, m_data); } bgfx_uniform* bgfx_uniform::set(float* value) { - return set(value, get_size_for_type(bgfx::UniformType::Vec4)); + return set(value, get_size_for_type(bgfx::UniformType::Vec4)); } bgfx_uniform* bgfx_uniform::set_int(int value) { - return set(&value, get_size_for_type(bgfx::UniformType::Int1)); + return set(&value, get_size_for_type(bgfx::UniformType::Int1)); } bgfx_uniform* bgfx_uniform::set_mat3(float* value) { - return set(value, get_size_for_type(bgfx::UniformType::Mat3)); + return set(value, get_size_for_type(bgfx::UniformType::Mat3)); } bgfx_uniform* bgfx_uniform::set_mat4(float* value) { - return set(value, get_size_for_type(bgfx::UniformType::Mat4)); + return set(value, get_size_for_type(bgfx::UniformType::Mat4)); } bgfx_uniform* bgfx_uniform::set(void* data, size_t size) { - int min_size = (size < m_data_size) ? size : m_data_size; - memcpy(m_data, data, min_size); - return this; + int min_size = (size < m_data_size) ? size : m_data_size; + memcpy(m_data, data, min_size); + return this; } size_t bgfx_uniform::get_size_for_type(bgfx::UniformType::Enum type) { - switch (type) - { - case bgfx::UniformType::Vec4: - return sizeof(float) * 4; + switch (type) + { + case bgfx::UniformType::Vec4: + return sizeof(float) * 4; - case bgfx::UniformType::Int1: - return sizeof(int); + case bgfx::UniformType::Int1: + return sizeof(int); - case bgfx::UniformType::Mat3: - return sizeof(float) * 3 * 3; + case bgfx::UniformType::Mat3: + return sizeof(float) * 3 * 3; - case bgfx::UniformType::Mat4: - return sizeof(float) * 4 * 4; + case bgfx::UniformType::Mat4: + return sizeof(float) * 4 * 4; - default: - return 0; - } -}
\ No newline at end of file + default: + return 0; + } +} diff --git a/src/osd/modules/render/bgfx/uniform.h b/src/osd/modules/render/bgfx/uniform.h index 6bb45f50d06..aa4c2cc097a 100644 --- a/src/osd/modules/render/bgfx/uniform.h +++ b/src/osd/modules/render/bgfx/uniform.h @@ -18,31 +18,31 @@ class bgfx_uniform { public: - bgfx_uniform(std::string name, bgfx::UniformType::Enum type); - virtual ~bgfx_uniform(); + bgfx_uniform(std::string name, bgfx::UniformType::Enum type); + virtual ~bgfx_uniform(); - virtual void upload(); + virtual void upload(); - // Getters - std::string name() { return m_name; } - bgfx::UniformType::Enum type() const { return m_type; } - bgfx::UniformHandle handle() const { return m_handle; } + // Getters + std::string name() { return m_name; } + bgfx::UniformType::Enum type() const { return m_type; } + bgfx::UniformHandle handle() const { return m_handle; } - // Setters - bgfx_uniform* set(float* value); - bgfx_uniform* set_int(int value); - bgfx_uniform* set_mat3(float* value); - bgfx_uniform* set_mat4(float* value); - bgfx_uniform* set(void* data, size_t size); + // Setters + bgfx_uniform* set(float* value); + bgfx_uniform* set_int(int value); + bgfx_uniform* set_mat3(float* value); + bgfx_uniform* set_mat4(float* value); + bgfx_uniform* set(void* data, size_t size); - static size_t get_size_for_type(bgfx::UniformType::Enum type); + static size_t get_size_for_type(bgfx::UniformType::Enum type); protected: - bgfx::UniformHandle m_handle; - std::string m_name; - bgfx::UniformType::Enum m_type; - uint8_t* m_data; - size_t m_data_size; + bgfx::UniformHandle m_handle; + std::string m_name; + bgfx::UniformType::Enum m_type; + uint8_t* m_data; + size_t m_data_size; }; -#endif // __DRAWBGFX_UNIFORM__
\ No newline at end of file +#endif // __DRAWBGFX_UNIFORM__ diff --git a/src/osd/modules/render/bgfx/uniformreader.cpp b/src/osd/modules/render/bgfx/uniformreader.cpp index 863c20e6e4f..141bc657121 100644 --- a/src/osd/modules/render/bgfx/uniformreader.cpp +++ b/src/osd/modules/render/bgfx/uniformreader.cpp @@ -10,44 +10,44 @@ #include "uniform.h" const uniform_reader::string_to_enum uniform_reader::TYPE_NAMES[uniform_reader::TYPE_COUNT] = { - { "int", bgfx::UniformType::Int1 }, - { "vec4", bgfx::UniformType::Vec4 }, - { "mat3", bgfx::UniformType::Mat3 }, - { "mat4", bgfx::UniformType::Mat4 }, - { "camera", bgfx::UniformType::Mat4 } + { "int", bgfx::UniformType::Int1 }, + { "vec4", bgfx::UniformType::Vec4 }, + { "mat3", bgfx::UniformType::Mat3 }, + { "mat4", bgfx::UniformType::Mat4 }, + { "camera", bgfx::UniformType::Mat4 } }; bgfx_uniform* uniform_reader::read_from_value(const Value& value) { - assert(value.HasMember("name")); - assert(value["name"].IsString()); - const char* name = value["name"].GetString(); + assert(value.HasMember("name")); + assert(value["name"].IsString()); + const char* name = value["name"].GetString(); - assert(value.HasMember("type")); - bgfx::UniformType::Enum type = bgfx::UniformType::Enum(get_enum_from_value(value, "type", bgfx::UniformType::Vec4, TYPE_NAMES, TYPE_COUNT)); - const size_t type_size = bgfx_uniform::get_size_for_type(type); + assert(value.HasMember("type")); + bgfx::UniformType::Enum type = bgfx::UniformType::Enum(get_enum_from_value(value, "type", bgfx::UniformType::Vec4, TYPE_NAMES, TYPE_COUNT)); + const size_t type_size = bgfx_uniform::get_size_for_type(type); - assert(value.HasMember("values")); - assert(value["values"].IsArray()); - const Value& value_array = value["values"]; - const size_t array_size = value_array.Size() * sizeof(float); + assert(value.HasMember("values")); + assert(value["values"].IsArray()); + const Value& value_array = value["values"]; + const size_t array_size = value_array.Size() * sizeof(float); - const size_t alloc_size = (type_size > array_size) ? type_size : array_size; - float* data = reinterpret_cast<float*>(new char[alloc_size]); + const size_t alloc_size = (type_size > array_size) ? type_size : array_size; + float* data = reinterpret_cast<float*>(new char[alloc_size]); - unsigned int index = 0; - for (; index < type_size / 4 && index < value_array.Size(); index++) - { - data[index] = (float)value_array[index].GetDouble(); - } + unsigned int index = 0; + for (; index < type_size / 4 && index < value_array.Size(); index++) + { + data[index] = (float)value_array[index].GetDouble(); + } - for (; index < type_size / 4; index++) { - data[index] = 0.0f; - } + for (; index < type_size / 4; index++) { + data[index] = 0.0f; + } - bgfx_uniform* uniform = new bgfx_uniform(name, type); - uniform->set((void*)data, type_size); - delete [] data; + bgfx_uniform* uniform = new bgfx_uniform(name, type); + uniform->set((void*)data, type_size); + delete [] data; - return uniform; + return uniform; } diff --git a/src/osd/modules/render/bgfx/uniformreader.h b/src/osd/modules/render/bgfx/uniformreader.h index ead4bb0cefe..40bedf8b732 100644 --- a/src/osd/modules/render/bgfx/uniformreader.h +++ b/src/osd/modules/render/bgfx/uniformreader.h @@ -19,23 +19,23 @@ class bgfx_uniform; enum uniform_type { - TYPE_INT1 = bgfx::UniformType::Int1, - TYPE_VEC4 = bgfx::UniformType::Vec4, - TYPE_MAT3 = bgfx::UniformType::Mat3, - TYPE_MAT4 = bgfx::UniformType::Mat4, - TYPE_CAMERA, // Alias for the current ortho camera, used to auto-bind on material load + TYPE_INT1 = bgfx::UniformType::Int1, + TYPE_VEC4 = bgfx::UniformType::Vec4, + TYPE_MAT3 = bgfx::UniformType::Mat3, + TYPE_MAT4 = bgfx::UniformType::Mat4, + TYPE_CAMERA, // Alias for the current ortho camera, used to auto-bind on material load - TYPE_COUNT = 5 + TYPE_COUNT = 5 }; class uniform_reader : public state_reader { public: - static bgfx_uniform* read_from_value(const Value& value); + static bgfx_uniform* read_from_value(const Value& value); private: - static const int TYPE_COUNT = uniform_type::TYPE_COUNT; - static const string_to_enum TYPE_NAMES[TYPE_COUNT]; + static const int TYPE_COUNT = uniform_type::TYPE_COUNT; + static const string_to_enum TYPE_NAMES[TYPE_COUNT]; }; -#endif // __DRAWBGFX_UNIFORM_READER__
\ No newline at end of file +#endif // __DRAWBGFX_UNIFORM_READER__ diff --git a/src/osd/modules/render/bgfx/writereader.cpp b/src/osd/modules/render/bgfx/writereader.cpp index b10220908c8..5d6ca0fcf93 100644 --- a/src/osd/modules/render/bgfx/writereader.cpp +++ b/src/osd/modules/render/bgfx/writereader.cpp @@ -3,22 +3,22 @@ #include "writereader.h" const write_reader::string_to_enum write_reader::RGB_NAMES[write_reader::RGB_COUNT] = { - { "true", BGFX_STATE_RGB_WRITE }, - { "false", 0 }, - { "1", BGFX_STATE_RGB_WRITE }, - { "0", 0 } + { "true", BGFX_STATE_RGB_WRITE }, + { "false", 0 }, + { "1", BGFX_STATE_RGB_WRITE }, + { "0", 0 } }; const write_reader::string_to_enum write_reader::ALPHA_NAMES[write_reader::ALPHA_COUNT] = { - { "true", BGFX_STATE_ALPHA_WRITE }, - { "false", 0 }, - { "1", BGFX_STATE_ALPHA_WRITE }, - { "0", 0 } + { "true", BGFX_STATE_ALPHA_WRITE }, + { "false", 0 }, + { "1", BGFX_STATE_ALPHA_WRITE }, + { "0", 0 } }; uint64_t write_reader::read_from_value(const Value& value) { - uint64_t rgb = get_enum_from_value(value, "rgb", 0, RGB_NAMES, RGB_COUNT); - uint64_t alpha = get_enum_from_value(value, "alpha", 0, ALPHA_NAMES, ALPHA_COUNT); - return rgb | alpha; + uint64_t rgb = get_enum_from_value(value, "rgb", 0, RGB_NAMES, RGB_COUNT); + uint64_t alpha = get_enum_from_value(value, "alpha", 0, ALPHA_NAMES, ALPHA_COUNT); + return rgb | alpha; } diff --git a/src/osd/modules/render/bgfx/writereader.h b/src/osd/modules/render/bgfx/writereader.h index 854505bc9cf..5210a8df286 100644 --- a/src/osd/modules/render/bgfx/writereader.h +++ b/src/osd/modules/render/bgfx/writereader.h @@ -7,13 +7,13 @@ class write_reader : public state_reader { public: - static uint64_t read_from_value(const Value& value); + static uint64_t read_from_value(const Value& value); private: - static const int RGB_COUNT = 4; - static const int ALPHA_COUNT = 4; - static const string_to_enum RGB_NAMES[RGB_COUNT]; - static const string_to_enum ALPHA_NAMES[ALPHA_COUNT]; + static const int RGB_COUNT = 4; + static const int ALPHA_COUNT = 4; + static const string_to_enum RGB_NAMES[RGB_COUNT]; + static const string_to_enum ALPHA_NAMES[ALPHA_COUNT]; }; -#endif // __DRAWBGFX_WRITE_READER__
\ No newline at end of file +#endif // __DRAWBGFX_WRITE_READER__ diff --git a/src/osd/modules/render/binpacker.cpp b/src/osd/modules/render/binpacker.cpp index 2054dfa54cf..fcd126f5c14 100644 --- a/src/osd/modules/render/binpacker.cpp +++ b/src/osd/modules/render/binpacker.cpp @@ -11,185 +11,185 @@ bool rectangle_packer::pack(const std::vector<packable_rectangle>& rects, std::vector<std::vector<packed_rectangle>>& packs, int pack_size) { - clear(); - - m_pack_size = pack_size; - - // Add rects to member array, and check to make sure none is too big - for (size_t rect = 0; rect < rects.size(); rect++) - { - m_rects.push_back(rectangle(0, 0, rects[rect].width(), rects[rect].height(), rects[rect].hash(), rects[rect].format(), rects[rect].rowpixels(), rects[rect].palette(), rects[rect].base())); - } - - // Sort from greatest to least area - std::sort(m_rects.rbegin(), m_rects.rend()); - - // Pack - while (m_num_packed < (int)m_rects.size()) - { - int i = m_packs.size(); - m_packs.push_back(rectangle(m_pack_size)); - m_roots.push_back(i); - if (!fill(i)) - { + clear(); + + m_pack_size = pack_size; + + // Add rects to member array, and check to make sure none is too big + for (size_t rect = 0; rect < rects.size(); rect++) + { + m_rects.push_back(rectangle(0, 0, rects[rect].width(), rects[rect].height(), rects[rect].hash(), rects[rect].format(), rects[rect].rowpixels(), rects[rect].palette(), rects[rect].base())); + } + + // Sort from greatest to least area + std::sort(m_rects.rbegin(), m_rects.rend()); + + // Pack + while (m_num_packed < (int)m_rects.size()) + { + int i = m_packs.size(); + m_packs.push_back(rectangle(m_pack_size)); + m_roots.push_back(i); + if (!fill(i)) + { return false; } - } + } - // Write out - packs.resize(m_roots.size()); - for (size_t i = 0; i < m_roots.size(); ++i) - { - packs[i].clear(); - add_pack_to_array(m_roots[i], packs[i]); - } + // Write out + packs.resize(m_roots.size()); + for (size_t i = 0; i < m_roots.size(); ++i) + { + packs[i].clear(); + add_pack_to_array(m_roots[i], packs[i]); + } - return true; + return true; } void rectangle_packer::clear() { - m_pack_size = 0; - m_num_packed = 0; - m_rects.clear(); - m_packs.clear(); - m_roots.clear(); + m_pack_size = 0; + m_num_packed = 0; + m_rects.clear(); + m_packs.clear(); + m_roots.clear(); } bool rectangle_packer::fill(int pack) { - // For each rect - for (size_t rect = 0; rect < m_rects.size(); ++rect) - { - // If it's not already packed - if (!m_rects[rect].packed) - { - // If it fits in the current working area - if (fits(m_rects[rect], m_packs[pack])) - { - // Store in lower-left of working area, split, and recurse - m_num_packed++; - split(pack, rect); - fill(m_packs[pack].children[0]); - fill(m_packs[pack].children[1]); - return true; - } - } - } - return false; + // For each rect + for (size_t rect = 0; rect < m_rects.size(); ++rect) + { + // If it's not already packed + if (!m_rects[rect].packed) + { + // If it fits in the current working area + if (fits(m_rects[rect], m_packs[pack])) + { + // Store in lower-left of working area, split, and recurse + m_num_packed++; + split(pack, rect); + fill(m_packs[pack].children[0]); + fill(m_packs[pack].children[1]); + return true; + } + } + } + return false; } void rectangle_packer::split(int pack, int rect) { - // Split the working area either horizontally or vertically with respect - // to the rect we're storing, such that we get the largest possible child - // area. - - rectangle left = m_packs[pack]; - rectangle right = m_packs[pack]; - rectangle bottom = m_packs[pack]; - rectangle top = m_packs[pack]; - - left.y += m_rects[rect].h; - left.w = m_rects[rect].w; - left.h -= m_rects[rect].h; - - right.x += m_rects[rect].w; - right.w -= m_rects[rect].w; - - bottom.x += m_rects[rect].w; - bottom.h = m_rects[rect].h; - bottom.w -= m_rects[rect].w; - - top.y += m_rects[rect].h; - top.h -= m_rects[rect].h; - - int max_lr_area = left.get_area(); - if (right.get_area() > max_lr_area) - { - max_lr_area = right.get_area(); - } - - int max_bt_area = bottom.get_area(); - if (top.get_area() > max_bt_area) - { - max_bt_area = top.get_area(); - } - - if (max_lr_area > max_bt_area) - { - if (left.get_area() > right.get_area()) - { - m_packs.push_back(left); - m_packs.push_back(right); - } - else - { - m_packs.push_back(right); - m_packs.push_back(left); - } - } - else - { - if (bottom.get_area() > top.get_area()) - { - m_packs.push_back(bottom); - m_packs.push_back(top); - } - else - { - m_packs.push_back(top); - m_packs.push_back(bottom); - } - } - - // This pack area now represents the rect we've just stored, so save the - // relevant info to it, and assign children. - m_packs[pack].w = m_rects[rect].w; - m_packs[pack].h = m_rects[rect].h; - m_packs[pack].hash = m_rects[rect].hash; - m_packs[pack].format = m_rects[rect].format; - m_packs[pack].rowpixels = m_rects[rect].rowpixels; - m_packs[pack].palette = m_rects[rect].palette; - m_packs[pack].base = m_rects[rect].base; - m_packs[pack].children[0] = m_packs.size() - 2; - m_packs[pack].children[1] = m_packs.size() - 1; - - // Done with the rect - m_rects[rect].packed = true; + // Split the working area either horizontally or vertically with respect + // to the rect we're storing, such that we get the largest possible child + // area. + + rectangle left = m_packs[pack]; + rectangle right = m_packs[pack]; + rectangle bottom = m_packs[pack]; + rectangle top = m_packs[pack]; + + left.y += m_rects[rect].h; + left.w = m_rects[rect].w; + left.h -= m_rects[rect].h; + + right.x += m_rects[rect].w; + right.w -= m_rects[rect].w; + + bottom.x += m_rects[rect].w; + bottom.h = m_rects[rect].h; + bottom.w -= m_rects[rect].w; + + top.y += m_rects[rect].h; + top.h -= m_rects[rect].h; + + int max_lr_area = left.get_area(); + if (right.get_area() > max_lr_area) + { + max_lr_area = right.get_area(); + } + + int max_bt_area = bottom.get_area(); + if (top.get_area() > max_bt_area) + { + max_bt_area = top.get_area(); + } + + if (max_lr_area > max_bt_area) + { + if (left.get_area() > right.get_area()) + { + m_packs.push_back(left); + m_packs.push_back(right); + } + else + { + m_packs.push_back(right); + m_packs.push_back(left); + } + } + else + { + if (bottom.get_area() > top.get_area()) + { + m_packs.push_back(bottom); + m_packs.push_back(top); + } + else + { + m_packs.push_back(top); + m_packs.push_back(bottom); + } + } + + // This pack area now represents the rect we've just stored, so save the + // relevant info to it, and assign children. + m_packs[pack].w = m_rects[rect].w; + m_packs[pack].h = m_rects[rect].h; + m_packs[pack].hash = m_rects[rect].hash; + m_packs[pack].format = m_rects[rect].format; + m_packs[pack].rowpixels = m_rects[rect].rowpixels; + m_packs[pack].palette = m_rects[rect].palette; + m_packs[pack].base = m_rects[rect].base; + m_packs[pack].children[0] = m_packs.size() - 2; + m_packs[pack].children[1] = m_packs.size() - 1; + + // Done with the rect + m_rects[rect].packed = true; } bool rectangle_packer::fits(rectangle& rect1, const rectangle& rect2) { - // Check to see if rect1 fits in rect2 - - if (rect1.w <= rect2.w && rect1.h <= rect2.h) - { - return true; - } - else - { - return false; - } + // Check to see if rect1 fits in rect2 + + if (rect1.w <= rect2.w && rect1.h <= rect2.h) + { + return true; + } + else + { + return false; + } } void rectangle_packer::add_pack_to_array(int pack, std::vector<packed_rectangle>& array) const { - if (m_packs[pack].hash != 0) - { + if (m_packs[pack].hash != 0) + { array.push_back(packed_rectangle(m_packs[pack].hash, m_packs[pack].format, m_packs[pack].w, m_packs[pack].h, m_packs[pack].x, m_packs[pack].y, m_packs[pack].rowpixels, m_packs[pack].palette, m_packs[pack].base)); - if (m_packs[pack].children[0] != -1) - { - add_pack_to_array(m_packs[pack].children[0], array); - } + if (m_packs[pack].children[0] != -1) + { + add_pack_to_array(m_packs[pack].children[0], array); + } - if (m_packs[pack].children[1] != -1) - { - add_pack_to_array(m_packs[pack].children[1], array); - } - } + if (m_packs[pack].children[1] != -1) + { + add_pack_to_array(m_packs[pack].children[1], array); + } + } } diff --git a/src/osd/modules/render/binpacker.h b/src/osd/modules/render/binpacker.h index 677083b5c09..696bd18eb7d 100644 --- a/src/osd/modules/render/binpacker.h +++ b/src/osd/modules/render/binpacker.h @@ -10,18 +10,18 @@ class rectangle_packer { public: - // The input and output are in terms of vectors of ints to avoid - // dependencies (although I suppose a public member struct could have been - // used). The parameters are: - - // packs : After packing, the outer array contains the packs (therefore - // the number of packs is packs.size()). Each inner array contains a - // sequence of sets of 3 ints. Each set represents a rectangle in the - // pack. The elements in the set are 1) the rect ID, 2) the x position - // of the rect with respect to the pack, and 3) the y position of the rect - // with respect to the pack. The widths and heights of the rects are not - // included, as it's assumed they are stored on the caller's side (they - // were after all the input to the function). + // The input and output are in terms of vectors of ints to avoid + // dependencies (although I suppose a public member struct could have been + // used). The parameters are: + + // packs : After packing, the outer array contains the packs (therefore + // the number of packs is packs.size()). Each inner array contains a + // sequence of sets of 3 ints. Each set represents a rectangle in the + // pack. The elements in the set are 1) the rect ID, 2) the x position + // of the rect with respect to the pack, and 3) the y position of the rect + // with respect to the pack. The widths and heights of the rects are not + // included, as it's assumed they are stored on the caller's side (they + // were after all the input to the function). class packable_rectangle { @@ -107,77 +107,77 @@ public: void* m_base; }; - bool pack(const std::vector<packable_rectangle>& rects, std::vector<std::vector<packed_rectangle>>& packs, int pack_size); + bool pack(const std::vector<packable_rectangle>& rects, std::vector<std::vector<packed_rectangle>>& packs, int pack_size); private: - struct rectangle - { - rectangle(int size) - : x(0) - , y(0) - , w(size) - , h(size) - , hash(-1) - , format(0) + struct rectangle + { + rectangle(int size) + : x(0) + , y(0) + , w(size) + , h(size) + , hash(-1) + , format(0) , rowpixels(0) , palette(nullptr) , base(nullptr) - , packed(false) - { - children[0] = -1; - children[1] = -1; - } - - rectangle(int x, int y, int w, int h, int hash, UINT32 format, int rowpixels, const rgb_t *palette, void *base) - : x(x) - , y(y) - , w(w) - , h(h) - , hash(hash) - , format(format) + , packed(false) + { + children[0] = -1; + children[1] = -1; + } + + rectangle(int x, int y, int w, int h, int hash, UINT32 format, int rowpixels, const rgb_t *palette, void *base) + : x(x) + , y(y) + , w(w) + , h(h) + , hash(hash) + , format(format) , rowpixels(rowpixels) , palette(palette) , base(base) - , packed(false) - { - children[0] = -1; - children[1] = -1; - } - - int get_area() const - { - return w * h; - } - - bool operator<(const rectangle& rect) const - { - return get_area() < rect.get_area(); - } - - int x; - int y; - int w; - int h; - int hash; - UINT32 format; - int rowpixels; - const rgb_t* palette; - void* base; - int children[2]; - bool packed; - }; - - void clear(); - bool fill(int pack); - void split(int pack, int rect); - bool fits(rectangle& rect1, const rectangle& rect2); - void add_pack_to_array(int pack, std::vector<packed_rectangle>& array) const; - - int m_pack_size; - int m_num_packed; - std::vector<rectangle> m_rects; - std::vector<rectangle> m_packs; - std::vector<int> m_roots; + , packed(false) + { + children[0] = -1; + children[1] = -1; + } + + int get_area() const + { + return w * h; + } + + bool operator<(const rectangle& rect) const + { + return get_area() < rect.get_area(); + } + + int x; + int y; + int w; + int h; + int hash; + UINT32 format; + int rowpixels; + const rgb_t* palette; + void* base; + int children[2]; + bool packed; + }; + + void clear(); + bool fill(int pack); + void split(int pack, int rect); + bool fits(rectangle& rect1, const rectangle& rect2); + void add_pack_to_array(int pack, std::vector<packed_rectangle>& array) const; + + int m_pack_size; + int m_num_packed; + std::vector<rectangle> m_rects; + std::vector<rectangle> m_packs; + std::vector<int> m_roots; }; -#endif // __RECTPACKER_H__
\ No newline at end of file +#endif // __RECTPACKER_H__ diff --git a/src/osd/modules/render/d3d/d3dcomm.h b/src/osd/modules/render/d3d/d3dcomm.h index 95934f0098a..4894cd7f491 100644 --- a/src/osd/modules/render/d3d/d3dcomm.h +++ b/src/osd/modules/render/d3d/d3dcomm.h @@ -223,7 +223,7 @@ struct vertex { float x, y, z; // X,Y,Z coordinates float rhw; // RHW when no HLSL, padding when HLSL - D3DCOLOR color; // diffuse color + D3DCOLOR color; // diffuse color float u0, v0; // texture stage 0 coordinates float u1, v1; // additional info for vector data }; diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h index a42e9995767..8989fca71c5 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.h +++ b/src/osd/modules/render/d3d/d3dhlsl.h @@ -334,7 +334,7 @@ public: int step; int screen_type; INT32(*adjustor)(running_machine &, void *, std::string *, INT32); - int id; + int id; }; private: @@ -371,7 +371,7 @@ private: d3d_base * d3dintf; // D3D interface running_machine * machine; - renderer_d3d9 * d3d; // D3D renderer + renderer_d3d9 * d3d; // D3D renderer bool master_enable; // overall enable flag bool vector_enable; // vector post-processing enable flag diff --git a/src/osd/modules/render/d3dtarget.h b/src/osd/modules/render/d3dtarget.h index 9179b2d43ba..566b1dbdfcd 100644 --- a/src/osd/modules/render/d3dtarget.h +++ b/src/osd/modules/render/d3dtarget.h @@ -11,4 +11,4 @@ #ifndef __D3DTARGET__ #define __D3DTARGET__ -#endif // __D3DTARGET__
\ No newline at end of file +#endif // __D3DTARGET__ diff --git a/src/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h index 8923f53317a..e6d15a757bb 100644 --- a/src/osd/modules/render/draw13.h +++ b/src/osd/modules/render/draw13.h @@ -41,7 +41,7 @@ struct quad_setup_data void compute(const render_primitive &prim, const int prescale); - INT32 dudx, dvdx, dudy, dvdy; + INT32 dudx, dvdx, dudy, dvdy; INT32 startu, startv; INT32 rotwidth, rotheight; }; @@ -210,4 +210,4 @@ private: static const copy_info_t s_blit_info_default[]; }; -#endif // __DRAW13__
\ No newline at end of file +#endif // __DRAW13__ diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp index e359de4624a..4198148d8cd 100644 --- a/src/osd/modules/render/drawbgfx.cpp +++ b/src/osd/modules/render/drawbgfx.cpp @@ -51,7 +51,7 @@ // MACROS //============================================================ -#define GIBBERISH (0) +#define GIBBERISH (0) //============================================================ // INLINES @@ -78,17 +78,17 @@ static void* sdlNativeWindowHandle(SDL_Window* _window) return nullptr; } -# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD +# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD return (void*)wmi.info.x11.window; -# elif BX_PLATFORM_OSX +# elif BX_PLATFORM_OSX return wmi.info.cocoa.window; -# elif BX_PLATFORM_WINDOWS +# elif BX_PLATFORM_WINDOWS return wmi.info.win.window; -# elif BX_PLATFORM_STEAMLINK +# elif BX_PLATFORM_STEAMLINK return wmi.info.vivante.window; # elif BX_PLATFORM_EMSCRIPTEN return nullptr; -# endif // BX_PLATFORM_ +# endif // BX_PLATFORM_ } #endif @@ -130,15 +130,15 @@ int renderer_bgfx::create() m_shaders = new shader_manager(); m_effects = new effect_manager(*m_shaders); - if (window().m_index != 0) - { + if (window().m_index != 0) + { #ifdef OSD_WINDOWS - m_framebuffer = m_targets->create_target("backbuffer", window().m_hwnd, m_width[window().m_index], m_height[window().m_index]); + m_framebuffer = m_targets->create_target("backbuffer", window().m_hwnd, m_width[window().m_index], m_height[window().m_index]); #else - m_framebuffer = m_targets->create_target("backbuffer", sdlNativeWindowHandle(window().sdl_window()), m_width[window().m_index], m_height[window().m_index]); + m_framebuffer = m_targets->create_target("backbuffer", sdlNativeWindowHandle(window().sdl_window()), m_width[window().m_index], m_height[window().m_index]); #endif - bgfx::touch(window().m_index); - } + bgfx::touch(window().m_index); + } // Create program from shaders. m_gui_effect[0] = m_effects->effect("gui_opaque"); @@ -209,11 +209,11 @@ void renderer_bgfx::put_packed_quad(render_primitive *prim, UINT32 hash, ScreenV float v0 = float(rect.y()) / float(CACHE_SIZE); float u1 = u0 + float(rect.width()) / float(CACHE_SIZE); float v1 = v0 + float(rect.height()) / float(CACHE_SIZE); - u1 -= 0.5f / float(CACHE_SIZE); - v1 -= 0.5f / float(CACHE_SIZE); - u0 += 0.5f / float(CACHE_SIZE); - v0 += 0.5f / float(CACHE_SIZE); - UINT32 rgba = u32Color(prim->color.r * 255, prim->color.g * 255, prim->color.b * 255, prim->color.a * 255); + u1 -= 0.5f / float(CACHE_SIZE); + v1 -= 0.5f / float(CACHE_SIZE); + u0 += 0.5f / float(CACHE_SIZE); + v0 += 0.5f / float(CACHE_SIZE); + UINT32 rgba = u32Color(prim->color.r * 255, prim->color.g * 255, prim->color.b * 255, prim->color.a * 255); float x[4] = { prim->bounds.x0, prim->bounds.x1, prim->bounds.x0, prim->bounds.x1 }; float y[4] = { prim->bounds.y0, prim->bounds.y0, prim->bounds.y1, prim->bounds.y1 }; @@ -781,11 +781,11 @@ int renderer_bgfx::draw(int update) } } - if (index != 0) - { - bgfx::setViewFrameBuffer(index, m_framebuffer->target()); - } - bgfx::setViewSeq(index, true); + if (index != 0) + { + bgfx::setViewFrameBuffer(index, m_framebuffer->target()); + } + bgfx::setViewSeq(index, true); bgfx::setViewRect(index, 0, 0, m_width[index], m_height[index]); // Setup view transform. @@ -1020,8 +1020,8 @@ bool renderer_bgfx::check_for_dirty_atlas() const UINT32 hash = get_texture_hash(prim); // If this texture is packable and not currently in the atlas, prepare the texture for putting in the atlas if ((hash != 0 && m_hash_to_entry[hash].hash() == 0 && acquired_infos[hash].hash() == 0) - || (hash != 0 && m_hash_to_entry[hash].hash() != hash && acquired_infos[hash].hash() == 0)) - { // Create create the texture and mark the atlas dirty + || (hash != 0 && m_hash_to_entry[hash].hash() != hash && acquired_infos[hash].hash() == 0)) + { // Create create the texture and mark the atlas dirty atlas_dirty = true; m_texinfo.push_back(rectangle_packer::packable_rectangle(hash, prim->flags & PRIMFLAG_TEXFORMAT_MASK, @@ -1096,4 +1096,4 @@ void renderer_bgfx::allocate_buffer(render_primitive *prim, UINT32 blend, bgfx:: slider_state* renderer_bgfx::get_slider_list() { return nullptr; -}
\ No newline at end of file +} diff --git a/src/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h index 02f63dd65e3..474f9ef8487 100644 --- a/src/osd/modules/render/drawd3d.h +++ b/src/osd/modules/render/drawd3d.h @@ -112,9 +112,9 @@ public: bool is_mod2x_supported() { return (bool)m_mod2x_supported; } bool is_mod4x_supported() { return (bool)m_mod4x_supported; } - D3DFORMAT get_screen_format() { return m_screen_format; } - D3DFORMAT get_pixel_format() { return m_pixformat; } - D3DDISPLAYMODE get_origmode() { return m_origmode; } + D3DFORMAT get_screen_format() { return m_screen_format; } + D3DFORMAT get_pixel_format() { return m_pixformat; } + D3DDISPLAYMODE get_origmode() { return m_origmode; } UINT32 get_last_texture_flags() { return m_last_texture_flags; } @@ -134,9 +134,9 @@ private: device * m_device; // pointer to the Direct3DDevice object int m_gamma_supported; // is full screen gamma supported? - present_parameters m_presentation; // set of presentation parameters - D3DDISPLAYMODE m_origmode; // original display mode for the adapter - D3DFORMAT m_pixformat; // pixel format we are using + present_parameters m_presentation; // set of presentation parameters + D3DDISPLAYMODE m_origmode; // original display mode for the adapter + D3DFORMAT m_pixformat; // pixel format we are using vertex_buffer * m_vertexbuf; // pointer to the vertex buffer object vertex * m_lockedbuf; // pointer to the locked vertex buffer @@ -145,14 +145,14 @@ private: vertex * m_vectorbatch; // pointer to the vector batch buffer int m_batchindex; // current index into the vector batch - poly_info m_poly[VERTEX_BUFFER_SIZE/3];// array to hold polygons as they are created + poly_info m_poly[VERTEX_BUFFER_SIZE/3];// array to hold polygons as they are created int m_numpolys; // number of accumulated polygons bool m_restarting; // if we're restarting int m_mod2x_supported; // is D3DTOP_MODULATE2X supported? int m_mod4x_supported; // is D3DTOP_MODULATE4X supported? - D3DFORMAT m_screen_format; // format to use for screen textures + D3DFORMAT m_screen_format; // format to use for screen textures texture_info * m_last_texture; // previous texture UINT32 m_last_texture_flags; // previous texture flags @@ -161,8 +161,8 @@ private: int m_last_blendsrc; // previous blendmode int m_last_blenddst; // previous blendmode int m_last_filter; // previous texture filter - UINT32 m_last_wrap; // previous wrap state - int m_last_modmode; // previous texture modulation + UINT32 m_last_wrap; // previous wrap state + int m_last_modmode; // previous texture modulation void * m_hlsl_buf; // HLSL vertex data shaders * m_shaders; // HLSL interface @@ -175,4 +175,4 @@ private: #endif // OSD_WINDOWS -#endif // __WIN_DRAWD3D__
\ No newline at end of file +#endif // __WIN_DRAWD3D__ diff --git a/src/osd/modules/render/drawgdi.h b/src/osd/modules/render/drawgdi.h index 016eb487dee..7606bf14738 100644 --- a/src/osd/modules/render/drawgdi.h +++ b/src/osd/modules/render/drawgdi.h @@ -54,4 +54,4 @@ private: size_t m_bmsize; }; -#endif // __DRAWGDI__
\ No newline at end of file +#endif // __DRAWGDI__ diff --git a/src/osd/modules/render/drawnone.h b/src/osd/modules/render/drawnone.h index a426805683e..08873860e61 100644 --- a/src/osd/modules/render/drawnone.h +++ b/src/osd/modules/render/drawnone.h @@ -33,4 +33,4 @@ public: virtual void toggle_fsfx() override { } }; -#endif // __DRAWNONE__
\ No newline at end of file +#endif // __DRAWNONE__ diff --git a/src/osd/modules/render/drawogl.h b/src/osd/modules/render/drawogl.h index 8427ec62cce..3d3d3235e6e 100644 --- a/src/osd/modules/render/drawogl.h +++ b/src/osd/modules/render/drawogl.h @@ -228,8 +228,8 @@ private: INT32 m_surf_h; GLfloat m_texVerticex[8]; - static bool s_shown_video_info; - static bool s_dll_loaded; + static bool s_shown_video_info; + static bool s_dll_loaded; }; -#endif // __DRAWOGL__
\ No newline at end of file +#endif // __DRAWOGL__ diff --git a/src/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h index 9e864019a6c..5fac2653fcc 100644 --- a/src/osd/modules/render/drawsdl.h +++ b/src/osd/modules/render/drawsdl.h @@ -83,4 +83,4 @@ struct sdl_scale_mode void (*yuv_blit)(const UINT16 *bitmap, UINT8 *ptr, const int pitch, const UINT32 *lookup, const int width, const int height); }; -#endif // __DRAWSDL2__
\ No newline at end of file +#endif // __DRAWSDL2__ diff --git a/src/osd/modules/render/sdlglcontext.h b/src/osd/modules/render/sdlglcontext.h index 27c0bbe68a6..5a284ef289d 100644 --- a/src/osd/modules/render/sdlglcontext.h +++ b/src/osd/modules/render/sdlglcontext.h @@ -64,4 +64,4 @@ private: char m_error[256]; }; -#endif // __SDL_GL_CONTEXT__
\ No newline at end of file +#endif // __SDL_GL_CONTEXT__ diff --git a/src/osd/modules/render/winglcontext.h b/src/osd/modules/render/winglcontext.h index 44a30888fa5..de8e6537707 100644 --- a/src/osd/modules/render/winglcontext.h +++ b/src/osd/modules/render/winglcontext.h @@ -167,4 +167,4 @@ private: static HMODULE m_module; }; -#endif // __WIN_GL_CONTEXT__
\ No newline at end of file +#endif // __WIN_GL_CONTEXT__ diff --git a/src/osd/modules/sync/work_osd.cpp b/src/osd/modules/sync/work_osd.cpp index 3238fdfe792..584f2a7af03 100644 --- a/src/osd/modules/sync/work_osd.cpp +++ b/src/osd/modules/sync/work_osd.cpp @@ -110,7 +110,7 @@ struct work_thread_info struct osd_work_queue { - std::mutex *lock; // lock for protecting the queue + std::mutex *lock; // lock for protecting the queue osd_work_item * volatile list; // list of items in the queue osd_work_item ** volatile tailptr; // pointer to the tail pointer of work items in the queue osd_work_item * volatile free; // free list of work items diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp index 173ea376d7f..7006ec1c7b9 100644 --- a/src/osd/windows/window.cpp +++ b/src/osd/windows/window.cpp @@ -205,19 +205,19 @@ bool windows_osd_interface::window_init() } const int fallbacks[VIDEO_MODE_COUNT] = { - -1, // NONE -> no fallback - VIDEO_MODE_NONE, // GDI -> NONE - VIDEO_MODE_D3D, // BGFX -> D3D + -1, // NONE -> no fallback + VIDEO_MODE_NONE, // GDI -> NONE + VIDEO_MODE_D3D, // BGFX -> D3D #if (USE_OPENGL) - VIDEO_MODE_GDI, // OPENGL -> GDI + VIDEO_MODE_GDI, // OPENGL -> GDI #endif - -1, // No SDL2ACCEL on Windows OSD + -1, // No SDL2ACCEL on Windows OSD #if (USE_OPENGL) - VIDEO_MODE_OPENGL, // D3D -> OPENGL + VIDEO_MODE_OPENGL, // D3D -> OPENGL #else - VIDEO_MODE_GDI, // D3D -> GDI + VIDEO_MODE_GDI, // D3D -> GDI #endif - -1 // No SOFT on Windows OSD + -1 // No SOFT on Windows OSD }; int current_mode = video_config.mode; diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 5a00fe13706..bd2e9c4b11e 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -280,12 +280,12 @@ const options_entry windows_options::s_option_entries[] = { WINOPTION_HWSTRETCH ";hws", "1", OPTION_BOOLEAN, "enables hardware stretching" }, // post-processing options - { nullptr, nullptr, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" }, - { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enables HLSL post-processing (PS3.0 required)" }, - { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" }, - { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" }, - { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" }, - { WINOPTION_HLSL_WRITE, nullptr, OPTION_STRING, "enables HLSL AVI writing (huge disk bandwidth suggested)" }, + { nullptr, nullptr, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" }, + { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enables HLSL post-processing (PS3.0 required)" }, + { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" }, + { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" }, + { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" }, + { WINOPTION_HLSL_WRITE, nullptr, OPTION_STRING, "enables HLSL AVI writing (huge disk bandwidth suggested)" }, { WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" }, { WINOPTION_HLSL_SNAP_HEIGHT, "1536", OPTION_STRING, "HLSL upscaled-snapshot height" }, { WINOPTION_SHADOW_MASK_TILE_MODE, "0", OPTION_INTEGER, "shadow mask tile mode (0 for screen based, 1 for source based)" }, diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index 7ca02a92844..952831f68bc 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -278,8 +278,8 @@ private: void build_slider_list(); void update_slider_list(); - windows_options & m_options; - slider_state * m_sliders; + windows_options & m_options; + slider_state * m_sliders; static const int DEFAULT_FONT_HEIGHT = 200; }; diff --git a/src/tools/jedutil.cpp b/src/tools/jedutil.cpp index a6cfc279e2a..9f3b54c3474 100644 --- a/src/tools/jedutil.cpp +++ b/src/tools/jedutil.cpp @@ -535,14 +535,14 @@ static pin_fuse_rows peel18cv8pinfuserows[] = { {19, 2304, 0, 252}}; static pin_fuse_rows ampal18p8pinfuserows[] = { - {12, 2268, 2304, 2556}, - {13, 1944, 1980, 2232}, - {14, 1620, 1656, 1908}, - {15, 1296, 1332, 1584}, - {16, 972, 1008, 1260}, - {17, 648, 684, 936}, - {18, 324, 360, 612}, - {19, 0, 36, 288}}; + {12, 2268, 2304, 2556}, + {13, 1944, 1980, 2232}, + {14, 1620, 1656, 1908}, + {15, 1296, 1332, 1584}, + {16, 972, 1008, 1260}, + {17, 648, 684, 936}, + {18, 324, 360, 612}, + {19, 0, 36, 288}}; static pin_fuse_rows gal18v10pinfuserows[] = { {9, 3096, 3132, 3384}, @@ -2019,13 +2019,13 @@ static pal_data paldata[] = { config_peel18cv8_pins, nullptr, get_peel18cv8_pin_fuse_state}, - {"AMPAL18P8", 2600, - ampal18p8pinfuserows, ARRAY_LENGTH(ampal18p8pinfuserows), - ampal18p8pinfusecolumns, ARRAY_LENGTH(ampal18p8pinfusecolumns), - print_ampal18p8_product_terms, - config_ampal18p8_pins, - nullptr, - nullptr}, + {"AMPAL18P8", 2600, + ampal18p8pinfuserows, ARRAY_LENGTH(ampal18p8pinfuserows), + ampal18p8pinfusecolumns, ARRAY_LENGTH(ampal18p8pinfusecolumns), + print_ampal18p8_product_terms, + config_ampal18p8_pins, + nullptr, + nullptr}, {"GAL18V10", 3540, gal18v10pinfuserows, ARRAY_LENGTH(gal18v10pinfuserows), gal18v10pinfusecolumns, ARRAY_LENGTH(gal18v10pinfusecolumns), @@ -5312,7 +5312,7 @@ static void config_ampal18p8_pins(const pal_data* pal, const jed_data* jed) output_pins[output_pin_count].pin = pal->pinfuserows[index].pin; output_pins[output_pin_count].flags = OUTPUT_COMBINATORIAL | OUTPUT_FEEDBACK_OUTPUT; - if (jed_get_fuse(jed, 2591 + (8 - index))) + if (jed_get_fuse(jed, 2591 + (8 - index))) { output_pins[output_pin_count].flags |= OUTPUT_ACTIVEHIGH; } diff --git a/src/version.cpp b/src/version.cpp index 65db62b5d62..0e42f37eb5d 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.170" +#define BARE_BUILD_VERSION "0.171" extern const char bare_build_version[]; extern const char build_version[]; |