From 787f186d48fd16c7d5a523d43c83ddca48e8cc6c Mon Sep 17 00:00:00 2001 From: Sergey Svishchev Date: Thu, 11 Dec 2014 20:49:45 +0300 Subject: various whitespace and comments fixes (nw) --- src/emu/bus/isa/cga.c | 4 ++-- src/emu/bus/pc_kbd/ec1841.c | 1 - src/emu/bus/pc_kbd/ec1841.h | 3 --- src/mess/drivers/asst128.c | 2 +- src/mess/drivers/ec184x.c | 3 +-- src/mess/drivers/iskr103x.c | 6 +++--- src/mess/drivers/mc1502.c | 30 ++++++++++++++---------------- src/mess/includes/genpc.h | 3 --- src/mess/includes/mc1502.h | 9 --------- 9 files changed, 21 insertions(+), 40 deletions(-) diff --git a/src/emu/bus/isa/cga.c b/src/emu/bus/isa/cga.c index 8e545116601..1c8cf2d83ca 100644 --- a/src/emu/bus/isa/cga.c +++ b/src/emu/bus/isa/cga.c @@ -513,7 +513,7 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_inten_comp_grey_update_row ) const rgb_t *palette = m_palette->palette()->entry_list_raw(); int i; - if ( y == 0 ) CGA_LOG(1,"cga_text_inten_update_row",("\n")); + if ( y == 0 ) CGA_LOG(1,"cga_text_inten_comp_grey_update_row",("\n")); for ( i = 0; i < x_count; i++ ) { UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff; @@ -632,7 +632,7 @@ MC6845_UPDATE_ROW( isa8_cga_device::cga_text_blink_update_row_si ) const rgb_t *palette = m_palette->palette()->entry_list_raw(); int i; - if ( y == 0 ) CGA_LOG(1,"cga_text_blink_update_row",("\n")); + if ( y == 0 ) CGA_LOG(1,"cga_text_blink_update_row_si",("\n")); for ( i = 0; i < x_count; i++ ) { UINT16 offset = ( ( ma + i ) << 1 ) & 0x3fff; diff --git a/src/emu/bus/pc_kbd/ec1841.c b/src/emu/bus/pc_kbd/ec1841.c index b45050b291b..856e4c3d724 100644 --- a/src/emu/bus/pc_kbd/ec1841.c +++ b/src/emu/bus/pc_kbd/ec1841.c @@ -48,7 +48,6 @@ const device_type PC_KBD_EC_1841 = &device_creator; ROM_START( ec_1841_keyboard ) ROM_REGION( 0x400, I8048_TAG, 0 ) - // XXX add P/N etc ROM_LOAD( "1816be48.bin", 0x000, 0x400, CRC(e9abfe44) SHA1(1db430c72c2d007ea0b8ae2514ff15c96baba308) ) ROM_END diff --git a/src/emu/bus/pc_kbd/ec1841.h b/src/emu/bus/pc_kbd/ec1841.h index 186c6a178fb..6d635895d95 100644 --- a/src/emu/bus/pc_kbd/ec1841.h +++ b/src/emu/bus/pc_kbd/ec1841.h @@ -15,7 +15,6 @@ #include "emu.h" #include "cpu/mcs48/mcs48.h" #include "pc_kbdc.h" -#include "machine/rescap.h" @@ -81,6 +80,4 @@ private: // device type definition extern const device_type PC_KBD_EC_1841; - - #endif diff --git a/src/mess/drivers/asst128.c b/src/mess/drivers/asst128.c index 2a1ff5fb7a8..cd70d45068c 100644 --- a/src/mess/drivers/asst128.c +++ b/src/mess/drivers/asst128.c @@ -84,7 +84,7 @@ static ADDRESS_MAP_START(asst128_io, AS_IO, 16, asst128_state) ADDRESS_MAP_END static SLOT_INTERFACE_START( asst128_floppies ) - SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD ) + SLOT_INTERFACE( "525ssqd", FLOPPY_525_SSQD ) SLOT_INTERFACE_END FLOPPY_FORMATS_MEMBER( asst128_state::asst128_formats ) diff --git a/src/mess/drivers/ec184x.c b/src/mess/drivers/ec184x.c index 44f366d325b..2a21c5a476c 100644 --- a/src/mess/drivers/ec184x.c +++ b/src/mess/drivers/ec184x.c @@ -202,7 +202,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ec1847_io, AS_IO, 8, ec184x_state ) ADDRESS_MAP_UNMAP_HIGH -// AM_RANGE(0x0210, 0x021f) AM_RAM // internal (non-standard?) bus extender +// AM_RANGE(0x0210, 0x021f) AM_RAM // internal (non-standard?) bus extender ADDRESS_MAP_END @@ -252,7 +252,6 @@ static MACHINE_CONFIG_START( ec1841, ec184x_state ) MCFG_CPU_IO_MAP(ec1841_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb) -// MCFG_MACHINE_START_OVERRIDE(ec184x_state, ec184x) MCFG_MACHINE_RESET_OVERRIDE(ec184x_state, ec184x) MCFG_EC1841_MOTHERBOARD_ADD("mb", "maincpu") diff --git a/src/mess/drivers/iskr103x.c b/src/mess/drivers/iskr103x.c index 25717bc57d7..7777cc84f1f 100644 --- a/src/mess/drivers/iskr103x.c +++ b/src/mess/drivers/iskr103x.c @@ -77,9 +77,9 @@ static MACHINE_CONFIG_START( iskr1030m, iskr103x_state ) MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu") MCFG_DEVICE_INPUT_DEFAULTS(iskr1030m) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1030m", false) // actually MDA? + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1030m", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", iskr103x_isa8_cards, "fdc_xt", false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, NULL, false) // hdc is WIP + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", iskr103x_isa8_cards, NULL, false) @@ -103,7 +103,7 @@ static MACHINE_CONFIG_START( iskr1031, iskr103x_state ) MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1031", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", iskr103x_isa8_cards, "fdc_xt", false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, NULL, false) // hdc is WIP + MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", iskr103x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", iskr103x_isa8_cards, NULL, false) diff --git a/src/mess/drivers/mc1502.c b/src/mess/drivers/mc1502.c index b861aa49a5c..e87e60644e4 100644 --- a/src/mess/drivers/mc1502.c +++ b/src/mess/drivers/mc1502.c @@ -51,8 +51,8 @@ TIMER_CALLBACK_MEMBER(mc1502_state::keyb_signal_callback) key |= ioport("Y10")->read(); key |= ioport("Y11")->read(); key |= ioport("Y12")->read(); -// DBG_LOG(1,"mc1502_k_s_c",("= %02X (%d) %s\n", key, m_kbd.pulsing, -// (key || m_kbd.pulsing) ? " will IRQ" : "")); +// DBG_LOG(1,"mc1502_k_s_c",("= %02X (%d) %s\n", key, m_kbd.pulsing, +// (key || m_kbd.pulsing) ? " will IRQ" : "")); /* If a key is pressed and we're not pulsing yet, start pulsing the IRQ1; @@ -73,7 +73,7 @@ TIMER_CALLBACK_MEMBER(mc1502_state::keyb_signal_callback) WRITE8_MEMBER(mc1502_state::mc1502_ppi_portb_w) { -// DBG_LOG(2,"mc1502_ppi_portb_w",("( %02X )\n", data)); +// DBG_LOG(2,"mc1502_ppi_portb_w",("( %02X )\n", data)); m_ppi_portb = data; m_pit8253->write_gate2(BIT(data, 0)); mc1502_speaker_set_spkrdata(BIT(data, 1)); @@ -87,14 +87,14 @@ WRITE8_MEMBER(mc1502_state::mc1502_ppi_portb_w) // bit 3: i8251 SYNDET pin triggers NMI (default = 1 = no) WRITE8_MEMBER(mc1502_state::mc1502_ppi_portc_w) { -// DBG_LOG(2,"mc1502_ppi_portc_w",("( %02X )\n", data)); +// DBG_LOG(2,"mc1502_ppi_portc_w",("( %02X )\n", data)); m_ppi_portc = data & 15; } -// 0x80 -- serial RxD -// 0x40 -- CASS IN, also loops back T2OUT (gated by CASWR) -// 0x20 -- T2OUT -// 0x10 -- SNDOUT +// 0x80 -- serial RxD +// 0x40 -- CASS IN, also loops back T2OUT (gated by CASWR) +// 0x20 -- T2OUT +// 0x10 -- SNDOUT READ8_MEMBER(mc1502_state::mc1502_ppi_portc_r) { int data = 0xff; @@ -104,8 +104,8 @@ READ8_MEMBER(mc1502_state::mc1502_ppi_portc_r) data = ( data & ~0x20 ) | ( m_pit_out2 ? 0x20 : 0x00 ); data = ( data & ~0x10 ) | ( (BIT(m_ppi_portb, 1) && m_pit_out2) ? 0x10 : 0x00 ); -// DBG_LOG(2,"mc1502_ppi_portc_r",("= %02X (tap_val %f t2out %d) at %s\n", -// data, tap_val, m_pit_out2, machine().describe_context())); +// DBG_LOG(2,"mc1502_ppi_portc_r",("= %02X (tap_val %f t2out %d) at %s\n", +// data, tap_val, m_pit_out2, machine().describe_context())); return data; } @@ -126,7 +126,7 @@ READ8_MEMBER(mc1502_state::mc1502_kppi_porta_r) if (m_kbd.mask & 0x0400) { key |= ioport("Y11")->read(); } if (m_kbd.mask & 0x0800) { key |= ioport("Y12")->read(); } key ^= 0xff; -// DBG_LOG(2,"mc1502_kppi_porta_r",("= %02X\n", key)); +// DBG_LOG(2,"mc1502_kppi_porta_r",("= %02X\n", key)); return key; } @@ -138,14 +138,14 @@ WRITE8_MEMBER(mc1502_state::mc1502_kppi_portb_w) m_kbd.mask |= 1 << 11; else m_kbd.mask &= ~(1 << 11); -// DBG_LOG(2,"mc1502_kppi_portb_w",("( %02X -> %04X )\n", data, m_kbd.mask)); +// DBG_LOG(2,"mc1502_kppi_portb_w",("( %02X -> %04X )\n", data, m_kbd.mask)); } WRITE8_MEMBER(mc1502_state::mc1502_kppi_portc_w) { m_kbd.mask &= ~(7 << 8); m_kbd.mask |= ((data ^ 7) & 7) << 8; -// DBG_LOG(2,"mc1502_kppi_portc_w",("( %02X -> %04X )\n", data, m_kbd.mask)); +// DBG_LOG(2,"mc1502_kppi_portc_w",("( %02X -> %04X )\n", data, m_kbd.mask)); } WRITE_LINE_MEMBER(mc1502_state::mc1502_i8251_syndet) @@ -219,7 +219,6 @@ static ADDRESS_MAP_START( mc1502_map, AS_PROGRAM, 8, mc1502_state ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00000, 0x97fff) AM_RAM /* 96K on mainboard + 512K on extension card */ AM_RANGE(0xc0000, 0xfbfff) AM_NOP -// AM_RANGE(0xe8000, 0xeffff) AM_ROM /* BASIC */ AM_RANGE(0xfc000, 0xfffff) AM_ROM ADDRESS_MAP_END @@ -232,7 +231,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(mc1502_io, AS_IO, 8, mc1502_state ) AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE("pic8259", pic8259_device, read, write) - AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE("upd8251", i8251_device, data_r, data_w) // not working yet + AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE("upd8251", i8251_device, data_r, data_w) AM_RANGE(0x0029, 0x0029) AM_DEVREADWRITE("upd8251", i8251_device, status_r, control_w) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE("pit8253", pit8253_device, read, write) AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE("ppi8255n1", i8255_device, read, write) @@ -244,7 +243,6 @@ static INPUT_PORTS_START( mc1502 ) INPUT_PORTS_END static MACHINE_CONFIG_START( mc1502, mc1502_state ) - /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, XTAL_16MHz/3) MCFG_CPU_PROGRAM_MAP(mc1502_map) MCFG_CPU_IO_MAP(mc1502_io) diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h index 4ec4258aeaa..93ceb476acb 100644 --- a/src/mess/includes/genpc.h +++ b/src/mess/includes/genpc.h @@ -154,7 +154,6 @@ extern const device_type IBM5150_MOTHERBOARD; MCFG_DEVICE_ADD(_tag, EC1841_MOTHERBOARD, 0) \ ec1841_mb_device::static_set_cputag(*device, _cputag); -// ======================> ibm5150_mb_device class ec1841_mb_device : public ibm5160_mb_device { public: @@ -177,8 +176,6 @@ public: virtual DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w ); }; - -// device type definition extern const device_type EC1841_MOTHERBOARD; #define MCFG_PCNOPPI_MOTHERBOARD_ADD(_tag, _cputag) \ diff --git a/src/mess/includes/mc1502.h b/src/mess/includes/mc1502.h index 7eef3a13a26..8704b1ae884 100644 --- a/src/mess/includes/mc1502.h +++ b/src/mess/includes/mc1502.h @@ -77,15 +77,6 @@ public: private: int m_pit_out2; - -/* - TIMER_CALLBACK_MEMBER(fdc_motor_callback); - static struct { - int fdc_motor_on; - emu_timer *fdc_motor_timer; - } m_motor; - const char *m_cputag; -*/ }; #endif /* MC1502_H_ */ -- cgit v1.2.3