diff options
Diffstat (limited to 'src/mess/drivers')
| -rw-r--r-- | src/mess/drivers/apple2.c | 82 | ||||
| -rw-r--r-- | src/mess/drivers/apple2e.c | 557 | ||||
| -rw-r--r-- | src/mess/drivers/apple2gs.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/comp4.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/dvk_ksm.c | 38 | ||||
| -rw-r--r-- | src/mess/drivers/ec184x.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/gamate.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/iskr103x.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/leapster.c | 46 | ||||
| -rw-r--r-- | src/mess/drivers/merlin.c | 12 | ||||
| -rw-r--r-- | src/mess/drivers/ngen.c | 8 | ||||
| -rw-r--r-- | src/mess/drivers/pc9801.c | 16 | ||||
| -rw-r--r-- | src/mess/drivers/pcd.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/px4.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/px8.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/simon.c | 10 | ||||
| -rw-r--r-- | src/mess/drivers/spc1000.c | 4 | ||||
| -rwxr-xr-x | src/mess/drivers/ti85.c | 32 | ||||
| -rw-r--r-- | src/mess/drivers/ticalc1x.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/tk2000.c | 58 |
20 files changed, 448 insertions, 449 deletions
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index 413cab064cc..e5406ff4efa 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -2,13 +2,13 @@ // copyright-holders:R. Belmont /*************************************************************************** - apple2.c - Apple II/II Plus and clones + apple2.c - Apple II/II Plus and clones - Next generation driver written in September/October 2014 by R. Belmont. - Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont - Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie. - -II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB possible. + Next generation driver written in September/October 2014 by R. Belmont. + Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont + Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie. + +II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB possible. 8K of ROM at $E000-$FFFF, empty sockets for $D000-$D7FF and $D800-$DFFF. Programmer's Aid #1 was sold by Apple for $D000-$D7FF, some third-party ROMs were also available. @@ -19,25 +19,25 @@ II: original base model. RAM sizes of 4, 8, 12, 16, 20, 24, 32, 36, and 48 KB p ROM contains original non-autostart Monitor and Integer BASIC; apparently Autostart + Integer is also possible. - -II Plus: RAM options reduced to 16/32/48 KB. + +II Plus: RAM options reduced to 16/32/48 KB. ROM expanded to 12KB from $D000-$FFFF containing Applesoft BASIC and the Autostart Monitor. Applesoft is a licensed version of Microsoft's 6502 BASIC as also found in Commodore and many other computers. - - + + Users of both models often connected the SHIFT key to the paddle #2 button (mapped to $C063) in order to inform properly written software that characters were to be intended upper/lower case. - + Both models commonly included a RAM "language card" in slot 0 which added 16K of RAM which could be banked into the $D000-$FFFF space to replace the ROMs. This allowed running Applesoft on a II and Integer BASIC on a II Plus. A II Plus with this card installed is often called a "64K Apple II"; this is the base configuration required to run ProDOS and some larger games. - -************************************************************************/ - + +************************************************************************/ + #include "emu.h" #include "machine/bankdev.h" #include "machine/ram.h" @@ -212,7 +212,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w) { // assume no cards are pulling /INH m_inh_slot = -1; - + // scan the slots to figure out which card(s) are INHibiting stuff for (int i = 0; i <= 7; i++) { @@ -226,7 +226,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w) { if (m_inh_bank != 1) { - m_upperbank->set_bank(1); + m_upperbank->set_bank(1); m_inh_bank = 1; } } @@ -234,7 +234,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w) { if (m_inh_bank != 0) { - m_upperbank->set_bank(0); + m_upperbank->set_bank(0); m_inh_bank = 0; } } @@ -248,7 +248,7 @@ WRITE_LINE_MEMBER(napple2_state::a2bus_inh_w) // if no slots are inhibiting, make sure ROM is fully switched in if ((m_inh_slot == -1) && (m_inh_bank != 0)) { - m_upperbank->set_bank(0); + m_upperbank->set_bank(0); m_inh_bank = 0; } } @@ -315,7 +315,7 @@ void napple2_state::machine_reset() m_anykeydown = false; } -/*************************************************************************** +/*************************************************************************** VIDEO ***************************************************************************/ @@ -332,16 +332,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(napple2_state::apple2_interrupt) m_video->m_sysconfig = m_sysconfig->read(); // check reset - if (m_resetdip) // if reset DIP is present, use it + if (m_resetdip) // if reset DIP is present, use it { if (m_resetdip->read() & 1) - { // CTRL-RESET + { // CTRL-RESET if ((m_kbspecial->read() & 0x88) == 0x88) { m_maincpu->reset(); } } - else // plain RESET + else // plain RESET { if (m_kbspecial->read() & 0x80) { @@ -349,7 +349,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(napple2_state::apple2_interrupt) } } } - else // no DIP, so always plain RESET + else // no DIP, so always plain RESET { if (m_kbspecial->read() & 0x80) { @@ -383,8 +383,8 @@ UINT32 napple2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, m_video->hgr_update(screen, bitmap, cliprect, 0, 191); } } - else // lo-res - { + else // lo-res + { if (m_video->m_mix) { m_video->lores_update(screen, bitmap, cliprect, 0, 159); @@ -404,7 +404,7 @@ UINT32 napple2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -/*************************************************************************** +/*************************************************************************** I/O ***************************************************************************/ // most softswitches don't care about read vs write, so handle them here @@ -440,12 +440,12 @@ void napple2_state::do_io(address_space &space, int offset) m_video->m_mix = true; break; case 0x54: // set page 1 - m_page2 = false; + m_page2 = false; m_video->m_page2 = false; break; case 0x55: // set page 2 - m_page2 = true; + m_page2 = true; m_video->m_page2 = true; break; @@ -479,7 +479,7 @@ void napple2_state::do_io(address_space &space, int offset) case 0x5f: // AN3 on m_an3 = true; break; - case 0x68: // IIgs STATE register, which ProDOS touches + case 0x68: // IIgs STATE register, which ProDOS touches break; case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77: @@ -510,15 +510,15 @@ READ8_MEMBER(napple2_state::c000_r) case 0x68: return m_cassette->input() > 0.0 ? 0x80 : 0; - case 0x61: // button 0 + case 0x61: // button 0 case 0x69: return (m_joybuttons->read() & 0x10) ? 0x80 : 0; - case 0x62: // button 1 + case 0x62: // button 1 case 0x6a: return (m_joybuttons->read() & 0x20) ? 0x80 : 0; - case 0x63: // button 2 + case 0x63: // button 2 case 0x6b: // check if SHIFT key mod configured if (m_sysconfig->read() & 0x04) @@ -527,11 +527,11 @@ READ8_MEMBER(napple2_state::c000_r) } return (m_joybuttons->read() & 0x40) ? 0x80 : 0; - case 0x64: // joy 1 X axis + case 0x64: // joy 1 X axis case 0x6c: return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0; - case 0x65: // joy 1 Y axis + case 0x65: // joy 1 Y axis case 0x6d: return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0; @@ -666,10 +666,10 @@ READ8_MEMBER(napple2_state::inh_r) { if (m_inh_slot != -1) { - return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); + return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); } - assert(0); // hitting inh_r with invalid m_inh_slot should not be possible + assert(0); // hitting inh_r with invalid m_inh_slot should not be possible return read_floatingbus(); } @@ -942,7 +942,7 @@ WRITE_LINE_MEMBER(napple2_state::ay3600_data_ready_w) if (m_transchar != 0) { m_strobe = 0x80; -// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar); +// printf("new char = %04x (%02x)\n", m_lastchar&0x3f, m_transchar); } } } @@ -1021,7 +1021,7 @@ INPUT_PORTS_START( apple2_sysconfig ) PORT_CONFSETTING(0x02, "Green") PORT_CONFSETTING(0x03, "Amber") - PORT_CONFNAME(0x04, 0x04, "Shift key mod") // default to installed + PORT_CONFNAME(0x04, 0x04, "Shift key mod") // default to installed PORT_CONFSETTING(0x00, "Not present") PORT_CONFSETTING(0x04, "Installed") INPUT_PORTS_END @@ -1053,7 +1053,7 @@ static INPUT_PORTS_START( apple2_common ) PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'') PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(') PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')') - PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') + PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR(':') PORT_CHAR('*') PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('-') PORT_CHAR('=') @@ -1186,7 +1186,7 @@ INPUT_PORTS_END static SLOT_INTERFACE_START(apple2_slot0_cards) SLOT_INTERFACE("lang", A2BUS_RAMCARD16K) /* Apple II RAM Language Card */ - SLOT_INTERFACE("ssram", A2BUS_RAMCARD128K) /* Saturn Systems 128K extended language card */ + SLOT_INTERFACE("ssram", A2BUS_RAMCARD128K) /* Saturn Systems 128K extended language card */ SLOT_INTERFACE_END static SLOT_INTERFACE_START(apple2_cards) @@ -1277,7 +1277,7 @@ static MACHINE_CONFIG_START( apple2_common, napple2_state ) MCFG_AY3600_SHIFT_CB(READLINE(napple2_state, ay3600_shift_r)) MCFG_AY3600_CONTROL_CB(READLINE(napple2_state, ay3600_control_r)) MCFG_AY3600_DATA_READY_CB(WRITELINE(napple2_state, ay3600_data_ready_w)) - MCFG_AY3600_AKO_CB(WRITELINE(napple2_state, ay3600_ako_w)) + MCFG_AY3600_AKO_CB(WRITELINE(napple2_state, ay3600_ako_w)) /* repeat timer. 15 Hz from page 90 of "The Apple II Circuit Description */ MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", napple2_state, ay3600_repeat, attotime::from_hz(15)) diff --git a/src/mess/drivers/apple2e.c b/src/mess/drivers/apple2e.c index be7e8693462..3439d62f659 100644 --- a/src/mess/drivers/apple2e.c +++ b/src/mess/drivers/apple2e.c @@ -4,88 +4,88 @@ apple2e.c - Apple IIe/IIc/IIc Plus and clones - Next generation driver written in September/October 2014 by R. Belmont. - Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont - Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie. - - - IIe: base of this driver. 64K RAM, slot 0 language card emulation without the double-read requirement, + Next generation driver written in September/October 2014 by R. Belmont. + Thanks to the original Apple II series driver's authors: Mike Balfour, Nathan Woods, and R. Belmont + Special thanks to the Apple II Documentation Project/Antoine Vignau and Peter Ferrie. + + + IIe: base of this driver. 64K RAM, slot 0 language card emulation without the double-read requirement, lowercase and SHIFT key on button 2, Open and Solid Apple buttons on joy buttons 0 and 1, auxiliary slot, built-in 80 column support if extra RAM added. - - Physical slot 0 was eliminated thanks to the built-in language card. - - Most of the write-only softswitches gained readback locations, necessary to make interrupt-driven - software possible. - - Base 80-column card: 1K RAM, allows 80 columns and double-lo-res, - no double-hi-res. - - Extended 80-column card: 64K RAM (including a second language card), - allows 80 columns, double-lo-res, and double-hi-res. - - Revision A motherboards (very rare) don't support double-hi-res; it's unclear - if double-lo-res works or not. We emulate the much more common Rev B or later - board. - - IIe enhanced: 65C02 CPU with more instructions, MouseText in the character generator. - - IIe platinum: Like enhanced but with added numeric keypad and extended 80-column card - included in the box. Keypad CLEAR generates ESC by default, one hardware mod - made it generate CTRL-X instead. (new keyboard encoder ROM?) - - NOTE: On real IIe and IIe enhanced h/w, pressing SHIFT and paddle button 2 will - short out the power supply and cause a safety shutdown. (We don't emulate - this "feature", and it was relatively rare in real life as Apple joysticks only - had buttons 0 and 1 normally). - - IIc: IIe enhanced shrunken into a pizzabox with a Disk II compatible - half-height drive included in the case. - - No slots, but included functionality equivalent to the following slots - on the motherboard: + + Physical slot 0 was eliminated thanks to the built-in language card. + + Most of the write-only softswitches gained readback locations, necessary to make interrupt-driven + software possible. + + Base 80-column card: 1K RAM, allows 80 columns and double-lo-res, + no double-hi-res. + + Extended 80-column card: 64K RAM (including a second language card), + allows 80 columns, double-lo-res, and double-hi-res. + + Revision A motherboards (very rare) don't support double-hi-res; it's unclear + if double-lo-res works or not. We emulate the much more common Rev B or later + board. + + IIe enhanced: 65C02 CPU with more instructions, MouseText in the character generator. + + IIe platinum: Like enhanced but with added numeric keypad and extended 80-column card + included in the box. Keypad CLEAR generates ESC by default, one hardware mod + made it generate CTRL-X instead. (new keyboard encoder ROM?) + + NOTE: On real IIe and IIe enhanced h/w, pressing SHIFT and paddle button 2 will + short out the power supply and cause a safety shutdown. (We don't emulate + this "feature", and it was relatively rare in real life as Apple joysticks only + had buttons 0 and 1 normally). + + IIc: IIe enhanced shrunken into a pizzabox with a Disk II compatible + half-height drive included in the case. + + No slots, but included functionality equivalent to the following slots + on the motherboard: - 2 Super Serial Cards (modem and printer ports) - extended 80 column card / 128K RAM - Disk II IWM controller - Apple II Mouse card (firmware entry points are compatible, but the hardware implementation omits the 68705 and is quite different!) - + Has a 40/80 column switch and a QWERTY/DVORAK switch. - - IIc (UniDisk 3.5): IIc with ROM doubled to 32K and the ROMSWITCH register - added to page between the original 16K ROM and the new added 16K. The - extra firmware space was dedicated to implementing the Protocol Converter, - later renamed "SmartPort", which communicates with "smart" packet devices - over the IWM bus. - - Partial AppleTalk code also exists in this ROM but it doesn't work and - was not completed. - - IIc (Original Memory Expansion): - Removes AppleTalk and adds support for a memory expansion card with up - to 1 MB; this is identical both in hardware and firmware to the "Slinky" - memory expansion card for the Apple IIe (a2bus/a2memexp.c). - - IIc (Revised Memory Expansion, Rev. 3): - Fixes several nasty bugs in the Original Memory Expansion version. Not - currently dumped. - - IIc (Rev 4): - Fixes memory size detection for memory cards with less than 1MB. Fixes - several screen hole errors introduced in Rev 3, and fixes Terminal Mode - wherein the firmware can be put into a built-in terminal mode for simple - tests with a modem. - - IIc Plus: - Like IIc with memory expansion, but with licensed built-in Zip Chip which - runs the 65C02 at 4 MHz turbo speed with a small cache RAM. - - The machine has an internal "Apple 3.5" drive plus a custom gate array - which emulates the functionality of the UniDisk 3.5's on-board 65C02. - This gets around the fact that 1 MHz isn't sufficient to handle direct - Woz-style control of a double-density 3.5" drive. - - External drive port allows IIgs-style daisy-chaining. + + IIc (UniDisk 3.5): IIc with ROM doubled to 32K and the ROMSWITCH register + added to page between the original 16K ROM and the new added 16K. The + extra firmware space was dedicated to implementing the Protocol Converter, + later renamed "SmartPort", which communicates with "smart" packet devices + over the IWM bus. + + Partial AppleTalk code also exists in this ROM but it doesn't work and + was not completed. + + IIc (Original Memory Expansion): + Removes AppleTalk and adds support for a memory expansion card with up + to 1 MB; this is identical both in hardware and firmware to the "Slinky" + memory expansion card for the Apple IIe (a2bus/a2memexp.c). + + IIc (Revised Memory Expansion, Rev. 3): + Fixes several nasty bugs in the Original Memory Expansion version. Not + currently dumped. + + IIc (Rev 4): + Fixes memory size detection for memory cards with less than 1MB. Fixes + several screen hole errors introduced in Rev 3, and fixes Terminal Mode + wherein the firmware can be put into a built-in terminal mode for simple + tests with a modem. + + IIc Plus: + Like IIc with memory expansion, but with licensed built-in Zip Chip which + runs the 65C02 at 4 MHz turbo speed with a small cache RAM. + + The machine has an internal "Apple 3.5" drive plus a custom gate array + which emulates the functionality of the UniDisk 3.5's on-board 65C02. + This gets around the fact that 1 MHz isn't sufficient to handle direct + Woz-style control of a double-density 3.5" drive. + + External drive port allows IIgs-style daisy-chaining. ---------------------------------- @@ -163,27 +163,27 @@ Address bus A0-A11 is Y0-Y11 #define A2_AUXSLOT_TAG "auxbus" #define A2_VIDEO_TAG "a2video" -#define A2_0000_TAG "r00bank" -#define A2_0200_TAG "r02bank" -#define A2_0400_TAG "r04bank" -#define A2_0800_TAG "r08bank" -#define A2_2000_TAG "r20bank" -#define A2_4000_TAG "r40bank" -#define A2_C100_TAG "c1bank" -#define A2_C300_TAG "c3bank" -#define A2_C400_TAG "c4bank" -#define A2_C800_TAG "c8bank" +#define A2_0000_TAG "r00bank" +#define A2_0200_TAG "r02bank" +#define A2_0400_TAG "r04bank" +#define A2_0800_TAG "r08bank" +#define A2_2000_TAG "r20bank" +#define A2_4000_TAG "r40bank" +#define A2_C100_TAG "c1bank" +#define A2_C300_TAG "c3bank" +#define A2_C400_TAG "c4bank" +#define A2_C800_TAG "c8bank" #define A2_LCBANK_TAG "lcbank" #define MOUSE_BUTTON_TAG "mse_button" #define MOUSE_XAXIS_TAG "mse_x" #define MOUSE_YAXIS_TAG "mse_y" -#define CNXX_UNCLAIMED -1 -#define CNXX_INTROM -2 +#define CNXX_UNCLAIMED -1 +#define CNXX_INTROM -2 #define IRQ_SLOT 0 -#define IRQ_VBL 1 +#define IRQ_VBL 1 #define IRQ_MOUSEXY 2 class apple2e_state : public driver_device @@ -430,7 +430,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) { // assume no cards are pulling /INH m_inh_slot = -1; - + // scan the slots to figure out which card(s) are INHibiting stuff for (int i = 0; i <= 7; i++) { @@ -444,7 +444,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) { if (m_inh_bank != 1) { - m_upperbank->set_bank(1); + m_upperbank->set_bank(1); m_inh_bank = 1; } } @@ -452,7 +452,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) { if (m_inh_bank != 0) { - m_upperbank->set_bank(0); + m_upperbank->set_bank(0); m_inh_bank = 0; } } @@ -466,7 +466,7 @@ WRITE_LINE_MEMBER(apple2e_state::a2bus_inh_w) // if no slots are inhibiting, make sure ROM is fully switched in if ((m_inh_slot == -1) && (m_inh_bank != 0)) { - m_upperbank->set_bank(0); + m_upperbank->set_bank(0); m_inh_bank = 0; } } @@ -485,7 +485,7 @@ READ8_MEMBER(apple2e_state::memexp_r) { if (m_exp_liveptr <= m_exp_addrmask) { - retval = m_exp_ram[m_exp_liveptr]; + retval = m_exp_ram[m_exp_liveptr]; } else { @@ -569,7 +569,7 @@ void apple2e_state::machine_start() m_cassette_out = 0; if (m_cassette) { - m_cassette->output(-1.0f); + m_cassette->output(-1.0f); } m_upperbank->set_bank(0); m_lcbank->set_bank(0); @@ -587,7 +587,7 @@ void apple2e_state::machine_start() m_exp_addrmask = m_ram_size - (128*1024) - 1; m_exp_ram = m_ram_ptr + (128*1024); } - else // no expansion + else // no expansion { m_exp_addrmask = 0; m_exp_ram = NULL; @@ -612,13 +612,13 @@ void apple2e_state::machine_start() m_aux_ptr = m_auxslotdevice->get_vram_ptr(); m_aux_bank_ptr = m_auxslotdevice->get_auxbank_ptr(); } - else // IIc has 128K right on the motherboard + else // IIc has 128K right on the motherboard { m_auxslotdevice = NULL; if (m_ram_size >= (128*1024)) { - m_aux_ptr = &m_ram_ptr[0x10000]; + m_aux_ptr = &m_ram_ptr[0x10000]; m_aux_bank_ptr = m_aux_ptr; } } @@ -749,7 +749,7 @@ void apple2e_state::raise_irq(int irq) if (m_irqmask) { - m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); + m_maincpu->set_input_line(M6502_IRQ_LINE, ASSERT_LINE); } } @@ -760,11 +760,11 @@ void apple2e_state::lower_irq(int irq) if (!m_irqmask) { - m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); + m_maincpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE); } } -/*************************************************************************** +/*************************************************************************** VIDEO ***************************************************************************/ @@ -779,7 +779,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2e_state::apple2_interrupt) if (m_isiic) { - update_iic_mouse(); + update_iic_mouse(); } if (scanline == 192) @@ -828,11 +828,11 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, { if (m_video->m_dhires) { - m_video->dhgr_update(screen, bitmap, cliprect, 0, 159); + m_video->dhgr_update(screen, bitmap, cliprect, 0, 159); } else { - m_video->hgr_update(screen, bitmap, cliprect, 0, 159); + m_video->hgr_update(screen, bitmap, cliprect, 0, 159); } m_video->text_update(screen, bitmap, cliprect, 160, 191); } @@ -848,8 +848,8 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, } } } - else // lo-res - { + else // lo-res + { if (m_video->m_mix) { if (m_video->m_dhires) @@ -867,11 +867,11 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, { if (m_video->m_dhires) { - m_video->dlores_update(screen, bitmap, cliprect, 0, 191); + m_video->dlores_update(screen, bitmap, cliprect, 0, 191); } else { - m_video->lores_update(screen, bitmap, cliprect, 0, 191); + m_video->lores_update(screen, bitmap, cliprect, 0, 191); } } } @@ -886,7 +886,7 @@ UINT32 apple2e_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -/*************************************************************************** +/*************************************************************************** I/O ***************************************************************************/ void apple2e_state::auxbank_update() @@ -954,16 +954,16 @@ void apple2e_state::update_slotrom_banks() m_c100bank->set_bank(cxswitch); m_c400bank->set_bank(cxswitch); -// printf("intcxrom %d cnxx_slot %d isiic %d romswitch %d\n", m_intcxrom, m_cnxx_slot, m_isiic, m_romswitch); +// printf("intcxrom %d cnxx_slot %d isiic %d romswitch %d\n", m_intcxrom, m_cnxx_slot, m_isiic, m_romswitch); if ((m_intcxrom) || (m_cnxx_slot < 0) || (m_isiic)) { if (m_romswitch) { - m_c800bank->set_bank(2); + m_c800bank->set_bank(2); } else { - m_c800bank->set_bank(1); + m_c800bank->set_bank(1); } } else @@ -975,16 +975,16 @@ void apple2e_state::update_slotrom_banks() { if (m_romswitch) { - m_c300bank->set_bank(2); + m_c300bank->set_bank(2); } else { - m_c300bank->set_bank(1); + m_c300bank->set_bank(1); } } else { - m_c300bank->set_bank(0); + m_c300bank->set_bank(0); } } @@ -1018,27 +1018,27 @@ void apple2e_state::lc_update(int offset) { if (m_lcram) { - m_lcbank->set_bank(1); + m_lcbank->set_bank(1); } else { if (m_romswitch) { - m_lcbank->set_bank(2); + m_lcbank->set_bank(2); } else { - m_lcbank->set_bank(0); + m_lcbank->set_bank(0); } } } #if 0 - printf("LC: new state %c%c dxxx=%04x altzp=%d\n", - m_lcram ? 'R' : 'x', - m_lcwriteenable ? 'W' : 'x', - m_lcram2 ? 0x1000 : 0x0000, - m_altzp); + printf("LC: new state %c%c dxxx=%04x altzp=%d\n", + m_lcram ? 'R' : 'x', + m_lcwriteenable ? 'W' : 'x', + m_lcram2 ? 0x1000 : 0x0000, + m_altzp); #endif } @@ -1055,35 +1055,35 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) { switch (offset) { - case 0x58: // DisXY + case 0x58: // DisXY m_xy = false; break; - case 0x59: // EnbXY + case 0x59: // EnbXY m_xy = true; break; - case 0x5a: // DisVBL + case 0x5a: // DisVBL m_vblmask = false; break; - case 0x5b: // EnVBL + case 0x5b: // EnVBL m_vblmask = true; break; - case 0x5c: // RisX0Edge + case 0x5c: // RisX0Edge m_x0edge = false; break; - case 0x5d: // FalX0Edge + case 0x5d: // FalX0Edge m_x0edge = true; break; - case 0x5e: // RisY0Edge + case 0x5e: // RisY0Edge if (!m_ioudis) { - m_y0edge = false; + m_y0edge = false; } break; - case 0x5f: // FalY0Edge + case 0x5f: // FalY0Edge if (!m_ioudis) { - m_y0edge = true; + m_y0edge = true; } break; } @@ -1091,14 +1091,14 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) if (m_ioudis) { - switch (offset) + switch (offset) { - case 0x5e: // SETDHIRES - m_video->m_dhires = true; + case 0x5e: // SETDHIRES + m_video->m_dhires = true; break; - case 0x5f: // CLRDHIRES - m_video->m_dhires = false; + case 0x5f: // CLRDHIRES + m_video->m_dhires = false; break; } } @@ -1111,7 +1111,7 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) case 0x20: if (m_cassette) { - m_cassette_state ^= 1; + m_cassette_state ^= 1; m_cassette->output(m_cassette_state ? 1.0f : -1.0f); } break; @@ -1127,11 +1127,11 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) { if (m_romswitch) { - m_lcbank->set_bank(2); + m_lcbank->set_bank(2); } else { - m_lcbank->set_bank(0); + m_lcbank->set_bank(0); } } } @@ -1142,7 +1142,7 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) m_speaker->level_w(m_speaker_state); break; - case 0x48: // (IIc only) clear mouse X/Y interrupt flags + case 0x48: // (IIc only) clear mouse X/Y interrupt flags m_xirq = m_yirq = false; lower_irq(IRQ_MOUSEXY); break; @@ -1160,24 +1160,24 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) m_video->m_mix = true; break; case 0x54: // set page 1 - m_page2 = false; + m_page2 = false; m_video->m_page2 = false; auxbank_update(); break; case 0x55: // set page 2 - m_page2 = true; + m_page2 = true; m_video->m_page2 = true; auxbank_update(); break; case 0x56: // select lo-res - m_video->m_hires = false; + m_video->m_hires = false; auxbank_update(); break; case 0x57: // select hi-res - m_video->m_hires = true; + m_video->m_hires = true; auxbank_update(); break; @@ -1205,10 +1205,10 @@ void apple2e_state::do_io(address_space &space, int offset, bool is_iic) case 0x5f: // AN3 on m_an3 = true; break; - case 0x68: // IIgs STATE register, which ProDOS touches + case 0x68: // IIgs STATE register, which ProDOS touches break; - // trigger joypad read + // trigger joypad read case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f: if (is_iic) @@ -1238,22 +1238,22 @@ READ8_MEMBER(apple2e_state::c000_r) case 0x00: // keyboard latch return m_transchar | m_strobe; - case 0x02: // RAMRDOFF + case 0x02: // RAMRDOFF m_ramrd = false; auxbank_update(); break; - case 0x03: // RAMRDON + case 0x03: // RAMRDON m_ramrd = true; auxbank_update(); break; - case 0x04: // RAMWRTOFF + case 0x04: // RAMWRTOFF m_ramwrt = false; auxbank_update(); break; - case 0x05: // RAMWRTON + case 0x05: // RAMWRTON m_ramwrt = true; auxbank_update(); break; @@ -1265,76 +1265,76 @@ READ8_MEMBER(apple2e_state::c000_r) return rv; } - case 0x11: // read LCRAM2 (LC Dxxx bank) + case 0x11: // read LCRAM2 (LC Dxxx bank) return m_lcram2 ? 0x80 : 0x00; - case 0x12: // read LCRAM (is LC readable?) + case 0x12: // read LCRAM (is LC readable?) return m_lcram ? 0x80 : 0x00; - case 0x13: // read RAMRD + case 0x13: // read RAMRD return m_ramrd ? 0x80 : 0x00; - case 0x14: // read RAMWRT + case 0x14: // read RAMWRT return m_ramwrt ? 0x80 : 0x00; - case 0x15: // read INTCXROM + case 0x15: // read INTCXROM return m_intcxrom ? 0x80 : 0x00; - case 0x16: // read ALTZP + case 0x16: // read ALTZP return m_altzp ? 0x80 : 0x00; - case 0x17: // read SLOTC3ROM + case 0x17: // read SLOTC3ROM return m_slotc3rom ? 0x80 : 0x00; - case 0x18: // read 80STORE + case 0x18: // read 80STORE return m_80store ? 0x80 : 0x00; - case 0x19: // read VBLBAR + case 0x19: // read VBLBAR return space.machine().first_screen()->vblank() ? 0x00 : 0x80; - case 0x1a: // read TEXT + case 0x1a: // read TEXT return m_video->m_graphics ? 0x00 : 0x80; - case 0x1b: // read MIXED + case 0x1b: // read MIXED return m_video->m_mix ? 0x80 : 0x00; - case 0x1c: // read PAGE2 + case 0x1c: // read PAGE2 return m_page2 ? 0x80 : 0x00; - case 0x1d: // read HIRES + case 0x1d: // read HIRES return m_video->m_hires ? 0x80 : 0x00; - case 0x1e: // read ALTCHARSET + case 0x1e: // read ALTCHARSET return m_video->m_altcharset ? 0x80 : 0x00; - case 0x1f: // read 80COL + case 0x1f: // read 80COL return m_video->m_80col ? 0x80 : 0x00; case 0x60: // cassette in case 0x68: if (m_cassette) { - return m_cassette->input() > 0.0 ? 0x80 : 0; + return m_cassette->input() > 0.0 ? 0x80 : 0; } return 0; - case 0x61: // button 0 or Open Apple + case 0x61: // button 0 or Open Apple case 0x69: return ((m_joybuttons->read() & 0x10) || (m_kbspecial->read() & 0x10)) ? 0x80 : 0; - case 0x62: // button 1 or Solid Apple + case 0x62: // button 1 or Solid Apple case 0x6a: return ((m_joybuttons->read() & 0x20) || (m_kbspecial->read() & 0x20)) ? 0x80 : 0; - case 0x63: // button 2 or SHIFT key + case 0x63: // button 2 or SHIFT key case 0x6b: return ((m_joybuttons->read() & 0x40) || (m_kbspecial->read() & 0x06)) ? 0x80 : 0; - case 0x64: // joy 1 X axis + case 0x64: // joy 1 X axis case 0x6c: return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0; - case 0x65: // joy 1 Y axis + case 0x65: // joy 1 Y axis case 0x6d: return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0; @@ -1346,10 +1346,10 @@ READ8_MEMBER(apple2e_state::c000_r) case 0x6f: return (space.machine().time().as_double() < m_joystick_y2_time) ? 0x80 : 0; - case 0x7e: // read IOUDIS + case 0x7e: // read IOUDIS return m_ioudis ? 0x80 : 0x00; - case 0x7f: // read DHIRES + case 0x7f: // read DHIRES return m_video->m_dhires ? 0x00 : 0x80; default: @@ -1366,79 +1366,79 @@ WRITE8_MEMBER(apple2e_state::c000_w) switch (offset) { - case 0x00: // 80STOREOFF + case 0x00: // 80STOREOFF m_80store = false; auxbank_update(); break; - case 0x01: // 80STOREON + case 0x01: // 80STOREON m_80store = true; auxbank_update(); break; - case 0x02: // RAMRDOFF + case 0x02: // RAMRDOFF m_ramrd = false; auxbank_update(); break; - case 0x03: // RAMRDON + case 0x03: // RAMRDON m_ramrd = true; auxbank_update(); break; - case 0x04: // RAMWRTOFF + case 0x04: // RAMWRTOFF m_ramwrt = false; auxbank_update(); break; - case 0x05: // RAMWRTON + case 0x05: // RAMWRTON m_ramwrt = true; auxbank_update(); break; - case 0x06: // INTCXROMOFF + case 0x06: // INTCXROMOFF m_intcxrom = false; update_slotrom_banks(); break; - case 0x07: // INTCXROMON + case 0x07: // INTCXROMON m_intcxrom = true; update_slotrom_banks(); break; - case 0x08: // ALTZPOFF + case 0x08: // ALTZPOFF m_altzp = false; auxbank_update(); break; - case 0x09: // ALTZPON + case 0x09: // ALTZPON m_altzp = true; auxbank_update(); break; - case 0x0a: // SETINTC3ROM + case 0x0a: // SETINTC3ROM m_slotc3rom = false; update_slotrom_banks(); break; - case 0x0b: // SETSLOTC3ROM + case 0x0b: // SETSLOTC3ROM m_slotc3rom = true; update_slotrom_banks(); break; - case 0x0c: // 80COLOFF + case 0x0c: // 80COLOFF m_video->m_80col = false; break; - case 0x0d: // 80COLON + case 0x0d: // 80COLON m_video->m_80col = true; break; - case 0x0e: // ALTCHARSETOFF + case 0x0e: // ALTCHARSETOFF m_video->m_altcharset = false; break; - case 0x0f: // ALTCHARSETON + case 0x0f: // ALTCHARSETON m_video->m_altcharset = true; break; @@ -1446,10 +1446,10 @@ WRITE8_MEMBER(apple2e_state::c000_w) m_strobe = 0; break; - case 0x20: // cassette output + case 0x20: // cassette output if (m_cassette) { - m_cassette_out ^= 1; + m_cassette_out ^= 1; m_cassette->output(m_cassette_out ? 1.0f : -1.0f); } break; @@ -1463,13 +1463,13 @@ WRITE8_MEMBER(apple2e_state::c000_w) // card may have banked auxram; get a new bank pointer m_aux_bank_ptr = m_auxslotdevice->get_auxbank_ptr(); } - do_io(space, offset, false); // make sure it also side-effect resets the paddles as documented + do_io(space, offset, false); // make sure it also side-effect resets the paddles as documented break; - case 0x7e: // SETIOUDIS + case 0x7e: // SETIOUDIS m_ioudis = true; break; - case 0x7f: // CLRIOUDIS + case 0x7f: // CLRIOUDIS m_ioudis = false; break; default: @@ -1487,114 +1487,114 @@ READ8_MEMBER(apple2e_state::c000_iic_r) case 0x00: // keyboard latch return m_transchar | m_strobe; - case 0x02: // RAMRDOFF + case 0x02: // RAMRDOFF m_ramrd = false; auxbank_update(); break; - case 0x03: // RAMRDON + case 0x03: // RAMRDON m_ramrd = true; auxbank_update(); break; - case 0x04: // RAMWRTOFF + case 0x04: // RAMWRTOFF m_ramwrt = false; auxbank_update(); break; - case 0x05: // RAMWRTON + case 0x05: // RAMWRTON m_ramwrt = true; auxbank_update(); break; - case 0x10: // read any key down, reset keyboard strobe + case 0x10: // read any key down, reset keyboard strobe { UINT8 rv = m_transchar | m_anykeydown; m_strobe = 0; return rv; } - case 0x11: // read LCRAM2 (LC Dxxx bank) + case 0x11: // read LCRAM2 (LC Dxxx bank) return m_lcram2 ? 0x80 : 0x00; - break; + break; - case 0x12: // read LCRAM (is LC readable?) + case 0x12: // read LCRAM (is LC readable?) return m_lcram ? 0x80 : 0x00; break; - case 0x13: // read RAMRD + case 0x13: // read RAMRD return m_ramrd ? 0x80 : 0x00; - case 0x14: // read RAMWRT + case 0x14: // read RAMWRT return m_ramwrt ? 0x80 : 0x00; - case 0x15: // read & reset mouse X0 interrupt flag + case 0x15: // read & reset mouse X0 interrupt flag lower_irq(IRQ_MOUSEXY); return m_xirq ? 0x80 : 0x00; - case 0x16: // read ALTZP + case 0x16: // read ALTZP return m_altzp ? 0x80 : 0x00; - case 0x17: // read & reset mouse Y0 interrupt flag + case 0x17: // read & reset mouse Y0 interrupt flag lower_irq(IRQ_MOUSEXY); return m_yirq ? 0x80 : 0x00; - case 0x18: // read 80STORE + case 0x18: // read 80STORE return m_80store ? 0x80 : 0x00; - case 0x19: // read VBL + case 0x19: // read VBL return m_vbl ? 0x80 : 0x00; - case 0x1a: // read TEXT + case 0x1a: // read TEXT return m_video->m_graphics ? 0x00 : 0x80; - case 0x1b: // read MIXED + case 0x1b: // read MIXED return m_video->m_mix ? 0x80 : 0x00; - case 0x1c: // read PAGE2 + case 0x1c: // read PAGE2 return m_page2 ? 0x80 : 0x00; - case 0x1d: // read HIRES + case 0x1d: // read HIRES return m_video->m_hires ? 0x80 : 0x00; - case 0x1e: // read ALTCHARSET + case 0x1e: // read ALTCHARSET return m_video->m_altcharset ? 0x80 : 0x00; - case 0x1f: // read 80COL + case 0x1f: // read 80COL return m_video->m_80col ? 0x80 : 0x00; - case 0x40: // read XYMask (IIc only) + case 0x40: // read XYMask (IIc only) return m_xy ? 0x80 : 0x00; - case 0x41: // read VBL mask (IIc only) + case 0x41: // read VBL mask (IIc only) return m_vblmask ? 0x80 : 0x00; - case 0x42: // read X0Edge (IIc only) + case 0x42: // read X0Edge (IIc only) return m_x0edge ? 0x80 : 0x00; - case 0x43: // read Y0Edge (IIc only) + case 0x43: // read Y0Edge (IIc only) return m_y0edge ? 0x80 : 0x00; case 0x60: // 40/80 column switch (IIc only) return (m_sysconfig->read() & 0x04) ? 0x80 : 0; - case 0x61: // button 0 or Open Apple or mouse button 1 + case 0x61: // button 0 or Open Apple or mouse button 1 case 0x69: return ((m_joybuttons->read() & 0x10) || (m_kbspecial->read() & 0x10)) ? 0x80 : 0; - case 0x62: // button 1 or Solid Apple + case 0x62: // button 1 or Solid Apple case 0x6a: return ((m_joybuttons->read() & 0x20) || (m_kbspecial->read() & 0x20)) ? 0x80 : 0; - case 0x63: // mouse button 2 (no other function on IIc) + case 0x63: // mouse button 2 (no other function on IIc) case 0x6b: return m_mouseb->read() ? 0 : 0x80; - case 0x64: // joy 1 X axis + case 0x64: // joy 1 X axis case 0x6c: return (space.machine().time().as_double() < m_joystick_x1_time) ? 0x80 : 0; - case 0x65: // joy 1 Y axis + case 0x65: // joy 1 Y axis case 0x6d: return (space.machine().time().as_double() < m_joystick_y1_time) ? 0x80 : 0; @@ -1606,12 +1606,12 @@ READ8_MEMBER(apple2e_state::c000_iic_r) case 0x6f: return m_y1 ? 0x80 : 0; - case 0x7e: // read IOUDIS + case 0x7e: // read IOUDIS m_vbl = false; lower_irq(IRQ_VBL); return m_ioudis ? 0x80 : 0x00; - case 0x7f: // read DHIRES + case 0x7f: // read DHIRES return m_video->m_dhires ? 0x00 : 0x80; default: @@ -1628,79 +1628,79 @@ WRITE8_MEMBER(apple2e_state::c000_iic_w) switch (offset) { - case 0x00: // 80STOREOFF + case 0x00: // 80STOREOFF m_80store = false; auxbank_update(); break; - case 0x01: // 80STOREON + case 0x01: // 80STOREON m_80store = true; auxbank_update(); break; - case 0x02: // RAMRDOFF + case 0x02: // RAMRDOFF m_ramrd = false; auxbank_update(); break; - case 0x03: // RAMRDON + case 0x03: // RAMRDON m_ramrd = true; auxbank_update(); break; - case 0x04: // RAMWRTOFF + case 0x04: // RAMWRTOFF m_ramwrt = false; auxbank_update(); break; - case 0x05: // RAMWRTON + case 0x05: // RAMWRTON m_ramwrt = true; auxbank_update(); break; - case 0x06: // INTCXROMOFF + case 0x06: // INTCXROMOFF m_intcxrom = false; update_slotrom_banks(); break; - case 0x07: // INTCXROMON + case 0x07: // INTCXROMON m_intcxrom = true; update_slotrom_banks(); break; - case 0x08: // ALTZPOFF + case 0x08: // ALTZPOFF m_altzp = false; auxbank_update(); break; - case 0x09: // ALTZPON + case 0x09: // ALTZPON m_altzp = true; auxbank_update(); break; - case 0x0a: // SETINTC3ROM + case 0x0a: // SETINTC3ROM m_slotc3rom = false; update_slotrom_banks(); break; - case 0x0b: // SETSLOTC3ROM + case 0x0b: // SETSLOTC3ROM m_slotc3rom = true; update_slotrom_banks(); break; - case 0x0c: // 80COLOFF + case 0x0c: // 80COLOFF m_video->m_80col = false; break; - case 0x0d: // 80COLON + case 0x0d: // 80COLON m_video->m_80col = true; break; - case 0x0e: // ALTCHARSETOFF + case 0x0e: // ALTCHARSETOFF m_video->m_altcharset = false; break; - case 0x0f: // ALTCHARSETON + case 0x0f: // ALTCHARSETON m_video->m_altcharset = true; break; @@ -1714,12 +1714,12 @@ WRITE8_MEMBER(apple2e_state::c000_iic_w) lower_irq(IRQ_VBL); break; - case 0x7e: // SETIOUDIS - m_ioudis = true; + case 0x7e: // SETIOUDIS + m_ioudis = true; break; - case 0x7f: // CLRIOUDIS - m_ioudis = false; + case 0x7f: // CLRIOUDIS + m_ioudis = false; break; default: @@ -1835,7 +1835,7 @@ READ8_MEMBER(apple2e_state::c080_r) } else { - if (m_slotdevice[slot] != NULL) + if (m_slotdevice[slot] != NULL) { return m_slotdevice[slot]->read_c0nx(space, offset % 0x10); } @@ -1867,7 +1867,7 @@ WRITE8_MEMBER(apple2e_state::c080_w) UINT8 apple2e_state::read_slot_rom(address_space &space, int slotbias, int offset) { - int slotnum = ((offset>>8) & 0xf) + slotbias; + int slotnum = ((offset>>8) & 0xf) + slotbias; if (m_slotdevice[slotnum] != NULL) { @@ -1970,10 +1970,10 @@ READ8_MEMBER(apple2e_state::inh_r) { if (m_inh_slot != -1) { - return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); + return m_slotdevice[m_inh_slot]->read_inh_rom(space, offset + 0xd000); } - assert(0); // hitting inh_r with invalid m_inh_slot should not be possible + assert(0); // hitting inh_r with invalid m_inh_slot should not be possible return read_floatingbus(); } @@ -1989,9 +1989,9 @@ READ8_MEMBER(apple2e_state::lc_r) { if (m_altzp) { - if (m_aux_bank_ptr) - { - if (offset < 0x1000) + if (m_aux_bank_ptr) + { + if (offset < 0x1000) { if (m_lcram2) { @@ -2004,15 +2004,15 @@ READ8_MEMBER(apple2e_state::lc_r) } return m_aux_bank_ptr[(offset & 0x1fff) + 0xe000]; - } - else - { - return read_floatingbus(); + } + else + { + return read_floatingbus(); } } else { - if (offset < 0x1000) + if (offset < 0x1000) { if (m_lcram2) { @@ -2038,8 +2038,8 @@ WRITE8_MEMBER(apple2e_state::lc_w) if (m_altzp) { if (m_aux_bank_ptr) - { - if (offset < 0x1000) + { + if (offset < 0x1000) { if (m_lcram2) { @@ -2057,7 +2057,7 @@ WRITE8_MEMBER(apple2e_state::lc_w) } else { - if (offset < 0x1000) + if (offset < 0x1000) { if (m_lcram2) { @@ -2295,8 +2295,8 @@ static ADDRESS_MAP_START( laser128_map, AS_PROGRAM, 8, apple2e_state ) AM_RANGE(0x2000, 0x3fff) AM_DEVICE(A2_2000_TAG, address_map_bank_device, amap8) AM_RANGE(0x4000, 0xbfff) AM_DEVICE(A2_4000_TAG, address_map_bank_device, amap8) AM_RANGE(0xc000, 0xc07f) AM_READWRITE(c000_r, c000_w) -// AM_RANGE(0xc098, 0xc09b) AM_DEVREADWRITE(IIC_ACIA1_TAG, mos6551_device, read, write) -// AM_RANGE(0xc0a8, 0xc0ab) AM_DEVREADWRITE(IIC_ACIA2_TAG, mos6551_device, read, write) +// AM_RANGE(0xc098, 0xc09b) AM_DEVREADWRITE(IIC_ACIA1_TAG, mos6551_device, read, write) +// AM_RANGE(0xc0a8, 0xc0ab) AM_DEVREADWRITE(IIC_ACIA2_TAG, mos6551_device, read, write) AM_RANGE(0xc0d0, 0xc0d3) AM_READWRITE(memexp_r, memexp_w) AM_RANGE(0xc0e0, 0xc0ef) AM_DEVREADWRITE(LASER128_UDC_TAG, applefdc_base_device, read, write) AM_RANGE(0xc080, 0xc0ff) AM_READWRITE(c080_r, c080_w) @@ -2309,20 +2309,20 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( r0000bank_map, AS_PROGRAM, 8, apple2e_state ) AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0000_r, ram0000_w) - AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0000_r, auxram0000_w) + AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0000_r, auxram0000_w) ADDRESS_MAP_END static ADDRESS_MAP_START( r0200bank_map, AS_PROGRAM, 8, apple2e_state ) - AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0200_r, ram0200_w) // wr 0 rd 0 + AM_RANGE(0x0000, 0x01ff) AM_READWRITE(ram0200_r, ram0200_w) // wr 0 rd 0 AM_RANGE(0x0200, 0x03ff) AM_READWRITE(auxram0200_r, ram0200_w) // wr 0 rd 1 AM_RANGE(0x0400, 0x05ff) AM_READWRITE(ram0200_r, auxram0200_w) // wr 1 rd 0 AM_RANGE(0x0600, 0x07ff) AM_READWRITE(auxram0200_r, auxram0200_w) // wr 1 rd 1 ADDRESS_MAP_END static ADDRESS_MAP_START( r0400bank_map, AS_PROGRAM, 8, apple2e_state ) - AM_RANGE(0x0000, 0x03ff) AM_READWRITE(ram0400_r, ram0400_w) // wr 0 rd 0 - AM_RANGE(0x0400, 0x07ff) AM_READWRITE(auxram0400_r, ram0400_w) // wr 0 rd 1 - AM_RANGE(0x0800, 0x0bff) AM_READWRITE(ram0400_r, auxram0400_w) // wr 1 rd 0 + AM_RANGE(0x0000, 0x03ff) AM_READWRITE(ram0400_r, ram0400_w) // wr 0 rd 0 + AM_RANGE(0x0400, 0x07ff) AM_READWRITE(auxram0400_r, ram0400_w) // wr 0 rd 1 + AM_RANGE(0x0800, 0x0bff) AM_READWRITE(ram0400_r, auxram0400_w) // wr 1 rd 0 AM_RANGE(0x0c00, 0x0fff) AM_READWRITE(auxram0400_r, auxram0400_w) // wr 1 rd 1 ADDRESS_MAP_END @@ -2330,21 +2330,21 @@ static ADDRESS_MAP_START( r0800bank_map, AS_PROGRAM, 8, apple2e_state ) AM_RANGE(0x0000, 0x17ff) AM_READWRITE(ram0800_r, ram0800_w) AM_RANGE(0x2000, 0x37ff) AM_READWRITE(auxram0800_r, ram0800_w) AM_RANGE(0x4000, 0x57ff) AM_READWRITE(ram0800_r, auxram0800_w) - AM_RANGE(0x6000, 0x77ff) AM_READWRITE(auxram0800_r, auxram0800_w) + AM_RANGE(0x6000, 0x77ff) AM_READWRITE(auxram0800_r, auxram0800_w) ADDRESS_MAP_END static ADDRESS_MAP_START( r2000bank_map, AS_PROGRAM, 8, apple2e_state ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ram2000_r, ram2000_w) AM_RANGE(0x2000, 0x3fff) AM_READWRITE(auxram2000_r, ram2000_w) AM_RANGE(0x4000, 0x5fff) AM_READWRITE(ram2000_r, auxram2000_w) - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(auxram2000_r, auxram2000_w) + AM_RANGE(0x6000, 0x7fff) AM_READWRITE(auxram2000_r, auxram2000_w) ADDRESS_MAP_END static ADDRESS_MAP_START( r4000bank_map, AS_PROGRAM, 8, apple2e_state ) AM_RANGE(0x00000, 0x07fff) AM_READWRITE(ram4000_r, ram4000_w) AM_RANGE(0x08000, 0x0ffff) AM_READWRITE(auxram4000_r, ram4000_w) AM_RANGE(0x10000, 0x17fff) AM_READWRITE(ram4000_r, auxram4000_w) - AM_RANGE(0x18000, 0x1ffff) AM_READWRITE(auxram4000_r, auxram4000_w) + AM_RANGE(0x18000, 0x1ffff) AM_READWRITE(auxram4000_r, auxram4000_w) ADDRESS_MAP_END static ADDRESS_MAP_START( c100bank_map, AS_PROGRAM, 8, apple2e_state ) @@ -2372,7 +2372,7 @@ static ADDRESS_MAP_START( c800bank_map, AS_PROGRAM, 8, apple2e_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( inhbank_map, AS_PROGRAM, 8, apple2e_state ) - AM_RANGE(0x0000, 0x2fff) AM_DEVICE(A2_LCBANK_TAG, address_map_bank_device, amap8) + AM_RANGE(0x0000, 0x2fff) AM_DEVICE(A2_LCBANK_TAG, address_map_bank_device, amap8) AM_RANGE(0x3000, 0x5fff) AM_READWRITE(inh_r, inh_w) ADDRESS_MAP_END @@ -2424,10 +2424,10 @@ WRITE_LINE_MEMBER(apple2e_state::ay3600_data_ready_w) trans |= (m_kbspecial->read() & 0x01) ? 0x0000 : 0x0200; // caps lock is bit 9 (active low) if (m_isiic) - { + { if (m_sysconfig->read() & 0x08) { - trans += 0x400; // go to DVORAK half of the ROM + trans += 0x400; // go to DVORAK half of the ROM } } @@ -2459,7 +2459,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(apple2e_state::ay3600_repeat) } else { - m_strobe = 0x80; + m_strobe = 0x80; } } } @@ -3169,7 +3169,7 @@ static MACHINE_CONFIG_START( apple2e, apple2e_state ) MCFG_AY3600_SHIFT_CB(READLINE(apple2e_state, ay3600_shift_r)) MCFG_AY3600_CONTROL_CB(READLINE(apple2e_state, ay3600_control_r)) MCFG_AY3600_DATA_READY_CB(WRITELINE(apple2e_state, ay3600_data_ready_w)) - MCFG_AY3600_AKO_CB(WRITELINE(apple2e_state, ay3600_ako_w)) + MCFG_AY3600_AKO_CB(WRITELINE(apple2e_state, ay3600_ako_w)) /* repeat timer. 15 Hz from page 7-15 of "Understanding the Apple IIe" */ MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", apple2e_state, ay3600_repeat, attotime::from_hz(15)) @@ -3215,8 +3215,8 @@ static MACHINE_CONFIG_DERIVED( tk3000, apple2e ) MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */ MCFG_CPU_PROGRAM_MAP(apple2e_map) -// MCFG_CPU_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock -// MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map) +// MCFG_CPU_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock +// MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( apple2ep, apple2e ) @@ -3597,4 +3597,3 @@ COMP( 1985, apple2c0, apple2c, 0, apple2c_iwm, apple2c, driver_device, COMP( 1986, apple2c3, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (Original Memory Expansion)", GAME_SUPPORTS_SAVE ) COMP( 1986, apple2c4, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (rev 4)", GAME_SUPPORTS_SAVE ) COMP( 1988, apple2cp, apple2c, 0, apple2cp, apple2c, driver_device, 0, "Apple Computer", "Apple //c Plus", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) - diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index ba62948018f..d5d35416be3 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -143,7 +143,7 @@ PALETTE_INIT_MEMBER(apple2gs_state,apple2gs) { int i; -// PALETTE_INIT_NAME(apple2)(palette); +// PALETTE_INIT_NAME(apple2)(palette); for (i = 0; i < 16; i++) { diff --git a/src/mess/drivers/comp4.c b/src/mess/drivers/comp4.c index 2f29b3d28de..6259553bfa7 100644 --- a/src/mess/drivers/comp4.c +++ b/src/mess/drivers/comp4.c @@ -4,11 +4,11 @@ Milton Bradley Comp IV * TMC0904NL CP0904A (die labeled 4A0970D-04A) - + This is a handheld Mastermind game; a code-breaking game where the player needs to find out the correct sequence of colours (numbers in our case). It is known as Logic 5 in Europe, and as Pythaligoras in Japan. - + Press the R key to start, followed by a set of unique numbers and E. Refer to the official manual for more information. @@ -63,7 +63,7 @@ READ8_MEMBER(comp4_state::read_k) for (int i = 0; i < 3; i++) if (m_o & (1 << (i + 1))) k |= m_button_matrix[i]->read(); - + return k; } diff --git a/src/mess/drivers/dvk_ksm.c b/src/mess/drivers/dvk_ksm.c index 778cc6b6ba1..73413043813 100644 --- a/src/mess/drivers/dvk_ksm.c +++ b/src/mess/drivers/dvk_ksm.c @@ -18,15 +18,15 @@ F4 + 0..9 on numeric keypad = setup mode. 0 changes serial port speed, 1..9 toggle one of mode bits: - 1 XON/XOFF 0: Off 1: On - 2 Character set 0: N0/N1 2: N2 - 3 Auto LF 0: Off 1: On - 4 Auto repeat 0: On 1: Off - 5 Auto wraparound 0: On 1: Off - 6 Interpret controls 0: Interpret 1: Display - 7 Parity check 0: Off 1: On - 8 Parity bits 0: None 1: Even - 9 Stop bits + 1 XON/XOFF 0: Off 1: On + 2 Character set 0: N0/N1 2: N2 + 3 Auto LF 0: Off 1: On + 4 Auto repeat 0: On 1: Off + 5 Auto wraparound 0: On 1: Off + 6 Interpret controls 0: Interpret 1: Display + 7 Parity check 0: Off 1: On + 8 Parity bits 0: None 1: Even + 9 Stop bits N0/N1 charset has regular ASCII in C0 page and Cyrillic in C1 page, switching between them via SI/SO. N2 charset has uppercase Cyrillic @@ -39,9 +39,9 @@ Terminfo description would be something like ksm|DVK KSM, - am, bw, dch1=\EP, ich1=\EQ, - acsc=hRiTjXkClJmFnNqUtEuPv\174wKxW.M\054Q\055S\053\136~_{@}Z0\177, - use=vt52, + am, bw, dch1=\EP, ich1=\EQ, + acsc=hRiTjXkClJmFnNqUtEuPv\174wKxW.M\054Q\055S\053\136~_{@}Z0\177, + use=vt52, To do: - make Caps Lock work @@ -220,8 +220,8 @@ WRITE8_MEMBER(ksm_state::ksm_ppi_portc_w) WRITE_LINE_MEMBER(ksm_state::write_keyboard_clock) { -// KSM never sends data to keyboard -// m_i8251kbd->write_txc(state); +// KSM never sends data to keyboard +// m_i8251kbd->write_txc(state); m_i8251kbd->write_rxc(state); } @@ -284,7 +284,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ksm_state::scanline_callback) { UINT16 y = m_screen->vpos(); UINT16 offset; - + DBG_LOG(2,"scanline_cb", ("addr %02x frame %" I64FMT "d x %.4d y %.3d row %.2d\n", m_video.line, m_screen->frame_number(), m_screen->hpos(), y, y%11)); @@ -384,8 +384,8 @@ MACHINE_CONFIG_END /* - Assumes that SRAM is at 0x2000, which is where technical manual puts it. - Chargen has 1 missing pixel in 'G' character. + Assumes that SRAM is at 0x2000, which is where technical manual puts it. + Chargen has 1 missing pixel in 'G' character. */ ROM_START( dvk_ksm ) ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00) @@ -397,8 +397,8 @@ ROM_START( dvk_ksm ) ROM_END /* - Assumes that SRAM is at 0x2100, otherwise identical. - Chargen has no missing pixels in 'G' character. + Assumes that SRAM is at 0x2100, otherwise identical. + Chargen has no missing pixels in 'G' character. */ ROM_START( dvk_ksm01 ) ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00) diff --git a/src/mess/drivers/ec184x.c b/src/mess/drivers/ec184x.c index 16b9026a4f8..44f366d325b 100644 --- a/src/mess/drivers/ec184x.c +++ b/src/mess/drivers/ec184x.c @@ -232,7 +232,7 @@ static MACHINE_CONFIG_START( ec1840, ec184x_state ) MCFG_DEVICE_INPUT_DEFAULTS(ec1840) MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1840.0002", false) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, NULL, false) @@ -258,8 +258,8 @@ static MACHINE_CONFIG_START( ec1841, ec184x_state ) MCFG_EC1841_MOTHERBOARD_ADD("mb", "maincpu") MCFG_DEVICE_INPUT_DEFAULTS(ec1841) - MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1841.0002", false) // cga - MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port + MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1841.0002", false) // cga + MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, "hdc", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, NULL, false) diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c index 1728c3eedae..57adbc5a5e9 100644 --- a/src/mess/drivers/gamate.c +++ b/src/mess/drivers/gamate.c @@ -67,7 +67,7 @@ WRITE8_MEMBER( gamate_state::video_w ) case 5: video.y=data;break; case 7: if (video.bitmap.write) { - if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) + if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) video.bitmap.data[video.bitmap.page2][video.y][video.x]=data; else logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x); diff --git a/src/mess/drivers/iskr103x.c b/src/mess/drivers/iskr103x.c index c3dae58dadf..25717bc57d7 100644 --- a/src/mess/drivers/iskr103x.c +++ b/src/mess/drivers/iskr103x.c @@ -77,7 +77,7 @@ 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) // actually MDA? 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", "isa4", iskr103x_isa8_cards, NULL, false) diff --git a/src/mess/drivers/leapster.c b/src/mess/drivers/leapster.c index ab8814a8d11..4ecebe4b2fe 100644 --- a/src/mess/drivers/leapster.c +++ b/src/mess/drivers/leapster.c @@ -1,33 +1,33 @@ -/* +/* LeapFrog - Leapster - educational system from 2003, software is all developed in MXFlash + educational system from 2003, software is all developed in MXFlash + + hwspecs - hwspecs - CPU: - Custom ASIC (ARCTangent 5.1 CPU @ 96MHz) + Custom ASIC (ARCTangent 5.1 CPU @ 96MHz) - Memory: - Leapster: 2MB onboard RAM, 256 bytes NVRAM. - Leapster2: 16MB RAM, 128kbytes NVRAM + Memory: + Leapster: 2MB onboard RAM, 256 bytes NVRAM. + Leapster2: 16MB RAM, 128kbytes NVRAM Media type: - Cartridges of 4-16MB with between 2 and 512kb NVRAM - - Graphics: - 4Mb ATI chip. + Cartridges of 4-16MB with between 2 and 512kb NVRAM + + Graphics: + 4Mb ATI chip. Audio: - Custom + Custom Screen: - 160x160 CSTN with touchscreen. + 160x160 CSTN with touchscreen. - - The Leapster 2 also has - USB 1.1 (client only) + full-sized SD slot. + + The Leapster 2 also has + USB 1.1 (client only) + full-sized SD slot. */ @@ -81,7 +81,7 @@ PCB - Handheld-Console: | | +------------| |------------+ | | C A R T R I D G E - S L O T | | - | | | | + | | | | | +-----------------------------+ | | | |ASY 310-10069 +-------------------+ | @@ -160,7 +160,7 @@ B1: 24L002B (GND)<- A2-| |-SCL VSS-| |-SDA +-----+ - + @@ -194,11 +194,11 @@ PCB - LEAPSTER-TV: | | C A R T R I D G E - S L O T | | | +-----------------------------+ | \ / - +-----------------------------------------------+ + +-----------------------------------------------+ + + + - - - diff --git a/src/mess/drivers/merlin.c b/src/mess/drivers/merlin.c index 1dba611ab9d..7934b30c4b8 100644 --- a/src/mess/drivers/merlin.c +++ b/src/mess/drivers/merlin.c @@ -2,7 +2,7 @@ Parker Bros Merlin handheld computer game * TMS1100NLL MP3404A-N2 (has internal ROM) - + To start a game, press NEW GAME, followed by a number: 1: Tic-Tac-Toe 2: Music Machine @@ -10,15 +10,15 @@ 4: Blackjack 13 5: Magic Square 6: Mindbender - + Refer to the official manual for more information on the games. - - + + Other handhelds assumed to be on similar hardware: - Dr. Smith - by Tomy, released in Japan (basically a white version of Merlin, let's assume for now that the ROM contents is identical) - Master Merlin - + Another sequel, called Split Second, looks like different hardware. @@ -96,7 +96,7 @@ SG = same game, CT = comp turn, NG = new game, HM = hit me */ READ8_MEMBER(merlin_state::read_k) { UINT8 k = 0; - + // read selected button rows for (int i = 0; i < 4; i++) if (m_o & (1 << i)) diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c index d0faccdd97f..f70dfa31bcc 100644 --- a/src/mess/drivers/ngen.c +++ b/src/mess/drivers/ngen.c @@ -1,8 +1,8 @@ /* - Convergent NGen series + Convergent NGen series - 10-11-14 - Skeleton driver + 10-11-14 - Skeleton driver */ @@ -115,7 +115,7 @@ WRITE16_MEMBER(ngen_state::cpu_peripheral_cb) m_maincpu->device_t::memory().space(AS_IO).install_readwrite_handler(addr, addr + 0x3ff, read16_delegate(FUNC(ngen_state::peripheral_r), this), write16_delegate(FUNC(ngen_state::peripheral_w), this)); logerror("Mapped peripherals to I/O 0x%04x\n",addr); } - break; + break; case 4: m_middle = data; break; @@ -301,7 +301,7 @@ WRITE_LINE_MEMBER( ngen_state::dma_hrq_changed ) void ngen_state::set_dma_channel(int channel, int state) { - if(!state) + if(!state) m_dma_channel = channel; else if(m_dma_channel == channel) m_dma_channel = -1; diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index eef97ba228a..458954ef945 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -17,7 +17,7 @@ - rewrite using slot devices - some later SWs put "Invalid command byte 05" (Absolutely Mahjong on Epson logo) - investigate on POR bit - - test 2dd more + - test 2dd more TODO (PC-9801RS): - extra features; @@ -607,8 +607,8 @@ public: DECLARE_WRITE8_MEMBER(pc9801rs_access_ctrl_w); DECLARE_WRITE8_MEMBER(pc9801rs_nmi_w); DECLARE_READ8_MEMBER(pc9801rs_midi_r); -// DECLARE_READ8_MEMBER(winram_r); -// DECLARE_WRITE8_MEMBER(winram_w); +// DECLARE_READ8_MEMBER(winram_r); +// DECLARE_WRITE8_MEMBER(winram_w); // DECLARE_READ8_MEMBER(pc9801_ext_opna_r); // DECLARE_WRITE8_MEMBER(pc9801_ext_opna_w); DECLARE_READ8_MEMBER(pic_r); @@ -2122,14 +2122,14 @@ WRITE8_MEMBER(pc9801_state::pc9821_ext2_video_ff_w) /*READ8_MEMBER(pc9801_state::winram_r) { - offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000; - return + offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000; + return } WRITE8_MEMBER(pc9801_state::winram_w) { - offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000; + offset = (offset & 0x1ffff) | (m_pc9821_window_bank & 0xfe) * 0x10000; }*/ static ADDRESS_MAP_START( pc9821_map, AS_PROGRAM, 32, pc9801_state ) @@ -3222,7 +3222,7 @@ ROM_START( pc9801ux ) ROM_LOAD( "font_ux.rom", 0x000000, 0x046800, BAD_DUMP CRC(19a76eeb) SHA1(96a006e8515157a624599c2b53a581ae0dd560fd) ) LOAD_KANJI_ROMS -// LOAD_IDE_ROM +// LOAD_IDE_ROM ROM_END /* @@ -3325,7 +3325,7 @@ ROM_START( pc9801vm ) ROM_LOAD( "font_vm.rom", 0x000000, 0x046800, BAD_DUMP CRC(456d9fc7) SHA1(78ba9960f135372825ab7244b5e4e73a810002ff) ) LOAD_KANJI_ROMS -// LOAD_IDE_ROM +// LOAD_IDE_ROM ROM_END /* diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c index 19ec2338741..2ca91c48c20 100644 --- a/src/mess/drivers/pcd.c +++ b/src/mess/drivers/pcd.c @@ -128,9 +128,9 @@ static ADDRESS_MAP_START( pcd_io, AS_IO, 16, pcd_state ) AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram") AM_RANGE(0xf840, 0xf841) AM_DEVREADWRITE8("pic1", pic8259_device, read, write, 0xff00) AM_RANGE(0xf900, 0xf907) AM_DEVREADWRITE8("fdc", wd2793_t, read, write, 0x00ff) -// AM_RANGE(0xf940, 0xf941) // sasi controller here? +// AM_RANGE(0xf940, 0xf941) // sasi controller here? AM_RANGE(0xf980, 0xf981) AM_READWRITE8(crt_data_r, crt_data_w, 0x00ff) AM_READ8(crt_status_r, 0xff00) -// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select) +// AM_RANGE(0xfa00, 0xfa7f) // pcs4-n (peripheral chip select) ADDRESS_MAP_END diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index 12a94451bf4..a07843f409d 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -45,7 +45,7 @@ // TYPE DEFINITIONS //************************************************************************** -class px4_state : public driver_device, public device_serial_interface +class px4_state : public driver_device, public device_serial_interface { public: px4_state(const machine_config &mconfig, device_type type, const char *tag) : @@ -60,7 +60,7 @@ public: m_speaker(*this, "speaker"), m_sio(*this, "sio"), m_rs232(*this, "rs232"), - m_caps1(*this, "capsule1"), m_caps2(*this, "capsule2"), + m_caps1(*this, "capsule1"), m_caps2(*this, "capsule2"), m_caps1_rom(NULL), m_caps2_rom(NULL), m_ctrl1(0), m_icrb(0), m_bankr(0), m_isr(0), m_ier(0), m_str(0), m_sior(0xbf), @@ -565,7 +565,7 @@ READ8_MEMBER( px4_state::sior_r ) { case 1: m_sior = (dec_2_bcd(m_time.local_time.year) >> 4) & 0xf; break; case 2: m_sior = dec_2_bcd(m_time.local_time.year) & 0xf; break; - case 3: m_sior = dec_2_bcd(m_time.local_time.month + 1); break; + case 3: m_sior = dec_2_bcd(m_time.local_time.month + 1); break; case 4: m_sior = dec_2_bcd(m_time.local_time.mday); break; case 5: m_sior = dec_2_bcd(m_time.local_time.hour); break; case 6: m_sior = dec_2_bcd(m_time.local_time.minute); break; diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c index 38403ae531a..662a1bfeba3 100644 --- a/src/mess/drivers/px8.c +++ b/src/mess/drivers/px8.c @@ -801,7 +801,7 @@ static MACHINE_CONFIG_START( px8, px8_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") - + // software MCFG_SOFTWARE_LIST_ADD("epson_cpm_list", "epson_cpm") MACHINE_CONFIG_END diff --git a/src/mess/drivers/simon.c b/src/mess/drivers/simon.c index e423973d172..48d1d4b2545 100644 --- a/src/mess/drivers/simon.c +++ b/src/mess/drivers/simon.c @@ -3,14 +3,14 @@ /*************************************************************************** Milton Bradley Simon - + Revision A hardware: * TMS1000 (has internal ROM), DS75494 lamp driver - + Newer revisions have a smaller 16-pin MB4850 chip instead of the TMS1000. This one has been decapped too, but we couldn't find an internal ROM. It is possibly a cost-reduced custom ASIC specifically for Simon. - + Other games assumed to be on similar hardware: - Pocket Simon, but there's a chance it only exists with MB4850 chip - Super Simon (TMS1100) @@ -61,7 +61,7 @@ public: READ8_MEMBER(simon_state::read_k) { UINT8 k = 0; - + // read selected button rows for (int i = 0; i < 4; i++) { @@ -82,7 +82,7 @@ WRITE16_MEMBER(simon_state::write_r) // R7 -> 75494 IN2 -> blue lamp for (int i = 0; i < 4; i++) output_set_lamp_value(i, data >> (4 + i) & 1); - + // R8 -> 75494 IN0 -> speaker m_speaker->level_w(data >> 8 & 1); diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c index d9791d912a4..fe6b4a9d3b1 100644 --- a/src/mess/drivers/spc1000.c +++ b/src/mess/drivers/spc1000.c @@ -391,7 +391,7 @@ void spc1000_state::machine_reset() READ8_MEMBER(spc1000_state::mc6847_videoram_r) { - if (offset == ~0) + if (offset == ~0) return 0xff; // m_GMODE layout: CSS|NA|PS2|PS1|~A/G|GM0|GM1|NA @@ -416,7 +416,7 @@ READ8_MEMBER( spc1000_state::porta_r ) data |= (m_cass->input() > 0.0038) ? 0x80 : 0; data |= ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY) ? 0x00 : 0x40; data &= ~(m_io_joy->read() & 0x3f); - + return data; } diff --git a/src/mess/drivers/ti85.c b/src/mess/drivers/ti85.c index ca7e6658d3e..24938ff9a7d 100755 --- a/src/mess/drivers/ti85.c +++ b/src/mess/drivers/ti85.c @@ -170,13 +170,13 @@ TI-83PlusSE ports: 2: ? 3: ON status, LCD power 4: Interrupt status - 5: Memory page 3 + 5: Memory page 3 6: Memory page 1 7: Memory page 2 10: Controll port for the display controller 11: Data port for the display controller - 15: Asic Version - + 15: Asic Version + TI-85 ports: 0: Video buffer offset (write only) 1: Keypad @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( ti83pse_io, AS_IO, 8, ti85_state ) AM_RANGE(0x0015, 0x0015) AM_READ(ti83pse_port_0015_r) AM_RANGE(0x0020, 0x0020) AM_READWRITE(ti83pse_port_0020_r, ti83pse_port_0020_w ) AM_RANGE(0x0021, 0x0021) AM_READWRITE(ti83pse_port_0021_r, ti83pse_port_0021_w ) - + AM_RANGE(0x0030, 0x0030) AM_READWRITE(ti83pse_ctimer1_setup_r, ti83pse_ctimer1_setup_w ) AM_RANGE(0x0031, 0x0031) AM_READWRITE(ti83pse_ctimer1_loop_r, ti83pse_ctimer1_loop_w ) AM_RANGE(0x0032, 0x0032) AM_READWRITE(ti83pse_ctimer1_count_r, ti83pse_ctimer1_count_w ) @@ -306,7 +306,7 @@ static ADDRESS_MAP_START( ti83pse_io, AS_IO, 8, ti85_state ) AM_RANGE(0x0036, 0x0036) AM_READWRITE(ti83pse_ctimer3_setup_r, ti83pse_ctimer3_setup_w ) AM_RANGE(0x0037, 0x0037) AM_READWRITE(ti83pse_ctimer3_loop_r, ti83pse_ctimer3_loop_w ) AM_RANGE(0x0038, 0x0038) AM_READWRITE(ti83pse_ctimer3_count_r, ti83pse_ctimer3_count_w ) - + AM_RANGE(0x0055, 0x0055) AM_READ(ti84pse_port_0055_r) AM_RANGE(0x0056, 0x0056) AM_READ(ti84pse_port_0056_r) ADDRESS_MAP_END @@ -713,7 +713,7 @@ static MACHINE_CONFIG_DERIVED( ti83p, ti81 ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - + MCFG_AMD_29F400T_ADD("flash") //MCFG_TI83PSERIAL_ADD( "tiserial" ) @@ -721,18 +721,18 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ti83pse, ti83p ) MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_CLOCK( 15000000) + MCFG_CPU_CLOCK( 15000000) MCFG_CPU_IO_MAP(ti83pse_io) - + MCFG_DEVICE_MODIFY("membank1") MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem) MCFG_DEVICE_MODIFY("membank2") MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem) - + MCFG_DEVICE_MODIFY("membank3") MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem) - + MCFG_DEVICE_MODIFY("membank4") MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem) @@ -743,7 +743,7 @@ static MACHINE_CONFIG_DERIVED( ti83pse, ti83p ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ti84p, ti83pse ) - MCFG_DEVICE_MODIFY("membank1") + MCFG_DEVICE_MODIFY("membank1") MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem) MCFG_DEVICE_MODIFY("membank2") @@ -756,7 +756,7 @@ static MACHINE_CONFIG_DERIVED( ti84p, ti83pse ) MCFG_DEVICE_PROGRAM_MAP(ti84p_banked_mem) MCFG_MACHINE_START_OVERRIDE(ti85_state, ti84p ) - MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0) + MCFG_DEVICE_REPLACE("flash", AMD_29F800T , 0) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ti84pse, ti83pse ) @@ -909,10 +909,10 @@ ROM_START (ti84pse) ROM_END ROM_START (ti84p) - ROM_REGION (0x100000, "flash",0) - ROM_DEFAULT_BIOS("b100v255mp") - ROM_SYSTEM_BIOS( 0, "b100v255mp", "Boot 1.00 OS V 2.55MP" ) - ROMX_LOAD( "ti84pb100v255mp.bin", 0x00000, 0x100000, CRC(4AF31251) SHA1(8F67269346644B87E7CD0F353F5F4030E787CF57), ROM_BIOS(1) ) + ROM_REGION (0x100000, "flash",0) + ROM_DEFAULT_BIOS("b100v255mp") + ROM_SYSTEM_BIOS( 0, "b100v255mp", "Boot 1.00 OS V 2.55MP" ) + ROMX_LOAD( "ti84pb100v255mp.bin", 0x00000, 0x100000, CRC(4AF31251) SHA1(8F67269346644B87E7CD0F353F5F4030E787CF57), ROM_BIOS(1) ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mess/drivers/ticalc1x.c b/src/mess/drivers/ticalc1x.c index 1b87c1a4738..2b5ad7adcda 100644 --- a/src/mess/drivers/ticalc1x.c +++ b/src/mess/drivers/ticalc1x.c @@ -3,7 +3,7 @@ /*************************************************************************** Texas Instruments TMS1xxx/0970/0980 handheld calculators - + Texas Instruments WIZ-A-TRON * TMC0907NL DP0907BS (die labeled 0970F-07B) @@ -61,7 +61,7 @@ READ8_MEMBER(ticalc1x_state::read_k) for (int i = 0; i < 4; i++) if (m_o & (1 << (i + 1))) k |= m_button_matrix[i]->read(); - + return k; } diff --git a/src/mess/drivers/tk2000.c b/src/mess/drivers/tk2000.c index b2c83428363..66874015335 100644 --- a/src/mess/drivers/tk2000.c +++ b/src/mess/drivers/tk2000.c @@ -2,18 +2,18 @@ // copyright-holders:R. Belmont /*************************************************************************** - tk2000.c - Microdigital TK2000 - + tk2000.c - Microdigital TK2000 + Driver by R. Belmont - + This system is only vaguely Apple II compatible. The keyboard works entirely differently, which is a big deal. - + $C05A - banks RAM from c100-ffff $C05B - banks ROM from c100-ffff - -************************************************************************/ - + +************************************************************************/ + #include "emu.h" #include "machine/bankdev.h" #include "machine/ram.h" @@ -129,7 +129,7 @@ void tk2000_state::machine_reset() m_strobe = 0; } -/*************************************************************************** +/*************************************************************************** VIDEO ***************************************************************************/ @@ -158,7 +158,7 @@ UINT32 tk2000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } -/*************************************************************************** +/*************************************************************************** I/O ***************************************************************************/ // most softswitches don't care about read vs write, so handle them here @@ -181,27 +181,27 @@ void tk2000_state::do_io(address_space &space, int offset) m_speaker->level_w(m_speaker_state); break; - case 0x50: // monochrome + case 0x50: // monochrome break; - case 0x51: // color + case 0x51: // color break; case 0x54: // set page 1 - m_page2 = false; + m_page2 = false; m_video->m_page2 = false; break; case 0x55: // set page 2 - m_page2 = true; + m_page2 = true; m_video->m_page2 = true; break; - case 0x5a: // ROM + case 0x5a: // ROM m_upperbank->set_bank(0); break; - case 0x5b: // RAM + case 0x5b: // RAM m_upperbank->set_bank(1); break; @@ -240,7 +240,7 @@ WRITE8_MEMBER(tk2000_state::c000_w) { switch (offset) { - case 0x00: // write row mask for keyboard scan + case 0x00: // write row mask for keyboard scan switch (data) { case 0: @@ -255,10 +255,10 @@ WRITE8_MEMBER(tk2000_state::c000_w) case 0x40: m_strobe = m_row6->read(); break; case 0x80: m_strobe = m_row7->read(); break; } - break; + break; case 0x5f: - m_strobe = m_kbspecial->read(); + m_strobe = m_kbspecial->read(); break; default: @@ -454,22 +454,22 @@ ADDRESS_MAP_END INPUT PORTS ***************************************************************************/ -/* - TK2000 matrix: - - 0 1 2 3 4 5 6 7 +/* + TK2000 matrix: + + 0 1 2 3 4 5 6 7 0SHIF B V C X Z - 1 G F D S A + 1 G F D S A 2 SPC T R E W Q - 3 LFT 5 4 3 2 1 - 4 RGT 6 7 8 9 0 - 5 DWN Y U I O P - 6 UP H J K L : + 3 LFT 5 4 3 2 1 + 4 RGT 6 7 8 9 0 + 5 DWN Y U I O P + 6 UP H J K L : 7 RTN N M , . ? - + write row mask 1/2/4/8/10/20/40/80 to $C000 read column at $C010 - + If $C05F is written, the Ctrl key is read in bit 0 of $C010 immediately afterwards. */ static INPUT_PORTS_START( tk2000 ) |
