diff options
author | 2013-11-05 06:59:51 +0000 | |
---|---|---|
committer | 2013-11-05 06:59:51 +0000 | |
commit | 44d5c1b8ab2ef3c06e831f901d0ab95262073bd7 (patch) | |
tree | bfdb73de82a28464c3b2c3098ad77a745b67759e /src/mess/machine | |
parent | 50cdc0f4ae9f07d666341cf3f60c253a71e6f016 (diff) |
Cleanups and version bumpmame0151
Diffstat (limited to 'src/mess/machine')
-rw-r--r-- | src/mess/machine/amigacd.c | 4 | ||||
-rw-r--r-- | src/mess/machine/amstrad.c | 2 | ||||
-rw-r--r-- | src/mess/machine/bbc.c | 8 | ||||
-rw-r--r-- | src/mess/machine/compiskb.c | 10 | ||||
-rw-r--r-- | src/mess/machine/compiskb.h | 2 | ||||
-rw-r--r-- | src/mess/machine/cs4031.c | 4 | ||||
-rw-r--r-- | src/mess/machine/cs4031.h | 4 | ||||
-rw-r--r-- | src/mess/machine/e05a03.c | 4 | ||||
-rw-r--r-- | src/mess/machine/e05a03.h | 4 | ||||
-rw-r--r-- | src/mess/machine/einstein.c | 6 | ||||
-rw-r--r-- | src/mess/machine/epson_sio.c | 4 | ||||
-rw-r--r-- | src/mess/machine/epson_sio.h | 4 | ||||
-rw-r--r-- | src/mess/machine/isa_cards.c | 4 | ||||
-rw-r--r-- | src/mess/machine/isa_cards.h | 4 | ||||
-rw-r--r-- | src/mess/machine/kb_7007_3.h | 2 | ||||
-rw-r--r-- | src/mess/machine/kb_ec1841.c | 2 | ||||
-rw-r--r-- | src/mess/machine/mtx.c | 4 | ||||
-rw-r--r-- | src/mess/machine/nascom1.c | 6 | ||||
-rw-r--r-- | src/mess/machine/pc.c | 8 | ||||
-rw-r--r-- | src/mess/machine/pf10.c | 4 | ||||
-rw-r--r-- | src/mess/machine/pf10.h | 4 | ||||
-rw-r--r-- | src/mess/machine/samcoupe.c | 4 | ||||
-rw-r--r-- | src/mess/machine/southbridge.c | 4 | ||||
-rw-r--r-- | src/mess/machine/tf20.c | 4 | ||||
-rw-r--r-- | src/mess/machine/tf20.h | 4 |
25 files changed, 55 insertions, 55 deletions
diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c index 2785c3a5455..d2f3a0e7384 100644 --- a/src/mess/machine/amigacd.c +++ b/src/mess/machine/amigacd.c @@ -431,7 +431,7 @@ static const amiga_autoconfig_device dmac_device = READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) { int ret = 0; - + tpi6525_device *tpi = space.machine().device<tpi6525_device>("tpi6525"); if ( (tpi->get_ddr_c() & 0x04) == 0 ) /* if pin 2 is set to input */ @@ -448,7 +448,7 @@ READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) WRITE8_DEVICE_HANDLER( amigacd_tpi6525_portb_w ) { tpi6525_device *tpi = space.machine().device<tpi6525_device>("tpi6525"); - + if ( tpi->get_ddr_b() & 0x01 ) /* if pin 0 is set to output */ matsucd_cmd_w( data & 1 ); /* write to the /CMD signal */ diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index a66e8bb604c..10217ea5d08 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -1428,7 +1428,7 @@ WRITE8_MEMBER(amstrad_state::amstrad_plus_asic_6000_w) } if(offset == 0x0800) // Programmable raster interrupt { - // logerror("ASIC: Wrote %02x to PRI\n",data); + // logerror("ASIC: Wrote %02x to PRI\n",data); m_asic.pri = data; } if(offset >= 0x0801 && offset <= 0x0803) // Split screen registers diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index a6585efa898..1d10857b366 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -574,7 +574,7 @@ READ8_MEMBER(bbc_state::bbcm_r) { via6522_device *via_0 = machine().device<via6522_device>("via6522_0"); via6522_device *via_1 = machine().device<via6522_device>("via6522_1"); - + myo = offset-0x200; if ((myo>=0x00) && (myo<=0x07)) return bbc_6845_r(space, myo-0x00); /* Video Controller */ if ((myo>=0x08) && (myo<=0x0f)) @@ -611,7 +611,7 @@ WRITE8_MEMBER(bbc_state::bbcm_w) { via6522_device *via_0 = machine().device<via6522_device>("via6522_0"); via6522_device *via_1 = machine().device<via6522_device>("via6522_1"); - + myo=offset-0x200; if ((myo>=0x00) && (myo<=0x07)) bbc_6845_w(space, myo-0x00, data); /* Video Controller */ if ((myo>=0x08) && (myo<=0x0f)) @@ -864,8 +864,8 @@ void bbc_state::bbcb_IC32_initialise(bbc_state *state) m_b0_sound=0x01; // Write Enable to the sound generator IC m_b1_speech_read=0x01; // READ select on the speech processor m_b2_speech_write=0x01; // WRITE select on the speech processor - m_b3_keyboard=0x01; // Keyboard write enable - m_b4_video0=0x01; // These two outputs define the number to be added to the start of screen address + m_b3_keyboard=0x01; // Keyboard write enable + m_b4_video0=0x01; // These two outputs define the number to be added to the start of screen address m_b5_video1=0x01; // in hardware to control hardware scrolling m_b6_caps_lock_led=0x01; // Operates the CAPS lock LED m_b7_shift_lock_led=0x01; // Operates the SHIFT lock LED diff --git a/src/mess/machine/compiskb.c b/src/mess/machine/compiskb.c index ba82291b725..19672df68d6 100644 --- a/src/mess/machine/compiskb.c +++ b/src/mess/machine/compiskb.c @@ -305,21 +305,21 @@ READ8_MEMBER( compis_keyboard_device::bus_r ) // bus_w - //------------------------------------------------- -WRITE8_MEMBER( compis_keyboard_device::bus_w ) +WRITE8_MEMBER( compis_keyboard_device::bus_w ) { /* - + bit description - + 0 keyboard row bit 0 1 keyboard row bit 1 2 keyboard row bit 2 3 keyboard row bit 3 - 4 + 4 5 speaker 6 CAPS LED 7 data out - + */ m_bus = data; diff --git a/src/mess/machine/compiskb.h b/src/mess/machine/compiskb.h index dba4a1dccc9..787065081fa 100644 --- a/src/mess/machine/compiskb.h +++ b/src/mess/machine/compiskb.h @@ -25,7 +25,7 @@ //************************************************************************** #define COMPIS_KEYBOARD_TAG "compiskb" -#define SPEAKER_TAG "speaker" +#define SPEAKER_TAG "speaker" diff --git a/src/mess/machine/cs4031.c b/src/mess/machine/cs4031.c index 5a758d97376..d93f349a96e 100644 --- a/src/mess/machine/cs4031.c +++ b/src/mess/machine/cs4031.c @@ -2,8 +2,8 @@ Chips & Technologies CS4031 chipset - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Chipset for 486 based PC/AT compatible systems. Consists of two individual chips: diff --git a/src/mess/machine/cs4031.h b/src/mess/machine/cs4031.h index 99815b7e048..9d1a95e6c14 100644 --- a/src/mess/machine/cs4031.h +++ b/src/mess/machine/cs4031.h @@ -2,8 +2,8 @@ Chips & Technologies CS4031 chipset - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Chipset for 486 based PC/AT compatible systems. Consists of two individual chips: diff --git a/src/mess/machine/e05a03.c b/src/mess/machine/e05a03.c index e7c52bcd59e..547dc1e4297 100644 --- a/src/mess/machine/e05a03.c +++ b/src/mess/machine/e05a03.c @@ -2,8 +2,8 @@ E05A03 Gate Array (used in the Epson LX-800) - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/e05a03.h b/src/mess/machine/e05a03.h index 025dfa16058..7a33c6b4f92 100644 --- a/src/mess/machine/e05a03.h +++ b/src/mess/machine/e05a03.h @@ -2,8 +2,8 @@ E05A03 Gate Array (used in the Epson LX-800) - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/einstein.c b/src/mess/machine/einstein.c index f7c29ad1cc5..7e587c64a6e 100644 --- a/src/mess/machine/einstein.c +++ b/src/mess/machine/einstein.c @@ -1,9 +1,9 @@ /*************************************************************************** - Tatung Einstein + Tatung Einstein - license: MAME - copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith + license: MAME + copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith ***************************************************************************/ diff --git a/src/mess/machine/epson_sio.c b/src/mess/machine/epson_sio.c index 5bff0ec86bf..84848c47102 100644 --- a/src/mess/machine/epson_sio.c +++ b/src/mess/machine/epson_sio.c @@ -2,8 +2,8 @@ EPSON SIO port emulation - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/epson_sio.h b/src/mess/machine/epson_sio.h index 6e3c2bd16b2..145009bff87 100644 --- a/src/mess/machine/epson_sio.h +++ b/src/mess/machine/epson_sio.h @@ -2,8 +2,8 @@ EPSON SIO port emulation - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/isa_cards.c b/src/mess/machine/isa_cards.c index 04a3ad94818..bd69eb04162 100644 --- a/src/mess/machine/isa_cards.c +++ b/src/mess/machine/isa_cards.c @@ -2,8 +2,8 @@ ISA cards - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/isa_cards.h b/src/mess/machine/isa_cards.h index 222b448d70a..686a7812622 100644 --- a/src/mess/machine/isa_cards.h +++ b/src/mess/machine/isa_cards.h @@ -2,8 +2,8 @@ ISA cards - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/kb_7007_3.h b/src/mess/machine/kb_7007_3.h index 1a53faa9045..35de2e98484 100644 --- a/src/mess/machine/kb_7007_3.h +++ b/src/mess/machine/kb_7007_3.h @@ -11,7 +11,7 @@ INPUT_PORTS_START( mc7007_3_keyboard ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Left Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 7") PORT_CODE(KEYCODE_7_PAD) // PORT_CODE(KEYCODE_HOME) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 7") PORT_CODE(KEYCODE_7_PAD) // PORT_CODE(KEYCODE_HOME) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 8") PORT_CODE(KEYCODE_8_PAD) // PORT_CODE(KEYCODE_UP) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 9") PORT_CODE(KEYCODE_9_PAD) // PORT_CODE(KEYCODE_PGUP) diff --git a/src/mess/machine/kb_ec1841.c b/src/mess/machine/kb_ec1841.c index 982e5492fb2..3c35f3f26ed 100644 --- a/src/mess/machine/kb_ec1841.c +++ b/src/mess/machine/kb_ec1841.c @@ -2,7 +2,7 @@ EC-1841 92-key keyboard emulation - Sends 9 non-standard scan codes (54..5C) and reassigns 3 standard + Sends 9 non-standard scan codes (54..5C) and reassigns 3 standard ones (2A, 36, 3A). EC-1841 BIOS converts scan codes into Cyrillic by default; 'Lat' key (mapped to F11) switches it to Latin mode. 'Rus' (F12) switches back. diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c index 78aca733778..5593a2a3485 100644 --- a/src/mess/machine/mtx.c +++ b/src/mess/machine/mtx.c @@ -2,8 +2,8 @@ Memotech MTX 500, MTX 512 and RS 128 - license: MAME - copyright-holders: (Original Author?), Dirk Best, Curt Coder + license: MAME + copyright-holders: (Original Author?), Dirk Best, Curt Coder **************************************************************************/ diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index 7fd8c76240e..f9f3737050a 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -1,9 +1,9 @@ /********************************************************************** - Nascom 1 and Nascom 2 + Nascom 1 and Nascom 2 - license: MAME - copyright-holders: (Original Author?), Dirk Best + license: MAME + copyright-holders: (Original Author?), Dirk Best **********************************************************************/ diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c index 50d620fe014..b2eff69e7c2 100644 --- a/src/mess/machine/pc.c +++ b/src/mess/machine/pc.c @@ -425,15 +425,15 @@ const struct pit8253_interface pcjr_pit8253_config = const i8251_interface mc1502_i8251_interface = { - DEVCB_NULL, /* XXX RxD data are accessible via PPI port C, bit 7 */ + DEVCB_NULL, /* XXX RxD data are accessible via PPI port C, bit 7 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), /* default handler does nothing */ + DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), /* default handler does nothing */ DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), DEVCB_NULL, - DEVCB_NULL /* XXX SYNDET triggers NMI */ + DEVCB_NULL /* XXX SYNDET triggers NMI */ }; WRITE_LINE_MEMBER(pc_state::mc1502_pit8253_out1_changed) @@ -1534,7 +1534,7 @@ MACHINE_RESET_MEMBER(pc_state,pc) m_speaker->level_w(0); // ec1841-specific code - m_memboards = m_ram->size()/(512*1024) - 1; + m_memboards = m_ram->size()/(512*1024) - 1; if (m_memboards > 3) m_memboards = 3; memset(m_memboard,0,sizeof(m_memboard)); diff --git a/src/mess/machine/pf10.c b/src/mess/machine/pf10.c index b996a77596a..ce499b8667c 100644 --- a/src/mess/machine/pf10.c +++ b/src/mess/machine/pf10.c @@ -2,8 +2,8 @@ EPSON PF-10 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Battery operated portable 3.5" floppy drive diff --git a/src/mess/machine/pf10.h b/src/mess/machine/pf10.h index 2c9dfeceddb..c2288599e1b 100644 --- a/src/mess/machine/pf10.h +++ b/src/mess/machine/pf10.h @@ -2,8 +2,8 @@ EPSON PF-10 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Battery operated portable 3.5" floppy drive diff --git a/src/mess/machine/samcoupe.c b/src/mess/machine/samcoupe.c index 516b8aa8961..e4598f8543f 100644 --- a/src/mess/machine/samcoupe.c +++ b/src/mess/machine/samcoupe.c @@ -2,8 +2,8 @@ Miles Gordon Technology SAM Coupe - license: MAME - copyright-holders: Lee Hammerton, Dirk Best + license: MAME + copyright-holders: Lee Hammerton, Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/southbridge.c b/src/mess/machine/southbridge.c index 99fa97b9e46..0c495fa3dbf 100644 --- a/src/mess/machine/southbridge.c +++ b/src/mess/machine/southbridge.c @@ -217,8 +217,8 @@ void southbridge_device::device_start() spaceio.install_readwrite_handler(0x0170, 0x0177, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs0),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs0), &(*m_ide2)),0xffffffff); spaceio.install_readwrite_handler(0x01f0, 0x01f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs0),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs0), &(*m_ide)),0xffffffff); // HACK: this works if you take out the (non working) fdc -// spaceio.install_readwrite_handler(0x0370, 0x0377, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide2)),0xffffffff); -// spaceio.install_readwrite_handler(0x03f0, 0x03f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide)),0xffffffff); +// spaceio.install_readwrite_handler(0x0370, 0x0377, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide2)),0xffffffff); +// spaceio.install_readwrite_handler(0x03f0, 0x03f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide)),0xffffffff); spaceio.install_readwrite_handler(0x0374, 0x0377, read8_delegate(FUNC(southbridge_device::ide2_read_cs1_r),this), write8_delegate(FUNC(southbridge_device::ide2_write_cs1_w), this),0xff0000); spaceio.install_readwrite_handler(0x03f4, 0x03f7, read8_delegate(FUNC(southbridge_device::ide_read_cs1_r),this), write8_delegate(FUNC(southbridge_device::ide_write_cs1_w), this),0xff0000); spaceio.nop_readwrite(0x00e0, 0x00ef); diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c index ce344eedb47..1c7d7d3698e 100644 --- a/src/mess/machine/tf20.c +++ b/src/mess/machine/tf20.c @@ -2,8 +2,8 @@ EPSON TF-20 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Dual 5.25" floppy drive with HX-20 factory option diff --git a/src/mess/machine/tf20.h b/src/mess/machine/tf20.h index e0748cd2f31..8ba20b1a93a 100644 --- a/src/mess/machine/tf20.h +++ b/src/mess/machine/tf20.h @@ -2,8 +2,8 @@ EPSON TF-20 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Dual 5.25" floppy drive with HX-20 factory option |