diff options
author | 2017-07-23 13:29:00 +1000 | |
---|---|---|
committer | 2017-07-23 13:29:00 +1000 | |
commit | ba3d0a88d6d84a8a239224c3a1303e80a8d84f15 (patch) | |
tree | 13d8e1d100f2dddf3b8d1e470be7ebe0312616c8 /src | |
parent | 3b369d976b6037a34edbc45d6eb9b8bead99f4c8 (diff) |
srcclean (nw)
Diffstat (limited to 'src')
56 files changed, 636 insertions, 636 deletions
diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index 7a5e6b26260..b49fedf7b82 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -22,7 +22,7 @@ enum A78_TYPE3, // as TYPE1 + POKEY chip on the PCB A78_TYPE6, // as TYPE1 + RAM IC on the PCB A78_TYPEA, // Alien Brigade, Crossbow (9x16K banks with diff bankswitch) - A78_TYPE8, // Rescue on Fractalus, as TYPE0 + 2K Mirror RAM IC on the PCB + A78_TYPE8, // Rescue on Fractalus, as TYPE0 + 2K Mirror RAM IC on the PCB A78_ABSOLUTE, // F18 Hornet A78_ACTIVISION, // Double Dragon, Rampage A78_HSC, // Atari HighScore cart diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 8d22a14e880..1c6b78f1b06 100644 --- a/src/devices/cpu/m37710/m37710.cpp +++ b/src/devices/cpu/m37710/m37710.cpp @@ -150,10 +150,10 @@ std::vector<std::pair<int, const address_space_config *>> m37710_cpu_device::mem const int m37710_cpu_device::m37710_irq_levels[M37710_LINE_MAX] = { // maskable - 0x6f, // DMA3 0 - 0x6e, // DMA2 1 - 0x6d, // DMA1 2 - 0x6c, // DMA0 3 + 0x6f, // DMA3 0 + 0x6e, // DMA2 1 + 0x6d, // DMA1 2 + 0x6c, // DMA0 3 0x70, // ADC 4 0x73, // UART 1 XMIT 5 0x74, // UART 1 RECV 6 @@ -182,10 +182,10 @@ const int m37710_cpu_device::m37710_irq_levels[M37710_LINE_MAX] = const int m37710_cpu_device::m37710_irq_vectors[M37710_LINE_MAX] = { // maskable - 0xffce, // DMA3 - 0xffd0, // DMA2 - 0xffd2, // DMA1 - 0xffd4, // DMA0 + 0xffce, // DMA3 + 0xffd0, // DMA2 + 0xffd2, // DMA1 + 0xffd4, // DMA0 0xffd6, // A-D converter 0xffd8, // UART1 transmit 0xffda, // UART1 receive @@ -225,7 +225,7 @@ const char *const m37710_cpu_device::m37710_rnames[128] = "Port P3 reg", "Port P2 dir reg", "Port P3 dir reg", - "Port P4 reg", // 10 (0x0A) - ports 0, 1, 2, 3 don't exist on 37720 + "Port P4 reg", // 10 (0x0A) - ports 0, 1, 2, 3 don't exist on 37720 "Port P5 reg", "Port P4 dir reg", "Port P5 dir reg", @@ -355,7 +355,7 @@ TIMER_CALLBACK_MEMBER( m37710_cpu_device::m37710_timer_cb ) int which = param; int curirq = M37710_LINE_TIMERA0 - which; -// logerror("Timer %d expired\n", which); +// logerror("Timer %d expired\n", which); m_timers[which]->adjust(m_reload[which], param); diff --git a/src/devices/machine/68340sim.cpp b/src/devices/machine/68340sim.cpp index 07e3c5e24d3..65090696444 100644 --- a/src/devices/machine/68340sim.cpp +++ b/src/devices/machine/68340sim.cpp @@ -9,7 +9,7 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h +//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h #define LOG_SETUP (1U << 1) #define LOG_READ (1U << 2) #define LOG_PORTS (1U << 3) @@ -19,7 +19,7 @@ #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h +//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGR(...) LOGMASKED(LOG_READ, __VA_ARGS__) #define LOGPORTS(...) LOGMASKED(LOG_PORTS, __VA_ARGS__) @@ -301,7 +301,7 @@ WRITE8_MEMBER( m68340_cpu_device::m68340_internal_sim_ports_w ) LOGSETUP(" * Reg %02x <- %02x - %s\n", offset, data, std::array<char const *, 16> {{"", "PORTA", "", "DDRA", "", "PPRA1", "", "PPRA2", "", "PORTB","", "PORTB1", "", "DDRB", "", "PPARB"}}[offset - 0x10]); - + switch (offset) { case m68340SIM_PORTA: diff --git a/src/devices/machine/mc14411.cpp b/src/devices/machine/mc14411.cpp index 726964370ca..8a3101af0c7 100644 --- a/src/devices/machine/mc14411.cpp +++ b/src/devices/machine/mc14411.cpp @@ -33,7 +33,7 @@ MACROS ***************************************************************************/ -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h +//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h #define LOG_SETUP (1U << 1) //#define VERBOSE (LOG_GENERAL|LOG_SETUP) @@ -41,7 +41,7 @@ #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h +//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #ifdef _MSC_VER @@ -58,7 +58,7 @@ ***************************************************************************/ const int mc14411_device::s_counter_divider[16] = { - ////////// X64 /////// X16 /////// X8 //////// X1 //////// + ////////// X64 /////// X16 /////// X8 //////// X1 //////// 3, // F1: 614.4 kHz 153.6 kHz 76800 Hz 9600 Hz 4, // F2: 460.8 kHz 115.2 kHz 57600 Hz 7200 Hz 6, // F3: 307.2 kHz 76800 Hz 36400 Hz 4800 Hz @@ -125,7 +125,7 @@ void mc14411_device::device_start() m_fx_timer[i] = timer_alloc(i); m_timer_enabled[i] = !m_out_fx_cbs[i].isnull(); } - + save_item(NAME(m_divider)); save_item(NAME(m_reset)); save_item(NAME(m_timer_enabled)); @@ -189,7 +189,7 @@ void mc14411_device::arm_timer(int i) //------------------------------------------------------------------------ -// device_reset - is called by the mame framework or by the owning device +// device_reset - is called by the mame framework or by the owning device // driver or by ASSERTING the reset line through set_reset_line //------------------------------------------------------------------------ @@ -201,7 +201,7 @@ void mc14411_device::device_reset() { if (!m_out_fx_cbs[i].isnull()) { - // Reset line according to datasheet and remember it for transitions to come + // Reset line according to datasheet and remember it for transitions to come (m_out_fx_cbs[i])(m_fx_state[i] = (i < TIMER_F15 ? 0 : 1)); } } @@ -242,7 +242,7 @@ void mc14411_device::device_timer(emu_timer &timer, device_timer_id id, int32_t //-------------------------------------------------------- // rate_select_w - implements the RSA and RSB input pins -// TODO: Needs to check real device behaviour how changing +// TODO: Needs to check real device behaviour how changing // divider at run time affects wave forms //-------------------------------------------------------- @@ -299,7 +299,7 @@ WRITE_LINE_MEMBER(mc14411_device::reset_w) LOGSETUP("%s %02x\n", FUNCNAME, state); m_reset = state; - + if (m_reset == ASSERT_LINE) { LOGSETUP(" - Asserting reset\n"); diff --git a/src/devices/machine/mc14411.h b/src/devices/machine/mc14411.h index 4130fa746c9..772be8370b4 100644 --- a/src/devices/machine/mc14411.h +++ b/src/devices/machine/mc14411.h @@ -15,7 +15,7 @@ F9 7 | MC14411 | 18 F15 F11 8 | | 17 F2 F14 9 | | 16 F4 - Reset* 10 | | 15 F6 + Reset* 10 | | 15 F6 Not Used 11 | | 14 F12 VSS 12 |_____________| 13 F13 @@ -121,8 +121,8 @@ private: devcb_write_line m_out_fx_cbs[16]; - uint32_t m_divider; // main divider to use, 0-3 column index into counter_divider - uint32_t m_reset; // Reset line state + uint32_t m_divider; // main divider to use, 0-3 column index into counter_divider + uint32_t m_reset; // Reset line state bool m_timer_enabled[16]; }; diff --git a/src/devices/machine/ncr5390.cpp b/src/devices/machine/ncr5390.cpp index 4cdf09cc3da..72adb5d8f76 100644 --- a/src/devices/machine/ncr5390.cpp +++ b/src/devices/machine/ncr5390.cpp @@ -464,7 +464,7 @@ void ncr5390_device::step(bool timeout) break; // check for command complete - if ((dma_command && tcounter == 0) // dma in/out: transfer counter == 0 + if ((dma_command && tcounter == 0) // dma in/out: transfer counter == 0 || (!dma_command && (xfr_phase & S_INP) == 0 && fifo_pos == 0) // non-dma out: fifo empty || (!dma_command && (xfr_phase & S_INP) == S_INP && fifo_pos == 1)) // non-dma in: every byte state = INIT_XFR_BUS_COMPLETE; diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp index e4f527d8caf..f8705686e20 100644 --- a/src/devices/machine/smioc.cpp +++ b/src/devices/machine/smioc.cpp @@ -20,11 +20,11 @@ * CPU - Intel N80C188 L0450591 @ ??MHz - U23 * MCU - Signetics SC87C451CCA68 220CP079109KA 97D8641 - U70 * DMA - KS82C37A - U46, U47, U48, U49, U50 - * SCC - Signetics SCC2698BC1A84 - U67 + * SCC - Signetics SCC2698BC1A84 - U67 * Memory - NEC D43256AGU-10LL 8948A9038 SRAM 32KB - U51 * Memory - Mitsubishi M5M187AJ 046101-35 SRAM 64K X 1?? - U37 - * Memory - AT&T M79018DX-15B 2K X 9 Dual Port SRAM - U53 - * Memory - AT&T M79018DX-15B 2K X 9 Dual Port SRAM - U54 + * Memory - AT&T M79018DX-15B 2K X 9 Dual Port SRAM - U53 + * Memory - AT&T M79018DX-15B 2K X 9 Dual Port SRAM - U54 Logic: * U8 - 22V10-25JC @@ -42,23 +42,23 @@ Program Memory: * 0x00000 - 0x07FFF : SRAM D43256AGU-10LL 32KB * 0xF8000 - 0xFFFFF : ROM 27C256 PLCC32 32KB - * 0xC0080 - 0xC008F : KS82C37A - Probably RAM DMA - * 0xC0090 - 0xC009F : KS82C37A - Serial DMA (Port 1 and 2?) - * 0xC00A0 - 0xC00AF : KS82C37A - Serial DMA (Port 3 and 4?) - * 0xC00B0 - 0xC00BF : KS82C37A - Serial DMA (Port 5 and 6?) - * 0xC00C0 - 0xC00CF : KS82C37A - Serial DMA (Port 7 and 8?) + * 0xC0080 - 0xC008F : KS82C37A - Probably RAM DMA + * 0xC0090 - 0xC009F : KS82C37A - Serial DMA (Port 1 and 2?) + * 0xC00A0 - 0xC00AF : KS82C37A - Serial DMA (Port 3 and 4?) + * 0xC00B0 - 0xC00BF : KS82C37A - Serial DMA (Port 5 and 6?) + * 0xC00C0 - 0xC00CF : KS82C37A - Serial DMA (Port 7 and 8?) IO Memory: * Unknown TODO: - * Emulate SCC and hook up RS232 ports - * Hook up console to RS232 port 1 - * Hook up System Monitor II to RS232 port 2 - * Dump 87C451 rom data and emulate MCU - * Dump 87C51 on SMIOC interconnect box - * Dump all PAL chips - * Hook up status LEDs + * Emulate SCC and hook up RS232 ports + * Hook up console to RS232 port 1 + * Hook up System Monitor II to RS232 port 2 + * Dump 87C451 rom data and emulate MCU + * Dump 87C51 on SMIOC interconnect box + * Dump all PAL chips + * Hook up status LEDs */ #include "emu.h" diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp index 39f25c3182c..5562473a77d 100644 --- a/src/devices/machine/tmp68301.cpp +++ b/src/devices/machine/tmp68301.cpp @@ -108,10 +108,10 @@ READ8_MEMBER(tmp68301_device::icr_r) WRITE8_MEMBER(tmp68301_device::icr_w) { /* - --x- ---- Vector number is autogenerated if 1, else use external source - ---x x--- 00 falling edge, 01 low level, 10 rising edge, 11 high level - ^ applies only to external irqs (offset 0 to 2) - ---- -xxx irq level + --x- ---- Vector number is autogenerated if 1, else use external source + ---x x--- 00 falling edge, 01 low level, 10 rising edge, 11 high level + ^ applies only to external irqs (offset 0 to 2) + ---- -xxx irq level */ m_icr[offset] = data; } @@ -296,7 +296,7 @@ void tmp68301_device::update_irq_state(uint16_t cause) uint16_t IVNR = m_regs[0x9a/2]; // Interrupt Vector Number Register (IVNR) // add cause to interrupt in-service register m_iisr |= cause; - + for (i = 0; i < 3; i++) { if ((m_iisr & 1 << i) && !(m_imr & (1<<i))) @@ -319,13 +319,13 @@ void tmp68301_device::update_irq_serial(uint16_t cause, uint8_t type) { int i; const uint8_t serial_irq_vector[3] = { 8, 0xc, 0x10 }; - + /* Take care of external interrupts */ uint16_t IVNR = m_regs[0x9a/2]; // Interrupt Vector Number Register (IVNR) // add cause to interrupt in-service register m_iisr |= cause; - + for (i = 4; i < 7; i++) { if ((m_iisr & 1 << i) && !(m_imr & (1<<i))) @@ -351,7 +351,7 @@ void tmp68301_device::update_irq_serial(uint16_t cause, uint8_t type) machine().firstcpu->set_input_line(level,HOLD_LINE); } - } + } } diff --git a/src/devices/machine/tmp68301.h b/src/devices/machine/tmp68301.h index 9e6c19ce9e3..1083fc1645f 100644 --- a/src/devices/machine/tmp68301.h +++ b/src/devices/machine/tmp68301.h @@ -40,7 +40,7 @@ public: void external_interrupt_0(); void external_interrupt_1(); void external_interrupt_2(); - + DECLARE_READ16_MEMBER(imr_r); DECLARE_WRITE16_MEMBER(imr_w); DECLARE_READ16_MEMBER(iisr_r); @@ -67,7 +67,7 @@ private: void update_timer( int i ); void update_irq_state(uint16_t cause); void update_irq_serial(uint16_t cause, uint8_t type); - + static constexpr uint16_t EXT_IRQ0 = 1 << 0; static constexpr uint16_t EXT_IRQ1 = 1 << 1; static constexpr uint16_t EXT_IRQ2 = 1 << 2; @@ -78,7 +78,7 @@ private: static constexpr uint16_t TIMER0_IRQ = 1 << 8; static constexpr uint16_t TIMER1_IRQ = 1 << 9; static constexpr uint16_t TIMER2_IRQ = 1 << 10; - + inline uint16_t read_word(offs_t address); inline void write_word(offs_t address, uint16_t data); @@ -98,7 +98,7 @@ private: uint16_t m_pdir; uint16_t m_pdr; uint8_t m_icr[10]; - + const address_space_config m_space_config; }; diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index 7c1fa28fbfc..f8fb30a059a 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -17,12 +17,12 @@ Implements WD2010 / WD1010 controller basics for a single hard disk. UNIMPLEMENTED FEATURES : - more than 1 drive (untested) - - multi sector transfers (M = 1) + - multi sector transfers (M = 1) - seek and index timers / ID not found. - implied seeks / implied writes / retries - edge or level triggered seek complete (SC) - - set_parameter / compute_correction - (the DWC flag is not usable in this context). + - set_parameter / compute_correction + (the DWC flag is not usable in this context). Pseudo code (from datasheet) left in to illustrate the intended instruction flow. Some loops were omitted! @@ -529,7 +529,7 @@ void wd2010_device::seek(uint8_t data) // ...update CYLINDER registers with cylinder found - m_task_file[TASK_FILE_CYLINDER_HIGH] = (m_present_cylinder >> 8) & 0xff; m_task_file[TASK_FILE_CYLINDER_LOW] = (m_present_cylinder - ((m_task_file[TASK_FILE_CYLINDER_HIGH] << 8) )) & 0xff; - + logerror("SEEK (END) - m_present_cylinder = %u SDH CYL L/H %02x / %02x\n", m_present_cylinder,m_task_file[TASK_FILE_CYLINDER_LOW],m_task_file[TASK_FILE_CYLINDER_HIGH]); cmd_timer->adjust(attotime::from_msec(35), newstatus); // 35 msecs makes "SEEK_TIMING" test happy. diff --git a/src/devices/video/huc6271.h b/src/devices/video/huc6271.h index 89dd5874e71..b578ae5f9ee 100644 --- a/src/devices/video/huc6271.h +++ b/src/devices/video/huc6271.h @@ -27,7 +27,7 @@ // ======================> huc6271_device class huc6271_device : public device_t, - public device_memory_interface + public device_memory_interface { public: // construction/destruction diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 0504b3f5f7f..2980752e547 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -949,8 +949,8 @@ mc6847_friend_device::character_map::character_map(const uint8_t *text_fontdata, // an external ROM nor are we on an MC6847T1 fontdata = m_stripes; character_mask = 0x7F; - color_base_0 = (mode & MODE_CSS ? 14 : 12); - color_base_1 = (mode & MODE_CSS ? 15 : 13); + color_base_0 = (mode & MODE_CSS ? 14 : 12); + color_base_1 = (mode & MODE_CSS ? 15 : 13); } else { diff --git a/src/devices/video/sda5708.cpp b/src/devices/video/sda5708.cpp index 99f097da593..5b9973ba2cd 100644 --- a/src/devices/video/sda5708.cpp +++ b/src/devices/video/sda5708.cpp @@ -17,7 +17,7 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h +//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h #define LOG_SETUP (1U << 1) #define LOG_CMD (1U << 2) #define LOG_DATA (1U << 3) @@ -28,7 +28,7 @@ #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h +//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGCMD(...) LOGMASKED(LOG_CMD, __VA_ARGS__) #define LOGDATA(...) LOGMASKED(LOG_DATA, __VA_ARGS__) @@ -62,15 +62,15 @@ DEFINE_DEVICE_TYPE(SDA5708, sda5708_device, "sda5708", "SDA570 sda5708_device::sda5708_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, SDA5708, tag, owner, clock) - , m_serial(0) - , m_load(0) - , m_reset(0) - , m_data(0) - , m_sdclk(0) - , m_cdp(0) - , m_digit(0) - , m_bright(0) - , m_clear(0) + , m_serial(0) + , m_load(0) + , m_reset(0) + , m_data(0) + , m_sdclk(0) + , m_cdp(0) + , m_digit(0) + , m_bright(0) + , m_clear(0) , m_ip(0) { } @@ -117,7 +117,7 @@ void sda5708_device::device_reset() // // The Load pin is an active low input used to enable data transfer into the display. // When Load is low, data is clocked into the 8 bit serial data register. When Load goes -// high, the contents of the 8 bit serial data register are evaluated by the display controller. +// high, the contents of the 8 bit serial data register are evaluated by the display controller. // While Load remains high the Data and SDCLK pins may be used to control other serial devices // on the same bus. //------------------------------------------------- @@ -146,7 +146,7 @@ WRITE_LINE_MEMBER( sda5708_device::load_w ) LOG("%s - line %s\n", FUNCNAME, state == ASSERT_LINE ? "asserted" : "cleared"); if (m_load != state && m_reset == CLEAR_LINE && state == CLEAR_LINE) { - switch (m_serial & SDA5708_REG_MASK) + switch (m_serial & SDA5708_REG_MASK) { case SDA5708_CNTR_COMMAND: LOGCMD("- Control command: %02x\n", m_serial); @@ -193,7 +193,7 @@ WRITE_LINE_MEMBER( sda5708_device::load_w ) break; } } - m_load = state; + m_load = state; } //------------------------------------------------- @@ -235,7 +235,7 @@ WRITE_LINE_MEMBER( sda5708_device::sdclk_w ) // // When the Reset pin is held low, the display will be reset. The multiplex counter, the address register, // the control word and the display bit patterns are all cleared. This means that the display will be -// blank and the display is set to 100% brightness and maximum peak current. +// blank and the display is set to 100% brightness and maximum peak current. // During normal operation the Reset pin is only made low for a short period when power is applied to // the circuit and is left at high level from then on. //------------------------------------------------- diff --git a/src/devices/video/sda5708.h b/src/devices/video/sda5708.h index 30769c04bb4..d2c0e5a92b9 100644 --- a/src/devices/video/sda5708.h +++ b/src/devices/video/sda5708.h @@ -18,28 +18,28 @@ * * Display front - LEDs * -------------------- - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx - * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx + * xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx xxxxx * Dig0 Dig1 Dig2 Dig3 Dig4 Dig5 Dig6 Dig7 * * Display rear - Pinout * --------------------- - * +--------------------------------------------------------+ - * | O O | - * | +----------------------------------------------+ | - * | | o o o o o o | | - * | | Pin:6 5 4 3 2 1 | | - * | | | | - * | +----------------------------------------------+ | - * +--------------------------------------------------------+ + * +--------------------------------------------------------+ + * | O O | + * | +----------------------------------------------+ | + * | | o o o o o o | | + * | | Pin:6 5 4 3 2 1 | | + * | | | | + * | +----------------------------------------------+ | + * +--------------------------------------------------------+ * 6:GND 5:_RESET 4:SDCLK 3:Data 2:_Load 1:Vcc - * - */ + * + */ ///************************************************************************* // INTERFACE CONFIGURATION MACROS diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index a4aed1d34b8..88754be3907 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -86,7 +86,7 @@ private: virtual void handle() override; ui_software_info const &m_uiinfo; - s_parts const m_parts; + s_parts const m_parts; }; class menu_select_launch::bios_selection : public menu diff --git a/src/frontend/mame/ui/selmenu.h b/src/frontend/mame/ui/selmenu.h index f101d8955e5..a95c5464373 100644 --- a/src/frontend/mame/ui/selmenu.h +++ b/src/frontend/mame/ui/selmenu.h @@ -217,7 +217,7 @@ private: // cleanup function static void exit(running_machine &machine); - bool m_ui_error; + bool m_ui_error; std::string m_error_text; game_driver const *m_info_driver; diff --git a/src/lib/formats/itt3030_dsk.cpp b/src/lib/formats/itt3030_dsk.cpp index 1f2e088b13c..305ab644233 100644 --- a/src/lib/formats/itt3030_dsk.cpp +++ b/src/lib/formats/itt3030_dsk.cpp @@ -37,18 +37,18 @@ const char *itt3030_format::extensions() const const itt3030_format::format itt3030_format::formats[] = { { /* 5,25" DS DD 70 tracks 16 SPT 256 bytes/sector */ floppy_image::FF_525, floppy_image::DSQD, floppy_image::MFM, - 2000, - 16, 70, 2, - 256, {}, - 1, {}, + 2000, + 16, 70, 2, + 256, {}, + 1, {}, 32, 22, 31 }, {/* 5,25" DS DD 35 tracks 16 SPT 256 bytes/sector */ floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM, - 2000, - 16, 35, 2, - 256, {}, - 1, {}, + 2000, + 16, 35, 2, + 256, {}, + 1, {}, 32, 22, 31 } }; diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index 4eb42c5e6e7..f90d5a83c62 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -1255,7 +1255,7 @@ void dcs_audio_device::denver_alloc_dmadac() if (m_channels < 6) dmadac_enable(&m_dmadac[m_channels], 6 - m_channels, false); //if (enable) - // recompute_sample_rate(); + // recompute_sample_rate(); } READ16_MEMBER( dcs_audio_device::denver_r ) @@ -1626,7 +1626,7 @@ uint16_t dcs_audio_device::data_r() TIMER_CALLBACK_MEMBER( dcs_audio_device::output_control_delayed_w ) { //if (LOG_DCS_IO) - // logerror("output_control = %04X\n", param); + // logerror("output_control = %04X\n", param); m_output_control = param; m_output_control_cycles = 0; } @@ -1657,7 +1657,7 @@ int dcs_audio_device::data2_r() if (m_rev >= 3) { // Not sure about this but allows sf2049 and roadburn to pass audio initialization tests at boot return m_output_control << 8; - } + } else { return m_output_control; } diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp index 788a1fd66e4..386a8bc8c7f 100644 --- a/src/mame/audio/nichisnd.cpp +++ b/src/mame/audio/nichisnd.cpp @@ -2,15 +2,15 @@ // copyright-holders:Angelo Salese,Takahiro Nogi /*************************************************************************** - Nichibutsu sound HW - - Shared component between niyanpai.cpp and csplayh5.cpp - - Uses a TMPZ84C011 with YM3812 and two DACs - - TODO: - - DVD sound routing in here - + Nichibutsu sound HW + + Shared component between niyanpai.cpp and csplayh5.cpp + + Uses a TMPZ84C011 with YM3812 and two DACs + + TODO: + - DVD sound routing in here + ***************************************************************************/ #include "emu.h" @@ -100,7 +100,7 @@ MACHINE_CONFIG_MEMBER(nichisnd_device::device_add_mconfig) MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE_EX(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) - MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) + MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END @@ -109,7 +109,7 @@ MACHINE_CONFIG_END //------------------------------------------------- void nichisnd_device::device_start() -{ +{ uint8_t *SNDROM = m_sound_rom; // sound program patch diff --git a/src/mame/audio/nichisnd.h b/src/mame/audio/nichisnd.h index 9c72310cdcb..6343a3832dd 100644 --- a/src/mame/audio/nichisnd.h +++ b/src/mame/audio/nichisnd.h @@ -2,7 +2,7 @@ // copyright-holders:Angelo Salese,Takahiro Nogi /*************************************************************************** - Nichibutsu sound HW + Nichibutsu sound HW ***************************************************************************/ @@ -51,7 +51,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; virtual void device_reset() override; - + private: required_device<generic_latch_8_device> m_soundlatch; required_region_ptr<uint8_t> m_sound_rom; diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp index 27c9d411c2f..0421c97b588 100644 --- a/src/mame/drivers/alphatro.cpp +++ b/src/mame/drivers/alphatro.cpp @@ -4,7 +4,7 @@ Triumph-Adler (or Royal) Alphatronic PC - Driver by Barry Rodewald, Robbbert, R. Belmont and Carl + Driver by Barry Rodewald, Robbbert, R. Belmont and Carl z80 + HD46505SP as a CRTC @@ -13,14 +13,14 @@ Floppy format: 13cm, 2 sides, 40 tracks, 16 sectors, 256 bytes = 320kb. FDC (uPD765) is in a plug-in module, there is no ROM on the module. - A configuration switch determines if the FDC is present. + A configuration switch determines if the FDC is present. Has a socket for monochrome (to the standard amber monitor), and another for RGB. We emulate this with a configuration switch. ToDo: - Newer ROM set from Team Europe and try to work out the graphics expansion - - uPD765 oddness that prevents Disk BASIC from loading + - uPD765 oddness that prevents Disk BASIC from loading ***************************************************************************/ @@ -85,7 +85,7 @@ public: DECLARE_READ8_MEMBER(port30_r); DECLARE_WRITE8_MEMBER(port30_w); DECLARE_READ8_MEMBER(portf0_r); - DECLARE_WRITE8_MEMBER(portf0_w); + DECLARE_WRITE8_MEMBER(portf0_w); DECLARE_INPUT_CHANGED_MEMBER(alphatro_break); DECLARE_WRITE_LINE_MEMBER(txdata_callback); DECLARE_WRITE_LINE_MEMBER(write_usart_clock); @@ -125,7 +125,7 @@ private: void alphatro_state::update_banking() { - if (m_port_10 & 0x80) // RAM at 0000? + if (m_port_10 & 0x80) // RAM at 0000? { m_lowbank->set_bank(1); } @@ -133,8 +133,8 @@ void alphatro_state::update_banking() { m_lowbank->set_bank(0); } - - if (m_port_10 & 0x40) // ROM cartridge at A000 + + if (m_port_10 & 0x40) // ROM cartridge at A000 { m_cartbank->set_bank(0); } @@ -142,14 +142,14 @@ void alphatro_state::update_banking() { m_cartbank->set_bank(1); } - - if (m_port_20 & 0x08) // VRAM at F000? + + if (m_port_20 & 0x08) // VRAM at F000? { m_monbank->set_bank(0); } else { - if (m_port_20 & 0x40) // IPL or Monitor at F000? + if (m_port_20 & 0x40) // IPL or Monitor at F000? { m_monbank->set_bank(2); } @@ -160,21 +160,21 @@ void alphatro_state::update_banking() } } -READ8_MEMBER (alphatro_state::ram0000_r) -{ - if (offset < 0xf000) +READ8_MEMBER (alphatro_state::ram0000_r) +{ + if (offset < 0xf000) { - return m_ram_ptr[offset]; + return m_ram_ptr[offset]; } return m_p_videoram[offset & 0xfff]; } -WRITE8_MEMBER(alphatro_state::ram0000_w) -{ - if (offset < 0xf000) +WRITE8_MEMBER(alphatro_state::ram0000_w) +{ + if (offset < 0xf000) { - m_ram_ptr[offset] = data; + m_ram_ptr[offset] = data; } else { @@ -188,9 +188,9 @@ READ8_MEMBER (alphatro_state::rama000_r) { return m_ram_ptr[offset+0xa000]; } WRITE8_MEMBER(alphatro_state::rama000_w) { m_ram_ptr[offset+0xa000] = data; } READ8_MEMBER (alphatro_state::rame000_r) { return m_ram_ptr[offset+0xe000]; } WRITE8_MEMBER(alphatro_state::rame000_w) { m_ram_ptr[offset+0xe000] = data; } - + READ8_MEMBER( alphatro_state::port10_r ) -{ +{ // Bit 0 -> 1 = FDC is installed, 0 = not // Bit 1 -> 1 = Graphic Board is installed, 0 = not // Bits 2-4 = Country select: 0 = Intl, 1 = German, 2 = US @@ -199,14 +199,14 @@ READ8_MEMBER( alphatro_state::port10_r ) // Bit 7 -> 1 = vblank or hblank, 0 = active display area u8 retval = 0x40; - + // we'll get "FDC present" and "graphics expansion present" from the config switches retval |= (m_config->read() & 3); if ((m_screen->vblank()) || (m_screen->hblank())) { retval |= 0x80; - } + } return retval; } @@ -232,7 +232,7 @@ WRITE8_MEMBER( alphatro_state::port10_w ) if (BIT(data,2)) m_cass_state = 1; - + update_banking(); } @@ -248,7 +248,7 @@ WRITE8_MEMBER( alphatro_state::port20_w ) // Bit 7 -> N/A m_port_20 = data; - + update_banking(); } @@ -260,9 +260,9 @@ READ8_MEMBER( alphatro_state::port30_r ) // Bit 3 -> 1 = Centronics BUSY, 0 = not u8 retval = 0; - + if (m_screen->vblank()) retval |= 0x02; - + return retval; } @@ -281,7 +281,7 @@ WRITE8_MEMBER( alphatro_state::portf0_w) if ((data & 0x1) && !(m_port_f0)) { m_fdc->reset(); - + floppy_connector *con = machine().device<floppy_connector>("fdc:0"); floppy_image_device *floppy = con ? con->get_device() : nullptr; if (floppy) @@ -296,7 +296,7 @@ WRITE8_MEMBER( alphatro_state::portf0_w) floppy->mon_w(0); } } - + m_port_f0 = data; } @@ -547,7 +547,7 @@ static INPUT_PORTS_START( alphatro ) PORT_CONFNAME( 0x20, 0x00, "Monitor") PORT_CONFSETTING( 0x00, "RGB") PORT_CONFSETTING( 0x20, "Amber") - + PORT_CONFNAME(0x01, 0x00, "Floppy disk installed") PORT_CONFSETTING(0x00, "Not present") PORT_CONFSETTING(0x01, "Installed") @@ -682,7 +682,7 @@ static MACHINE_CONFIG_START( alphatro ) MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dmac", i8257_device, dreq2_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", alphatro_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatro_floppies, "525dd", floppy_image_device::default_floppy_formats) - + MCFG_DEVICE_ADD("dmac" , I8257, MAIN_CLOCK) MCFG_I8257_OUT_HRQ_CB(WRITELINE(alphatro_state, hrq_w)) MCFG_I8257_IN_MEMR_CB(READ8(alphatro_state, ram0000_r)) @@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( alphatro ) MCFG_I8257_IN_IOR_2_CB(DEVREAD8("fdc", upd765a_device, mdma_r)) MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("fdc", upd765a_device, mdma_w)) MCFG_I8257_OUT_TC_CB(DEVWRITELINE("fdc", upd765a_device, tc_line_w)) - + MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12_288MHz / 8) // clk unknown MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) @@ -725,14 +725,14 @@ static MACHINE_CONFIG_START( alphatro ) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG) MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) MCFG_ADDRESS_MAP_BANK_STRIDE(0x4000) - + /* F000 banking */ MCFG_DEVICE_ADD("monbank", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(monbank_map) MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG) MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) - + // software list MCFG_SOFTWARE_LIST_ADD("flop_list", "alphatro_flop") MACHINE_CONFIG_END diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index d748836c8b8..681515f98ad 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -18,13 +18,13 @@ * M4T28-8R128H1 TimeKeeper RTC/CMOS * PLX PCI9050 Bus Target Interface Chip (interfaces ISA-style designs to PCI) * Midway ZeusII-series custom video - * Actiontec PM560LKI PCI Data/Fax Modem (PCI\VEN_11C1&DEV_0480&SUBSYS_04801668) - * TL16c552 dual UART - * ADSP-2181 based DCS2 audio (unclear which variant) - * ICS AV9110 Serially Programmable Frequency Generator. Programmed through ADSP FL0,FL1,FL2 pins. - * Cirrus Logic CS4338 16 bit stereo audio serial DAC, PCB has space for 3 chips (6-channels), only 1 is populated - * Maxim MAX192 8 channel 10 bit serial ADC - * PIC16C57 (protection? serial #?) + * Actiontec PM560LKI PCI Data/Fax Modem (PCI\VEN_11C1&DEV_0480&SUBSYS_04801668) + * TL16c552 dual UART + * ADSP-2181 based DCS2 audio (unclear which variant) + * ICS AV9110 Serially Programmable Frequency Generator. Programmed through ADSP FL0,FL1,FL2 pins. + * Cirrus Logic CS4338 16 bit stereo audio serial DAC, PCB has space for 3 chips (6-channels), only 1 is populated + * Maxim MAX192 8 channel 10 bit serial ADC + * PIC16C57 (protection? serial #?) * Quantum Fireball CX 6.4GB IDE HDD (C/H/S 13328/15/63) TODO: diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp index 3213b44ddba..20a91ff347a 100644 --- a/src/mame/drivers/csplayh5.cpp +++ b/src/mame/drivers/csplayh5.cpp @@ -9,8 +9,8 @@ TODO: - Implement DVD routing and YUV decoding; - game timings seem busted, could be due of missing DVD hook-up - - csplayh1: inputs doesn't work at all, slower than the others too. - Probably not a DVD but CD rom game? + - csplayh1: inputs doesn't work at all, slower than the others too. + Probably not a DVD but CD rom game? DVD Notes: - TMP68301 communicates with h8 via their respective internal serial comms @@ -61,7 +61,7 @@ public: required_device<nichisnd_device> m_nichisnd; required_ioport_array<5> m_key; required_memory_region m_region_maincpu; - + uint16_t m_mux_data; DECLARE_READ16_MEMBER(csplayh5_mux_r); @@ -91,7 +91,7 @@ public: DECLARE_DRIVER_INIT(renaimj); DECLARE_DRIVER_INIT(thenanpa); DECLARE_DRIVER_INIT(tsuwaku); - + virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(csplayh5_irq); DECLARE_WRITE_LINE_MEMBER(csplayh5_vdp0_interrupt); @@ -343,10 +343,10 @@ WRITE_LINE_MEMBER(csplayh5_state::ide_irq) WRITE16_MEMBER(csplayh5_state::tmp68301_parallel_port_w) { /* - -x-- ---- used during ROM check, h8 reset assert? - ---- x--- enable DVD sound? Used by aimode at very least + -x-- ---- used during ROM check, h8 reset assert? + ---- x--- enable DVD sound? Used by aimode at very least */ - + if(data & ~0x48) printf("%04x\n",data); } @@ -434,7 +434,7 @@ DRIVER_INIT_MEMBER(csplayh5_state,tsuwaku) { general_init(0x856e/2, 0x6018); } #define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \ ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(bios+1)) /* Note '+1' */ - + #define DVD_BIOS \ ROM_REGION( 0x20000, "subcpu", 0 ) \ ROM_SYSTEM_BIOS( 0, "vb102", "va1b102" ) \ @@ -448,7 +448,7 @@ DRIVER_INIT_MEMBER(csplayh5_state,tsuwaku) { general_init(0x856e/2, 0x6018); } // dummy ROM definition ROM_START( nichidvd ) ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASE00 ) // tmp68301 prg - + DVD_BIOS ROM_REGION( 0x20000, ":nichisnd:audiorom", ROMREGION_ERASE00 ) // z80 @@ -483,21 +483,21 @@ ROM_END ROM_START( mjgalpri ) ROM_REGION( 0x40000, "maincpu", 0 ) // tmp68301 prg - ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(e8427076) SHA1(9b449599ffac2b67a29fac11d1e85218668d805d) ) + ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(e8427076) SHA1(9b449599ffac2b67a29fac11d1e85218668d805d) ) ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(653fcc14) SHA1(6231ec5f45a9f5e587dcd00ff85f9bbfae7364ab) ) - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 - ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(7b9b1887) SHA1(1393a1d79f3cc7ab68275791af4ec16e825056df) ) + ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(7b9b1887) SHA1(1393a1d79f3cc7ab68275791af4ec16e825056df) ) DVD_BIOS - + ROM_REGION( 0x400000, "blit_gfx", ROMREGION_ERASEFF ) // blitter based gfxs - ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(6497bc8f) SHA1(ce0ecfab8df87f7356aa42648e47ffda53840188) ) - ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(3ac982e8) SHA1(d889d45888cf7bcb5af808f63e9ad41204bd5992) ) - - ROM_REGION( 0x040000, "gal", ROMREGION_ERASE00 ) + ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(6497bc8f) SHA1(ce0ecfab8df87f7356aa42648e47ffda53840188) ) + ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(3ac982e8) SHA1(d889d45888cf7bcb5af808f63e9ad41204bd5992) ) + + ROM_REGION( 0x040000, "gal", ROMREGION_ERASE00 ) ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(4c92a523) SHA1(51da73fdfdfccdc070fa8a13163e031438b50876) ) - + DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb8001", 0, SHA1(30f356af4e08567273a88758bb0ddd3544eea228) ) ROM_END @@ -527,7 +527,7 @@ ROM_START( csplayh5 ) ROM_LOAD16_BYTE( "1.ic2", 0x00001, 0x20000, CRC(81ca49a4) SHA1(601b6802ab85be61f45a64f5b4c7e1f1ae5ee887) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x00000, 0x20000, CRC(0b920806) SHA1(95f50ebfb296ba29aaa8079a41f5362cb9e879cc) ) @@ -565,21 +565,21 @@ ROM_END ROM_START( mogitate ) ROM_REGION( 0x40000, "maincpu", 0 ) // tmp68301 prg - ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(42ec6c2e) SHA1(a0279502e1f7e62f072ec6612caf198aa0ae3af7) ) - ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(f71546c6) SHA1(546b0d12e7b1627c96d5a17c015bdbbca1e93232) ) + ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(42ec6c2e) SHA1(a0279502e1f7e62f072ec6612caf198aa0ae3af7) ) + ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(f71546c6) SHA1(546b0d12e7b1627c96d5a17c015bdbbca1e93232) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 - ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(7927c1d6) SHA1(15f0c0051124e7b7667eb721dd12938333b31899) ) + ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(7927c1d6) SHA1(15f0c0051124e7b7667eb721dd12938333b31899) ) ROM_REGION( 0x400000, "blit_gfx", ROMREGION_ERASEFF ) // blitter based gfxs - ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(ea655990) SHA1(7f59cfab21e8858625e82a9501acc943b07f799c) ) - ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(4c910b86) SHA1(48007f03f4e445b9de15531afe821c1b18fccae1) ) + ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(ea655990) SHA1(7f59cfab21e8858625e82a9501acc943b07f799c) ) + ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(4c910b86) SHA1(48007f03f4e445b9de15531afe821c1b18fccae1) ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb8006", 0, SHA1(aa911e46e791d89ce4fed4a32b4b0637ba3a9920) ) - + ROM_REGION( 0x040000, "gal", ROMREGION_ERASE00 ) ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(ac5c9495) SHA1(1c54ecf6dedbf8c3a29207c1c91b52e2ff394d9d) ) ROM_END @@ -611,7 +611,7 @@ ROM_START( renaimj ) ROM_LOAD16_BYTE( "1.ic2", 0x00001, 0x20000, CRC(285a5651) SHA1(c572a7c82759600e29e31518c69b17ae173c2263) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x00000, 0x20000, CRC(614d17b9) SHA1(d6fb4441f55902c2b89b4bec53aae5311d81f07b) ) @@ -622,9 +622,9 @@ ROM_START( renaimj ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb8008", 0, SHA1(49c92cb9b08ee7773f3d93fce0bbecc3c0ae654d) ) - + ROM_REGION( 0x40000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "gal18v8b.020", 0x000000, 0x040000, CRC(0a32a144) SHA1(f3b4a1174adbb2f7b7500adeafa20142f6a16d08) ) + ROM_LOAD( "gal18v8b.020", 0x000000, 0x040000, CRC(0a32a144) SHA1(f3b4a1174adbb2f7b7500adeafa20142f6a16d08) ) ROM_END ROM_START( bikiniko ) @@ -633,7 +633,7 @@ ROM_START( bikiniko ) ROM_LOAD16_BYTE( "1.ic2", 0x00001, 0x20000, CRC(13a885af) SHA1(ba8221fab1a37f1937e4399eabe3eaa9093884d3) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x00000, 0x20000, CRC(4a2142d6) SHA1(3a762f7b7cccdb6715b5f59524b04b12694fc130) ) @@ -652,7 +652,7 @@ ROM_START( csplayh6 ) ROM_LOAD16_BYTE( "1.ic2", 0x00001, 0x20000, CRC(1e4679ca) SHA1(f5df03c07f749906bbcef26a4a5d433564d4aeb8) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x00000, 0x20000, CRC(3ce03f2d) SHA1(5ccdcac8bad25b4f680ed7a2074575711c25af41) ) @@ -663,9 +663,9 @@ ROM_START( csplayh6 ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb8010", 0, SHA1(01e247fe1b86bbfe743e09a625432874f881a9a0) ) - + ROM_REGION( 0x40000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "palce16v8h.020_bad", 0x000000, 0x040000, BAD_DUMP CRC(2aec4e37) SHA1(79d64394c0f6f2c5e17ae9fc62eaa279da466ccd) ) + ROM_LOAD( "palce16v8h.020_bad", 0x000000, 0x040000, BAD_DUMP CRC(2aec4e37) SHA1(79d64394c0f6f2c5e17ae9fc62eaa279da466ccd) ) ROM_END ROM_START( thenanpa ) @@ -695,7 +695,7 @@ ROM_START( pokoachu ) ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(789ffbc8) SHA1(44f3846414682e19465b485ffb89c7b78920cb0a) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(9d344bad) SHA1(276c8066a2b5090edf6ba00843b7a9496c90f99f) ) @@ -707,7 +707,7 @@ ROM_START( pokoachu ) DISK_IMAGE_READONLY( "nb8012", 0, SHA1(06c611f110377f5d02bbde1ab1d43d3623772b7b) ) ROM_REGION( 0x40000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(ac5c9495) SHA1(1c54ecf6dedbf8c3a29207c1c91b52e2ff394d9d) ) + ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(ac5c9495) SHA1(1c54ecf6dedbf8c3a29207c1c91b52e2ff394d9d) ) ROM_END ROM_START( csplayh7 ) @@ -716,7 +716,7 @@ ROM_START( csplayh7 ) ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(162f8cff) SHA1(8aa185fd1daa943d0b21fdf6e692f7782bc6dac4) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(5905b199) SHA1(9155455bc21d23d439c4732549ff1143ee17b9d3) ) @@ -737,7 +737,7 @@ ROM_START( aimode ) ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(c86765a8) SHA1(924831c07191e046beec79dd1da30c1944cfe57c) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(e6404950) SHA1(bb179c27ce65f7dc58d2aeed4710347e7953e11c) ) @@ -749,7 +749,7 @@ ROM_START( aimode ) DISK_IMAGE_READONLY( "nb8014", 0, SHA1(c5ad9bd66f0930e1c477126301286e38f077c164) ) ROM_REGION( 0x40000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(0a32a144) SHA1(f3b4a1174adbb2f7b7500adeafa20142f6a16d08) ) + ROM_LOAD( "gal16v8b.020", 0x000000, 0x040000, CRC(0a32a144) SHA1(f3b4a1174adbb2f7b7500adeafa20142f6a16d08) ) ROM_END ROM_START( fuudol ) @@ -758,7 +758,7 @@ ROM_START( fuudol ) ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(b1fa335e) SHA1(8a881c9c511fb63b00a3a7e433bae12aa9c2c262) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(f6442026) SHA1(f49ddeeeaf6fffdccea9ba73bce3ca60c07a7647) ) @@ -775,44 +775,44 @@ ROM_END ROM_START( tsuwaku ) ROM_REGION( 0x40000, "maincpu", 0 ) // tmp68301 prg - ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(a9890007) SHA1(3cd36c653d387842289f74c3cf35435f9d2a3aca) ) - ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(4577bf7b) SHA1(fed88157ded8ac72cc28cdd3b2ee36c293a6ee93) ) + ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(a9890007) SHA1(3cd36c653d387842289f74c3cf35435f9d2a3aca) ) + ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(4577bf7b) SHA1(fed88157ded8ac72cc28cdd3b2ee36c293a6ee93) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(8451b9a9) SHA1(4e61c4b5ea7e91b53c97bd060b41466ba5005fd0) ) - + ROM_REGION( 0x400000, "blit_gfx", ROMREGION_ERASEFF ) // blitter based gfxs - ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(00657ca3) SHA1(a02bb8a177f3915ddf0bf97fd69426a3a28061a5) ) - ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(edf56c94) SHA1(76d95a45aced3ad8bfe8a561f355731f4f99603e) ) + ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(00657ca3) SHA1(a02bb8a177f3915ddf0bf97fd69426a3a28061a5) ) + ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(edf56c94) SHA1(76d95a45aced3ad8bfe8a561f355731f4f99603e) ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb8017", 0, SHA1(6c86985574d53f990c4eec573d7fa84782cb9c4c) ) - + ROM_REGION( 0x040000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "gal16v8h.020", 0x000000, 0x040000, CRC(ac5c9495) SHA1(1c54ecf6dedbf8c3a29207c1c91b52e2ff394d9d) ) + ROM_LOAD( "gal16v8h.020", 0x000000, 0x040000, CRC(ac5c9495) SHA1(1c54ecf6dedbf8c3a29207c1c91b52e2ff394d9d) ) ROM_END ROM_START( nichisel ) ROM_REGION( 0x40000, "maincpu", 0 ) // tmp68301 prg - ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(95fb8e74) SHA1(79aa45ed1c3bd3e1a83b02afb64268efb386100e) ) - ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(fb84fc3e) SHA1(6b87c3516ceec59ec96012ea6a3d2fa9670a1cb3) ) + ROM_LOAD16_BYTE( "1.ic2", 0x000001, 0x020000, CRC(95fb8e74) SHA1(79aa45ed1c3bd3e1a83b02afb64268efb386100e) ) + ROM_LOAD16_BYTE( "2.ic3", 0x000000, 0x020000, CRC(fb84fc3e) SHA1(6b87c3516ceec59ec96012ea6a3d2fa9670a1cb3) ) DVD_BIOS - + ROM_REGION( 0x20000, ":nichisnd:audiorom", 0 ) // z80 ROM_LOAD( "11.ic51", 0x000000, 0x020000, CRC(f94981fd) SHA1(84dae027f10717a084016310cd245bb4c2ee6a56) ) - + ROM_REGION( 0x400000, "blit_gfx", ROMREGION_ERASEFF ) // blitter based gfxs - ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(5ab63481) SHA1(fc81fbdd1df496813fc0d80bcab6d0434b75d311) ) - ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(50085861) SHA1(b8f99a66a743c9bf66ef307fe4b581586e293fe5) ) + ROM_LOAD16_BYTE( "3.ic40", 0x000000, 0x080000, CRC(5ab63481) SHA1(fc81fbdd1df496813fc0d80bcab6d0434b75d311) ) + ROM_LOAD16_BYTE( "4.ic41", 0x000001, 0x080000, CRC(50085861) SHA1(b8f99a66a743c9bf66ef307fe4b581586e293fe5) ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "nb80sp", 0, SHA1(48eb9f8adba0ea5f59cfcbdee61c29b4af84ac97) ) - + ROM_REGION( 0x040000, "gal", ROMREGION_ERASE00 ) - ROM_LOAD( "palce16v8h.020", 0x000000, 0x040000, CRC(228b98fb) SHA1(53b57a09610425a5bb9d0ffe0f68dce2d9ab3bf6) ) + ROM_LOAD( "palce16v8h.020", 0x000000, 0x040000, CRC(228b98fb) SHA1(53b57a09610425a5bb9d0ffe0f68dce2d9ab3bf6) ) ROM_END // 1995 @@ -821,7 +821,7 @@ GAME( 1995, csplayh1, 0, csplayh5, csplayh5, csplayh5_state, csplayh1, GAME( 1998, nichidvd, 0, csplayh5, csplayh5, csplayh5_state, 0, ROT0, "Nichibutsu", "Nichbutsu High Rate DVD BIOS", MACHINE_IS_BIOS_ROOT ) // 1998 -/* 01 */ GAME( 1998, mjgalpri, nichidvd, csplayh5, csplayh5, csplayh5_state, mjgalpri, ROT0, "Nichibutsu/Just&Just", "Mahjong Gal-pri - World Gal-con Grandprix (Japan)", MACHINE_NOT_WORKING ) +/* 01 */ GAME( 1998, mjgalpri, nichidvd, csplayh5, csplayh5, csplayh5_state, mjgalpri, ROT0, "Nichibutsu/Just&Just", "Mahjong Gal-pri - World Gal-con Grandprix (Japan)", MACHINE_NOT_WORKING ) // 02 : Sengoku Mahjong Kurenai Otome-tai : Nichibutsu/Just&Just /* 03 */ GAME( 1998, junai, nichidvd, csplayh5, csplayh5, csplayh5_state, junai, ROT0, "Nichibutsu/eic", "Junai - Manatsu no First Kiss (Japan)", MACHINE_NOT_WORKING ) /* 04 */ GAME( 1998, csplayh5, nichidvd, csplayh5, csplayh5, csplayh5_state, csplayh5, ROT0, "Nichibutsu", "Mahjong Hanafuda Cosplay Tengoku 5 (Japan)", MACHINE_NOT_WORKING ) diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp index 7eb7fad1ce7..0dddf8e6a87 100644 --- a/src/mame/drivers/cvs.cpp +++ b/src/mame/drivers/cvs.cpp @@ -88,7 +88,7 @@ Additional work Todo & FIXME: - Emulate protection properly in later games (reads area 0x73fx); -- Superbike hangs indefinitely when collecting balloon bonus the +- Superbike hangs indefinitely when collecting balloon bonus the second time around, protection or s2650 core bug? - the board most probably has discrete circuits. The 393Hz tone used for shots (superbike) and collisions (8ball) is just a guess. @@ -1594,11 +1594,11 @@ DRIVER_INIT_MEMBER(cvs_state,superbik) ROM[0x0168] = 0xc0; ROM[0x0169] = 0xc0; ROM[0x016a] = 0xc0; - + ROM[0x413f] = 0xc0; ROM[0x4140] = 0xc0; ROM[0x4141] = 0xc0; - + /* and speed up the protection check */ ROM[0x0099] = 0xc0; ROM[0x009a] = 0xc0; diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index c611b4fd984..e274c3f1f89 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -276,7 +276,7 @@ * * LED Dot Matrix Display hookup * ------------------------------------- - * "DISPLAY CONN ALT" connected to the SDA5708 + * "DISPLAY CONN ALT" connected to the SDA5708 * pin signal connected to * 1 VCC +5v * 2 LOAD1* PA2 68340 pin 121 IP01 @@ -304,7 +304,7 @@ * 9 Q4 Reset* SDA5708 pin 5 * 13 D D8 68340 pin 134 IP01 * 14 Enable* Q1 74138 pin 14 IP12 - * 15 Clear* System reset + * 15 Clear* System reset * * Identified low level drivers in firmware * ---------------------------------------- @@ -346,7 +346,7 @@ // MACROS / CONSTANTS //************************************************************************** -//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h +//#define LOG_GENERAL (1U << 0) // Already defined in logmacro.h #define LOG_SETUP (1U << 1) #define LOG_DISPLAY (1U << 2) @@ -355,7 +355,7 @@ #include "logmacro.h" -//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h +//#define LOG(...) LOGMASKED(LOG_GENERAL, __VA_ARGS__) // Already defined in logmacro.h #define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__) #define LOGDISPLAY(...) LOGMASKED(LOG_DISPLAY, __VA_ARGS__) @@ -400,7 +400,7 @@ WRITE8_MEMBER (dbox_state::sda5708_reset){ WRITE8_MEMBER (dbox_state::sda5708_clk){ LOGDISPLAY("%s\n", FUNCNAME); m_display->sdclk_w(CLEAR_LINE); - m_display->data_w((0x80 & data) != 0 ? ASSERT_LINE : CLEAR_LINE); + m_display->data_w((0x80 & data) != 0 ? ASSERT_LINE : CLEAR_LINE); m_display->sdclk_w(ASSERT_LINE); } @@ -412,7 +412,7 @@ WRITE8_MEMBER (dbox_state::write_pa){ static ADDRESS_MAP_START( dbox_map, AS_PROGRAM, 32, dbox_state ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0) AM_RANGE(0x700000, 0x77ffff) AM_RAM // CS2 -// AM_RANGE(0x780000, 0x7807ff) AM_RAM // CS3 +// AM_RANGE(0x780000, 0x7807ff) AM_RAM // CS3 AM_RANGE(0x780100, 0x7801ff) AM_WRITE8(sda5708_reset, 0xffffffff) AM_RANGE(0x780600, 0x7806ff) AM_WRITE8(sda5708_clk, 0xffffffff) AM_RANGE(0x800000, 0x8fffff) AM_RAM // CS1 @@ -433,7 +433,7 @@ static MACHINE_CONFIG_START( dbox ) /* IP16 74256 8 bit latch */ MCFG_LATCH8_ADD("hct259.ip16") MCFG_LATCH8_WRITE_4(DEVWRITELINE("display", sda5708_device, reset_w)) - + MACHINE_CONFIG_END DRIVER_INIT_MEMBER(dbox_state, dbox) @@ -444,7 +444,7 @@ DRIVER_INIT_MEMBER(dbox_state, dbox) // TODO: Figure out what DVB2000 is doing ROM_START( dbox ) ROM_REGION(0x1000000, "maincpu", 0) -// ROM_LOAD16_WORD( "dvb2000.bin", 0x000000, 0x08b742, CRC(5b21c455) SHA1(1e7654c37dfa65d1b8ac2469cdda82f91b47b3c7) ) +// ROM_LOAD16_WORD( "dvb2000.bin", 0x000000, 0x08b742, CRC(5b21c455) SHA1(1e7654c37dfa65d1b8ac2469cdda82f91b47b3c7) ) ROM_LOAD16_WORD( "nokboot.bin", 0x000000, 0x020000, CRC(0ff53e1f) SHA1(52002ee22c032775dac383d408c44abe9244724f) ) ROM_END diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp index 257b17f14fa..8005b3f888f 100644 --- a/src/mame/drivers/dec8.cpp +++ b/src/mame/drivers/dec8.cpp @@ -842,7 +842,7 @@ static ADDRESS_MAP_START( dec8_mcu_io_map, AS_IO, 8, dec8_state ) ADDRESS_MAP_END /* - Super Real Darwin is similar but only appears to have a single port + Super Real Darwin is similar but only appears to have a single port */ READ8_MEMBER(dec8_state::srdarwin_mcu_from_main_r) @@ -2352,7 +2352,7 @@ static MACHINE_CONFIG_START( srdarwin ) MCFG_CPU_ADD("audiocpu", DECO_222, 1500000) MCFG_CPU_PROGRAM_MAP(dec8_s_map) /* NMIs are caused by the main CPU */ - + MCFG_CPU_ADD("mcu", I8751, XTAL_8MHz) /* unknown frequency */ MCFG_CPU_IO_MAP(srdarwin_mcu_io_map) diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp index 22970e5e5bb..7e6410457db 100644 --- a/src/mame/drivers/fontwriter.cpp +++ b/src/mame/drivers/fontwriter.cpp @@ -11,7 +11,7 @@ 512k RAM Custom gate array 640x400 dot-matrix LCD - + Things to check - Hook up 37720 DMAC, it's used before this dies - Check if "stack in bank FF" bit is used @@ -101,7 +101,7 @@ MACHINE_CONFIG_END ROM_START(fw700ger) ROM_REGION(0x200000, "maincpu", 0) /* M37720 program ROM */ - ROM_LOAD( "lh5370pd.ic7", 0x000000, 0x200000, CRC(29083e13) SHA1(7e1605f91b53580e75f638f9e6b0917305c35f84) ) + ROM_LOAD( "lh5370pd.ic7", 0x000000, 0x200000, CRC(29083e13) SHA1(7e1605f91b53580e75f638f9e6b0917305c35f84) ) ROM_END SYST( 1994, fw700ger, 0, 0, fontwriter, fontwriter, fontwriter_state, 0, "Sharp", "FontWriter FW-700 (German)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index 3557bf636f5..c86acbeecd0 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -93,7 +93,7 @@ /* * The baudrate on the Force68k CPU-1 to CPU-6 is generated by a Motorola 14411 bitrate generator - * The CPU-6 documents matches the circuits that I could find on the CPU-1 board. + * The CPU-6 documents matches the circuits that I could find on the CPU-1 board. * * From the documents: * @@ -119,7 +119,7 @@ * However, the datasheet says baudrate is strapable for 110-9600 but the output is 153600 * so the system rom MUST setup the acia to divide by 16 to generate the correct baudrate. * - * There are multiple ways to achieve some of the baud rates and we have only seen a CPU-6 users manual so + * There are multiple ways to achieve some of the baud rates and we have only seen a CPU-6 users manual so * emulation mimics a CPU-6 board at the moment until further information has been gathered. */ diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 5fecd95adea..d236f395108 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -18,7 +18,7 @@ Maniac Square | 1996 | GAE1 501 | 940411 | DS5002FP (unprotected version available) Snow Board | 1996 | CG-1V 366 | 960419/1 | Lattice IspLSI 1016-80LJ Bang! | 1998 | CG-1V 388 | 980921/1 | No - Play 2000 | 1999 | CG-1V-149 | ? | DS5002FP (by Nova Desitec) + Play 2000 | 1999 | CG-1V-149 | ? | DS5002FP (by Nova Desitec) Notes: touchgo: @@ -475,7 +475,7 @@ static ADDRESS_MAP_START( alighunt_map, AS_PROGRAM, 16, gaelco2_state ) AM_RANGE(0x500000, 0x500001) AM_WRITE(gaelco2_coin_w) /* Coin lockout + counters */ AM_RANGE(0x500006, 0x500007) AM_WRITENOP /* ??? */ AM_RANGE(0xfe0000, 0xfe7fff) AM_RAM /* Work RAM */ - AM_RANGE(0xfe8000, 0xfeffff) AM_RAM AM_SHARE("shareram") /* Work RAM (shared with D5002FP) */ + AM_RANGE(0xfe8000, 0xfeffff) AM_RAM AM_SHARE("shareram") /* Work RAM (shared with D5002FP) */ ADDRESS_MAP_END @@ -691,7 +691,7 @@ static ADDRESS_MAP_START( touchgo_map, AS_PROGRAM, 16, gaelco2_state ) AM_RANGE(0x300006, 0x300007) AM_READ_PORT("IN3") /* SERVICESW + Input 4P */ AM_RANGE(0x500000, 0x50001f) AM_WRITE(touchgo_coin_w) /* Coin counters */ AM_RANGE(0xfe0000, 0xfe7fff) AM_RAM /* Work RAM */ - AM_RANGE(0xfe8000, 0xfeffff) AM_RAM AM_SHARE("shareram") /* Work RAM (shared with D5002FP) */ + AM_RANGE(0xfe8000, 0xfeffff) AM_RAM AM_SHARE("shareram") /* Work RAM (shared with D5002FP) */ ADDRESS_MAP_END @@ -1290,7 +1290,7 @@ static MACHINE_CONFIG_START( wrally2 ) MCFG_CPU_PROGRAM_MAP(wrally2_map) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold) - MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) + MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MCFG_EEPROM_SERIAL_93C66_ADD("eeprom") @@ -1447,26 +1447,26 @@ ROM_START( wrally2 ) A little less obvious is why the older dump had the following startup code, which appears to have been partially patched out - 0200: mov sp,#$70 - 0203: mov a,pcon - 0205: anl a,#$20 - 0207: jnz $0203 - 0209: nop - 020A: nop - 020B: nop - 020C: mov dptr,#$FC01 + 0200: mov sp,#$70 + 0203: mov a,pcon + 0205: anl a,#$20 + 0207: jnz $0203 + 0209: nop + 020A: nop + 020B: nop + 020C: mov dptr,#$FC01 while the newer dump has this - 0200: mov sp,#$70 - 0203: mov mcon,#$68 - 0206: mov i2cfg,#$00 - 0209: mov crcr,#$80 - 020C: mov dptr,#$FC01 + 0200: mov sp,#$70 + 0203: mov mcon,#$68 + 0206: mov i2cfg,#$00 + 0209: mov crcr,#$80 + 020C: mov dptr,#$FC01 either way the 2nd dump is in much better state, so we're using that. */ - ROM_LOAD( "wr2_dallas.bin", 0x00000, 0x8000, CRC(4c532e9e) SHA1(d0aad72b204d4abd3b8d7d5bbaf8d2d2f78edaa6) ) + ROM_LOAD( "wr2_dallas.bin", 0x00000, 0x8000, CRC(4c532e9e) SHA1(d0aad72b204d4abd3b8d7d5bbaf8d2d2f78edaa6) ) ROM_REGION( 0x100, "gaelco_ds5002fp:mcu:internal", ROMREGION_ERASE00 ) /* these are the default states stored in NVRAM */ diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp index 2aaaca9f7a6..1c55a6e3d0c 100644 --- a/src/mame/drivers/globalvr.cpp +++ b/src/mame/drivers/globalvr.cpp @@ -145,7 +145,7 @@ ROM_START( nfs ) DISK_IMAGE_READONLY( "EMERGENCY RECOVERY DISK 11.11.2003 Rev A", 0, SHA1(38656b9da94150e5e8ed8a4183d2cc149e96aedd) ) ROM_END -ROM_START( nfsgt ) +ROM_START( nfsgt ) DISK_REGION( "ide:0:hdd:image" ) DISK_IMAGE_READONLY( "NEED FOR SPEED GT", 0, SHA1(58bb2b47e30b65f2f09d2c2f2d7f300cf420b18a) ) diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index 5302bc52ab1..1a2495c9f84 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -52,24 +52,24 @@ static constexpr unsigned MASTER_CLOCK = 9808000; static constexpr unsigned VIDEO_MEM_SIZE= 8192; static constexpr unsigned ALPHA_MEM_SIZE= 4096; static constexpr unsigned GRAPH_MEM_SIZE= 16384; -static constexpr unsigned CRT_STS_READY_BIT = 0; -static constexpr unsigned CRT_STS_DISPLAY_BIT = 1; -static constexpr unsigned CRT_STS_BUSY_BIT = 7; -static constexpr unsigned CRT_CTL_RD_RQ_BIT = 0; -static constexpr unsigned CRT_CTL_WIPEOUT_BIT = 1; -static constexpr unsigned CRT_CTL_POWERDN_BIT = 2; -static constexpr unsigned CRT_CTL_GRAPHICS_BIT = 7; +static constexpr unsigned CRT_STS_READY_BIT = 0; +static constexpr unsigned CRT_STS_DISPLAY_BIT = 1; +static constexpr unsigned CRT_STS_BUSY_BIT = 7; +static constexpr unsigned CRT_CTL_RD_RQ_BIT = 0; +static constexpr unsigned CRT_CTL_WIPEOUT_BIT = 1; +static constexpr unsigned CRT_CTL_POWERDN_BIT = 2; +static constexpr unsigned CRT_CTL_GRAPHICS_BIT = 7; // Time to read/write a byte in video memory (in master clock cycles) -static constexpr unsigned CRT_RW_TIME = 96; +static constexpr unsigned CRT_RW_TIME = 96; // Time taken by hw timer updating (semi-made up) (in usec) -static constexpr unsigned TIMER_BUSY_USEC = 128; -static constexpr unsigned IRQ_KEYBOARD_BIT = 0; -static constexpr unsigned IRQ_TIMER0_BIT = 1; -static constexpr unsigned TIMER_COUNT = 4; -static constexpr unsigned IRQ_IOP0_BIT = IRQ_TIMER0_BIT + TIMER_COUNT; -static constexpr unsigned IOP_COUNT = 0; -static constexpr unsigned IRQ_BIT_COUNT = IRQ_IOP0_BIT + IOP_COUNT; -static constexpr unsigned NO_IRQ = IRQ_BIT_COUNT; +static constexpr unsigned TIMER_BUSY_USEC = 128; +static constexpr unsigned IRQ_KEYBOARD_BIT = 0; +static constexpr unsigned IRQ_TIMER0_BIT = 1; +static constexpr unsigned TIMER_COUNT = 4; +static constexpr unsigned IRQ_IOP0_BIT = IRQ_TIMER0_BIT + TIMER_COUNT; +static constexpr unsigned IOP_COUNT = 0; +static constexpr unsigned IRQ_BIT_COUNT = IRQ_IOP0_BIT + IOP_COUNT; +static constexpr unsigned NO_IRQ = IRQ_BIT_COUNT; // ************ // hp85_state diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp index 9f8dc9d1236..a79997e6686 100644 --- a/src/mame/drivers/konmedal.cpp +++ b/src/mame/drivers/konmedal.cpp @@ -214,7 +214,7 @@ static ADDRESS_MAP_START( ddboy_main, AS_PROGRAM, 8, konmedal_state ) AM_RANGE(0xc800, 0xc80f) AM_DEVWRITE("k056832", k056832_device, b_w) AM_RANGE(0xc80f, 0xc80f) AM_READ(magic_r) AM_RANGE(0xcc00, 0xcc00) AM_DEVREADWRITE("oki", okim6295_device, read, write) - AM_RANGE(0xd000, 0xd000) AM_WRITENOP // ??? writes 00 and 3f every frame + AM_RANGE(0xd000, 0xd000) AM_WRITENOP // ??? writes 00 and 3f every frame AM_RANGE(0xd800, 0xd87f) AM_DEVREADWRITE("k051649", k051649_device, k051649_waveform_r, k051649_waveform_w) AM_RANGE(0xd880, 0xd889) AM_DEVWRITE("k051649", k051649_device, k051649_frequency_w) AM_RANGE(0xd88a, 0xd88e) AM_DEVWRITE("k051649", k051649_device, k051649_volume_w) @@ -273,31 +273,31 @@ static INPUT_PORTS_START( konmedal ) PORT_DIPSETTING( 0x0d, "25%" ) PORT_DIPSETTING( 0x0e, "20%" ) PORT_DIPSETTING( 0x0f, "15%" ) - PORT_DIPNAME( 0x30, 0x00, "Play Timer" ) PORT_DIPLOCATION("SW2:5,6") + PORT_DIPNAME( 0x30, 0x00, "Play Timer" ) PORT_DIPLOCATION("SW2:5,6") PORT_DIPSETTING( 0x00, "30 sec" ) PORT_DIPSETTING( 0x10, "24 sec" ) PORT_DIPSETTING( 0x20, "18 sec" ) PORT_DIPSETTING( 0x30, "12 sec" ) - PORT_DIPNAME( 0x40, 0x40, "Backup Memory" ) PORT_DIPLOCATION("SW2:7") + PORT_DIPNAME( 0x40, 0x40, "Backup Memory" ) PORT_DIPLOCATION("SW2:7") PORT_DIPSETTING( 0x40, "Keep" ) PORT_DIPSETTING( 0x00, "Clear" ) - PORT_DIPNAME( 0x80, 0x00, "Demo Sound" ) PORT_DIPLOCATION("SW2:8") + PORT_DIPNAME( 0x80, 0x00, "Demo Sound" ) PORT_DIPLOCATION("SW2:8") PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // medal - PORT_BIT( 0xd0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused + PORT_BIT( 0x0e, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // medal + PORT_BIT( 0xd0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Test") PORT_CODE(KEYCODE_F2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // medal ack - PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) // medal ack + PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNKNOWN ) // unused INPUT_PORTS_END void konmedal_state::machine_start() diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp index 33051db2fe4..d6406d98e7b 100644 --- a/src/mame/drivers/macpci.cpp +++ b/src/mame/drivers/macpci.cpp @@ -153,10 +153,10 @@ MACHINE_CONFIG_END ROM_START( pippin ) ROM_REGION( 0x400000, "bootrom", ROMREGION_64BIT | ROMREGION_BE ) ROM_SYSTEM_BIOS(0, "v13", "Kinka v 1.3") - ROMX_LOAD( "bandai pippin (19960920 - kinka 1.3) - 3e6b3ee4-a52528e9ce8c.rom", 0x000000, 0x400000, CRC(87a1337d) SHA1(8e512af6e34dd823f3defec77d43ecbff1ecad54), ROM_BIOS(1) ) + ROMX_LOAD( "bandai pippin (19960920 - kinka 1.3) - 3e6b3ee4-a52528e9ce8c.rom", 0x000000, 0x400000, CRC(87a1337d) SHA1(8e512af6e34dd823f3defec77d43ecbff1ecad54), ROM_BIOS(1) ) ROM_SYSTEM_BIOS(1, "v12", "Kinka v 1.2") - ROMX_LOAD( "bandai pippin (19960628 - kinka 1.2) - 3e10e14c-72c40c1af23a.rom", 0x000000, 0x400000, CRC(4fead4b3) SHA1(3fa02e9b0fa702ac6e02edc08911eac8b50e2d1f), ROM_BIOS(2) ) + ROMX_LOAD( "bandai pippin (19960628 - kinka 1.2) - 3e10e14c-72c40c1af23a.rom", 0x000000, 0x400000, CRC(4fead4b3) SHA1(3fa02e9b0fa702ac6e02edc08911eac8b50e2d1f), ROM_BIOS(2) ) ROM_SYSTEM_BIOS(2, "v1", "Kinka v 1.0") ROMX_LOAD( "341s0251.u1", 0x000006, 0x100000, CRC(aaea2449) SHA1(2f63e215260a42fb7c5f2364682d5e8c0604646f),ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(6) | ROM_BIOS(3)) @@ -165,7 +165,7 @@ ROM_START( pippin ) ROMX_LOAD( "341s0254.u4", 0x000000, 0x100000, CRC(3e2851ba) SHA1(7cbf5d6999e890f5e9ab2bc4b10ca897c4dc2016),ROM_GROUPWORD | ROM_REVERSE | ROM_SKIP(6) | ROM_BIOS(3)) ROM_SYSTEM_BIOS(3, "vgm", "Kinka GM version") - ROMX_LOAD( "bandai pippin (19960128 - kinka gm flash) - 2bf65931-318e40f6a1f4.rom", 0x000000, 0x400000, CRC(4ff875e6) SHA1(eb8739cab1807c6c7c51acc7f4a3afc1f9c6ddbb), ROM_BIOS(4) ) + ROMX_LOAD( "bandai pippin (19960128 - kinka gm flash) - 2bf65931-318e40f6a1f4.rom", 0x000000, 0x400000, CRC(4ff875e6) SHA1(eb8739cab1807c6c7c51acc7f4a3afc1f9c6ddbb), ROM_BIOS(4) ) ROM_SYSTEM_BIOS(4, "pre", "Kinka pre-release") ROMX_LOAD( "kinka-pre.rom", 0x000000, 0x400000, CRC(4ff875e6) SHA1(eb8739cab1807c6c7c51acc7f4a3afc1f9c6ddbb),ROM_BIOS(5) ) diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index efb5c18aea0..cde24c8e279 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -1908,7 +1908,7 @@ ROM_START( mmaze ) ROM_LOAD( "mm_obj-1.bin", 0x20000, 0x20000, CRC(1ce49e04) SHA1(fc30a03e443bece11bd86771ebd1fcb40d15b0b9) ) ROM_LOAD( "mm_obj-2.bin", 0x40000, 0x20000, CRC(3d3d5de3) SHA1(aa8032f1d99af1d92b0afaa11933548e0d39f03b) ) ROM_LOAD( "mm_obj-3.bin", 0x60000, 0x20000, CRC(dac57358) SHA1(5175b66d3622cb56ed7be3568b247195d1485579) ) - + ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM, avoids TEST PROGRAM INITIALIZE ERROR on boot ROM_LOAD( "mmaze.nv", 0, 0x800, CRC(73e62b56) SHA1(dd228490cbe5fd57cf7a7fe867e074c75c84ee90) ) ROM_END @@ -1951,7 +1951,7 @@ ROM_START( mmaze2 ) ROM_LOAD( "mm_obj-1.bin", 0x20000, 0x20000, CRC(1ce49e04) SHA1(fc30a03e443bece11bd86771ebd1fcb40d15b0b9) ) ROM_LOAD( "mm_obj-2.bin", 0x40000, 0x20000, CRC(3d3d5de3) SHA1(aa8032f1d99af1d92b0afaa11933548e0d39f03b) ) ROM_LOAD( "mm_obj-3.bin", 0x60000, 0x20000, CRC(dac57358) SHA1(5175b66d3622cb56ed7be3568b247195d1485579) ) - + ROM_REGION( 0x0800, "nvram", 0 ) // default NVRAM, avoids TEST PROGRAM INITIALIZE ERROR on boot ROM_LOAD( "mmaze.nv", 0, 0x800, CRC(73e62b56) SHA1(dd228490cbe5fd57cf7a7fe867e074c75c84ee90) ) ROM_END diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index 56f845a224a..8687ceed2f8 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -2727,7 +2727,7 @@ static MACHINE_CONFIG_START( naomi_base ) MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom") MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0) - // high probable this MCU uses one of "fast Z80" cores, like ASCII R800, Kawasaki KC80 or similar, where clocks per instructions is much different from regular Z80. + // high probable this MCU uses one of "fast Z80" cores, like ASCII R800, Kawasaki KC80 or similar, where clocks per instructions is much different from regular Z80. // was made few attempts to measure CPU core clock using different methods (in term of "regular Z80" clock and cycles): // - GPIO toggle in a loop - 13.499Mhz, // - using UART as timer - 13.260MHz, diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp index f1a77791f7a..c3607c47ede 100644 --- a/src/mame/drivers/nes_vt.cpp +++ b/src/mame/drivers/nes_vt.cpp @@ -15,7 +15,7 @@ VT03 - above + 4bpp sprite / bg modes, enhanced palette VT08 - ? - + VT09 - alt 4bpp modes? VT16 - ? @@ -366,7 +366,7 @@ void nes_vt_state::machine_start() m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(nes_vt_state::scanline_irq),this)); // m_ppu->set_hblank_callback(ppu2c0x_device::hblank_delegate(FUNC(device_nes_cart_interface::hblank_irq),m_cartslot->m_cart)); -// m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(device_nes_cart_interface::chr_r),m_cartslot->m_cart), write8_delegate(FUNC(device_nes_cart_interface::chr_w),m_cartslot->m_cart)); +// m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(device_nes_cart_interface::chr_r),m_cartslot->m_cart), write8_delegate(FUNC(device_nes_cart_interface::chr_w),m_cartslot->m_cart)); m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(nes_vt_state::nt_r),this), write8_delegate(FUNC(nes_vt_state::nt_w),this)); } diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index 8369ca72e2a..f431e6da7b4 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -1973,7 +1973,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( blitz99, seattle150 ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) @@ -1985,7 +1985,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( blitz2k, seattle150 ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) @@ -1997,7 +1997,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( carnevil, seattle150 ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CARNEVIL) @@ -2009,7 +2009,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( hyprdriv, seattle200_widget ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(2) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0af7) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_HYPRDRIV) diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 98971c3ef07..1c0ce5e35dc 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -4078,7 +4078,7 @@ ROM_START( kokoroj2 ) ROM_REGION( 0x500000, "mainpcb:soundcpu", 0 ) /* sound CPU */ ROM_LOAD_x4( "epr-16185.ic36", 0x100000, 0x020000, CRC(afb97c4d) SHA1(f6e77d932824f93d89559a9cb3b2d678d5fc6940) ) ROM_LOAD( "mpr-16184.ic35", 0x200000, 0x100000, CRC(d7a19751) SHA1(8ae9f13689c8f9851e1eea995c51285972bed4a2) ) - // IC24 & IC34 are not populated + // IC24 & IC34 are not populated ROM_REGION( 0x400000, "mainpcb:gfx1", 0 ) /* tiles */ ROM_LOAD16_BYTE( "mpr-16188.ic14", 0x000000, 0x200000, CRC(83a450ab) SHA1(1d0b45512d784ed1d82135b84c7c540f92d789f7) ) diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 351c00f7fd1..0187ff6ea44 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -2527,7 +2527,7 @@ static ADDRESS_MAP_START( setaroul_map, AS_PROGRAM, 16, setaroul_state ) AM_RANGE(0xf40000, 0xf40bff) AM_WRITE(spriteylow_w) AM_RANGE(0xf40c00, 0xf40c11) AM_WRITE(spritectrl_w) -// AM_RANGE(0xf80000, 0xf80001) AM_WRITE // $40 at boot +// AM_RANGE(0xf80000, 0xf80001) AM_WRITE // $40 at boot ADDRESS_MAP_END /*************************************************************************** @@ -8297,7 +8297,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(setaroul_state::interrupt) int scanline = param; if ((scanline % 32) == 0) // every 2ms? - m_maincpu->set_input_line(2, HOLD_LINE); // read 1 board column (out of 26) every other call + m_maincpu->set_input_line(2, HOLD_LINE); // read 1 board column (out of 26) every other call if (scanline == 248) m_maincpu->set_input_line(4, HOLD_LINE); // vblank diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index f34b80865f7..66518468bb8 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -2453,7 +2453,7 @@ static INPUT_PORTS_START( gocowboy ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE_MEMBER("hopper_large", ticket_dispenser_device, line_r) // 3/4' pay sensor (large) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_NAME("Meter Switch") // capsule test (pressed while booting) / next in test mode PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE2 ) PORT_NAME("Reset Switch") // reset backup ram (pressed while booting) / previous in test mode - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) // test mode (keep pressed in game) / select in test mode / service coin + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) // test mode (keep pressed in game) / select in test mode / service coin PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("COIN") diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 5a9e8626e29..58a4a8f7768 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( targeth ) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", targeth_state, interrupt, "screen", 0, 1) - MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) + MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) /* video hardware */ diff --git a/src/mame/drivers/tg100.cpp b/src/mame/drivers/tg100.cpp index 7b1feb71d34..24629919d90 100644 --- a/src/mame/drivers/tg100.cpp +++ b/src/mame/drivers/tg100.cpp @@ -3,10 +3,10 @@ /* Yamaha TG100 AWM Tone Generator Skeleton written by superctr - + Roms dumped by vampirefrog Service manual scanned by bmos - + CPU: Hitachi HD6435208A00P (H8/520) - 20MHz clock - Mode bits 0,1 high, 2 low @@ -23,7 +23,7 @@ Other ICs: HG62E11R54FS (XK462A00) Gate array (LCD control, glue logic) - + */ #include "emu.h" @@ -69,14 +69,14 @@ static MACHINE_CONFIG_START( tg100 ) MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type (H8/520) */ MCFG_CPU_PROGRAM_MAP( tg100_map ) MCFG_CPU_IO_MAP( tg100_io_map ) - + MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - + MCFG_SOUND_ADD("ymw258", MULTIPCM, 9400000) MCFG_DEVICE_ADDRESS_MAP(0, ymw258_map) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - + MACHINE_CONFIG_END ROM_START( tg100 ) @@ -86,7 +86,7 @@ ROM_START( tg100 ) ROM_REGION(0x200000, "ymw258", 0) ROM_LOAD( "xk992a0.ic6", 0x000000, 0x200000, CRC(01dc6954) SHA1(32ec77a46f4d005538c735f56ad48fa7243c63be) ) - + ROM_END // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index 335d33be715..297291c49b1 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -221,7 +221,7 @@ static MACHINE_CONFIG_START( thoop2 ) MCFG_CPU_PROGRAM_MAP(thoop2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", thoop2_state, irq6_line_hold) - MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) + MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL_24MHz / 2) MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map) MCFG_WATCHDOG_ADD("watchdog") diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp index 29ca517075a..4495ca7d196 100644 --- a/src/mame/drivers/timelimt.cpp +++ b/src/mame/drivers/timelimt.cpp @@ -298,7 +298,7 @@ ROM_START( timelimt ) ROM_REGION( 0x0060, "proms", 0 ) ROM_LOAD( "clr.35", 0x0000, 0x0020, CRC(9c9e6073) SHA1(98496175bf19a8cdb0018705bc1a2193b8a782e1) ) ROM_LOAD( "clr.48", 0x0020, 0x0020, CRC(a0bcac59) SHA1(e5832831b21981363509b79d89766757bd9273b0) ) /* FIXED BITS (xxxxxx1x) */ - ROM_LOAD( "clr.57", 0x0040, 0x0020, CRC(3a9f5394) SHA1(0b501f81ce1df722cf7ef982c03e0be337bfe9ee) ) + ROM_LOAD( "clr.57", 0x0040, 0x0020, CRC(3a9f5394) SHA1(0b501f81ce1df722cf7ef982c03e0be337bfe9ee) ) ROM_END ROM_START( progress ) diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp index 0fb202a73d0..1ccc613fd28 100644 --- a/src/mame/drivers/tourvis.cpp +++ b/src/mame/drivers/tourvis.cpp @@ -407,7 +407,7 @@ static INPUT_PORTS_START( tourvision ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off )) PORT_DIPSETTING( 0x00, DEF_STR( On )) - + PORT_START( "DSW2" ) PORT_DIPNAME( 0x03, 0x03, "Coins needed 2" ) PORT_DIPSETTING( 0x03, "1" ) diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 6bb868ee6ee..566ff21bb37 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -958,7 +958,7 @@ CUSTOM_INPUT_MEMBER(vegas_state::i40_r) break; } //if (m_i40_data & 0x1000) - // printf("%08X: i40_r: select: %x index: %d data: %x\n", machine().device("maincpu")->safe_pc(), m_i40_data, index, data); + // printf("%08X: i40_r: select: %x index: %d data: %x\n", machine().device("maincpu")->safe_pc(), m_i40_data, index, data); //m_i40_data &= ~0x1000; return data; } @@ -986,11 +986,11 @@ WRITE32_MEMBER(vegas_state::wheel_board_w) case 0x1: for (uint8_t bit = 0; bit < 8; bit++) machine().output().set_lamp_value(bit, (arg >> bit) & 0x1); - + /* leader lamp bit is included in every write, for some reason. */ machine().output().set_lamp_value(8, (data >> 12) & 0x1); break; - + case 0x2: m_keypad_select = arg; break; @@ -1641,7 +1641,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( gauntleg, vegas ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CALSPEED) @@ -1654,7 +1654,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( gauntdl, vegas ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL) @@ -1667,7 +1667,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( warfa, vegas250 ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE) @@ -1680,7 +1680,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( tenthdeg, vegas ) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2115, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) - MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) + MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL) diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 6e3eab06a30..6aaab7febf4 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -30,9 +30,9 @@ public: m_fakey(*this, "FAKEY"), m_visarea(0, 0, 0, 0) { } - static constexpr uint32_t YBUFFER_COUNT = 15; - static constexpr uint32_t VRAM_SIZE = 0x40000; - static constexpr uint32_t VRAM_MASK = VRAM_SIZE - 1; + static constexpr uint32_t YBUFFER_COUNT = 15; + static constexpr uint32_t VRAM_SIZE = 0x40000; + static constexpr uint32_t VRAM_MASK = VRAM_SIZE - 1; enum { diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index a128bf7bc9a..21b5a3497e8 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -315,7 +315,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(interrupt); private: - required_device<upd4992_device> m_rtc; // ! Actually D4911C ! + required_device<upd4992_device> m_rtc; // ! Actually D4911C ! required_device<ticket_dispenser_device> m_hopper; required_ioport_array<26> m_bet; diff --git a/src/mame/layout/sda5708.lay b/src/mame/layout/sda5708.lay index 8ed68750e5e..98d1def4d52 100644 --- a/src/mame/layout/sda5708.lay +++ b/src/mame/layout/sda5708.lay @@ -6,8 +6,8 @@ <element name="Pixel"> <!-- The data sheet says 575nm wave length which is yellow but occular comparison - suggests ~515nm which is green and also stated as the color in the data sheet - The colors below are green based on the occular comparison with the real hardware --> + suggests ~515nm which is green and also stated as the color in the data sheet + The colors below are green based on the occular comparison with the real hardware --> <disk state="0"> <color red="0.12" green="1.0" blue="0.0" /> <bounds x="0" y="0" width="1" height="1" /> @@ -60,24 +60,24 @@ int main() { - int digits = 8; // 8 digits - int cols = 5; // 5 rows in each digit - int rows = 7; // 7 columns in each digit - int size = 100; // size of each led - int dsx = 380; // distance between each digit - int psx = 111 - size; // horizontal distance between leds - int psy = 114 - size; // vertical distance between leds + int digits = 8; // 8 digits + int cols = 5; // 5 rows in each digit + int rows = 7; // 7 columns in each digit + int size = 100; // size of each led + int dsx = 380; // distance between each digit + int psx = 111 - size; // horizontal distance between leds + int psy = 114 - size; // vertical distance between leds - for (int d = 1; d <= digits; d++ ){ - for (int y = 1; y <= rows; y++){ - for (int x = 1; x <= cols; x++) { - printf( "<bezel name=\"Dot_%d\" element=\"Pixel\" state=\"0\"><bounds x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\"/></bezel>\n", - d * 100 + y * 10 + x, - (d - 1) * (cols *(size + psx) + dsx) + (x - 1) * (size + psx), - (y - 1) * (psy + size), size, size); - } - } - } + for (int d = 1; d <= digits; d++ ){ + for (int y = 1; y <= rows; y++){ + for (int x = 1; x <= cols; x++) { + printf( "<bezel name=\"Dot_%d\" element=\"Pixel\" state=\"0\"><bounds x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\"/></bezel>\n", + d * 100 + y * 10 + x, + (d - 1) * (cols *(size + psx) + dsx) + (x - 1) * (size + psx), + (y - 1) * (psy + size), size, size); + } + } + } } --> <bezel name="Dot_111" element="Pixel" state="0"><bounds x="0" y="0" width="100" height="100"/></bezel> @@ -362,4 +362,4 @@ int main() <bezel name="Dot_875" element="Pixel" state="0"><bounds x="6989" y="684" width="100" height="100"/></bezel> </view> -</mamelayout>
\ No newline at end of file +</mamelayout> diff --git a/src/mame/layout/setaroul.lay b/src/mame/layout/setaroul.lay index f27f4811bc2..5ffca45e012 100644 --- a/src/mame/layout/setaroul.lay +++ b/src/mame/layout/setaroul.lay @@ -3,396 +3,396 @@ <!-- Straight up bets --> <element name="Bet 0"> <disk> <color red="1.00" green="0.91" blue="0.52"/> </disk> - <text string="0"> <color red="0.06" green="0.39" blue="0.00"/> </text> </element> + <text string="0"> <color red="0.06" green="0.39" blue="0.00"/> </text> </element> <element name="Bet 1"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="1"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="1"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 2"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="2"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="2"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 3"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="3"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="3"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 4"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="4"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="4"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 5"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="5"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="5"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 6"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="6"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="6"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 7"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="7"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="7"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 8"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="8"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="8"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 9"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="9"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="9"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 10"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="10"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="10"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- 11 is black like 10 --> <element name="Bet 11"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="11"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="11"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 12"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="12"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="12"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 13"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="13"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="13"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 14"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="14"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="14"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 15"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="15"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="15"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 16"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="16"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="16"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 17"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="17"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="17"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 18"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="18"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="18"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- 19 is red like 18 --> <element name="Bet 19"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="19"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="19"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 20"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="20"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="20"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 21"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="21"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="21"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 22"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="22"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="22"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 23"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="23"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="23"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 24"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="24"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="24"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 25"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="25"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="25"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 26"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="26"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="26"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 27"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="27"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="27"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 28"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="28"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="28"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- 29 is black like 28 --> <element name="Bet 29"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="29"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="29"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 30"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="30"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="30"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 31"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="31"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="31"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 32"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="32"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="32"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 33"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="33"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="33"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 34"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="34"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="34"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 35"> <disk> <color red="0.06" green="0.06" blue="0.06"/> </disk> - <text string="35"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="35"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 36"> <disk> <color red="0.71" green="0.00" blue="0.00"/> </disk> - <text string="36"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> + <text string="36"> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- Corner/Split bets --> <element name="Bet"> - <disk> <color red="0.00" green="0.16" blue="0.00"/> </disk> + <disk> <color red="0.00" green="0.16" blue="0.00"/> </disk> </element> <!-- Outside bets --> <element name="Bet 19-36"> - <text string="19-36"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="19-36"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet 1-12"> - <text string="1-12"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="1-12"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet 1-18"> - <text string="1-18"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="1-18"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet Odd"> - <text string="ODD"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="ODD"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet 13-24"> - <text string="13-24"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="13-24"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet Even"> - <text string="EVEN"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="EVEN"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet Red"> - <rect> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.71" green="0.00" blue="0.00"/> </rect> - <text string="RED"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <rect> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.71" green="0.00" blue="0.00"/> </rect> + <text string="RED"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet 25-36"> - <text string="25-36"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> + <text string="25-36"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.00" green="0.00" blue="0.00"/> </text> </element> <element name="Bet Black"> - <rect> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.06" green="0.06" blue="0.06"/> </rect> - <text string="BLACK"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <rect> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.06" green="0.06" blue="0.06"/> </rect> + <text string="BLACK"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- Special Keys --> <element name="Pay"> - <text string="PAY"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <text string="PAY"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet All"> - <text string="ALL"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <text string="ALL"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet Cancel"> - <text string="CANCEL"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <text string="CANCEL"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <element name="Bet Repeat"> - <text string="REPEAT"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> + <text string="REPEAT"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="1.00" green="0.91" blue="0.52"/> </text> </element> <!-- Debug Keys --> <element name="Unknown"> - <text string="UNK"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.80" green="0.80" blue="0.80"/> </text> + <text string="UNK"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.80" green="0.80" blue="0.80"/> </text> </element> <element name="Debug"> - <text string="DBG"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.80" green="0.80" blue="0.80"/> </text> + <text string="DBG"> <bounds x="0.00" y="0.00" width="2.25" height="0.65"/> <color red="0.80" green="0.80" blue="0.80"/> </text> </element> <!-- Board background --> <element name="Board"> - <rect> <bounds x="0.00" y="0.00" width="240" height="112"/> <color red="0.06" green="0.39" blue="0.00"/> </rect> + <rect> <bounds x="0.00" y="0.00" width="240" height="112"/> <color red="0.06" green="0.39" blue="0.00"/> </rect> </element> <view name="Standard Screen (3:4) and Board"> - <!-- Screen (Top) --> - <screen index="0"> - <bounds x="0" y="0" width="240" height="320"/> - </screen> - - - <!-- Board (Bottom) --> - <bezel element="Board"> <bounds x="0.0" y="330.0" width="240.0" height="112.0"/> </bezel> - - <!-- Top Row --> - <bezel element="Pay" inputtag="BET.00" inputmask="0x01"> <bounds x="-2.0" y="340.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet 19-36" inputtag="BET.04" inputmask="0x01"> <bounds x="38.0" y="340.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Odd" inputtag="BET.0C" inputmask="0x01"> <bounds x="102.0" y="340.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Red" inputtag="BET.14" inputmask="0x01"> <bounds x="166.0" y="340.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet All" inputtag="BET.19" inputmask="0x01"> <bounds x="206.0" y="340.0" width="36.0" height="11.0"/> </bezel> - - <!-- Bottom Row 1 --> - <bezel element="Unknown" inputtag="BET.00" inputmask="0x80"> <bounds x="7.0" y="402.3" width="18.0" height="10.5"/> </bezel> - <bezel element="Bet 1-12" inputtag="BET.04" inputmask="0x80"> <bounds x="38.0" y="404.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet 13-24" inputtag="BET.0C" inputmask="0x80"> <bounds x="102.0" y="404.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet 25-36" inputtag="BET.14" inputmask="0x80"> <bounds x="166.0" y="404.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Cancel" inputtag="BET.18" inputmask="0x80"> <bounds x="206.0" y="404.0" width="36.0" height="11.0"/> </bezel> - - <!-- Bottom Row 2 --> - <bezel element="Debug" inputtag="BET.01" inputmask="0x80"> <bounds x="7.0" y="420.3" width="18.0" height="10.5"/> </bezel> - <bezel element="Bet 1-18" inputtag="BET.05" inputmask="0x80"> <bounds x="38.0" y="420.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Even" inputtag="BET.0D" inputmask="0x80"> <bounds x="102.0" y="420.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Black" inputtag="BET.15" inputmask="0x80"> <bounds x="166.0" y="420.0" width="36.0" height="11.0"/> </bezel> - <bezel element="Bet Repeat" inputtag="BET.19" inputmask="0x80"> <bounds x="206.0" y="420.0" width="36.0" height="11.0"/> </bezel> - - <!-- Column 0 --> - <bezel element="Bet 0" inputtag="BET.00" inputmask="0x08"> <bounds x="11.0" y="372.0" width="10.0" height="10.0"/> </bezel> - - <!-- Column between 0 and 1-3 --> - <bezel element="Bet" inputtag="BET.01" inputmask="0x02"> <bounds x="22.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.01" inputmask="0x04"> <bounds x="22.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.01" inputmask="0x08"> <bounds x="22.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.01" inputmask="0x10"> <bounds x="22.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.01" inputmask="0x20"> <bounds x="22.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.01" inputmask="0x40"> <bounds x="22.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 1-3 --> - <bezel element="Bet 3" inputtag="BET.02" inputmask="0x02"> <bounds x="27.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.02" inputmask="0x04"> <bounds x="30.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 2" inputtag="BET.02" inputmask="0x08"> <bounds x="27.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.02" inputmask="0x10"> <bounds x="30.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 1" inputtag="BET.02" inputmask="0x20"> <bounds x="27.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.02" inputmask="0x40"> <bounds x="30.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 1-3 and 4-6 --> - <bezel element="Bet" inputtag="BET.03" inputmask="0x02"> <bounds x="38.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.03" inputmask="0x04"> <bounds x="38.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.03" inputmask="0x08"> <bounds x="38.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.03" inputmask="0x10"> <bounds x="38.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.03" inputmask="0x20"> <bounds x="38.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.03" inputmask="0x40"> <bounds x="38.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 4-6 --> - <bezel element="Bet 6" inputtag="BET.04" inputmask="0x02"> <bounds x="43.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.04" inputmask="0x04"> <bounds x="46.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 5" inputtag="BET.04" inputmask="0x08"> <bounds x="43.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.04" inputmask="0x10"> <bounds x="46.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 4" inputtag="BET.04" inputmask="0x20"> <bounds x="43.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.04" inputmask="0x40"> <bounds x="46.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 4-6 and 7-9 --> - <bezel element="Bet" inputtag="BET.05" inputmask="0x02"> <bounds x="54.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.05" inputmask="0x04"> <bounds x="54.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.05" inputmask="0x08"> <bounds x="54.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.05" inputmask="0x10"> <bounds x="54.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.05" inputmask="0x20"> <bounds x="54.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.05" inputmask="0x40"> <bounds x="54.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 7-9 --> - <bezel element="Bet 9" inputtag="BET.06" inputmask="0x02"> <bounds x="59.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.06" inputmask="0x04"> <bounds x="62.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 8" inputtag="BET.06" inputmask="0x08"> <bounds x="59.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.06" inputmask="0x10"> <bounds x="62.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 7" inputtag="BET.06" inputmask="0x20"> <bounds x="59.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.06" inputmask="0x40"> <bounds x="62.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 7-9 and 10-12 --> - <bezel element="Bet" inputtag="BET.07" inputmask="0x02"> <bounds x="70.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.07" inputmask="0x04"> <bounds x="70.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.07" inputmask="0x08"> <bounds x="70.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.07" inputmask="0x10"> <bounds x="70.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.07" inputmask="0x20"> <bounds x="70.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.07" inputmask="0x40"> <bounds x="70.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 10-12 --> - <bezel element="Bet 12" inputtag="BET.08" inputmask="0x02"> <bounds x="75.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.08" inputmask="0x04"> <bounds x="78.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 11" inputtag="BET.08" inputmask="0x08"> <bounds x="75.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.08" inputmask="0x10"> <bounds x="78.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 10" inputtag="BET.08" inputmask="0x20"> <bounds x="75.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.08" inputmask="0x40"> <bounds x="78.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 10-12 and 13-15 --> - <bezel element="Bet" inputtag="BET.09" inputmask="0x02"> <bounds x="86.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.09" inputmask="0x04"> <bounds x="86.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.09" inputmask="0x08"> <bounds x="86.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.09" inputmask="0x10"> <bounds x="86.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.09" inputmask="0x20"> <bounds x="86.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.09" inputmask="0x40"> <bounds x="86.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 13-15 --> - <bezel element="Bet 15" inputtag="BET.0A" inputmask="0x02"> <bounds x="91.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0A" inputmask="0x04"> <bounds x="94.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 14" inputtag="BET.0A" inputmask="0x08"> <bounds x="91.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0A" inputmask="0x10"> <bounds x="94.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 13" inputtag="BET.0A" inputmask="0x20"> <bounds x="91.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0A" inputmask="0x40"> <bounds x="94.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 13-15 and 16-18 --> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x02"> <bounds x="102.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x04"> <bounds x="102.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x08"> <bounds x="102.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x10"> <bounds x="102.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x20"> <bounds x="102.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0B" inputmask="0x40"> <bounds x="102.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 16-18 --> - <bezel element="Bet 18" inputtag="BET.0C" inputmask="0x02"> <bounds x="107.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0C" inputmask="0x04"> <bounds x="110.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 17" inputtag="BET.0C" inputmask="0x08"> <bounds x="107.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0C" inputmask="0x10"> <bounds x="110.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 16" inputtag="BET.0C" inputmask="0x20"> <bounds x="107.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0C" inputmask="0x40"> <bounds x="110.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 16-18 and 19-21 --> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x02"> <bounds x="118.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x04"> <bounds x="118.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x08"> <bounds x="118.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x10"> <bounds x="118.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x20"> <bounds x="118.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0D" inputmask="0x40"> <bounds x="118.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 19-21 --> - <bezel element="Bet 21" inputtag="BET.0E" inputmask="0x02"> <bounds x="123.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0E" inputmask="0x04"> <bounds x="126.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 20" inputtag="BET.0E" inputmask="0x08"> <bounds x="123.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0E" inputmask="0x10"> <bounds x="126.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 19" inputtag="BET.0E" inputmask="0x20"> <bounds x="123.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0E" inputmask="0x40"> <bounds x="126.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 19-21 and 22-24 --> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x02"> <bounds x="134.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x04"> <bounds x="134.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x08"> <bounds x="134.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x10"> <bounds x="134.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x20"> <bounds x="134.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.0F" inputmask="0x40"> <bounds x="134.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 22-24 --> - <bezel element="Bet 24" inputtag="BET.10" inputmask="0x02"> <bounds x="139.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.10" inputmask="0x04"> <bounds x="142.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 23" inputtag="BET.10" inputmask="0x08"> <bounds x="139.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.10" inputmask="0x10"> <bounds x="142.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 22" inputtag="BET.10" inputmask="0x20"> <bounds x="139.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.10" inputmask="0x40"> <bounds x="142.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 22-24 and 25-27 --> - <bezel element="Bet" inputtag="BET.11" inputmask="0x02"> <bounds x="150.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.11" inputmask="0x04"> <bounds x="150.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.11" inputmask="0x08"> <bounds x="150.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.11" inputmask="0x10"> <bounds x="150.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.11" inputmask="0x20"> <bounds x="150.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.11" inputmask="0x40"> <bounds x="150.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 25-27 --> - <bezel element="Bet 27" inputtag="BET.12" inputmask="0x02"> <bounds x="155.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.12" inputmask="0x04"> <bounds x="158.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 26" inputtag="BET.12" inputmask="0x08"> <bounds x="155.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.12" inputmask="0x10"> <bounds x="158.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 25" inputtag="BET.12" inputmask="0x20"> <bounds x="155.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.12" inputmask="0x40"> <bounds x="158.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 25-27 and 28-30 --> - <bezel element="Bet" inputtag="BET.13" inputmask="0x02"> <bounds x="166.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.13" inputmask="0x04"> <bounds x="166.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.13" inputmask="0x08"> <bounds x="166.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.13" inputmask="0x10"> <bounds x="166.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.13" inputmask="0x20"> <bounds x="166.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.13" inputmask="0x40"> <bounds x="166.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 28-30 --> - <bezel element="Bet 30" inputtag="BET.14" inputmask="0x02"> <bounds x="171.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.14" inputmask="0x04"> <bounds x="174.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 29" inputtag="BET.14" inputmask="0x08"> <bounds x="171.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.14" inputmask="0x10"> <bounds x="174.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 28" inputtag="BET.14" inputmask="0x20"> <bounds x="171.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.14" inputmask="0x40"> <bounds x="174.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 28-30 and 31-33 --> - <bezel element="Bet" inputtag="BET.15" inputmask="0x02"> <bounds x="182.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.15" inputmask="0x04"> <bounds x="182.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.15" inputmask="0x08"> <bounds x="182.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.15" inputmask="0x10"> <bounds x="182.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.15" inputmask="0x20"> <bounds x="182.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.15" inputmask="0x40"> <bounds x="182.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 31-33 --> - <bezel element="Bet 33" inputtag="BET.16" inputmask="0x02"> <bounds x="187.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.16" inputmask="0x04"> <bounds x="190.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 32" inputtag="BET.16" inputmask="0x08"> <bounds x="187.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.16" inputmask="0x10"> <bounds x="190.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 31" inputtag="BET.16" inputmask="0x20"> <bounds x="187.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.16" inputmask="0x40"> <bounds x="190.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column between 31-33 and 34-36 --> - <bezel element="Bet" inputtag="BET.17" inputmask="0x02"> <bounds x="198.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.17" inputmask="0x04"> <bounds x="198.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.17" inputmask="0x08"> <bounds x="198.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.17" inputmask="0x10"> <bounds x="198.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.17" inputmask="0x20"> <bounds x="198.0" y="391.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.17" inputmask="0x40"> <bounds x="198.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Column 34-36 --> - <bezel element="Bet 36" inputtag="BET.18" inputmask="0x02"> <bounds x="203.0" y="356.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.18" inputmask="0x04"> <bounds x="206.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 35" inputtag="BET.18" inputmask="0x08"> <bounds x="203.0" y="372.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.18" inputmask="0x10"> <bounds x="206.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet 34" inputtag="BET.18" inputmask="0x20"> <bounds x="203.0" y="388.0" width="10.0" height="10.0"/> </bezel> - <bezel element="Bet" inputtag="BET.18" inputmask="0x40"> <bounds x="206.0" y="399.0" width="4.0" height="4.0"/> </bezel> - - <!-- Rightmost column --> - <bezel element="Bet" inputtag="BET.19" inputmask="0x02"> <bounds x="222.0" y="359.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.19" inputmask="0x04"> <bounds x="222.0" y="367.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.19" inputmask="0x08"> <bounds x="222.0" y="375.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.19" inputmask="0x10"> <bounds x="222.0" y="383.0" width="4.0" height="4.0"/> </bezel> - <bezel element="Bet" inputtag="BET.19" inputmask="0x20"> <bounds x="222.0" y="391.0" width="4.0" height="4.0"/> </bezel> - + <!-- Screen (Top) --> + <screen index="0"> + <bounds x="0" y="0" width="240" height="320"/> + </screen> + + + <!-- Board (Bottom) --> + <bezel element="Board"> <bounds x="0.0" y="330.0" width="240.0" height="112.0"/> </bezel> + + <!-- Top Row --> + <bezel element="Pay" inputtag="BET.00" inputmask="0x01"> <bounds x="-2.0" y="340.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet 19-36" inputtag="BET.04" inputmask="0x01"> <bounds x="38.0" y="340.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Odd" inputtag="BET.0C" inputmask="0x01"> <bounds x="102.0" y="340.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Red" inputtag="BET.14" inputmask="0x01"> <bounds x="166.0" y="340.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet All" inputtag="BET.19" inputmask="0x01"> <bounds x="206.0" y="340.0" width="36.0" height="11.0"/> </bezel> + + <!-- Bottom Row 1 --> + <bezel element="Unknown" inputtag="BET.00" inputmask="0x80"> <bounds x="7.0" y="402.3" width="18.0" height="10.5"/> </bezel> + <bezel element="Bet 1-12" inputtag="BET.04" inputmask="0x80"> <bounds x="38.0" y="404.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet 13-24" inputtag="BET.0C" inputmask="0x80"> <bounds x="102.0" y="404.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet 25-36" inputtag="BET.14" inputmask="0x80"> <bounds x="166.0" y="404.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Cancel" inputtag="BET.18" inputmask="0x80"> <bounds x="206.0" y="404.0" width="36.0" height="11.0"/> </bezel> + + <!-- Bottom Row 2 --> + <bezel element="Debug" inputtag="BET.01" inputmask="0x80"> <bounds x="7.0" y="420.3" width="18.0" height="10.5"/> </bezel> + <bezel element="Bet 1-18" inputtag="BET.05" inputmask="0x80"> <bounds x="38.0" y="420.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Even" inputtag="BET.0D" inputmask="0x80"> <bounds x="102.0" y="420.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Black" inputtag="BET.15" inputmask="0x80"> <bounds x="166.0" y="420.0" width="36.0" height="11.0"/> </bezel> + <bezel element="Bet Repeat" inputtag="BET.19" inputmask="0x80"> <bounds x="206.0" y="420.0" width="36.0" height="11.0"/> </bezel> + + <!-- Column 0 --> + <bezel element="Bet 0" inputtag="BET.00" inputmask="0x08"> <bounds x="11.0" y="372.0" width="10.0" height="10.0"/> </bezel> + + <!-- Column between 0 and 1-3 --> + <bezel element="Bet" inputtag="BET.01" inputmask="0x02"> <bounds x="22.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.01" inputmask="0x04"> <bounds x="22.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.01" inputmask="0x08"> <bounds x="22.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.01" inputmask="0x10"> <bounds x="22.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.01" inputmask="0x20"> <bounds x="22.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.01" inputmask="0x40"> <bounds x="22.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 1-3 --> + <bezel element="Bet 3" inputtag="BET.02" inputmask="0x02"> <bounds x="27.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.02" inputmask="0x04"> <bounds x="30.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 2" inputtag="BET.02" inputmask="0x08"> <bounds x="27.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.02" inputmask="0x10"> <bounds x="30.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 1" inputtag="BET.02" inputmask="0x20"> <bounds x="27.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.02" inputmask="0x40"> <bounds x="30.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 1-3 and 4-6 --> + <bezel element="Bet" inputtag="BET.03" inputmask="0x02"> <bounds x="38.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.03" inputmask="0x04"> <bounds x="38.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.03" inputmask="0x08"> <bounds x="38.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.03" inputmask="0x10"> <bounds x="38.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.03" inputmask="0x20"> <bounds x="38.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.03" inputmask="0x40"> <bounds x="38.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 4-6 --> + <bezel element="Bet 6" inputtag="BET.04" inputmask="0x02"> <bounds x="43.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.04" inputmask="0x04"> <bounds x="46.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 5" inputtag="BET.04" inputmask="0x08"> <bounds x="43.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.04" inputmask="0x10"> <bounds x="46.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 4" inputtag="BET.04" inputmask="0x20"> <bounds x="43.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.04" inputmask="0x40"> <bounds x="46.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 4-6 and 7-9 --> + <bezel element="Bet" inputtag="BET.05" inputmask="0x02"> <bounds x="54.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.05" inputmask="0x04"> <bounds x="54.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.05" inputmask="0x08"> <bounds x="54.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.05" inputmask="0x10"> <bounds x="54.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.05" inputmask="0x20"> <bounds x="54.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.05" inputmask="0x40"> <bounds x="54.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 7-9 --> + <bezel element="Bet 9" inputtag="BET.06" inputmask="0x02"> <bounds x="59.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.06" inputmask="0x04"> <bounds x="62.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 8" inputtag="BET.06" inputmask="0x08"> <bounds x="59.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.06" inputmask="0x10"> <bounds x="62.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 7" inputtag="BET.06" inputmask="0x20"> <bounds x="59.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.06" inputmask="0x40"> <bounds x="62.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 7-9 and 10-12 --> + <bezel element="Bet" inputtag="BET.07" inputmask="0x02"> <bounds x="70.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.07" inputmask="0x04"> <bounds x="70.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.07" inputmask="0x08"> <bounds x="70.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.07" inputmask="0x10"> <bounds x="70.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.07" inputmask="0x20"> <bounds x="70.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.07" inputmask="0x40"> <bounds x="70.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 10-12 --> + <bezel element="Bet 12" inputtag="BET.08" inputmask="0x02"> <bounds x="75.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.08" inputmask="0x04"> <bounds x="78.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 11" inputtag="BET.08" inputmask="0x08"> <bounds x="75.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.08" inputmask="0x10"> <bounds x="78.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 10" inputtag="BET.08" inputmask="0x20"> <bounds x="75.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.08" inputmask="0x40"> <bounds x="78.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 10-12 and 13-15 --> + <bezel element="Bet" inputtag="BET.09" inputmask="0x02"> <bounds x="86.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.09" inputmask="0x04"> <bounds x="86.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.09" inputmask="0x08"> <bounds x="86.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.09" inputmask="0x10"> <bounds x="86.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.09" inputmask="0x20"> <bounds x="86.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.09" inputmask="0x40"> <bounds x="86.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 13-15 --> + <bezel element="Bet 15" inputtag="BET.0A" inputmask="0x02"> <bounds x="91.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0A" inputmask="0x04"> <bounds x="94.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 14" inputtag="BET.0A" inputmask="0x08"> <bounds x="91.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0A" inputmask="0x10"> <bounds x="94.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 13" inputtag="BET.0A" inputmask="0x20"> <bounds x="91.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0A" inputmask="0x40"> <bounds x="94.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 13-15 and 16-18 --> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x02"> <bounds x="102.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x04"> <bounds x="102.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x08"> <bounds x="102.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x10"> <bounds x="102.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x20"> <bounds x="102.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0B" inputmask="0x40"> <bounds x="102.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 16-18 --> + <bezel element="Bet 18" inputtag="BET.0C" inputmask="0x02"> <bounds x="107.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0C" inputmask="0x04"> <bounds x="110.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 17" inputtag="BET.0C" inputmask="0x08"> <bounds x="107.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0C" inputmask="0x10"> <bounds x="110.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 16" inputtag="BET.0C" inputmask="0x20"> <bounds x="107.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0C" inputmask="0x40"> <bounds x="110.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 16-18 and 19-21 --> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x02"> <bounds x="118.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x04"> <bounds x="118.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x08"> <bounds x="118.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x10"> <bounds x="118.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x20"> <bounds x="118.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0D" inputmask="0x40"> <bounds x="118.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 19-21 --> + <bezel element="Bet 21" inputtag="BET.0E" inputmask="0x02"> <bounds x="123.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0E" inputmask="0x04"> <bounds x="126.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 20" inputtag="BET.0E" inputmask="0x08"> <bounds x="123.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0E" inputmask="0x10"> <bounds x="126.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 19" inputtag="BET.0E" inputmask="0x20"> <bounds x="123.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0E" inputmask="0x40"> <bounds x="126.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 19-21 and 22-24 --> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x02"> <bounds x="134.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x04"> <bounds x="134.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x08"> <bounds x="134.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x10"> <bounds x="134.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x20"> <bounds x="134.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.0F" inputmask="0x40"> <bounds x="134.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 22-24 --> + <bezel element="Bet 24" inputtag="BET.10" inputmask="0x02"> <bounds x="139.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.10" inputmask="0x04"> <bounds x="142.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 23" inputtag="BET.10" inputmask="0x08"> <bounds x="139.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.10" inputmask="0x10"> <bounds x="142.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 22" inputtag="BET.10" inputmask="0x20"> <bounds x="139.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.10" inputmask="0x40"> <bounds x="142.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 22-24 and 25-27 --> + <bezel element="Bet" inputtag="BET.11" inputmask="0x02"> <bounds x="150.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.11" inputmask="0x04"> <bounds x="150.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.11" inputmask="0x08"> <bounds x="150.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.11" inputmask="0x10"> <bounds x="150.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.11" inputmask="0x20"> <bounds x="150.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.11" inputmask="0x40"> <bounds x="150.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 25-27 --> + <bezel element="Bet 27" inputtag="BET.12" inputmask="0x02"> <bounds x="155.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.12" inputmask="0x04"> <bounds x="158.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 26" inputtag="BET.12" inputmask="0x08"> <bounds x="155.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.12" inputmask="0x10"> <bounds x="158.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 25" inputtag="BET.12" inputmask="0x20"> <bounds x="155.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.12" inputmask="0x40"> <bounds x="158.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 25-27 and 28-30 --> + <bezel element="Bet" inputtag="BET.13" inputmask="0x02"> <bounds x="166.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.13" inputmask="0x04"> <bounds x="166.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.13" inputmask="0x08"> <bounds x="166.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.13" inputmask="0x10"> <bounds x="166.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.13" inputmask="0x20"> <bounds x="166.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.13" inputmask="0x40"> <bounds x="166.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 28-30 --> + <bezel element="Bet 30" inputtag="BET.14" inputmask="0x02"> <bounds x="171.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.14" inputmask="0x04"> <bounds x="174.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 29" inputtag="BET.14" inputmask="0x08"> <bounds x="171.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.14" inputmask="0x10"> <bounds x="174.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 28" inputtag="BET.14" inputmask="0x20"> <bounds x="171.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.14" inputmask="0x40"> <bounds x="174.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 28-30 and 31-33 --> + <bezel element="Bet" inputtag="BET.15" inputmask="0x02"> <bounds x="182.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.15" inputmask="0x04"> <bounds x="182.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.15" inputmask="0x08"> <bounds x="182.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.15" inputmask="0x10"> <bounds x="182.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.15" inputmask="0x20"> <bounds x="182.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.15" inputmask="0x40"> <bounds x="182.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 31-33 --> + <bezel element="Bet 33" inputtag="BET.16" inputmask="0x02"> <bounds x="187.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.16" inputmask="0x04"> <bounds x="190.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 32" inputtag="BET.16" inputmask="0x08"> <bounds x="187.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.16" inputmask="0x10"> <bounds x="190.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 31" inputtag="BET.16" inputmask="0x20"> <bounds x="187.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.16" inputmask="0x40"> <bounds x="190.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column between 31-33 and 34-36 --> + <bezel element="Bet" inputtag="BET.17" inputmask="0x02"> <bounds x="198.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.17" inputmask="0x04"> <bounds x="198.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.17" inputmask="0x08"> <bounds x="198.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.17" inputmask="0x10"> <bounds x="198.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.17" inputmask="0x20"> <bounds x="198.0" y="391.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.17" inputmask="0x40"> <bounds x="198.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Column 34-36 --> + <bezel element="Bet 36" inputtag="BET.18" inputmask="0x02"> <bounds x="203.0" y="356.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.18" inputmask="0x04"> <bounds x="206.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 35" inputtag="BET.18" inputmask="0x08"> <bounds x="203.0" y="372.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.18" inputmask="0x10"> <bounds x="206.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet 34" inputtag="BET.18" inputmask="0x20"> <bounds x="203.0" y="388.0" width="10.0" height="10.0"/> </bezel> + <bezel element="Bet" inputtag="BET.18" inputmask="0x40"> <bounds x="206.0" y="399.0" width="4.0" height="4.0"/> </bezel> + + <!-- Rightmost column --> + <bezel element="Bet" inputtag="BET.19" inputmask="0x02"> <bounds x="222.0" y="359.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.19" inputmask="0x04"> <bounds x="222.0" y="367.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.19" inputmask="0x08"> <bounds x="222.0" y="375.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.19" inputmask="0x10"> <bounds x="222.0" y="383.0" width="4.0" height="4.0"/> </bezel> + <bezel element="Bet" inputtag="BET.19" inputmask="0x20"> <bounds x="222.0" y="391.0" width="4.0" height="4.0"/> </bezel> + </view> diff --git a/src/mame/machine/cps2crypt.cpp b/src/mame/machine/cps2crypt.cpp index 568df93be34..ceccdea6b5b 100644 --- a/src/mame/machine/cps2crypt.cpp +++ b/src/mame/machine/cps2crypt.cpp @@ -765,7 +765,7 @@ DRIVER_INIT_MEMBER(cps_state,cps2crypt) key[0] = (decoded[0] << 16) | decoded[1]; key[1] = (decoded[2] << 16) | decoded[3]; - // decoded[4] == watchdog instruction third word + // decoded[4] == watchdog instruction third word // decoded[5] == watchdog instruction second word // decoded[6] == watchdog instruction first word // decoded[7] == 0x4000 (bits 8 to 23 of CPS2 object output address) diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index 928eafc10cb..6da366c0e9a 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -40,7 +40,7 @@ private: int m_joystick_data_select; /* which nibble of joystick data we want */ }; -// used by the Arcade bootlegs. +// used by the Arcade bootlegs. // Button II is actually on the left of a standard PCE joypad so we need to invert our button layout here. #define PCE_STANDARD_INPUT_PORT_P1 \ PORT_START( "JOY" ) \ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index b3e33c4b68e..bff1bcf5e4e 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -10508,24 +10508,24 @@ airraid // (c) 1987 Seibu Kaihatsu cshooter // (c) 1987 JKH (bootleg) @source:csplayh5.cpp -aimode // (c) 1999 +aimode // (c) 1999 bikiniko // (c) 1999 csplayh1 // (c) 1995 csplayh5 // (c) 1998 -csplayh6 // (c) 1999 +csplayh6 // (c) 1999 csplayh7 // (c) 1999 fuudol // (c) 2000 junai // (c) 1998 junai2 // (c) 1998 -mogitate // (c) 1998 -nichidvd // -nichisel // (c) 2000 -mjgalpri // (c) 1998 +mogitate // (c) 1998 +nichidvd // +nichisel // (c) 2000 +mjgalpri // (c) 1998 mjmania // (c) 1999 -pokoachu // (c) 1999 -renaimj // (c) 1999 +pokoachu // (c) 1999 +renaimj // (c) 1999 thenanpa // (c) 1999 -tsuwaku // (c) 2000 +tsuwaku // (c) 2000 @source:cswat.cpp cswat // (c) 1984 @@ -12628,7 +12628,7 @@ fmtownssj // FM-Towns II SJ fmtownsux // 1991.11 FM-Towns II UX @source:fontwriter.cpp -fw700ger // (c) Sharp +fw700ger // (c) Sharp @source:foodf.cpp foodf // 136020 (c) 1982 // made by Gencomp diff --git a/src/mame/video/itech8.cpp b/src/mame/video/itech8.cpp index c812f6003d8..58931aba00a 100644 --- a/src/mame/video/itech8.cpp +++ b/src/mame/video/itech8.cpp @@ -372,7 +372,7 @@ void itech8_state::perform_blit(address_space &space) /* advance to the next byte */ addr += xdir; - addr &= VRAM_MASK; + addr &= VRAM_MASK; } /* skip right */ diff --git a/src/mame/video/timelimt.cpp b/src/mame/video/timelimt.cpp index 1c18a1f00ff..40ec0718dab 100644 --- a/src/mame/video/timelimt.cpp +++ b/src/mame/video/timelimt.cpp @@ -36,7 +36,7 @@ PALETTE_INIT_MEMBER(timelimt_state, timelimt) 3, resistances_rg, weights_g, 0, 0, 2, resistances_b, weights_b, 0, 0); - + for (i = 0;i < palette.entries();i++) { int bit0,bit1,bit2,r,g,b; diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index d9316e18c22..b445bacacbe 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -2154,7 +2154,7 @@ void texture_info::compute_size(int texwidth, int texheight) m_xborderpix = 0; m_yborderpix = 0; - bool shaders_enabled = m_renderer->get_shaders()->enabled(); + bool shaders_enabled = m_renderer->get_shaders()->enabled(); bool wrap_texture = (m_flags & PRIMFLAG_TEXWRAP_MASK) == PRIMFLAG_TEXWRAP_MASK; // skip border when shaders are enabled |