summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-10-15 07:19:47 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-10-15 07:19:47 +0000
commitc93ed344fbd26a9c2c49bdbc99014d8dc0cbe9ef (patch)
treea5017b8341bdadc5bcd1185ae49fe4c0a85424b8 /src/mess/drivers
parenta4dd32afb6cbfaae0e452c90486060682ab1c31c (diff)
Cleanups and version bumpmame0155
Diffstat (limited to 'src/mess/drivers')
-rw-r--r--src/mess/drivers/a2600.c6
-rw-r--r--src/mess/drivers/a7800.c26
-rw-r--r--src/mess/drivers/aim65.c2
-rw-r--r--src/mess/drivers/apf.c4
-rw-r--r--src/mess/drivers/apple2.c38
-rw-r--r--src/mess/drivers/apple2gs.c2
-rw-r--r--src/mess/drivers/apple3.c2
-rw-r--r--src/mess/drivers/atari400.c114
-rw-r--r--src/mess/drivers/atarist.c4
-rw-r--r--src/mess/drivers/atom.c8
-rw-r--r--src/mess/drivers/bbcbc.c2
-rw-r--r--src/mess/drivers/beta.c22
-rw-r--r--src/mess/drivers/casloopy.c8
-rw-r--r--src/mess/drivers/cc40.c14
-rw-r--r--src/mess/drivers/cgenie.c8
-rw-r--r--src/mess/drivers/channelf.c2
-rw-r--r--src/mess/drivers/concept.c4
-rw-r--r--src/mess/drivers/crvision.c4
-rw-r--r--src/mess/drivers/electron.c2
-rw-r--r--src/mess/drivers/ep64.c2
-rw-r--r--src/mess/drivers/exelv.c6
-rw-r--r--src/mess/drivers/fc100.c2
-rw-r--r--src/mess/drivers/fm7.c196
-rw-r--r--src/mess/drivers/gameking.c8
-rw-r--r--src/mess/drivers/gamepock.c2
-rw-r--r--src/mess/drivers/gba.c2
-rw-r--r--src/mess/drivers/geniusiq.c4
-rw-r--r--src/mess/drivers/gmaster.c2
-rw-r--r--src/mess/drivers/ibmpcjr.c2
-rw-r--r--src/mess/drivers/intv.c22
-rw-r--r--src/mess/drivers/itt3030.c46
-rw-r--r--src/mess/drivers/kyocera.c12
-rw-r--r--src/mess/drivers/laser3k.c162
-rw-r--r--src/mess/drivers/m5.c2
-rw-r--r--src/mess/drivers/msx.c43
-rw-r--r--src/mess/drivers/myvision.c8
-rw-r--r--src/mess/drivers/nc.c6
-rw-r--r--src/mess/drivers/nes.c20
-rw-r--r--src/mess/drivers/ngp.c14
-rw-r--r--src/mess/drivers/pc2000.c6
-rw-r--r--src/mess/drivers/pc6001.c16
-rw-r--r--src/mess/drivers/pc8401a.c2
-rw-r--r--src/mess/drivers/pc9801.c16
-rw-r--r--src/mess/drivers/pegasus.c16
-rw-r--r--src/mess/drivers/pencil2.c2
-rw-r--r--src/mess/drivers/pet.c4
-rw-r--r--src/mess/drivers/pockstat.c2
-rw-r--r--src/mess/drivers/pokemini.c6
-rw-r--r--src/mess/drivers/pt68k4.c34
-rw-r--r--src/mess/drivers/pv1000.c12
-rw-r--r--src/mess/drivers/pv2000.c10
-rw-r--r--src/mess/drivers/rx78.c12
-rw-r--r--src/mess/drivers/scv.c6
-rw-r--r--src/mess/drivers/socrates.c4
-rw-r--r--src/mess/drivers/sorcerer.c4
-rw-r--r--src/mess/drivers/spc1000.c48
-rw-r--r--src/mess/drivers/specpls3.c22
-rw-r--r--src/mess/drivers/spectrum.c8
-rw-r--r--src/mess/drivers/studio2.c36
-rw-r--r--src/mess/drivers/supracan.c8
-rw-r--r--src/mess/drivers/sv8000.c10
-rw-r--r--src/mess/drivers/svision.c8
-rw-r--r--src/mess/drivers/thomson.c2
-rw-r--r--src/mess/drivers/ti74.c32
-rw-r--r--src/mess/drivers/timex.c14
-rw-r--r--src/mess/drivers/tsispch.c6
-rw-r--r--src/mess/drivers/tutor.c6
-rw-r--r--src/mess/drivers/tvc.c12
-rw-r--r--src/mess/drivers/uzebox.c2
-rw-r--r--src/mess/drivers/vboy.c4
-rw-r--r--src/mess/drivers/vc4000.c30
-rw-r--r--src/mess/drivers/vii.c30
-rw-r--r--src/mess/drivers/x07.c6
73 files changed, 634 insertions, 635 deletions
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index 3b1b52beb5b..1d0d6a47d5d 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -244,14 +244,14 @@ WRITE8_MEMBER(a2600_state::cart_over_riot_w)
{
m_cart->write_bank(space, offset, 0);
m_riot_ram[0x20 + offset] = data;
-
+
}
WRITE8_MEMBER(a2600_state::cart_over_tia_w)
{
// Both Cart & TIA see these addresses
m_cart->write_bank(space, offset, data);
- m_tia->write(space, offset, data);
+ m_tia->write(space, offset, data);
}
MACHINE_START_MEMBER(a2600_state,a2600)
@@ -313,7 +313,7 @@ MACHINE_START_MEMBER(a2600_state,a2600)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000, 0x1fff, read8_delegate(FUNC(vcs_cart_slot_device::read_rom),(vcs_cart_slot_device*)m_cart));
break;
}
-
+
/* Banks may have changed, reset the cpu so it uses the correct reset vector */
m_maincpu->reset();
}
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index 6c5ba9c3b19..8352d1ab71f 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -9,7 +9,7 @@
2002/05/13 kubecj added more banks for bankswitching
added PAL machine description
changed clock to be precise
- improved cart emulation (in machine/)
+ improved cart emulation (in machine/)
2012/10/25 Robert Tuccitto NTSC Color Generator utilized for
color palette with hue shift/start
@@ -88,10 +88,10 @@
2014/05/06 Mike Saarna/Robert Tuccitto Brought initial Maria cycle counts
inline from measurements taken with logic analyzer and tests.
-
+
2014/08/25 Fabio Priuli Converted carts to be slot devices and cleaned
up the driver (removed the pokey, cleaned up rom regions, etc.)
-
+
***************************************************************************/
#include "emu.h"
@@ -121,19 +121,19 @@ public:
m_io_console_buttons(*this, "console_buttons"),
m_cart(*this, "cartslot"),
m_screen(*this, "screen") { }
-
+
int m_lines;
int m_ispal;
-
+
int m_ctrl_lock;
int m_ctrl_reg;
int m_maria_flag;
int m_p1_one_button;
int m_p2_one_button;
int m_bios_enabled;
-
+
UINT8 *m_bios;
-
+
DECLARE_READ8_MEMBER(bios_or_cart_r);
DECLARE_WRITE8_MEMBER(ram0_w);
DECLARE_READ8_MEMBER(tia_r);
@@ -151,7 +151,7 @@ public:
DECLARE_READ8_MEMBER(riot_joystick_r);
DECLARE_READ8_MEMBER(riot_console_button_r);
DECLARE_WRITE8_MEMBER(riot_button_pullup_w);
-
+
protected:
required_device<cpu_device> m_maincpu;
required_device<tia_device> m_tia;
@@ -223,7 +223,7 @@ READ8_MEMBER(a7800_state::tia_r)
return 0x80;
default:
logerror("undefined TIA read %x\n",offset);
-
+
}
return 0xff;
}
@@ -231,7 +231,7 @@ READ8_MEMBER(a7800_state::tia_r)
// TIA
WRITE8_MEMBER(a7800_state::tia_w)
{
- if (offset < 0x20)
+ if (offset < 0x20)
{ //INPTCTRL covers TIA registers 0x00-0x1F until locked
if (data & 0x01)
{
@@ -291,12 +291,12 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
AM_RANGE(0x2040, 0x20ff) AM_RAMBANK("ram0") // mirror (6116 block 0)
AM_RANGE(0x2140, 0x21ff) AM_RAMBANK("ram1") // mirror (6116 block 1)
- AM_RANGE(0x2800, 0x2fff) AM_RAMBANK("mirror") // these should mirror "main_ram" (according to docs)
+ AM_RANGE(0x2800, 0x2fff) AM_RAMBANK("mirror") // these should mirror "main_ram" (according to docs)
AM_RANGE(0x3000, 0x37ff) AM_RAMBANK("mirror") // but system have issues in such case...
AM_RANGE(0x3800, 0x3fff) AM_RAMBANK("mirror")
AM_RANGE(0x4000, 0xffff) AM_DEVWRITE("cartslot", a78_cart_slot_device, write_40xx)
AM_RANGE(0x4000, 0xbfff) AM_DEVREAD("cartslot", a78_cart_slot_device, read_40xx)
- AM_RANGE(0xc000, 0xffff) AM_READ(bios_or_cart_r) // here also the BIOS can be accessed
+ AM_RANGE(0xc000, 0xffff) AM_READ(bios_or_cart_r) // here also the BIOS can be accessed
ADDRESS_MAP_END
@@ -1313,7 +1313,7 @@ void a7800_state::machine_start()
save_item(NAME(m_ctrl_lock));
save_item(NAME(m_ctrl_reg));
save_item(NAME(m_maria_flag));
-
+
// install additional handlers, if needed
if (m_cart->exists())
{
diff --git a/src/mess/drivers/aim65.c b/src/mess/drivers/aim65.c
index 305b61a8ca5..6f48b026494 100644
--- a/src/mess/drivers/aim65.c
+++ b/src/mess/drivers/aim65.c
@@ -158,7 +158,7 @@ int aim65_state::load_cart(device_image_interface &image, generic_slot_device *s
{
astring errmsg;
errmsg.printf("Attempted to load file with wrong extension\nSocket '%s' only accepts files with '.%s' extension",
- slot_tag, slot_tag);
+ slot_tag, slot_tag);
image.seterror(IMAGE_ERROR_UNSPECIFIED, errmsg.cstr());
return IMAGE_INIT_FAIL;
}
diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c
index a5d21ac78e9..1ad3d9c15eb 100644
--- a/src/mess/drivers/apf.c
+++ b/src/mess/drivers/apf.c
@@ -246,7 +246,7 @@ void apf_state::machine_start()
m_has_cart_ram = true;
break;
}
-
+
m_cart->save_ram();
}
}
@@ -310,7 +310,7 @@ static ADDRESS_MAP_START( apfm1000_map, AS_PROGRAM, 8, apf_state )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_SHARE("videoram")
AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0x4000, 0x4fff) AM_MIRROR(0x1000) AM_ROM AM_REGION("roms", 0)
- AM_RANGE(0x6800, 0x7fff) AM_NOP // BASIC accesses ROM here too, but this is installed at machine_start
+ AM_RANGE(0x6800, 0x7fff) AM_NOP // BASIC accesses ROM here too, but this is installed at machine_start
AM_RANGE(0x8000, 0x9fff) AM_DEVREAD("cartslot", apf_cart_slot_device, read_rom)
AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM AM_REGION("roms", 0)
ADDRESS_MAP_END
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 5da2149d2f8..e69ecef172c 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -177,14 +177,14 @@ UniDisk 3.5 drive!)
The external drive port supports not only 5.25 drives but also UniDisk and
Apple 3.5 drives, allowing via daisy-chaining any combination of UniDisk,
Apple 3.5 and Apple 5.25 drives - up to three devices
-
-----------------------------------
-
-TK3000 keyboard matrix
-
-Data bus D0-D7 is X0-X7
-Address bus A0-A11 is Y0-Y11
-
+
+----------------------------------
+
+TK3000 keyboard matrix
+
+Data bus D0-D7 is X0-X7
+Address bus A0-A11 is Y0-Y11
+
***************************************************************************/
@@ -267,16 +267,16 @@ static ADDRESS_MAP_START( apple2_map, AS_PROGRAM, 8, apple2_state )
ADDRESS_MAP_END
/*
-
+
LS259 at H12
-
+
A8 = D
A9 = A
A10 = B
A11 = C
-
- 374/259 outputs to 65C02 c000/c010 selected by Z80 WR OR Z80 IORQ? (schematic is not super legible)
-
+
+ 374/259 outputs to 65C02 c000/c010 selected by Z80 WR OR Z80 IORQ? (schematic is not super legible)
+
*/
// RAM and ROM alternate in 8K blocks: ROM at 0/4/8/c, RAM at 2/6/a/e (RAM is only 1k and further mirrors inside those locations)
@@ -1028,9 +1028,9 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("mcms1", A2BUS_MCMS1) /* Mountain Computer Music System, card 1 of 2 */
SLOT_INTERFACE("mcms2", A2BUS_MCMS2) /* Mountain Computer Music System, card 2 of 2. must be in card 1's slot + 1! */
SLOT_INTERFACE("dx1", A2BUS_DX1) /* Decillonix DX-1 sampler card */
- SLOT_INTERFACE("tm2ho", A2BUS_TIMEMASTERHO) /* Applied Engineering TimeMaster II H.O. */
- SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
-// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
+ SLOT_INTERFACE("tm2ho", A2BUS_TIMEMASTERHO) /* Applied Engineering TimeMaster II H.O. */
+ SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
+// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(apple2eaux_cards)
@@ -1197,7 +1197,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tk3000, apple2e )
MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- 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_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
@@ -1330,7 +1330,7 @@ static MACHINE_CONFIG_DERIVED( laser128ex2, apple2c )
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl4", A2BUS_LASER128, NULL)
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl5", A2BUS_LASER128, NULL)
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_LASER128, NULL)
- MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl7", A2BUS_LASER128, NULL)
+ MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl7", A2BUS_LASER128, NULL)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( space84, apple2p )
@@ -1672,7 +1672,7 @@ ROM_START(las128e2)
ROM_LOAD ( "341-0265-a.chr", 0x1000, 0x1000, BAD_DUMP CRC(2651014d) SHA1(b2b5d87f52693817fc747df087a4aa1ddcdb1f10)) // need to dump real laser rom
ROM_REGION(0x8000,"maincpu",0)
- ROM_LOAD( "laser 128ex2 rom version 6.1.bin", 0x000000, 0x008000, CRC(7f911c90) SHA1(125754c1bd777d4c510f5239b96178c6f2e3236b) )
+ ROM_LOAD( "laser 128ex2 rom version 6.1.bin", 0x000000, 0x008000, CRC(7f911c90) SHA1(125754c1bd777d4c510f5239b96178c6f2e3236b) )
ROM_REGION( 0x800, "keyboard", ROMREGION_ERASE00 )
ROM_LOAD( "342-0132-c.e12", 0x000, 0x800, BAD_DUMP CRC(e47045f4) SHA1(12a2e718f5f4acd69b6c33a45a4a940b1440a481) ) // need to dump real laser rom
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index b4bc5f463ce..485dce64382 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -576,7 +576,7 @@ ROM_START(apple2gsr0p2) // 3/10/1986 Cortland prototype, boots as "Apple //'ing
ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89))
ROM_REGION(0x20000,"maincpu",0)
- ROM_LOAD( "apple iigs alpha rom 2.0 19860310.bin", 0x000000, 0x020000, CRC(a47d275f) SHA1(c5836adcfc8be69c7351b84afa94c814e8d92b81) )
+ ROM_LOAD( "apple iigs alpha rom 2.0 19860310.bin", 0x000000, 0x020000, CRC(a47d275f) SHA1(c5836adcfc8be69c7351b84afa94c814e8d92b81) )
ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00)
diff --git a/src/mess/drivers/apple3.c b/src/mess/drivers/apple3.c
index 2edb7caafa7..9035551bd09 100644
--- a/src/mess/drivers/apple3.c
+++ b/src/mess/drivers/apple3.c
@@ -33,7 +33,7 @@ static SLOT_INTERFACE_START(apple3_cards)
SLOT_INTERFACE("cffa2", A2BUS_CFFA2_6502) /* CFFA2000 Compact Flash for Apple II (www.dreher.net), 6502 firmware */
SLOT_INTERFACE("applicard", A2BUS_APPLICARD) /* PCPI Applicard */
SLOT_INTERFACE("thclock", A2BUS_THUNDERCLOCK) /* ThunderWare ThunderClock Plus - driver assumes slot 2 by default */
- SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
+ SLOT_INTERFACE("mouse", A2BUS_MOUSE) /* Apple II Mouse Card */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START( a3_floppies )
diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c
index 78c9667e54d..5cd907f2368 100644
--- a/src/mess/drivers/atari400.c
+++ b/src/mess/drivers/atari400.c
@@ -252,7 +252,7 @@ public:
m_8000(*this, "8000"),
m_a000(*this, "a000"),
m_cart(*this, "cartleft"),
- m_cart2(*this, "cartright") { }
+ m_cart2(*this, "cartright") { }
DECLARE_MACHINE_START(a400);
DECLARE_MACHINE_START(a800);
@@ -267,7 +267,7 @@ public:
DECLARE_WRITE8_MEMBER(a600xl_pia_pb_w);
DECLARE_WRITE8_MEMBER(a800xl_pia_pb_w);
- DECLARE_READ8_MEMBER(read_d5xx); // at least one cart type can enable/disable roms when reading
+ DECLARE_READ8_MEMBER(read_d5xx); // at least one cart type can enable/disable roms when reading
DECLARE_WRITE8_MEMBER(disable_cart);
// these are needed to handle carts which can disable ROM without
@@ -290,13 +290,13 @@ public:
DECLARE_WRITE8_MEMBER(xegs_low_w);
DECLARE_READ8_MEMBER(xegs_high_r);
DECLARE_WRITE8_MEMBER(xegs_high_w);
-
+
TIMER_DEVICE_CALLBACK_MEMBER(a400_interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(a800xl_interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(a5200_interrupt);
-
+
protected:
- //required_device<cpu_device> m_maincpu; // maincpu is already contained in atari_common_state
+ //required_device<cpu_device> m_maincpu; // maincpu is already contained in atari_common_state
required_device<ram_device> m_ram;
required_device<pia6821_device> m_pia;
optional_device<dac_device> m_dac;
@@ -310,7 +310,7 @@ protected:
int m_cart_disabled, m_cart_helper;
int m_last_offs;
UINT8 m_mmu, m_ext_bank;
-
+
void setup_ram(int bank,UINT32 size);
void setup_cart(a800_cart_slot_device *slot);
};
@@ -334,18 +334,18 @@ READ8_MEMBER(a400_state::a600xl_low_r)
READ8_MEMBER(a400_state::a1200xl_low_r)
{
- if (offset < 0x5000) // 0x0000-0x4fff
+ if (offset < 0x5000) // 0x0000-0x4fff
return m_ram->pointer()[offset];
- else if (offset < 0x5800) // 0x5000-0x57ff
+ else if (offset < 0x5800) // 0x5000-0x57ff
{
if (m_mmu & 0x80)
return m_ram->pointer()[offset];
else
return m_region_maincpu->base()[0xd000 + (offset & 0x7ff)];
}
- else if (offset < 0xc000) // 0x5800-0xbfff
+ else if (offset < 0xc000) // 0x5800-0xbfff
return m_ram->pointer()[offset];
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
return m_ram->pointer()[offset];
@@ -356,25 +356,25 @@ READ8_MEMBER(a400_state::a1200xl_low_r)
READ8_MEMBER(a400_state::a800xl_low_r)
{
- if (offset < 0x5000) // 0x0000-0x4fff
+ if (offset < 0x5000) // 0x0000-0x4fff
return m_ram->pointer()[offset];
- else if (offset < 0x5800) // 0x5000-0x57ff
+ else if (offset < 0x5800) // 0x5000-0x57ff
{
if (m_mmu & 0x80)
return m_ram->pointer()[offset];
else
return m_region_maincpu->base()[0xd000 + (offset & 0x7ff)];
}
- else if (offset < 0xa000) // 0x5800-0x9fff
+ else if (offset < 0xa000) // 0x5800-0x9fff
return m_ram->pointer()[offset];
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
{
if (m_mmu & 0x02)
return m_ram->pointer()[offset];
else
return m_region_maincpu->base()[(offset & 0x1fff) + 0xa000];
}
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
return m_ram->pointer()[offset];
@@ -385,21 +385,21 @@ READ8_MEMBER(a400_state::a800xl_low_r)
WRITE8_MEMBER(a400_state::a800xl_low_w)
{
- if (offset < 0x5000) // 0x0000-0x4fff
+ if (offset < 0x5000) // 0x0000-0x4fff
m_ram->pointer()[offset] = data;
- else if (offset < 0x5800) // 0x5000-0x57ff
+ else if (offset < 0x5800) // 0x5000-0x57ff
{
if (m_mmu & 0x80)
m_ram->pointer()[offset] = data;
}
- else if (offset < 0xa000) // 0x5800-0x7fff
+ else if (offset < 0xa000) // 0x5800-0x7fff
m_ram->pointer()[offset] = data;
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
{
if (m_mmu & 0x02)
m_ram->pointer()[offset] = data;
}
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
m_ram->pointer()[offset] = data;
@@ -422,9 +422,9 @@ WRITE8_MEMBER(a400_state::a800xl_high_w)
READ8_MEMBER(a400_state::a130xe_low_r)
{
- if (offset < 0x4000) // 0x0000-0x3fff
+ if (offset < 0x4000) // 0x0000-0x3fff
return m_ram->pointer()[offset];
- else if (offset < 0x8000) // 0x4000-0x7fff
+ else if (offset < 0x8000) // 0x4000-0x7fff
{
// NOTE: ANTIC accesses to extra RAM are not supported yet!
if (!(m_mmu & 0x80) && offset >= 0x5000 && offset < 0x5800)
@@ -434,16 +434,16 @@ READ8_MEMBER(a400_state::a130xe_low_r)
else
return m_ram->pointer()[offset];
}
- else if (offset < 0xa000) // 0x8000-0x9fff
+ else if (offset < 0xa000) // 0x8000-0x9fff
return m_ram->pointer()[offset];
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
{
if (m_mmu & 0x02)
return m_ram->pointer()[offset];
else
return m_region_maincpu->base()[(offset & 0x1fff) + 0xa000];
}
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
return m_ram->pointer()[offset];
@@ -454,9 +454,9 @@ READ8_MEMBER(a400_state::a130xe_low_r)
WRITE8_MEMBER(a400_state::a130xe_low_w)
{
- if (offset < 0x4000) // 0x0000-0x3fff
+ if (offset < 0x4000) // 0x0000-0x3fff
m_ram->pointer()[offset] = data;
- else if (offset < 0x8000) // 0x4000-0x7fff
+ else if (offset < 0x8000) // 0x4000-0x7fff
{
// NOTE: ANTIC accesses to extra RAM are not supported yet!
if (!(m_mmu & 0x80) && offset >= 0x5000 && offset < 0x5800)
@@ -466,14 +466,14 @@ WRITE8_MEMBER(a400_state::a130xe_low_w)
else
m_ram->pointer()[offset] = data;
}
- else if (offset < 0xa000) // 0x5800-0x7fff
+ else if (offset < 0xa000) // 0x5800-0x7fff
m_ram->pointer()[offset] = data;
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
{
if (m_mmu & 0x02)
m_ram->pointer()[offset] = data;
}
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
m_ram->pointer()[offset] = data;
@@ -482,22 +482,22 @@ WRITE8_MEMBER(a400_state::a130xe_low_w)
READ8_MEMBER(a400_state::xegs_low_r)
{
- if (offset < 0x5000) // 0x0000-0x4fff
+ if (offset < 0x5000) // 0x0000-0x4fff
return m_ram->pointer()[offset];
- else if (offset < 0x5800) // 0x5000-0x57ff
+ else if (offset < 0x5800) // 0x5000-0x57ff
{
if (m_mmu & 0x80)
return m_ram->pointer()[offset];
else
return m_region_maincpu->base()[0xd000 + (offset & 0x7ff)];
}
- else if (offset < 0x8000) // 0x5800-0x7fff
+ else if (offset < 0x8000) // 0x5800-0x7fff
return m_ram->pointer()[offset];
- else if (offset < 0xa000) // 0x8000-0x9fff
+ else if (offset < 0xa000) // 0x8000-0x9fff
return m_region_maincpu->base()[0x8000 + (offset & 0x1fff)];
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
return m_region_maincpu->base()[0x8000 + (offset & 0x1fff)];
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
return m_ram->pointer()[offset];
@@ -508,18 +508,18 @@ READ8_MEMBER(a400_state::xegs_low_r)
WRITE8_MEMBER(a400_state::xegs_low_w)
{
- if (offset < 0x5000) // 0x0000-0x4fff
+ if (offset < 0x5000) // 0x0000-0x4fff
m_ram->pointer()[offset] = data;
- else if (offset < 0x5800) // 0x5000-0x57ff
+ else if (offset < 0x5800) // 0x5000-0x57ff
{
if (m_mmu & 0x80)
m_ram->pointer()[offset] = data;
}
- else if (offset < 0x8000) // 0x5800-0x7fff
+ else if (offset < 0x8000) // 0x5800-0x7fff
m_ram->pointer()[offset] = data;
- else if (offset < 0xc000) // 0xa000-0xbfff
+ else if (offset < 0xc000) // 0xa000-0xbfff
return;
- else // 0xc000-0xcfff
+ else // 0xc000-0xcfff
{
if (!(m_mmu & 0x01))
m_ram->pointer()[offset] = data;
@@ -1705,14 +1705,14 @@ void a400_state::setup_ram(int bank, UINT32 size)
switch (bank)
{
- case 0: // 0x0000-0x7fff
+ case 0: // 0x0000-0x7fff
ram_top = MIN(size, 0x8000) - 1;
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x0000, ram_top, "0000");
if (m_0000 == NULL)
m_0000.findit();
m_0000->set_base(m_ram->pointer());
break;
- case 1: // 0x8000-0x9fff
+ case 1: // 0x8000-0x9fff
ram_top = MIN(size, 0xa000) - 1;
if (ram_top > 0x8000)
{
@@ -1720,9 +1720,9 @@ void a400_state::setup_ram(int bank, UINT32 size)
if (m_8000 == NULL)
m_8000.findit();
m_8000->set_base(m_ram->pointer() + 0x8000);
- }
+ }
break;
- case 2: // 0xa000-0xbfff
+ case 2: // 0xa000-0xbfff
ram_top = MIN(size, 0xc000) - 1;
if (ram_top > 0xa000)
{
@@ -1730,7 +1730,7 @@ void a400_state::setup_ram(int bank, UINT32 size)
if (m_a000 == NULL)
m_a000.findit();
m_a000->set_base(m_ram->pointer() + 0xa000);
- }
+ }
break;
}
}
@@ -1745,7 +1745,7 @@ READ8_MEMBER(a400_state::special_read_8000)
{
offset += 0x8000;
if (m_ram->size() < offset)
- return 0;
+ return 0;
else
return m_ram->pointer()[offset];
}
@@ -1769,7 +1769,7 @@ READ8_MEMBER(a400_state::special_read_a000)
{
offset += 0xa000;
if (m_ram->size() < offset)
- return 0;
+ return 0;
else
return m_ram->pointer()[offset];
}
@@ -1808,7 +1808,7 @@ WRITE8_MEMBER(a400_state::disable_cart)
case A800_EXPRESS:
case A800_DIAMOND:
case A800_WILLIAMS:
- // use m_cart_disabled & m_last_offs to avoid continuous remapping of
+ // use m_cart_disabled & m_last_offs to avoid continuous remapping of
// the memory space in some games (e.g. dropzone)
if (offset & 0x8 && !m_cart_disabled)
m_cart_disabled = 1;
@@ -1816,7 +1816,7 @@ WRITE8_MEMBER(a400_state::disable_cart)
{
if (m_cart_disabled)
m_cart_disabled = 0;
-
+
if ((offset & 0x7) != m_last_offs)
{
// we enter here only if we are writing to a different offset than last time
@@ -1833,7 +1833,7 @@ WRITE8_MEMBER(a400_state::disable_cart)
{
if (m_cart_disabled)
m_cart_disabled = 0;
-
+
if ((offset & 0x0f) != m_last_offs)
{
// we enter here only if we are writing to a different offset than last time
@@ -1845,7 +1845,7 @@ WRITE8_MEMBER(a400_state::disable_cart)
case A800_SPARTADOS:
// writes with offset & 8 are also used to enable/disable the subcart, so they go through!
m_cart->write_d5xx(space, offset, data);
- break;
+ break;
case A800_OSSM091:
case A800_OSS8K:
if ((offset & 0x9) == 0x08)
@@ -1868,7 +1868,7 @@ WRITE8_MEMBER(a400_state::disable_cart)
break;
default:
break;
- }
+ }
}
}
@@ -1958,7 +1958,7 @@ void a400_state::setup_cart(a800_cart_slot_device *slot)
m_maincpu->space(AS_PROGRAM).install_write_handler(0x4000, 0x5fff, write8_delegate(FUNC(a800_cart_slot_device::write_80xx),(a800_cart_slot_device*)slot));
m_maincpu->space(AS_PROGRAM).unmap_write(0x6000, 0xbfff);
break;
- }
+ }
}
}
@@ -2014,7 +2014,7 @@ MACHINE_START_MEMBER( a400_state, a800 )
MACHINE_START_MEMBER( a400_state, a800xl )
{
m_mmu = 0xfd;
- m_ext_bank = 0x03; // only used by a130xe
+ m_ext_bank = 0x03; // only used by a130xe
setup_cart(m_cart);
save_item(NAME(m_cart_disabled));
@@ -2056,8 +2056,8 @@ WRITE8_MEMBER(a400_state::gtia_cb)
**************************************************************/
WRITE8_MEMBER(a400_state::a600xl_pia_pb_w)
-{
- m_mmu = data;
+{
+ m_mmu = data;
}
WRITE8_MEMBER(a400_state::a800xl_pia_pb_w)
diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c
index 329213a6ed1..86ac1af97da 100644
--- a/src/mess/drivers/atarist.c
+++ b/src/mess/drivers/atarist.c
@@ -1228,7 +1228,7 @@ static ADDRESS_MAP_START( st_map, AS_PROGRAM, 16, st_state )
AM_RANGE(0x000008, 0x1fffff) AM_RAM
AM_RANGE(0x200000, 0x3fffff) AM_RAM
AM_RANGE(0x400000, 0xf9ffff) AM_READWRITE(berr_r, berr_w)
- //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot
+ //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot
AM_RANGE(0xfc0000, 0xfeffff) AM_ROM AM_REGION(M68000_TAG, 0) AM_WRITE(berr_w)
AM_RANGE(0xff8000, 0xff8001) AM_READWRITE8(mmu_r, mmu_w, 0x00ff)
AM_RANGE(0xff8200, 0xff8203) AM_READWRITE8(shifter_base_r, shifter_base_w, 0x00ff)
@@ -1272,7 +1272,7 @@ static ADDRESS_MAP_START( megast_map, AS_PROGRAM, 16, megast_state )
AM_RANGE(0x000000, 0x000007) AM_ROM AM_REGION(M68000_TAG, 0)
AM_RANGE(0x000008, 0x1fffff) AM_RAM
AM_RANGE(0x200000, 0x3fffff) AM_RAM
- //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot
+ //AM_RANGE(0xfa0000, 0xfbffff) // mapped by the cartslot
AM_RANGE(0xfc0000, 0xfeffff) AM_ROM AM_REGION(M68000_TAG, 0)
// AM_RANGE(0xff7f30, 0xff7f31) AM_READWRITE(blitter_dst_inc_y_r, blitter_dst_inc_y_w) // for TOS 1.02
AM_RANGE(0xff8000, 0xff8001) AM_READWRITE8(mmu_r, mmu_w, 0x00ff)
diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c
index 33da05e91d1..c3d6e1cc723 100644
--- a/src/mess/drivers/atom.c
+++ b/src/mess/drivers/atom.c
@@ -250,7 +250,7 @@ static ADDRESS_MAP_START( atom_mem, AS_PROGRAM, 8, atom_state )
AM_RANGE(0x0a05, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x97ff) AM_RAM AM_SHARE("video_ram")
AM_RANGE(0x9800, 0x9fff) AM_RAM
-// AM_RANGE(0xa000, 0xafff) // mapped by the cartslot
+// AM_RANGE(0xa000, 0xafff) // mapped by the cartslot
AM_RANGE(0xb000, 0xb003) AM_MIRROR(0x3fc) AM_DEVREADWRITE(INS8255_TAG, i8255_device, read, write)
// AM_RANGE(0xb400, 0xb403) AM_DEVREADWRITE(MC6854_TAG, mc6854_device, read, write)
// AM_RANGE(0xb404, 0xb404) AM_READ_PORT("ECONET")
@@ -680,7 +680,7 @@ int atom_state::load_cart(device_image_interface &image, generic_slot_device *sl
}
slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- slot->common_load_rom(slot->get_rom_base(), size, "rom");
+ slot->common_load_rom(slot->get_rom_base(), size, "rom");
return IMAGE_INIT_PASS;
}
@@ -882,12 +882,12 @@ ROM_END
DRIVER_INIT_MEMBER(atomeb_state, atomeb)
{
// these have to be set here, so that we can pass m_ext[*] to device_image_load!
- char str[8];
+ char str[8];
for (int i = 0; i < 16; i++)
{
sprintf(str,"rom_a%x", i);
m_ext[i] = machine().device<generic_slot_device>(str);
- }
+ }
}
diff --git a/src/mess/drivers/bbcbc.c b/src/mess/drivers/bbcbc.c
index af1a7a703c7..a67db079108 100644
--- a/src/mess/drivers/bbcbc.c
+++ b/src/mess/drivers/bbcbc.c
@@ -42,7 +42,7 @@ public:
static ADDRESS_MAP_START( bbcbc_prg, AS_PROGRAM, 8, bbcbc_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
- //AM_RANGE(0x4000, 0xbfff) // mapped by the cartslot
+ //AM_RANGE(0x4000, 0xbfff) // mapped by the cartslot
AM_RANGE(0xe000, 0xe02f) AM_RAM
AM_RANGE(0xe030, 0xe030) AM_READ_PORT("LINE01")
AM_RANGE(0xe031, 0xe031) AM_READ_PORT("LINE02")
diff --git a/src/mess/drivers/beta.c b/src/mess/drivers/beta.c
index daec10b2c1c..14799269d79 100644
--- a/src/mess/drivers/beta.c
+++ b/src/mess/drivers/beta.c
@@ -60,7 +60,7 @@ public:
m_q8(*this, "Q8"),
m_q9(*this, "Q9")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_device<generic_slot_device> m_eprom;
@@ -68,18 +68,18 @@ public:
required_ioport m_q7;
required_ioport m_q8;
required_ioport m_q9;
-
+
virtual void machine_start();
-
+
DECLARE_READ8_MEMBER( riot_pa_r );
DECLARE_WRITE8_MEMBER( riot_pa_w );
DECLARE_READ8_MEMBER( riot_pb_r );
DECLARE_WRITE8_MEMBER( riot_pb_w );
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
-
+
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( beta_eprom );
DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( beta_eprom );
-
+
/* EPROM state */
int m_eprom_oe;
int m_eprom_ce;
@@ -87,11 +87,11 @@ public:
UINT8 m_eprom_data;
UINT8 m_old_data;
dynamic_buffer m_eprom_rom;
-
+
/* display state */
UINT8 m_ls145_p;
UINT8 m_segment;
-
+
emu_timer *m_led_refresh_timer;
TIMER_CALLBACK_MEMBER(led_refresh);
};
@@ -285,16 +285,16 @@ WRITE8_MEMBER( beta_state::riot_pb_w )
DEVICE_IMAGE_LOAD_MEMBER( beta_state, beta_eprom )
{
UINT32 size = m_eprom->common_get_size("rom");
-
+
if (size != 0x800)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_eprom->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_eprom->common_load_rom(m_eprom->get_rom_base(), size, "rom");
-
+ m_eprom->common_load_rom(m_eprom->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index 5490c6f131c..51e7eb991d7 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -478,13 +478,13 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
UINT8 *SRC, *DST;
dynamic_buffer temp;
temp.resize(0x200000);
-
+
m_cart->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE);
SRC = temp;
DST = m_cart->get_rom_base();
- m_cart->common_load_rom(temp, size, "rom");
-
+ m_cart->common_load_rom(temp, size, "rom");
+
// fix endianness
for (int i = 0; i < 0x200000; i += 4)
{
@@ -495,7 +495,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
DST[i + 2] = tempa;
DST[i + 3] = tempb;
}
-
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/cc40.c b/src/mess/drivers/cc40.c
index 2211b16efb1..185fcb60b5b 100644
--- a/src/mess/drivers/cc40.c
+++ b/src/mess/drivers/cc40.c
@@ -51,7 +51,7 @@
provided that the machine is turned off properly. If a program is running,
you may have to press [BREAK] before turning the CC-40 off. If RAM contents
ends up dodgy somehow, just delete the nvram files.
-
+
Officially, minimum total RAM size is 6KB. The system will still boot with less,
but don't expect all software to work properly.
@@ -114,7 +114,7 @@ public:
UINT8 m_clock_control;
UINT8 m_clock_divider;
UINT8 m_key_select;
-
+
UINT8 *m_sysram[2];
UINT16 m_sysram_size[2];
UINT16 m_sysram_end[2];
@@ -165,8 +165,8 @@ DEVICE_IMAGE_LOAD_MEMBER(cc40_state, cc40_cartridge)
return IMAGE_INIT_FAIL;
}
- m_cart->rom_alloc(0x20000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // allocate a larger ROM region to have 4x32K banks
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+ m_cart->rom_alloc(0x20000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // allocate a larger ROM region to have 4x32K banks
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
return IMAGE_INIT_PASS;
}
@@ -265,7 +265,7 @@ WRITE8_MEMBER(cc40_state::bus_control_w)
m_sysram_mask[0] = d3 - 1;
m_sysram_end[1] = d3 + d2;
m_sysram_mask[1] = d2 - 1;
-
+
// d4,d5: cartridge memory addressing
// 00: 2K @ $5000-$57ff & $5800-$5fff
// 01: 8K @ $5000-$6fff & $7000-$8fff
@@ -524,12 +524,12 @@ void cc40_state::init_sysram(int chip, UINT16 size)
// init to largest possible
m_sysram[chip] = auto_alloc_array(machine(), UINT8, 0x2000);
save_pointer(NAME(m_sysram[chip]), 0x2000, chip);
-
+
save_item(NAME(m_sysram_size[chip]), chip);
save_item(NAME(m_sysram_end[chip]), chip);
save_item(NAME(m_sysram_mask[chip]), chip);
}
-
+
m_nvram[chip]->set_base(m_sysram[chip], size);
m_sysram_size[chip] = size;
}
diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c
index 7e2422f466f..990e8fe3fec 100644
--- a/src/mess/drivers/cgenie.c
+++ b/src/mess/drivers/cgenie.c
@@ -492,16 +492,16 @@ static const floppy_interface cgenie_floppy_interface =
DEVICE_IMAGE_LOAD_MEMBER( cgenie_state, cgenie_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size > 0x1000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(0x1000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/channelf.c b/src/mess/drivers/channelf.c
index e555fafdb34..360026065b6 100644
--- a/src/mess/drivers/channelf.c
+++ b/src/mess/drivers/channelf.c
@@ -178,7 +178,7 @@ void channelf_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_write_handler(0x3000, 0x3fff, write8_delegate(FUNC(channelf_cart_slot_device::write_bank),(channelf_cart_slot_device*)m_cart));
break;
}
-
+
m_cart->save_ram();
}
}
diff --git a/src/mess/drivers/concept.c b/src/mess/drivers/concept.c
index 2de213bad24..ade1949db95 100644
--- a/src/mess/drivers/concept.c
+++ b/src/mess/drivers/concept.c
@@ -196,8 +196,8 @@ INPUT_PORTS_END
SLOT_INTERFACE_START( concept_a2_cards )
SLOT_INTERFACE("fchdd", A2BUS_CORVUS) /* Corvus flat-cable HDD interface (see notes in a2corvus.c) */
- SLOT_INTERFACE("fdc01", A2BUS_CORVFDC01) /* Corvus WD1793 floppy controller */
- SLOT_INTERFACE("fdc02", A2BUS_CORVFDC02) /* Corvus NEC765 buffered floppy controller */
+ SLOT_INTERFACE("fdc01", A2BUS_CORVFDC01) /* Corvus WD1793 floppy controller */
+ SLOT_INTERFACE("fdc02", A2BUS_CORVFDC02) /* Corvus NEC765 buffered floppy controller */
SLOT_INTERFACE_END
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index 269d832135f..c984a021d63 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -712,7 +712,7 @@ void crvision_pal_state::machine_start()
// state saving
save_item(NAME(m_keylatch));
save_item(NAME(m_joylatch));
-
+
if (m_cart->exists())
{
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom40),(crvision_cart_slot_device*)m_cart));
@@ -729,7 +729,7 @@ void laser2001_state::machine_start()
// state saving
save_item(NAME(m_keylatch));
save_item(NAME(m_joylatch));
-
+
if (m_cart->exists())
{
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(crvision_cart_slot_device::read_rom40),(crvision_cart_slot_device*)m_cart));
diff --git a/src/mess/drivers/electron.c b/src/mess/drivers/electron.c
index c8bebb637b3..b42f5a94270 100644
--- a/src/mess/drivers/electron.c
+++ b/src/mess/drivers/electron.c
@@ -194,7 +194,7 @@ ROM_START(electron)
/* 24000 9 keyboard mirror */
/* 28000 10 Basic rom */
ROM_LOAD( "basic.rom", 0x28000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
- /* 2c000 11 Basic rom mirror */
+ /* 2c000 11 Basic rom mirror */
ROM_COPY( "user1", 0x28000, 0x2c000, 0x4000 )
/* 30000 12 available for cartridges with a language ROM */
/* 34000 13 available for cartridges with a language ROM */
diff --git a/src/mess/drivers/ep64.c b/src/mess/drivers/ep64.c
index 0471c5b17b5..4ef1f30fb7c 100644
--- a/src/mess/drivers/ep64.c
+++ b/src/mess/drivers/ep64.c
@@ -320,7 +320,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( dave_64k_mem, AS_PROGRAM, 8, ep64_state )
AM_RANGE(0x000000, 0x007fff) AM_ROM AM_REGION(Z80_TAG, 0)
- //AM_RANGE(0x010000, 0x01ffff) // mapped by the cartslot
+ //AM_RANGE(0x010000, 0x01ffff) // mapped by the cartslot
AM_RANGE(0x3f0000, 0x3fffff) AM_DEVICE(NICK_TAG, nick_device, vram_map)
ADDRESS_MAP_END
diff --git a/src/mess/drivers/exelv.c b/src/mess/drivers/exelv.c
index 6dc28b4d4c9..f59fda313a6 100644
--- a/src/mess/drivers/exelv.c
+++ b/src/mess/drivers/exelv.c
@@ -361,7 +361,7 @@ WRITE8_MEMBER(exelv_state::tms7041_portd_w)
/*
- CARTRIDGE ACCESS
+ CARTRIDGE ACCESS
*/
READ8_MEMBER(exelv_state::rom_r)
{
@@ -466,7 +466,7 @@ PALETTE_INIT_MEMBER(exelv_state, exelv)
/* Machine Initialization */
MACHINE_START_MEMBER( exelv_state, exl100)
-{
+{
/* register for state saving */
save_item(NAME(m_tms7020_portb));
save_item(NAME(m_tms7041_portb));
@@ -481,7 +481,7 @@ MACHINE_START_MEMBER( exelv_state, exeltel)
UINT8 *rom = memregion("user1")->base() + 0x0200;
membank("bank1")->configure_entry(0, rom);
membank("bank1")->set_entry(0);
-
+
/* register for state saving */
save_item(NAME(m_tms7020_portb));
save_item(NAME(m_tms7041_portb));
diff --git a/src/mess/drivers/fc100.c b/src/mess/drivers/fc100.c
index 1b3a6e18335..b3c600750c0 100644
--- a/src/mess/drivers/fc100.c
+++ b/src/mess/drivers/fc100.c
@@ -114,7 +114,7 @@ private:
static ADDRESS_MAP_START( fc100_mem, AS_PROGRAM, 8, fc100_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0x5fff ) AM_ROM AM_REGION("roms", 0)
- //AM_RANGE(0x6000, 0x6fff) // mapped by the cartslot
+ //AM_RANGE(0x6000, 0x6fff) // mapped by the cartslot
AM_RANGE( 0x7800, 0x7fff ) AM_READ_BANK("bankr") AM_WRITE_BANK("bankw") // Banked RAM/ROM
AM_RANGE( 0x8000, 0xbfff ) AM_RAM // expansion ram pack - if omitted you get a 'Pages?' prompt at boot
AM_RANGE( 0xc000, 0xffff ) AM_RAM AM_SHARE("videoram")
diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c
index 591058ab112..4d0aa7f1ab3 100644
--- a/src/mess/drivers/fm7.c
+++ b/src/mess/drivers/fm7.c
@@ -1001,105 +1001,105 @@ void fm7_state::fm7_update_bank(address_space & space, int bank, UINT8 physical)
, m_avbank8, m_avbank9, m_avbank10, m_avbank11, m_avbank12, m_avbank13, m_avbank14, m_avbank15, m_avbank16 };
avbank[bank]->set_bank(physical);
-/* UINT8* RAM = memregion("maincpu")->base();
- UINT16 size = 0xfff;
- char bank_name[10];
-
- if(bank == 15)
- size = 0xbff;
-
- sprintf(bank_name,"bank%d",bank+1);
-
- if(physical >= 0x10 && physical <= 0x1b)
- {
- switch(physical)
- {
- case 0x10:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram0_r),this),write8_delegate(FUNC(fm7_state::fm7_vram0_w),this));
- break;
- case 0x11:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram1_r),this),write8_delegate(FUNC(fm7_state::fm7_vram1_w),this));
- break;
- case 0x12:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram2_r),this),write8_delegate(FUNC(fm7_state::fm7_vram2_w),this));
- break;
- case 0x13:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram3_r),this),write8_delegate(FUNC(fm7_state::fm7_vram3_w),this));
- break;
- case 0x14:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram4_r),this),write8_delegate(FUNC(fm7_state::fm7_vram4_w),this));
- break;
- case 0x15:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram5_r),this),write8_delegate(FUNC(fm7_state::fm7_vram5_w),this));
- break;
- case 0x16:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram6_r),this),write8_delegate(FUNC(fm7_state::fm7_vram6_w),this));
- break;
- case 0x17:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram7_r),this),write8_delegate(FUNC(fm7_state::fm7_vram7_w),this));
- break;
- case 0x18:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram8_r),this),write8_delegate(FUNC(fm7_state::fm7_vram8_w),this));
- break;
- case 0x19:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram9_r),this),write8_delegate(FUNC(fm7_state::fm7_vram9_w),this));
- break;
- case 0x1a:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vramA_r),this),write8_delegate(FUNC(fm7_state::fm7_vramA_w),this));
- break;
- case 0x1b:
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vramB_r),this),write8_delegate(FUNC(fm7_state::fm7_vramB_w),this));
- break;
- }
+/* UINT8* RAM = memregion("maincpu")->base();
+ UINT16 size = 0xfff;
+ char bank_name[10];
+
+ if(bank == 15)
+ size = 0xbff;
+
+ sprintf(bank_name,"bank%d",bank+1);
+
+ if(physical >= 0x10 && physical <= 0x1b)
+ {
+ switch(physical)
+ {
+ case 0x10:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram0_r),this),write8_delegate(FUNC(fm7_state::fm7_vram0_w),this));
+ break;
+ case 0x11:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram1_r),this),write8_delegate(FUNC(fm7_state::fm7_vram1_w),this));
+ break;
+ case 0x12:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram2_r),this),write8_delegate(FUNC(fm7_state::fm7_vram2_w),this));
+ break;
+ case 0x13:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram3_r),this),write8_delegate(FUNC(fm7_state::fm7_vram3_w),this));
+ break;
+ case 0x14:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram4_r),this),write8_delegate(FUNC(fm7_state::fm7_vram4_w),this));
+ break;
+ case 0x15:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram5_r),this),write8_delegate(FUNC(fm7_state::fm7_vram5_w),this));
+ break;
+ case 0x16:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram6_r),this),write8_delegate(FUNC(fm7_state::fm7_vram6_w),this));
+ break;
+ case 0x17:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram7_r),this),write8_delegate(FUNC(fm7_state::fm7_vram7_w),this));
+ break;
+ case 0x18:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram8_r),this),write8_delegate(FUNC(fm7_state::fm7_vram8_w),this));
+ break;
+ case 0x19:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vram9_r),this),write8_delegate(FUNC(fm7_state::fm7_vram9_w),this));
+ break;
+ case 0x1a:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vramA_r),this),write8_delegate(FUNC(fm7_state::fm7_vramA_w),this));
+ break;
+ case 0x1b:
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_vramB_r),this),write8_delegate(FUNC(fm7_state::fm7_vramB_w),this));
+ break;
+ }
// membank(bank+1)->set_base(RAM+(physical<<12)-0x10000);
- return;
- }
- if(physical == 0x1c)
- {
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_console_ram_banked_r),this),write8_delegate(FUNC(fm7_state::fm7_console_ram_banked_w),this));
- return;
- }
- if(physical == 0x1d)
- {
- space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_sub_ram_ports_banked_r),this),write8_delegate(FUNC(fm7_state::fm7_sub_ram_ports_banked_w),this));
- return;
- }
- if(physical == 0x35)
- {
- if(m_init_rom_en && (m_type == SYS_FM11 || m_type == SYS_FM16))
- {
- RAM = memregion("init")->base();
- space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
- space.nop_write(bank*0x1000,(bank*0x1000)+size);
- membank(bank_name)->set_base(RAM+(physical<<12)-0x35000);
- return;
- }
- }
- if(physical == 0x36 || physical == 0x37)
- {
- if(m_init_rom_en && (m_type != SYS_FM11 && m_type != SYS_FM16))
- {
- RAM = memregion("init")->base();
- space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
- space.nop_write(bank*0x1000,(bank*0x1000)+size);
- membank(bank_name)->set_base(RAM+(physical<<12)-0x36000);
- return;
- }
- }
- if(physical > 0x37 && physical <= 0x3f)
- {
- if(m_basic_rom_en && (m_type != SYS_FM11 && m_type != SYS_FM16))
- {
- RAM = memregion("fbasic")->base();
- space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
- space.nop_write(bank*0x1000,(bank*0x1000)+size);
- membank(bank_name)->set_base(RAM+(physical<<12)-0x38000);
- return;
- }
- }
- space.install_readwrite_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
- membank(bank_name)->set_base(RAM+(physical<<12));
- */
+ return;
+ }
+ if(physical == 0x1c)
+ {
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_console_ram_banked_r),this),write8_delegate(FUNC(fm7_state::fm7_console_ram_banked_w),this));
+ return;
+ }
+ if(physical == 0x1d)
+ {
+ space.install_readwrite_handler(bank*0x1000,(bank*0x1000)+size,read8_delegate(FUNC(fm7_state::fm7_sub_ram_ports_banked_r),this),write8_delegate(FUNC(fm7_state::fm7_sub_ram_ports_banked_w),this));
+ return;
+ }
+ if(physical == 0x35)
+ {
+ if(m_init_rom_en && (m_type == SYS_FM11 || m_type == SYS_FM16))
+ {
+ RAM = memregion("init")->base();
+ space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
+ space.nop_write(bank*0x1000,(bank*0x1000)+size);
+ membank(bank_name)->set_base(RAM+(physical<<12)-0x35000);
+ return;
+ }
+ }
+ if(physical == 0x36 || physical == 0x37)
+ {
+ if(m_init_rom_en && (m_type != SYS_FM11 && m_type != SYS_FM16))
+ {
+ RAM = memregion("init")->base();
+ space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
+ space.nop_write(bank*0x1000,(bank*0x1000)+size);
+ membank(bank_name)->set_base(RAM+(physical<<12)-0x36000);
+ return;
+ }
+ }
+ if(physical > 0x37 && physical <= 0x3f)
+ {
+ if(m_basic_rom_en && (m_type != SYS_FM11 && m_type != SYS_FM16))
+ {
+ RAM = memregion("fbasic")->base();
+ space.install_read_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
+ space.nop_write(bank*0x1000,(bank*0x1000)+size);
+ membank(bank_name)->set_base(RAM+(physical<<12)-0x38000);
+ return;
+ }
+ }
+ space.install_readwrite_bank(bank*0x1000,(bank*0x1000)+size,bank_name);
+ membank(bank_name)->set_base(RAM+(physical<<12));
+ */
}
void fm7_state::fm7_mmr_refresh(address_space& space)
diff --git a/src/mess/drivers/gameking.c b/src/mess/drivers/gameking.c
index 6cc3cef8bb7..60b6960f3c8 100644
--- a/src/mess/drivers/gameking.c
+++ b/src/mess/drivers/gameking.c
@@ -103,16 +103,16 @@ DRIVER_INIT_MEMBER(gameking_state, gameking)
DEVICE_IMAGE_LOAD_MEMBER( gameking_state, gameking_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size > 0x20000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/gamepock.c b/src/mess/drivers/gamepock.c
index b65aee1d8f1..cb9816771dc 100644
--- a/src/mess/drivers/gamepock.c
+++ b/src/mess/drivers/gamepock.c
@@ -12,7 +12,7 @@ static ADDRESS_MAP_START(gamepock_mem, AS_PROGRAM, 8, gamepock_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000,0x0fff) AM_ROM
AM_RANGE(0x1000,0x3fff) AM_NOP
- //AM_RANGE(0x4000,0xbfff) AM_ROM // mapped by the cartslot
+ //AM_RANGE(0x4000,0xbfff) AM_ROM // mapped by the cartslot
AM_RANGE(0xc000,0xc7ff) AM_MIRROR(0x0800) AM_RAM
AM_RANGE(0xff80,0xffff) AM_RAM /* 128 bytes microcontroller RAM */
ADDRESS_MAP_END
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index 6a1190ce14d..c66e8987a14 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -1896,7 +1896,7 @@ READ32_MEMBER(gba_state::gba_bios_r)
if (m_bios_protected != 0)
offset = (m_bios_last_address + 8) / 4;
-
+
return rom[offset & 0x3fff];
}
diff --git a/src/mess/drivers/geniusiq.c b/src/mess/drivers/geniusiq.c
index 63f5d3dcb01..b86ab54fa9f 100644
--- a/src/mess/drivers/geniusiq.c
+++ b/src/mess/drivers/geniusiq.c
@@ -759,10 +759,10 @@ void geniusiq_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER(geniusiq_state,iq128_cart)
{
UINT32 size = m_cart->common_get_size("rom");
-
+
// we always a 0x100000 region, for easier mapping in the memory map
m_cart->rom_alloc(0x100000, GENERIC_ROM16_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
m_cart_state = IQ128_ROM_CART;
diff --git a/src/mess/drivers/gmaster.c b/src/mess/drivers/gmaster.c
index d9ea92780a5..9c7cf293929 100644
--- a/src/mess/drivers/gmaster.c
+++ b/src/mess/drivers/gmaster.c
@@ -182,7 +182,7 @@ WRITE8_MEMBER(gmaster_state::gmaster_port_w)
static ADDRESS_MAP_START( gmaster_mem, AS_PROGRAM, 8, gmaster_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_READWRITE(gmaster_io_r, gmaster_io_w)
- //AM_RANGE(0x8000, 0xfeff) // mapped by the cartslot
+ //AM_RANGE(0x8000, 0xfeff) // mapped by the cartslot
AM_RANGE(0xff00, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mess/drivers/ibmpcjr.c b/src/mess/drivers/ibmpcjr.c
index e7ce6c289d9..7de1bf95ddf 100644
--- a/src/mess/drivers/ibmpcjr.c
+++ b/src/mess/drivers/ibmpcjr.c
@@ -464,7 +464,7 @@ int pcjr_state::load_cart(device_image_interface &image, generic_slot_device *sl
size -= header_size;
image.fseek(header_size, SEEK_SET);
}
-
+
slot->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
slot->common_load_rom(slot->get_rom_base(), size, "rom");
diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c
index 905f99787a1..9beeae578ce 100644
--- a/src/mess/drivers/intv.c
+++ b/src/mess/drivers/intv.c
@@ -380,11 +380,11 @@ static ADDRESS_MAP_START( intv_mem, AS_PROGRAM, 16, intv_state )
AM_RANGE(0x01f0, 0x01ff) AM_DEVREADWRITE8("ay8914", ay8914_device, read, write, 0x00ff)
AM_RANGE(0x0200, 0x035f) AM_READWRITE(intv_ram16_r, intv_ram16_w)
AM_RANGE(0x0400, 0x04ff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom04)
- AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
+ AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
AM_RANGE(0x2000, 0x2fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom20)
AM_RANGE(0x3000, 0x37ff) AM_DEVREAD("stic", stic_device, grom_read) // GROM, 8-bits wide
- AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
- AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
+ AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
+ AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
AM_RANGE(0x4000, 0x47ff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom40)
AM_RANGE(0x4800, 0x4fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom48)
AM_RANGE(0x5000, 0x5fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom50)
@@ -407,11 +407,11 @@ static ADDRESS_MAP_START( intvoice_mem, AS_PROGRAM, 16, intv_state )
AM_RANGE(0x01f0, 0x01ff) AM_DEVREADWRITE8("ay8914", ay8914_device, read, write, 0x00ff)
AM_RANGE(0x0200, 0x035f) AM_READWRITE(intv_ram16_r, intv_ram16_w)
AM_RANGE(0x0400, 0x04ff) AM_DEVREAD("voice", intv_voice_device, read_rom04)
- AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
+ AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
AM_RANGE(0x2000, 0x2fff) AM_DEVREAD("voice", intv_voice_device, read_rom20)
AM_RANGE(0x3000, 0x37ff) AM_DEVREAD("stic", stic_device, grom_read) // GROM, 8-bits wide
- AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
- AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
+ AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
+ AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
AM_RANGE(0x4000, 0x47ff) AM_DEVREAD("voice", intv_voice_device, read_rom40)
AM_RANGE(0x4800, 0x4fff) AM_DEVREAD("voice", intv_voice_device, read_rom48)
AM_RANGE(0x5000, 0x5fff) AM_DEVREAD("voice", intv_voice_device, read_rom50)
@@ -432,12 +432,12 @@ static ADDRESS_MAP_START( intv2_mem , AS_PROGRAM, 16, intv_state )
AM_RANGE(0x0100, 0x01ef) AM_READWRITE(intv_ram8_r, intv_ram8_w)
AM_RANGE(0x01f0, 0x01ff) AM_DEVREADWRITE8("ay8914", ay8914_device, read, write, 0x00ff)
AM_RANGE(0x0200, 0x035f) AM_READWRITE(intv_ram16_r, intv_ram16_w)
- AM_RANGE(0x0400, 0x04ff) AM_ROM AM_REGION("maincpu", 0x400 << 1) // Exec ROM, 10-bits wide
- AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
+ AM_RANGE(0x0400, 0x04ff) AM_ROM AM_REGION("maincpu", 0x400 << 1) // Exec ROM, 10-bits wide
+ AM_RANGE(0x1000, 0x1fff) AM_ROM AM_REGION("maincpu", 0x1000 << 1) // Exec ROM, 10-bits wide
AM_RANGE(0x2000, 0x2fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom20)
- AM_RANGE(0x3000, 0x37ff) AM_DEVREAD("stic", stic_device, grom_read) // GROM, 8-bits wide
- AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
- AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
+ AM_RANGE(0x3000, 0x37ff) AM_DEVREAD("stic", stic_device, grom_read) // GROM, 8-bits wide
+ AM_RANGE(0x3800, 0x39ff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM, 8-bits wide
+ AM_RANGE(0x3a00, 0x3bff) AM_READWRITE(intv_gram_r, intv_gram_w) // GRAM Alias, 8-bits wide
AM_RANGE(0x4000, 0x47ff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom40)
AM_RANGE(0x4800, 0x4fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom48)
AM_RANGE(0x5000, 0x5fff) AM_DEVREAD("cartslot", intv_cart_slot_device, read_rom50)
diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c
index e6a748c3332..5d9aa417b6c 100644
--- a/src/mess/drivers/itt3030.c
+++ b/src/mess/drivers/itt3030.c
@@ -324,18 +324,18 @@ READ8_MEMBER(itt3030_state::i8078_r)
{
if (offset)
{
-// printf("Read 8078 status\n");
+// printf("Read 8078 status\n");
if (!m_keyskip)
{
- return 0x10;
+ return 0x10;
}
}
else
{
-// printf("Read 8078 data\n");
+// printf("Read 8078 data\n");
if (!m_keyskip)
{
- m_keyskip = true; // don't keep reporting the 'b' key, just the once to trick the boot ROM
+ m_keyskip = true; // don't keep reporting the 'b' key, just the once to trick the boot ROM
return 0x0c;
}
}
@@ -433,21 +433,21 @@ WRITE_LINE_MEMBER(itt3030_state::fdchld_w)
}
/*
- 7 Data Request (DRQ - inverted 1791-Signal)
- 6 Interrupt Request (INTRQ - 1791-Signal)
- 5 Head Load (HLD - inverted 1791-Signal)
- 4 Ready 3 (Drive 3 ready)
- 3 Ready 2 (Drive 2 ready)
- 2 Ready l (Drive 1 ready)
- 1 Write protect (the disk in the selected drive is write protected)
- 0 HLT (Halt signal during head load and track change)
+ 7 Data Request (DRQ - inverted 1791-Signal)
+ 6 Interrupt Request (INTRQ - 1791-Signal)
+ 5 Head Load (HLD - inverted 1791-Signal)
+ 4 Ready 3 (Drive 3 ready)
+ 3 Ready 2 (Drive 2 ready)
+ 2 Ready l (Drive 1 ready)
+ 1 Write protect (the disk in the selected drive is write protected)
+ 0 HLT (Halt signal during head load and track change)
*/
READ8_MEMBER(itt3030_state::fdc_stat_r)
{
UINT8 res = 0;
- floppy_image_device *floppy1 = m_con1 ? m_con1->get_device() : 0;
- floppy_image_device *floppy2 = m_con2 ? m_con2->get_device() : 0;
- floppy_image_device *floppy3 = m_con3 ? m_con3->get_device() : 0;
+ floppy_image_device *floppy1 = m_con1 ? m_con1->get_device() : 0;
+ floppy_image_device *floppy2 = m_con2 ? m_con2->get_device() : 0;
+ floppy_image_device *floppy3 = m_con3 ? m_con3->get_device() : 0;
res = m_fdc_drq ? 0x80 : 0x00;
res |= m_fdc_irq ? 0x40 : 0x00;
@@ -472,14 +472,14 @@ WRITE8_MEMBER(itt3030_state::fdc_w)
}
/*
- 7 SEL1 - Select drive 1
- 6 SEL2 - Select drive 2
- 5 SEL3 - Select drive 3
- 4 MOTOR - Motor on
- 3 DOOR - Drive door lock drives 1 + 2 (not possible with all drives)
- 2 SIDESEL - Select disk side
- 1 KOMP - write comp on/off
- 0 RG J - Change separator stage to read
+ 7 SEL1 - Select drive 1
+ 6 SEL2 - Select drive 2
+ 5 SEL3 - Select drive 3
+ 4 MOTOR - Motor on
+ 3 DOOR - Drive door lock drives 1 + 2 (not possible with all drives)
+ 2 SIDESEL - Select disk side
+ 1 KOMP - write comp on/off
+ 0 RG J - Change separator stage to read
*/
WRITE8_MEMBER(itt3030_state::fdc_cmd_w)
{
diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c
index b83fee74748..3adb9ba6ac7 100644
--- a/src/mess/drivers/kyocera.c
+++ b/src/mess/drivers/kyocera.c
@@ -1167,10 +1167,10 @@ WRITE_LINE_MEMBER( tandy200_state::i8155_to_w )
void kc85_state::machine_start()
{
address_space &program = m_maincpu->space(AS_PROGRAM);
-
+
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
/* initialize RTC */
m_rtc->cs_w(1);
m_rtc->oe_w(1);
@@ -1210,10 +1210,10 @@ void kc85_state::machine_start()
void pc8201_state::machine_start()
{
UINT8 *ram = m_ram->pointer();
-
+
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
/* initialize RTC */
m_rtc->cs_w(1);
m_rtc->oe_w(1);
@@ -1244,10 +1244,10 @@ void pc8201_state::machine_start()
void trsm100_state::machine_start()
{
address_space &program = m_maincpu->space(AS_PROGRAM);
-
+
astring region_tag;
m_opt_region = memregion(region_tag.cpy(m_opt_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
/* initialize RTC */
m_rtc->cs_w(1);
m_rtc->oe_w(1);
diff --git a/src/mess/drivers/laser3k.c b/src/mess/drivers/laser3k.c
index 3b0d6632ca3..b07f74daef9 100644
--- a/src/mess/drivers/laser3k.c
+++ b/src/mess/drivers/laser3k.c
@@ -1,31 +1,31 @@
/***************************************************************************
-
+
laser3k.c
Driver for VTech Laser 3000 / Dick Smith Electronics "The Cat"
-
+
This machine is somewhat similar to a 48K Apple II if you blur your eyes
a lot, but it generally fits in poorly with 100% compatible machines
(no chance of a compatible language card or auxmem) so it gets its own driver.
-
+
An "emulation cartridge" is required to run Apple II software; it's unclear
what that consists of.
-
+
Banking theory:
- 6502 has 4 banking windows, 0000-3FFF, 4000-7FFF, 8000-BFFF, C000-FFFF
- Physical address space is 0x00000-0x3FFFF. ROM and I/O at the top, RAM
up to 0x2FFFF (192k max).
- Each window has a bank number register at physical 3C07C/D/E/F
-
+
Technical manual at:
http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Computers/LASER/LASER%203000/Manuals/The%20Cat%20Technical%20Reference%20Manual.pdf
-
+
TODO:
- Finish keyboard
- RGB graphics mode
- FDC C800 page appears to be inside the FDC cartridge, need a dump :( (can hack to use IWM in the meantime)
- Centronics printer port (data at 3c090, read ack at 3c1c0, read busy at 3c1c2)
- cassette
-
+
***************************************************************************/
#include "emu.h"
@@ -248,78 +248,78 @@ void laser3k_state::do_io(int offset)
{
switch (offset)
{
- case 0x08: // set border color to black
+ case 0x08: // set border color to black
m_border_color = 0;
break;
- case 0x09: // set border color to red
+ case 0x09: // set border color to red
m_border_color = 1;
break;
- case 0x0a: // set border color to green
+ case 0x0a: // set border color to green
m_border_color = 12;
break;
- case 0x0b: // set border color to yellow
+ case 0x0b: // set border color to yellow
m_border_color = 13;
break;
- case 0x0c: // set border color to blue
+ case 0x0c: // set border color to blue
m_border_color = 6;
break;
- case 0x0d: // set border color to magenta
+ case 0x0d: // set border color to magenta
m_border_color = 3;
break;
- case 0x0e: // set border color to cyan
+ case 0x0e: // set border color to cyan
m_border_color = 14;
break;
- case 0x0f: // set border color to white
+ case 0x0f: // set border color to white
m_border_color = 15;
break;
- case 0x18: // set bg color to black
+ case 0x18: // set bg color to black
m_bg_color = 0;
break;
- case 0x19: // set bg color to red
+ case 0x19: // set bg color to red
m_bg_color = 1;
break;
- case 0x1a: // set bg color to green
+ case 0x1a: // set bg color to green
m_bg_color = 12;
break;
- case 0x1b: // set bg color to yellow
+ case 0x1b: // set bg color to yellow
m_bg_color = 13;
break;
- case 0x1c: // set bg color to blue
+ case 0x1c: // set bg color to blue
m_bg_color = 6;
break;
- case 0x1d: // set bg color to magenta
+ case 0x1d: // set bg color to magenta
m_bg_color = 3;
break;
- case 0x1e: // set bg color to cyan
+ case 0x1e: // set bg color to cyan
m_bg_color = 14;
break;
- case 0x1f: // set bg color to white
+ case 0x1f: // set bg color to white
m_bg_color = 15;
break;
- case 0x28: // set fg color to normal
+ case 0x28: // set fg color to normal
m_fg_color = 15;
break;
- case 0x29: // set fg color to red
+ case 0x29: // set fg color to red
m_fg_color = 1;
break;
- case 0x2a: // set fg color to green
+ case 0x2a: // set fg color to green
m_fg_color = 12;
break;
- case 0x2b: // set fg color to yellow
+ case 0x2b: // set fg color to yellow
m_fg_color = 13;
break;
- case 0x2c: // set fg color to blue
+ case 0x2c: // set fg color to blue
m_fg_color = 6;
break;
- case 0x2d: // set fg color to magenta
+ case 0x2d: // set fg color to magenta
m_fg_color = 3;
break;
- case 0x2e: // set fg color to cyan
+ case 0x2e: // set fg color to cyan
m_fg_color = 14;
break;
- case 0x2f: // set fg color to white
+ case 0x2f: // set fg color to white
m_fg_color = 15;
break;
@@ -328,51 +328,51 @@ void laser3k_state::do_io(int offset)
m_speaker->level_w(m_speaker_state);
break;
- case 0x4c: // low resolution (40 column)
+ case 0x4c: // low resolution (40 column)
m_80col = false;
m_maincpu->set_unscaled_clock(1021800);
break;
- case 0x4d: // RGB mode
+ case 0x4d: // RGB mode
m_gfxmode = RGB;
break;
- case 0x4e: // double hi-res
+ case 0x4e: // double hi-res
m_80col = true;
m_gfxmode = DHIRES;
m_maincpu->set_unscaled_clock(1021800*2);
break;
-
- case 0x4f: // high resolution (80 column). Yes, the CPU clock also doubles when the pixel clock does (!)
+
+ case 0x4f: // high resolution (80 column). Yes, the CPU clock also doubles when the pixel clock does (!)
m_80col = true;
m_maincpu->set_unscaled_clock(1021800*2);
break;
- case 0x50: // graphics mode
+ case 0x50: // graphics mode
m_gfxmode = HIRES;
break;
- case 0x51: // text mode
+ case 0x51: // text mode
m_gfxmode = TEXT;
break;
- case 0x52: // no mix
+ case 0x52: // no mix
m_mix = false;
break;
- case 0x53: // mixed mode
+ case 0x53: // mixed mode
m_mix = true;
break;
- case 0x54: // set page 1
+ case 0x54: // set page 1
m_disp_page = 0;
break;
- case 0x55: // set page 2
+ case 0x55: // set page 2
m_disp_page = 1;
break;
- case 0x56: // disable emulation (?)
+ case 0x56: // disable emulation (?)
break;
default:
@@ -385,10 +385,10 @@ READ8_MEMBER( laser3k_state::io_r )
{
switch (offset)
{
- case 0x00: // keyboard latch
+ case 0x00: // keyboard latch
return m_transchar | m_strobe;
- case 0x10: // keyboard strobe
+ case 0x10: // keyboard strobe
{
UINT8 rv = m_transchar | m_strobe;
m_strobe = 0;
@@ -397,16 +397,16 @@ READ8_MEMBER( laser3k_state::io_r )
case 0x7c:
return m_bank0val;
-
+
case 0x7d:
return m_bank1val;
-
+
case 0x7e:
return m_bank2val;
-
+
case 0x7f:
return m_bank3val;
-
+
default:
do_io(offset);
break;
@@ -419,18 +419,18 @@ WRITE8_MEMBER( laser3k_state::io_w )
{
switch (offset)
{
- case 0x10: // clear keyboard latch
+ case 0x10: // clear keyboard latch
m_strobe = 0;
break;
- case 0x68: // SN76489 sound
+ case 0x68: // SN76489 sound
m_sn->write(space, 0, data);
break;
- case 0x78: // called "SYSTEM" in the boot ROM listing, but unsure what it does
+ case 0x78: // called "SYSTEM" in the boot ROM listing, but unsure what it does
break;
- case 0x7c: // bank 0
+ case 0x7c: // bank 0
m_bank0val = data & 0xf;
m_bank0->set_bank(m_bank0val);
break;
@@ -440,12 +440,12 @@ WRITE8_MEMBER( laser3k_state::io_w )
m_bank1->set_bank(m_bank1val);
break;
- case 0x7e: // bank 2
+ case 0x7e: // bank 2
m_bank2val = data & 0xf;
m_bank2->set_bank(m_bank2val);
break;
- case 0x7f: // bank 3
+ case 0x7f: // bank 3
m_bank3val = data & 0xf;
m_bank3->set_bank(m_bank3val);
break;
@@ -460,15 +460,15 @@ READ8_MEMBER( laser3k_state::io2_r )
{
switch (offset)
{
- case 0xc2: // h-blank status
+ case 0xc2: // h-blank status
return space.machine().first_screen()->hblank() ? 0x80 : 0x00;
- case 0xc3: // v-blank status
+ case 0xc3: // v-blank status
return space.machine().first_screen()->vblank() ? 0x80 : 0x00;
- case 0xc5: // CPU 1/2 MHz status?
+ case 0xc5: // CPU 1/2 MHz status?
return 0x00;
-
+
default:
printf("io2_r @ unknown %x\n", offset);
break;
@@ -505,7 +505,7 @@ void laser3k_state::plot_text_character(bitmap_ind16 &bitmap, int xpos, int ypos
for (i = 0; i < xscale; i++)
{
- bitmap.pix16(ypos + y, xpos + (x * xscale) + i) = color;
+ bitmap.pix16(ypos + y, xpos + (x * xscale) + i) = color;
}
}
}
@@ -520,11 +520,11 @@ void laser3k_state::text_update(screen_device &screen, bitmap_ind16 &bitmap, con
if (m_80col)
{
- start_address = (m_disp_page == 0) ? 0x1000 : 0x1800;
+ start_address = (m_disp_page == 0) ? 0x1000 : 0x1800;
}
else
{
- start_address = (m_disp_page == 0) ? 0x400 : 0x800;
+ start_address = (m_disp_page == 0) ? 0x400 : 0x800;
}
m_flash = ((machine().time() * 4).seconds & 1) ? 1 : 0;
@@ -541,9 +541,9 @@ void laser3k_state::text_update(screen_device &screen, bitmap_ind16 &bitmap, con
/* calculate address */
address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
- plot_text_character(bitmap, col * 7, row, 1, m_a2_videoram[address],
+ plot_text_character(bitmap, col * 7, row, 1, m_a2_videoram[address],
memregion("gfx1")->base(), memregion("gfx1")->bytes());
- plot_text_character(bitmap, (col + 40) * 7, row, 1, m_a2_videoram[address+0x400],
+ plot_text_character(bitmap, (col + 40) * 7, row, 1, m_a2_videoram[address+0x400],
memregion("gfx1")->base(), memregion("gfx1")->bytes());
}
}
@@ -553,7 +553,7 @@ void laser3k_state::text_update(screen_device &screen, bitmap_ind16 &bitmap, con
{
/* calculate address */
address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
- plot_text_character(bitmap, col * 14, row, 2, m_a2_videoram[address],
+ plot_text_character(bitmap, col * 14, row, 2, m_a2_videoram[address],
memregion("gfx1")->base(), memregion("gfx1")->bytes());
}
}
@@ -565,7 +565,7 @@ void laser3k_state::hgr_update(screen_device &screen, bitmap_ind16 &bitmap, cons
const UINT8 *vram;
int row, col, b;
int offset;
- UINT8 vram_row[42] ;
+ UINT8 vram_row[42] ;
UINT16 v;
UINT16 *p;
UINT32 w;
@@ -601,7 +601,7 @@ void laser3k_state::hgr_update(screen_device &screen, bitmap_ind16 &bitmap, cons
| (((UINT32) vram_row[col+2] & 0x7f) << 14);
artifact_map_ptr = &m_hires_artifact_map[((vram_row[col+1] & 0x80) >> 7) * 16];
- for (b = 0; b < 7; b++)
+ for (b = 0; b < 7; b++)
{
v = artifact_map_ptr[((w >> (b + 7-1)) & 0x07) | (((b ^ col) & 0x01) << 3)];
*(p++) = v;
@@ -629,7 +629,7 @@ void laser3k_state::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, con
if (endrow < beginrow)
return;
- vram = m_ram->pointer() + (m_disp_page ? 0x8000 : 0x4000);
+ vram = m_ram->pointer() + (m_disp_page ? 0x8000 : 0x4000);
vram_row[0] = 0;
vram_row[81] = 0;
@@ -641,12 +641,12 @@ void laser3k_state::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, con
offset = ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col)) | ((row & 7) << 10);
if (col < 40)
{
- vram_row[1+(col*2)+0] = vram[offset];
+ vram_row[1+(col*2)+0] = vram[offset];
vram_row[1+(col*2)+1] = vram[offset+1];
}
else
{
- vram_row[1+(col*2)+0] = vram[offset+0x2000];
+ vram_row[1+(col*2)+0] = vram[offset+0x2000];
vram_row[1+(col*2)+1] = vram[offset+0x2001];
}
}
@@ -659,7 +659,7 @@ void laser3k_state::dhgr_update(screen_device &screen, bitmap_ind16 &bitmap, con
| (((UINT32) vram_row[col+1] & 0x7f) << 7)
| (((UINT32) vram_row[col+2] & 0x7f) << 14);
- for (b = 0; b < 7; b++)
+ for (b = 0; b < 7; b++)
{
v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
*(p++) = v;
@@ -673,18 +673,18 @@ UINT32 laser3k_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
switch (m_gfxmode)
{
case TEXT:
- text_update(screen, bitmap, cliprect, 0, 191);
+ text_update(screen, bitmap, cliprect, 0, 191);
break;
case HIRES:
if (m_mix)
{
- hgr_update(screen, bitmap, cliprect, 0, 159);
- text_update(screen, bitmap, cliprect, 160, 191);
+ hgr_update(screen, bitmap, cliprect, 0, 159);
+ text_update(screen, bitmap, cliprect, 160, 191);
}
else
{
- hgr_update(screen, bitmap, cliprect, 0, 191);
+ hgr_update(screen, bitmap, cliprect, 0, 191);
}
break;
@@ -694,12 +694,12 @@ UINT32 laser3k_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
case DHIRES:
if (m_mix)
{
- dhgr_update(screen, bitmap, cliprect, 0, 159);
- text_update(screen, bitmap, cliprect, 160, 191);
+ dhgr_update(screen, bitmap, cliprect, 0, 159);
+ text_update(screen, bitmap, cliprect, 160, 191);
}
else
{
- dhgr_update(screen, bitmap, cliprect, 0, 191);
+ dhgr_update(screen, bitmap, cliprect, 0, 191);
}
break;
}
@@ -793,14 +793,14 @@ WRITE_LINE_MEMBER(laser3k_state::ay3600_data_ready_w)
mod = (m_kbspecial->read() & 0x06) ? 0x01 : 0x00;
mod |= (m_kbspecial->read() & 0x08) ? 0x02 : 0x00;
-// printf("lastchar = %02x\n", m_lastchar & 0x3f);
+// printf("lastchar = %02x\n", m_lastchar & 0x3f);
m_transchar = key_remap[m_lastchar&0x3f][mod];
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);
}
}
}
@@ -865,7 +865,7 @@ static INPUT_PORTS_START( laser3k )
PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a')
PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('\"')
+ PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('\"')
PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_UNUSED)
PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c
index c9797394764..c1e86d3d633 100644
--- a/src/mess/drivers/m5.c
+++ b/src/mess/drivers/m5.c
@@ -243,7 +243,7 @@ WRITE8_MEMBER( m5_state::fd5_tc_w )
static ADDRESS_MAP_START( m5_mem, AS_PROGRAM, 8, m5_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_ROM
- //AM_RANGE(0x2000, 0x6fff) // mapped by the cartslot
+ //AM_RANGE(0x2000, 0x6fff) // mapped by the cartslot
AM_RANGE(0x7000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c
index b1cc5bacb21..8d75eb30f8b 100644
--- a/src/mess/drivers/msx.c
+++ b/src/mess/drivers/msx.c
@@ -1926,8 +1926,8 @@ static MACHINE_CONFIG_DERIVED( cpc50b, msx_ntsc )
// 1? Cartridge slot
// No keyboard?
// No cassette port?
- // No printer port?
-
+ // No printer port?
+
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 3, 1) /* 16KB RAM */
@@ -2142,7 +2142,7 @@ static MACHINE_CONFIG_DERIVED( gfc1080a, msx_ntsc )
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 0, 4) // 64KB RAM
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot2", 3, 0)
-
+
MCFG_FRAGMENT_ADD( msx1_cartlist )
MACHINE_CONFIG_END
@@ -4009,7 +4009,7 @@ static MACHINE_CONFIG_DERIVED( hc6, msx_ntsc )
// AY8910/YM2149?
// FDC: None, 0 drives,
// 2 Cartridge slots?
-
+
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 2, 2) // 32KB RAM
@@ -4029,7 +4029,7 @@ static MACHINE_CONFIG_DERIVED( hc7, msx_ntsc )
// AY8910/YM2149?
// FDC: None, 0 drives,
// 2 Cartridge slots?
-
+
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
MCFG_MSX_LAYOUT_RAM("ram", 2, 0, 0, 4) // 64KB RAM
@@ -4062,7 +4062,7 @@ MACHINE_CONFIG_END
/* MSX - Yamaha CX5F (with SFG05) */
-ROM_START (cx5f)
+ROM_START (cx5f)
ROM_REGION (0x8000, "maincpu", 0)
ROM_LOAD ("cx5fbios.rom", 0x0000, 0x8000, CRC(dc662057) SHA1(36d77d357a5fd15af2ab266ee66e5091ba4770a3))
ROM_END
@@ -6036,30 +6036,30 @@ MACHINE_CONFIG_END
/* MSX2 - Sanyo MPC-2500FD */
ROM_START (mpc2500f)
- ROM_REGION (0x10000, "maincpu", 0)
- ROM_LOAD ("mpc2500fdbios.rom", 0x0000, 0x8000, CRC(e7d08e29) SHA1(0f851ee7a1cf79819f61cc89e9948ee72a413802))
- ROM_LOAD ("mpc2500fdext.rom", 0x8000, 0x4000, CRC(3d7dc718) SHA1(e1f834b28c3ee7c9f79fe6fbf2b23c8a0617892b))
+ ROM_REGION (0x10000, "maincpu", 0)
+ ROM_LOAD ("mpc2500fdbios.rom", 0x0000, 0x8000, CRC(e7d08e29) SHA1(0f851ee7a1cf79819f61cc89e9948ee72a413802))
+ ROM_LOAD ("mpc2500fdext.rom", 0x8000, 0x4000, CRC(3d7dc718) SHA1(e1f834b28c3ee7c9f79fe6fbf2b23c8a0617892b))
ROM_LOAD ("mpc2500fddisk.rom", 0xc000, 0x4000, CRC(38454059) SHA1(58ac78bba29a06645ca8d6a94ef2ac68b743ad32))
ROM_END
static MACHINE_CONFIG_DERIVED( mpc2500f, msx2 )
- // YM2149
- // FDC: wd2793?, 1? 3.5" DSDD drive?
- // 2 Cartridge slots?
+ // YM2149
+ // FDC: wd2793?, 1? 3.5" DSDD drive?
+ // 2 Cartridge slots?
// S-3527 MSX Eninge
- MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
- MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
- MCFG_MSX_LAYOUT_CARTRIDGE("cartslot2", 2, 0)
+ MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
+ MCFG_MSX_LAYOUT_CARTRIDGE("cartslot1", 1, 0)
+ MCFG_MSX_LAYOUT_CARTRIDGE("cartslot2", 2, 0)
MCFG_MSX_LAYOUT_ROM("ext", 2, 3, 0, 1, "maincpu", 0x8000)
MCFG_MSX_LAYOUT_DISK1("disk", 3, 1, 1, 1, "maincpu", 0xC000)
- MCFG_MSX_LAYOUT_RAM_MM("ram_mm", 3, 2, 0x10000) /* 64KB?? Mapper RAM */
+ MCFG_MSX_LAYOUT_RAM_MM("ram_mm", 3, 2, 0x10000) /* 64KB?? Mapper RAM */
MCFG_FRAGMENT_ADD( msx_wd2793_force_ready )
MCFG_FRAGMENT_ADD( msx_1_35_dd_drive )
MCFG_FRAGMENT_ADD( msx2_floplist )
- MCFG_FRAGMENT_ADD( msx2_cartlist )
+ MCFG_FRAGMENT_ADD( msx2_cartlist )
MACHINE_CONFIG_END
/* MSX2 - Sanyo Wavy MPC-25FD */
@@ -7202,7 +7202,7 @@ ROM_START (victhc95a)
ROM_LOAD ("hc95aext.rom", 0x8000, 0x4000, CRC(4a48779c) SHA1(b8e30d604d319d511cbfbc61e5d8c38fbb9c5a33))
ROM_LOAD ("hc95adisk.rom", 0xc000, 0x4000, CRC(11bca2ed) SHA1(a7a34671bddb48fa6c74182e2977f9129558ec32))
ROM_LOAD ("hc95afirm.rom", 0x10000, 0x4000, CRC(53791d91) SHA1(caeffdd654394726c8c0824b21af7ff51c0b1031))
-
+
ROM_REGION (0x20000, "kanji", 0)
ROM_LOAD ("hc95akfn.rom", 0x0000, 0x20000, CRC(d23d4d2d) SHA1(db03211b7db46899df41db2b1dfbec972109a967))
ROM_END
@@ -7215,7 +7215,7 @@ static MACHINE_CONFIG_DERIVED( victhc95a, msx2 )
// 1 Cartridge slot (slot 1 or 2?)
// S-1985 MSX Engine
// V9958 VDP
-
+
MCFG_MSX_LAYOUT_ROM("bios", 0, 0, 0, 2, "maincpu", 0x0000)
MCFG_MSX_LAYOUT_ROM("ext", 0, 1, 0, 1, "maincpu", 0x8000)
MCFG_MSX_LAYOUT_ROM("firm", 0, 1, 1, 1, "maincpu", 0x10000)
@@ -7387,7 +7387,7 @@ ROM_END
static MACHINE_CONFIG_DERIVED( yis604, msx2 )
// YM2149 (in S-3527)
- // FDC: None, 0 drives
+ // FDC: None, 0 drives
// 2 Cartridge slots
// S-3527 MSX Engine
@@ -7398,7 +7398,7 @@ static MACHINE_CONFIG_DERIVED( yis604, msx2 )
MCFG_MSX_LAYOUT_ROM("yrm502", 3, 1, 1, 1, "maincpu", 0xc000)
MCFG_MSX_LAYOUT_RAM_MM("ram_mm", 3, 2, 0x10000) // 64KB Mapper RAM
MCFG_MSX_LAYOUT_YAMAHA_EXPANSION("expansion", 3, 3, "sfg05")
-
+
MCFG_FRAGMENT_ADD( msx2_cartlist )
MACHINE_CONFIG_END
@@ -8433,4 +8433,3 @@ COMP(19??, hbf9sp, 0, 0, hbf9sp, msx2jp, driver_device, 0, "Son
/* Temporary placeholders, Turbo-R hardware is not supported yet */
COMP(19??, fsa1gt, 0, 0, fsa1gt, msx2jp, driver_device, 0, "Panasonic", "FS-A1GT (MSX Turbo-R)", GAME_NOT_WORKING)
COMP(19??, fsa1st, 0, 0, fsa1st, msx2jp, driver_device, 0, "Panasonic", "FS-A1ST (MSX Turbo-R)", GAME_NOT_WORKING)
-
diff --git a/src/mess/drivers/myvision.c b/src/mess/drivers/myvision.c
index 7c4254fbba2..0bbc56f2c78 100644
--- a/src/mess/drivers/myvision.c
+++ b/src/mess/drivers/myvision.c
@@ -66,7 +66,7 @@ private:
static ADDRESS_MAP_START(myvision_mem, AS_PROGRAM, 8, myvision_state)
ADDRESS_MAP_UNMAP_HIGH
- //AM_RANGE(0x0000, 0x5fff) // mapped by the cartslot
+ //AM_RANGE(0x0000, 0x5fff) // mapped by the cartslot
AM_RANGE(0xa000, 0xa7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_DEVREADWRITE("tms9918", tms9918a_device, vram_read, vram_write)
AM_RANGE(0xe002, 0xe002) AM_DEVREADWRITE("tms9918", tms9918a_device, register_read, register_write)
@@ -144,15 +144,15 @@ void myvision_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( myvision_state, cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x4000 && size != 0x6000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index 85295fb2f45..a900f7fc83c 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -801,7 +801,7 @@ void nc_state::machine_start()
m_card_size = m_card_ram->bytes();
else
m_card_size = 0;
-
+
/* keyboard timer */
m_keyboard_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(nc_state::nc_keyboard_timer_callback),this));
m_keyboard_timer->adjust(attotime::from_msec(10));
@@ -1138,14 +1138,14 @@ MACHINE_RESET_MEMBER(nc_state, nc200)
MACHINE_START_MEMBER(nc_state, nc200)
{
m_type = NC_TYPE_200;
-
+
astring region_tag;
m_card_ram = memregion(region_tag.cpy(m_card->tag()).cat(GENERIC_ROM_REGION_TAG));
if (m_card_ram)
m_card_size = m_card_ram->bytes();
else
m_card_size = 0;
-
+
/* keyboard timer */
m_keyboard_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(nc_state::nc_keyboard_timer_callback),this));
m_keyboard_timer->adjust(attotime::from_msec(10));
diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c
index 447d6cedc3e..f9823fa387d 100644
--- a/src/mess/drivers/nes.c
+++ b/src/mess/drivers/nes.c
@@ -752,10 +752,10 @@ void nes_state::setup_disk(nes_disksys_device *slot)
space.install_write_handler(0x6000, 0x7fff, write8_delegate(FUNC(nes_disksys_device::write_m), (nes_disksys_device *)slot));
space.install_read_handler(0x8000, 0xffff, read8_delegate(FUNC(nes_disksys_device::read_h), (nes_disksys_device *)slot));
space.install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(nes_disksys_device::write_h), (nes_disksys_device *)slot));
-
+
slot->vram_alloc(0x2000);
slot->prgram_alloc(0x8000);
-
+
slot->pcb_start(machine(), m_ciram, FALSE);
slot->pcb_reg_postload(machine());
m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(device_nes_cart_interface::chr_r),(device_nes_cart_interface *)slot), write8_delegate(FUNC(device_nes_cart_interface::chr_w),(device_nes_cart_interface *)slot));
@@ -768,7 +768,7 @@ void nes_state::setup_disk(nes_disksys_device *slot)
MACHINE_START_MEMBER( nes_state, fds )
-{
+{
m_ciram = auto_alloc_array(machine(), UINT8, 0x800);
setup_ioports();
setup_disk(m_disk);
@@ -778,14 +778,14 @@ MACHINE_RESET_MEMBER( nes_state, fds )
{
// Reset the mapper variables
m_disk->pcb_reset();
-
+
// the rest is the same as for nes/famicom/dendy
m_maincpu->reset();
-
+
memset(m_pad_latch, 0, sizeof(m_pad_latch));
memset(m_zapper_latch, 0, sizeof(m_zapper_latch));
m_paddle_latch = 0;
- m_paddle_btn_latch = 0;
+ m_paddle_btn_latch = 0;
}
static MACHINE_CONFIG_DERIVED( fds, famicom )
@@ -810,7 +810,7 @@ MACHINE_START_MEMBER( nes_state, famitwin )
if (!m_cartslot->exists())
{
setup_disk(m_disk);
-
+
// replace the famicom disk ROM with the famicom twin one (until we modernize the floppy drive)
m_maincpu->space(AS_PROGRAM).install_read_bank(0xe000, 0xffff, "ftbios");
membank("ftbios")->set_base(machine().root_device().memregion("maincpu")->base() + 0xe000);
@@ -824,14 +824,14 @@ MACHINE_RESET_MEMBER( nes_state, famitwin )
// if there is no cart inserted, initialize the disk expansion instead
if (!m_cartslot->exists())
m_disk->pcb_reset();
-
+
// the rest is the same as for nes/famicom/dendy
m_maincpu->reset();
-
+
memset(m_pad_latch, 0, sizeof(m_pad_latch));
memset(m_zapper_latch, 0, sizeof(m_zapper_latch));
m_paddle_latch = 0;
- m_paddle_btn_latch = 0;
+ m_paddle_btn_latch = 0;
}
static MACHINE_CONFIG_DERIVED( famitwin, famicom )
diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c
index 00dafbee343..d98dfb9c3e7 100644
--- a/src/mess/drivers/ngp.c
+++ b/src/mess/drivers/ngp.c
@@ -136,7 +136,7 @@ public:
m_k1ge(*this, "k1ge"),
m_io_controls(*this, "Controls"),
m_io_power(*this, "Power") ,
- m_maincpu(*this, "maincpu")
+ m_maincpu(*this, "maincpu")
{
m_flash_chip[0].present = 0;
m_flash_chip[0].state = F_READ;
@@ -651,7 +651,7 @@ void ngp_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_bank(0x800000, 0x9fffff, "flash1");
membank("flash0")->set_base(cart);
membank("flash1")->set_base(cart + 0x200000);
-
+
m_flash_chip[0].data = cart;
m_flash_chip[0].org_data[0] = m_flash_chip[0].data[0];
m_flash_chip[0].org_data[1] = m_flash_chip[0].data[1];
@@ -669,7 +669,7 @@ void ngp_state::machine_start()
m_flash_chip[0].org_data[13] = m_flash_chip[0].data[0x1fc001];
m_flash_chip[0].org_data[14] = m_flash_chip[0].data[0x1fc002];
m_flash_chip[0].org_data[15] = m_flash_chip[0].data[0x1fc003];
-
+
m_flash_chip[1].data = cart + 0x200000;
m_flash_chip[1].org_data[0] = m_flash_chip[1].data[0];
m_flash_chip[1].org_data[1] = m_flash_chip[1].data[1];
@@ -739,17 +739,17 @@ UINT32 ngp_state::screen_update_ngp(screen_device &screen, bitmap_ind16 &bitmap,
DEVICE_IMAGE_LOAD_MEMBER( ngp_state, ngp_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x8000 && size != 0x80000 && size != 0x100000 && size != 0x200000 && size != 0x400000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
// alloc 0x400000 ROM to simplify mapping in the address map
m_cart->rom_alloc(0x400000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
//printf("%2x%2x - %x - %x\n", (unsigned int) memregion("cart")->u8(0x20), (unsigned int) memregion("cart")->u8(0x21),
// (unsigned int) memregion("cart")->u8(0x22), (unsigned int) memregion("cart")->u8(0x23));
m_flash_chip[0].manufacturer_id = 0x98;
diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c
index 5b846a537b3..c6b4f23c81a 100644
--- a/src/mess/drivers/pc2000.c
+++ b/src/mess/drivers/pc2000.c
@@ -759,7 +759,7 @@ void gl4004_state::machine_start()
UINT8 *cart = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG))->base();
if (!cart)
cart = memregion("bios")->base();
-
+
m_bank0->configure_entries(0, 0x20, bios, 0x4000);
m_bank1->configure_entries(0, 0x20, bios, 0x4000);
m_bank2->configure_entries(0, 0x20, bios, 0x4000);
@@ -814,8 +814,8 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart )
// we always allocate a 0x40000 region, even if most carts span only 0x20000,
// because the bankswitch code accesses up to 16 x 16K banks...
m_cart->rom_alloc(0x40000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c
index 399cb47ee4e..f86f592bd36 100644
--- a/src/mess/drivers/pc6001.c
+++ b/src/mess/drivers/pc6001.c
@@ -922,7 +922,7 @@ WRITE8_MEMBER(pc6001_state::nec_ppi8255_w)
static ADDRESS_MAP_START(pc6001_map, AS_PROGRAM, 8, pc6001_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP
- //AM_RANGE(0x4000, 0x5fff) // mapped by the cartslot
+ //AM_RANGE(0x4000, 0x5fff) // mapped by the cartslot
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xffff) AM_RAM AM_SHARE("ram")
ADDRESS_MAP_END
@@ -1639,7 +1639,7 @@ WRITE8_MEMBER(pc6001_state::necsr_ppi8255_w)
if(0)
{
//printf("%02x\n",data);
-
+
if ((data & 0x0f) == 0x05 && m_cart_rom)
m_bank1->set_base(m_cart_rom->base() + 0x2000);
if ((data & 0x0f) == 0x04)
@@ -2074,13 +2074,13 @@ void pc6001_state::machine_start()
void pc6001_state::machine_reset()
{
m_video_ram = m_region_maincpu->base() + 0xc000;
-
+
if (m_cart->exists())
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x5fff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
m_port_c_8255=0;
m_cas_switch = 0;
@@ -2095,13 +2095,13 @@ void pc6001_state::machine_reset()
MACHINE_RESET_MEMBER(pc6001_state,pc6001m2)
{
m_video_ram = m_region_maincpu->base() + 0xc000 + 0x28000;
-
+
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
// hackish way to simplify bankswitch handling
if (m_cart_rom)
memcpy(m_region_maincpu->base() + 0x48000, m_cart_rom->base(), 0x4000);
-
+
m_port_c_8255=0;
m_cas_switch = 0;
@@ -2134,11 +2134,11 @@ MACHINE_RESET_MEMBER(pc6001_state,pc6001m2)
MACHINE_RESET_MEMBER(pc6001_state,pc6001sr)
{
m_video_ram = m_region_maincpu->base() + 0x70000;
-
+
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
// should this be mirrored into the EXROM regions? hard to tell without an actual cart dump...
-
+
m_port_c_8255=0;
m_cas_switch = 0;
diff --git a/src/mess/drivers/pc8401a.c b/src/mess/drivers/pc8401a.c
index a4f07f39e5c..b5c1ef4cd4b 100644
--- a/src/mess/drivers/pc8401a.c
+++ b/src/mess/drivers/pc8401a.c
@@ -521,7 +521,7 @@ void pc8401a_state::machine_start()
/* bank switch */
bankswitch(0);
-
+
/* register for state saving */
save_item(NAME(m_mmr));
save_item(NAME(m_io_addr));
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index 7f3c206f1c1..c40661dee40 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -38,9 +38,9 @@
- Dies on ARTIC check;
- Presumably one ROM is undumped?
- TODO: (PC-9821AP)
- - No way to exit the initial loop. Code looks broken/bad dump?
-
+ TODO: (PC-9821AP)
+ - No way to exit the initial loop. Code looks broken/bad dump?
+
floppy issues TODO (certain fail)
- Unsupported disk types: *.nfd, *.fdd, *.nhd
- 46 Okunen Monogatari - The Shinkaron
@@ -553,7 +553,7 @@ public:
UINT8 m_joy_sel;
UINT8 m_ext2_ff;
UINT8 m_sys_type;
-
+
DECLARE_WRITE_LINE_MEMBER( keyboard_irq );
DECLARE_WRITE_LINE_MEMBER( write_uart_clock );
DECLARE_READ8_MEMBER(pc9801_xx_r);
@@ -702,7 +702,7 @@ public:
DECLARE_MACHINE_START(pc9801bx2);
DECLARE_MACHINE_START(pc9821);
DECLARE_MACHINE_START(pc9821ap2);
-
+
DECLARE_MACHINE_RESET(pc9801_common);
DECLARE_MACHINE_RESET(pc9801f);
DECLARE_MACHINE_RESET(pc9801rs);
@@ -1938,7 +1938,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_knjram_w)
WRITE8_MEMBER(pc9801_state::pc9801rs_bank_w)
{
if(offset == 1)
- {
+ {
if((data & 0xf0) == 0x00 || (data & 0xf0) == 0x10)
{
if((data & 0xed) == 0x00)
@@ -3375,7 +3375,7 @@ MACHINE_START_MEMBER(pc9801_state,pc9821)
MACHINE_START_MEMBER(pc9801_state,pc9821ap2)
{
MACHINE_START_CALL_MEMBER(pc9821);
-
+
// ...
}
@@ -3891,7 +3891,7 @@ static MACHINE_CONFIG_DERIVED( pc9821ap2, pc9821)
MCFG_CPU_IO_MAP(pc9821_io)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pc9801_state, pc9801_vrtc_irq)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
-
+
MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9821ap2)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c
index 068ca37ea14..37ec17917b8 100644
--- a/src/mess/drivers/pegasus.c
+++ b/src/mess/drivers/pegasus.c
@@ -95,7 +95,7 @@ public:
DECLARE_DRIVER_INIT(pegasus);
TIMER_DEVICE_CALLBACK_MEMBER(pegasus_firq);
void pegasus_decrypt_rom(UINT8 *ROM, bool force_decrypt);
-
+
int load_cart(device_image_interface &image, generic_slot_device *slot, const char *reg_tag);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp00_load) { return load_cart(image, m_exp_00, "0000"); }
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(exp01_load) { return load_cart(image, m_exp_01, "1000"); }
@@ -183,10 +183,10 @@ READ8_MEMBER( pegasus_state::pegasus_protection_r )
static ADDRESS_MAP_START(pegasus_mem, AS_PROGRAM, 8, pegasus_state)
ADDRESS_MAP_UNMAP_HIGH
- //AM_RANGE(0x0000, 0x2fff) // mapped by the cartslots 1-3
+ //AM_RANGE(0x0000, 0x2fff) // mapped by the cartslots 1-3
AM_RANGE(0xb000, 0xbdff) AM_RAM
AM_RANGE(0xbe00, 0xbfff) AM_RAM AM_SHARE("p_videoram")
- //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslots 4-5
+ //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslots 4-5
AM_RANGE(0xe000, 0xe1ff) AM_READ(pegasus_protection_r)
AM_RANGE(0xe200, 0xe3ff) AM_READWRITE(pegasus_pcg_r,pegasus_pcg_w)
AM_RANGE(0xe400, 0xe403) AM_MIRROR(0x1fc) AM_DEVREADWRITE("pia_u", pia6821_device, read, write)
@@ -413,13 +413,13 @@ int pegasus_state::load_cart(device_image_interface &image, generic_slot_device
{
UINT32 size = slot->common_get_size(reg_tag);
bool any_socket = false;
-
+
if (size > 0x1000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
if (image.software_entry() != NULL && size == 0)
{
// we might be loading a cart compatible with all sockets!
@@ -436,12 +436,12 @@ int pegasus_state::load_cart(device_image_interface &image, generic_slot_device
}
}
- slot->rom_alloc(0x1000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // we alloc 0x1000 also for smaller roms!
+ slot->rom_alloc(0x1000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE); // we alloc 0x1000 also for smaller roms!
slot->common_load_rom(slot->get_rom_base(), size, any_socket ? "rom" : reg_tag);
-
+
// raw images have to be decrypted (in particular the ones from softlist)
pegasus_decrypt_rom(slot->get_rom_base(), image.software_entry() != NULL);
-
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/pencil2.c b/src/mess/drivers/pencil2.c
index bbb45718380..bcffa59c4f8 100644
--- a/src/mess/drivers/pencil2.c
+++ b/src/mess/drivers/pencil2.c
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START(pencil2_mem, AS_PROGRAM, 8, pencil2_state)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x5fff) AM_WRITENOP // stop error log filling up
AM_RANGE(0x6000, 0x67ff) AM_MIRROR(0x1800) AM_RAM
- //AM_RANGE(0x8000, 0xffff) // mapped by the cartslot
+ //AM_RANGE(0x8000, 0xffff) // mapped by the cartslot
ADDRESS_MAP_END
static ADDRESS_MAP_START(pencil2_io, AS_IO, 8, pencil2_state)
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index 0f982885a23..09f4dca6c9b 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -248,7 +248,7 @@ READ8_MEMBER( pet_state::read )
data = m_rom->base()[offset - 0x9000];
}
break;
-
+
case SELB:
if (norom)
{
@@ -258,7 +258,7 @@ READ8_MEMBER( pet_state::read )
data = m_rom->base()[offset - 0x9000];
}
break;
-
+
case SELC: case SELD: case SELF:
if (norom)
{
diff --git a/src/mess/drivers/pockstat.c b/src/mess/drivers/pockstat.c
index 64bdc7dae4e..cb599de0751 100644
--- a/src/mess/drivers/pockstat.c
+++ b/src/mess/drivers/pockstat.c
@@ -961,7 +961,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash )
if (size != 0x20f40)
return IMAGE_INIT_FAIL;
-
+
image.fread(cart_id, 0xf40);
for (int i = 0; i < strlen(gme_id); i++)
diff --git a/src/mess/drivers/pokemini.c b/src/mess/drivers/pokemini.c
index 14a3a87de59..a12452db818 100644
--- a/src/mess/drivers/pokemini.c
+++ b/src/mess/drivers/pokemini.c
@@ -56,7 +56,7 @@ public:
m_speaker(*this, "speaker"),
m_i2cmem(*this, "i2cmem"),
m_cart(*this, "cartslot"),
- m_inputs(*this, "INPUTS")
+ m_inputs(*this, "INPUTS")
{ }
UINT8 m_pm_reg[0x100];
@@ -1506,7 +1506,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pokemini_state, pokemini_cart )
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM image: ROM image is too small");
return IMAGE_INIT_FAIL;
}
-
+
/* Verify that the image is not too big */
if (size > 0x1fffff)
{
@@ -1515,7 +1515,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pokemini_state, pokemini_cart )
}
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c
index 3f5c0a6b6f8..e163f1539df 100644
--- a/src/mess/drivers/pt68k4.c
+++ b/src/mess/drivers/pt68k4.c
@@ -9,21 +9,21 @@
2014-01-03 Connect real DUARTs, FDC, and TimeKeeper. Settings now save properly, floppies can be read.
2014-01-19 ISA bus and compatible cards, PC keyboard support, speaker support
2014-09-20 Add PT68K2, add save states, we have a working SK*DOS disk!
-
+
This has the appearance of a PC, including pc power supply, slots, etc
on a conventional pc-like motherboard and case.
Some pics: http://www.wormfood.net/old_computers/
-
-Source code and manuals for the HUMBUG BIOS and SK*DOS are at:
-http://www.users.cloud9.net/~stark/sources.html
-
-Usage:
+
+Source code and manuals for the HUMBUG BIOS and SK*DOS are at:
+http://www.users.cloud9.net/~stark/sources.html
+
+Usage:
Start up and press Enter as prompted. Type he to see a command list, or fd to boot from the
first floppy drive.
-
+
The stock NVRAM configures PT68k2 for 2 DSDD 5.25" drives, and PT68k4 for 2 DSHD 5.25" drives.
-
+
Chips:
68230 Parallel Interface/Timer @ FE0081
68681 DUART/Timer (x2) @ FE0001 and FE0041
@@ -48,9 +48,9 @@ IRQs:
5: DUART1
6: PC FDC IRQ
-TODO: 68230 device
- This system and SK*DOS don't like our ISA WDXT-GEN emulation so HDD installs are not currently possible.
-
+TODO: 68230 device
+ This system and SK*DOS don't like our ISA WDXT-GEN emulation so HDD installs are not currently possible.
+
****************************************************************************/
#include "emu.h"
@@ -73,7 +73,7 @@ TODO: 68230 device
#define ISABUS_TAG "isa"
#define KBDC_TAG "pc_kbdc"
#define SPEAKER_TAG "speaker"
-#define WDFDC_TAG "wdfdc"
+#define WDFDC_TAG "wdfdc"
class pt68k4_state : public driver_device
{
@@ -219,11 +219,11 @@ WRITE8_MEMBER(pt68k4_state::fdc_select_w)
switch (drive)
{
case 0:
- floppy->ss_w((data & 0x40) ? 1 : 0);
+ floppy->ss_w((data & 0x40) ? 1 : 0);
break;
case 1:
- floppy2->ss_w((data & 0x40) ? 1 : 0);
+ floppy2->ss_w((data & 0x40) ? 1 : 0);
break;
default:
@@ -381,7 +381,7 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_START( pt68k2, pt68k4_state )
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz/2) // 68k2 came in 8, 10, and 12 MHz versions
+ MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz/2) // 68k2 came in 8, 10, and 12 MHz versions
MCFG_CPU_PROGRAM_MAP(pt68k2_mem)
MCFG_MC68681_ADD("duart1", XTAL_3_6864MHz)
@@ -459,8 +459,8 @@ MACHINE_CONFIG_END
/* ROM definition */
ROM_START( pt68k2 )
ROM_REGION16_BE( 0x10000, "roms", 0 )
- ROM_LOAD16_BYTE( "hum_u20.bin", 0x000000, 0x008000, CRC(69db483a) SHA1(9dfea73e4d7deef7c66a27cca92eb7c9ff767215) )
- ROM_LOAD16_BYTE( "hum_u27.bin", 0x000001, 0x008000, CRC(54441b06) SHA1(0e2d63b1cd01f88f37fc4859c11c252c4fea220b) )
+ ROM_LOAD16_BYTE( "hum_u20.bin", 0x000000, 0x008000, CRC(69db483a) SHA1(9dfea73e4d7deef7c66a27cca92eb7c9ff767215) )
+ ROM_LOAD16_BYTE( "hum_u27.bin", 0x000001, 0x008000, CRC(54441b06) SHA1(0e2d63b1cd01f88f37fc4859c11c252c4fea220b) )
ROM_REGION(0x800, TIMEKEEPER_TAG, 0)
ROM_LOAD( "u21_ds1220.bin", 0x000000, 0x000800, CRC(7a6b75ce) SHA1(07663860aa6cc21aed04a568ff9c05bc75d62e4f) )
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index bf3118263f5..5dff81ea8e1 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -185,7 +185,7 @@ public:
static ADDRESS_MAP_START( pv1000, AS_PROGRAM, 8, pv1000_state )
- //AM_RANGE(0x0000, 0x7fff) // mapped by the cartslot
+ //AM_RANGE(0x0000, 0x7fff) // mapped by the cartslot
AM_RANGE(0xb800, 0xbbff) AM_RAM AM_SHARE("p_videoram")
AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE(gfxram_w) AM_REGION("gfxram", 0)
ADDRESS_MAP_END
@@ -312,16 +312,16 @@ PALETTE_INIT_MEMBER(pv1000_state, pv1000)
DEVICE_IMAGE_LOAD_MEMBER( pv1000_state, pv1000_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x2000 && size != 0x4000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
@@ -407,7 +407,7 @@ void pv1000_state::machine_start()
// FIXME: this is needed for gfx decoding, but there is probably a cleaner solution!
astring region_tag;
memcpy(memregion("gfxrom")->base(), memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG))->base(), m_cart->get_rom_size());
- }
+ }
save_item(NAME(m_io_regs));
save_item(NAME(m_fd_data));
diff --git a/src/mess/drivers/pv2000.c b/src/mess/drivers/pv2000.c
index 8f4bf1e76fd..11719fdb074 100644
--- a/src/mess/drivers/pv2000.c
+++ b/src/mess/drivers/pv2000.c
@@ -179,7 +179,7 @@ static ADDRESS_MAP_START( pv2000_map, AS_PROGRAM, 8, pv2000_state )
AM_RANGE(0x7000, 0x7fff) AM_RAM
//AM_RANGE(0x8000, 0xbfff) ext ram?
- //AM_RANGE(0xc000, 0xffff) // mapped by the cartslot
+ //AM_RANGE(0xc000, 0xffff) // mapped by the cartslot
ADDRESS_MAP_END
@@ -361,16 +361,16 @@ void pv2000_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x2000 && size != 0x4000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index 3a334a72268..c12443405d6 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -259,7 +259,7 @@ WRITE8_MEMBER( rx78_state::vdp_pri_mask_w )
static ADDRESS_MAP_START(rx78_mem, AS_PROGRAM, 8, rx78_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_ROM
- //AM_RANGE(0x2000, 0x5fff) // mapped by the cartslot
+ //AM_RANGE(0x2000, 0x5fff) // mapped by the cartslot
AM_RANGE(0x6000, 0xafff) AM_RAM //ext RAM
AM_RANGE(0xb000, 0xebff) AM_RAM
AM_RANGE(0xec00, 0xffff) AM_READWRITE(rx78_vram_r, rx78_vram_w)
@@ -409,7 +409,7 @@ INPUT_PORTS_END
void rx78_state::machine_reset()
{
- address_space &prg = m_maincpu->space(AS_PROGRAM);
+ address_space &prg = m_maincpu->space(AS_PROGRAM);
if (m_cart->exists())
prg.install_read_handler(0x2000, 0x5fff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
}
@@ -417,16 +417,16 @@ void rx78_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( rx78_state, rx78_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x2000 && size != 0x4000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/scv.c b/src/mess/drivers/scv.c
index 9ee007a2550..f14e795a0cc 100644
--- a/src/mess/drivers/scv.c
+++ b/src/mess/drivers/scv.c
@@ -64,13 +64,13 @@ protected:
static ADDRESS_MAP_START( scv_mem, AS_PROGRAM, 8, scv_state )
- AM_RANGE( 0x0000, 0x0fff ) AM_ROM // BIOS
+ AM_RANGE( 0x0000, 0x0fff ) AM_ROM // BIOS
AM_RANGE( 0x2000, 0x3403 ) AM_RAM AM_SHARE("videoram") // VRAM + 4 registers
AM_RANGE( 0x3600, 0x3600 ) AM_DEVWRITE("upd1771c", upd1771c_device, write)
- AM_RANGE( 0x8000, 0xff7f ) AM_DEVREADWRITE("cartslot", scv_cart_slot_device, read_cart, write_cart) // cartridge
- AM_RANGE( 0xff80, 0xffff ) AM_RAM // upd7801 internal RAM
+ AM_RANGE( 0x8000, 0xff7f ) AM_DEVREADWRITE("cartslot", scv_cart_slot_device, read_cart, write_cart) // cartridge
+ AM_RANGE( 0xff80, 0xffff ) AM_RAM // upd7801 internal RAM
ADDRESS_MAP_END
diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c
index f7e90cc6c3d..9d9bad38b88 100644
--- a/src/mess/drivers/socrates.c
+++ b/src/mess/drivers/socrates.c
@@ -319,7 +319,7 @@ void socrates_state::machine_reset()
{
astring region_tag;
m_cart_reg = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
m_rom_bank = 0xF3; // actually set semi-randomly on real console but we need to initialize it somewhere...
socrates_set_rom_bank();
m_ram_bank = 0; // the actual console sets it semi randomly on power up, and the bios cleans it up.
@@ -898,7 +898,7 @@ void iqunlim_state::machine_start()
{
astring region_tag;
m_cart_reg = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
UINT8 *bios = m_bios_reg->base();
UINT8 *cart = m_cart_reg ? m_cart_reg->base() : m_bios_reg->base();
UINT8 *ram = m_vram_reg->base();
diff --git a/src/mess/drivers/sorcerer.c b/src/mess/drivers/sorcerer.c
index 804be385a10..05c320acf7b 100644
--- a/src/mess/drivers/sorcerer.c
+++ b/src/mess/drivers/sorcerer.c
@@ -163,7 +163,7 @@ static ADDRESS_MAP_START( sorcerer_mem, AS_PROGRAM, 8, sorcerer_state)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot")
AM_RANGE(0x0800, 0xbfff) AM_RAM
- //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslot
+ //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslot
AM_RANGE(0xe000, 0xefff) AM_ROM /* rom pac and bios */
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_REGION("maincpu", 0xf000) /* screen ram */
AM_RANGE(0xf800, 0xfbff) AM_ROM /* char rom */
@@ -176,7 +176,7 @@ static ADDRESS_MAP_START( sorcererd_mem, AS_PROGRAM, 8, sorcerer_state)
AM_RANGE(0x0800, 0xbbff) AM_RAM
AM_RANGE(0xbc00, 0xbcff) AM_ROM
AM_RANGE(0xbe00, 0xbe03) AM_DEVREADWRITE("fdc", micropolis_device, read, write)
- //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslot
+ //AM_RANGE(0xc000, 0xdfff) // mapped by the cartslot
AM_RANGE(0xe000, 0xefff) AM_ROM /* rom pac and bios */
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_REGION("maincpu", 0xf000) /* screen ram */
AM_RANGE(0xf800, 0xfbff) AM_ROM /* char rom */
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index 31aa390010a..dcfb79dca44 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -70,7 +70,7 @@ public:
DECLARE_READ8_MEMBER(fdc_8255_c_r);
DECLARE_WRITE8_MEMBER(fdc_8255_c_w);
DECLARE_READ8_MEMBER( upd765_tc_r );
- DECLARE_WRITE8_MEMBER( fdc_control_w );
+ DECLARE_WRITE8_MEMBER( fdc_control_w );
MC6847_GET_CHARROM_MEMBER(get_char_rom)
{
return m_p_videoram[0x1000 + (ch & 0x7f) * 16 + line];
@@ -85,27 +85,27 @@ private:
virtual void machine_reset();
required_device<mc6847_base_device> m_vdg;
required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_fdccpu;
- required_device<upd765a_device> m_fdc;
+ required_device<cpu_device> m_fdccpu;
+ required_device<upd765a_device> m_fdc;
required_device<i8255_device> m_pio;
required_device<ram_device> m_ram;
required_device<cassette_image_device> m_cass;
floppy_image_device *m_fd0;
floppy_image_device *m_fd1;
-
- emu_timer *m_timer_tc;
-
+
+ emu_timer *m_timer_tc;
+
UINT8 m_i8255_0_pc;
UINT8 m_i8255_1_pc;
UINT8 m_i8255_portb;
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
void spc1000_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- m_fdc->tc_w(false);
+ m_fdc->tc_w(false);
}
static ADDRESS_MAP_START(spc1000_mem, AS_PROGRAM, 8, spc1000_state )
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( spc1000_io , AS_IO, 8, spc1000_state )
AM_RANGE(0x8009, 0x8009) AM_READ_PORT("LINE9")
AM_RANGE(0xA000, 0xA000) AM_READWRITE(spc1000_iplk_r, spc1000_iplk_w)
AM_RANGE(0xC000, 0xC002) AM_READWRITE(spc1000_sd725_r, spc1000_sd725_w)
-// AM_RANGE(0xC000, 0xC003) AM_DEVREADWRITE("d8255_master", i8255_device, read, write)
+// AM_RANGE(0xC000, 0xC003) AM_DEVREADWRITE("d8255_master", i8255_device, read, write)
ADDRESS_MAP_END
/* Input ports */
@@ -342,7 +342,7 @@ static INPUT_PORTS_START( spc1000 )
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I') PORT_CHAR(0x09)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8 (") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
PORT_START("LINE9")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_START) PORT_NAME("IPL") PORT_CODE(KEYCODE_END)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_START) PORT_NAME("IPL") PORT_CODE(KEYCODE_END)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("- =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')
@@ -369,20 +369,20 @@ void spc1000_state::machine_reset()
membank("bank2")->set_base(ram);
membank("bank3")->set_base(mem);
membank("bank4")->set_base(ram + 0x8000);
-
+
m_work_ram = auto_alloc_array_clear(machine(), UINT8, 0x10000);
m_fdccpu->set_input_line_vector(0, 0);
-
+
m_fd0 = machine().device<floppy_connector>("upd765:0")->get_device();
m_fd1 = machine().device<floppy_connector>("upd765:1")->get_device();
- m_timer_tc = timer_alloc(1, NULL);
+ m_timer_tc = timer_alloc(1, NULL);
m_timer_tc->adjust(attotime::never);
// enable rom
- m_fdccpu->space(AS_PROGRAM).install_rom(0x0000, 0xfff, 0, 0x2000, memregion("rom")->base());
-
- m_IPLK = 1;
+ m_fdccpu->space(AS_PROGRAM).install_rom(0x0000, 0xfff, 0, 0x2000, memregion("rom")->base());
+
+ m_IPLK = 1;
}
READ8_MEMBER(spc1000_state::mc6847_videoram_r)
@@ -452,23 +452,23 @@ static MACHINE_CONFIG_START( spc1000, spc1000_state )
MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(sd725_mem)
MCFG_CPU_IO_MAP(sd725_io)
-
+
MCFG_DEVICE_ADD("d8255_master", I8255, 0)
MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_master", i8255_device, pb_r))
MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_master", i8255_device, pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spc1000_state, fdc_8255_b_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(spc1000_state, fdc_8255_b_w))
MCFG_I8255_IN_PORTC_CB(READ8(spc1000_state, fdc_8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spc1000_state, fdc_8255_c_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(spc1000_state, fdc_8255_c_w))
// floppy disk controller
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("fdccpu", INPUT_LINE_IRQ0))
+ MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("fdccpu", INPUT_LINE_IRQ0))
// floppy drives
MCFG_FLOPPY_DRIVE_ADD("upd765:0", sd725_floppies, "sd320", floppy_image_device::default_floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD("upd765:1", sd725_floppies, "sd320", floppy_image_device::default_floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("upd765:1", sd725_floppies, "sd320", floppy_image_device::default_floppy_formats)
//CFG_SOFTWARE_LIST_ADD("disk_list","spc1000_flop")
-
+
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
@@ -501,8 +501,8 @@ ROM_START( spc1000 )
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD( "spcall.rom", 0x0000, 0x8000, CRC(19638fc9) SHA1(489f1baa7aebf3c8c660325fb1fd790d84203284))
- ROM_REGION( 0x10000, "fdccpu", 0)
- ROM_LOAD("sd725a.bin", 0x0000, 0x1000, CRC(96ac2eb8) SHA1(8e9d8f63a7fb87af417e95603e71cf537a6e83f1))
+ ROM_REGION( 0x10000, "fdccpu", 0)
+ ROM_LOAD("sd725a.bin", 0x0000, 0x1000, CRC(96ac2eb8) SHA1(8e9d8f63a7fb87af417e95603e71cf537a6e83f1))
ROM_END
#if 0
diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c
index 3e4502bd780..cc761d7a5c6 100644
--- a/src/mess/drivers/specpls3.c
+++ b/src/mess/drivers/specpls3.c
@@ -217,13 +217,13 @@ void spectrum_state::spectrum_plus3_update_memory()
int ram_page = m_port_7ffd_data & 0x07;
unsigned char *ram_data = messram + (ram_page<<14);
membank("bank4")->set_base(ram_data);
-
+
logerror("RAM at 0xc000: %02x\n", ram_page);
-
+
/* Reset memory between 0x4000 - 0xbfff in case extended paging was being used */
/* Bank 5 in 0x4000 - 0x7fff */
membank("bank2")->set_base(messram + (5 << 14));
-
+
/* Bank 2 in 0x8000 - 0xbfff */
membank("bank3")->set_base(messram + (2 << 14));
@@ -231,13 +231,13 @@ void spectrum_state::spectrum_plus3_update_memory()
{
/* ROM switching */
int ROMSelection = BIT(m_port_7ffd_data, 4) | ((m_port_1ffd_data >> 1) & 0x02);
-
+
/* rom 0 is editor, rom 1 is syntax, rom 2 is DOS, rom 3 is 48 BASIC */
unsigned char *ChosenROM = memregion("maincpu")->base() + 0x010000 + (ROMSelection << 14);
-
+
membank("bank1")->set_base(ChosenROM);
space.unmap_write(0x0000, 0x3fff);
-
+
logerror("rom switch: %02x\n", ROMSelection);
}
}
@@ -247,20 +247,20 @@ void spectrum_state::spectrum_plus3_update_memory()
int MemorySelection = (m_port_1ffd_data >> 1) & 0x03;
const int *memory_selection = &spectrum_plus3_memory_selections[(MemorySelection << 2)];
unsigned char *ram_data = messram + (memory_selection[0] << 14);
-
+
membank("bank1")->set_base(ram_data);
/* allow writes to 0x0000-0x03fff */
space.install_write_bank(0x0000, 0x3fff, "bank1");
-
+
ram_data = messram + (memory_selection[1] << 14);
membank("bank2")->set_base(ram_data);
-
+
ram_data = messram + (memory_selection[2] << 14);
membank("bank3")->set_base(ram_data);
-
+
ram_data = messram + (memory_selection[3] << 14);
membank("bank4")->set_base(ram_data);
-
+
logerror("extended memory paging: %02x\n", MemorySelection);
}
}
diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c
index 545bb649ec7..5ecfdbb1ad6 100644
--- a/src/mess/drivers/spectrum.c
+++ b/src/mess/drivers/spectrum.c
@@ -654,16 +654,16 @@ INTERRUPT_GEN_MEMBER(spectrum_state::spec_interrupt)
DEVICE_IMAGE_LOAD_MEMBER(spectrum_state, spectrum_cart)
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x4000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/studio2.c b/src/mess/drivers/studio2.c
index 822808ed027..6c731019253 100644
--- a/src/mess/drivers/studio2.c
+++ b/src/mess/drivers/studio2.c
@@ -201,7 +201,7 @@ Notes:
class studio2_state : public driver_device
{
public:
-
+
studio2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, CDP1802_TAG),
@@ -213,7 +213,7 @@ public:
m_b(*this, "B"),
m_screen(*this, "screen")
{ }
-
+
required_device<cosmac_device> m_maincpu;
required_device<beep_device> m_beeper;
optional_device<cdp1861_device> m_vdc;
@@ -222,10 +222,10 @@ public:
required_ioport m_a;
required_ioport m_b;
required_device<screen_device> m_screen;
-
+
virtual void machine_start();
virtual void machine_reset();
-
+
DECLARE_READ8_MEMBER( cart_400 );
DECLARE_READ8_MEMBER( cart_a00 );
DECLARE_READ8_MEMBER( cart_e00 );
@@ -238,7 +238,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( q_w );
DECLARE_INPUT_CHANGED_MEMBER( reset_w );
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( studio2_cart_load );
-
+
/* keyboard state */
UINT8 m_keylatch;
DECLARE_DRIVER_INIT(studio2);
@@ -252,12 +252,12 @@ public:
m_color0_ram(*this, "color0_ram"),
m_color1_ram(*this, "color1_ram")
{ }
-
+
virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
+
required_shared_ptr<UINT8> m_color0_ram;
required_shared_ptr<UINT8> m_color1_ram;
-
+
DECLARE_WRITE8_MEMBER( dma_w );
};
@@ -269,18 +269,18 @@ public:
m_cti(*this, CDP1864_TAG),
m_color_ram(*this, "color_ram")
{ }
-
+
required_device<cdp1864_device> m_cti;
-
+
virtual void machine_start();
virtual void machine_reset();
-
+
DECLARE_READ8_MEMBER( cart_c00 );
DECLARE_WRITE8_MEMBER( dma_w );
DECLARE_READ_LINE_MEMBER( rdata_r );
DECLARE_READ_LINE_MEMBER( bdata_r );
DECLARE_READ_LINE_MEMBER( gdata_r );
-
+
/* video state */
required_shared_ptr<UINT8> m_color_ram;
UINT8 m_color;
@@ -511,7 +511,7 @@ void mpt02_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400, 0x07ff, read8_delegate(FUNC(studio2_state::cart_400), this));
m_maincpu->space(AS_PROGRAM).install_read_handler(0x0c00, 0x0fff, read8_delegate(FUNC(mpt02_state::cart_c00), this));
}
-
+
// register for state saving
save_item(NAME(m_keylatch));
}
@@ -529,10 +529,10 @@ void mpt02_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
{
UINT32 size;
-
+
// always alloc 3K, even if range $400-$600 is not read by the system (RAM is present there)
m_cart->rom_alloc(0xc00, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
-
+
if (image.software_entry() == NULL)
{
if (!strcmp(image.filetype(), "st2"))
@@ -540,8 +540,8 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
UINT8 header[0x100];
UINT8 catalogue[10], title[32], pages[64];
UINT8 blocks;
-
- if (image.length() <= 0x100)
+
+ if (image.length() <= 0x100)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid ROM file");
return IMAGE_INIT_FAIL;
@@ -560,7 +560,7 @@ DEVICE_IMAGE_LOAD_MEMBER( studio2_state, studio2_cart_load )
memcpy(&catalogue, &header[16], 10);
memcpy(&title, &header[32], 32);
memcpy(&pages, &header[64], 64);
-
+
/* read ST2 cartridge into memory */
for (int block = 0; block < (blocks - 1); block++)
{
diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c
index b025f1570f6..3a1e60accef 100644
--- a/src/mess/drivers/supracan.c
+++ b/src/mess/drivers/supracan.c
@@ -1125,7 +1125,7 @@ WRITE16_MEMBER( supracan_state::vram_w )
}
static ADDRESS_MAP_START( supracan_mem, AS_PROGRAM, 16, supracan_state )
- //AM_RANGE( 0x000000, 0x3fffff ) // mapped by the cartslot
+ //AM_RANGE( 0x000000, 0x3fffff ) // mapped by the cartslot
AM_RANGE( 0xe80200, 0xe80201 ) AM_READ_PORT("P1")
AM_RANGE( 0xe80202, 0xe80203 ) AM_READ_PORT("P2")
AM_RANGE( 0xe80208, 0xe80209 ) AM_READ_PORT("P3")
@@ -1754,7 +1754,7 @@ WRITE16_MEMBER( supracan_state::video_w )
DEVICE_IMAGE_LOAD_MEMBER( supracan_state, supracan_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size > 0x400000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
@@ -1762,8 +1762,8 @@ DEVICE_IMAGE_LOAD_MEMBER( supracan_state, supracan_cart )
}
m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_BIG);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/sv8000.c b/src/mess/drivers/sv8000.c
index 597156c5030..1f9925c7a91 100644
--- a/src/mess/drivers/sv8000.c
+++ b/src/mess/drivers/sv8000.c
@@ -94,7 +94,7 @@ private:
static ADDRESS_MAP_START(sv8000_mem, AS_PROGRAM, 8, sv8000_state)
ADDRESS_MAP_UNMAP_HIGH
- //AM_RANGE(0x0000, 0x0fff) // mapped by the cartslot
+ //AM_RANGE(0x0000, 0x0fff) // mapped by the cartslot
AM_RANGE( 0x8000, 0x83ff ) AM_RAM // Work RAM??
AM_RANGE( 0xc000, 0xcbff ) AM_RAM AM_SHARE("videoram")
ADDRESS_MAP_END
@@ -197,16 +197,16 @@ void sv8000_state::machine_reset()
DEVICE_IMAGE_LOAD_MEMBER( sv8000_state, cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size != 0x1000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Incorrect or not support cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/svision.c b/src/mess/drivers/svision.c
index 88e657ec2c8..f92f5b7cc0b 100644
--- a/src/mess/drivers/svision.c
+++ b/src/mess/drivers/svision.c
@@ -452,16 +452,16 @@ DRIVER_INIT_MEMBER(svision_state, svisions)
DEVICE_IMAGE_LOAD_MEMBER( svision_state, svision_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
if (size > 0x20000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c
index 1ad8eacabce..3db601fcccf 100644
--- a/src/mess/drivers/thomson.c
+++ b/src/mess/drivers/thomson.c
@@ -1093,7 +1093,7 @@ static MACHINE_CONFIG_DERIVED( mo5, to7 )
MCFG_DEVICE_REMOVE( "mc6846" )
- MCFG_PALETTE_MODIFY( "palette" )
+ MCFG_PALETTE_MODIFY( "palette" )
MCFG_PALETTE_INIT_OWNER(thomson_state, mo5)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
diff --git a/src/mess/drivers/ti74.c b/src/mess/drivers/ti74.c
index d7cbfb08c8b..d06a75a2b76 100644
--- a/src/mess/drivers/ti74.c
+++ b/src/mess/drivers/ti74.c
@@ -5,11 +5,11 @@
Texas Instruments TI-74 BASICALC
Texas Instruments TI-95 PROCALC
hardware family: CC-40 -> TI-74 BASICALC -> TI-95 PROCALC
-
+
TI-74 PCB layout:
note: TI-95 PCB is nearly the same, just with a different size LCD screen,
its CPU is labeled C70011, and the system ROM is labeled HN61256PC95.
-
+
DOCK-BUS
--||||||||---
C == |
@@ -49,16 +49,16 @@
* - indicates that it's on the other side of the PCB
-
+
Overall, the hardware is very similar to TI CC-40. A lot has been shuffled around
to cut down on complexity (and probably for protection too). To reduce power usage
even more, the OS often idles while waiting for any keypress that triggers an interrupt
and wakes the processor up.
-
+
The machine is powered by 4 AAA batteries. These will also save internal RAM,
provided that the machine is turned off properly.
-
-
+
+
TODO:
- it runs too fast due to missing clock divider emulation in TMS70C46
- external ram cartridge
@@ -131,10 +131,10 @@ DEVICE_IMAGE_LOAD_MEMBER(ti74_state, ti74_cartridge)
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Invalid file size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
@@ -165,7 +165,7 @@ void ti74_state::update_lcd_indicator(UINT8 y, UINT8 x, int state)
// TI-95 ref._________________...
// output# | 40 43 41 44 42 12 11 10/13/14 0 1 2
// above | _LOW _ERROR 2nd INV ALPHA LC INS DEGRAD HEX OCT I/O
- // screen- | _P{70} <{71} RUN{3}
+ // screen- | _P{70} <{71} RUN{3}
// area . SYS{4}
output_set_lamp_value(y * 10 + x, state);
}
@@ -175,7 +175,7 @@ static HD44780_PIXEL_UPDATE(ti74_pixel_update)
// char size is 5x7 + cursor
if (x > 4 || y > 7)
return;
-
+
if (line == 1 && pos == 15)
{
// the last char is used to control the 14 lcd indicators
@@ -236,7 +236,7 @@ READ8_MEMBER(ti74_state::keyboard_r)
if (m_key_select >> i & 1)
ret |= m_key_matrix[i]->read();
}
-
+
return ret;
}
@@ -250,14 +250,14 @@ WRITE8_MEMBER(ti74_state::bankswitch_w)
{
// d0-d1: system rom bankswitch
membank("sysbank")->set_entry(data & 3);
-
+
// d2: power-on latch
if (~data & 4 && m_power)
{
m_power = 0;
m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); // stop running
}
-
+
// d3: N/C
}
@@ -265,7 +265,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, ti74_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("hd44780", hd44780_device, read, write)
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("sysram.ic3")
- //AM_RANGE(0x4000, 0xbfff) // mapped by the cartslot
+ //AM_RANGE(0x4000, 0xbfff) // mapped by the cartslot
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("sysbank")
ADDRESS_MAP_END
@@ -486,7 +486,7 @@ void ti74_state::update_battery_status(int state)
void ti74_state::machine_reset()
{
m_power = 1;
-
+
update_battery_status(m_battery_inp->read());
}
diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c
index 2221048011e..ade345aeb1c 100644
--- a/src/mess/drivers/timex.c
+++ b/src/mess/drivers/timex.c
@@ -598,7 +598,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart )
int chunks_in_file = 0;
dynamic_buffer header;
header.resize(9);
-
+
if (size % 0x2000 != 9)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "File corrupted");
@@ -609,22 +609,22 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart )
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Loading from softlist is not supported yet");
return IMAGE_INIT_FAIL;
}
-
+
m_dock->rom_alloc(0x10000, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
DOCK = m_dock->get_rom_base();
-
+
// check header
image.fread(header, 9);
-
+
for (int i = 0; i < 8; i++)
if (header[i + 1] & 0x02) chunks_in_file++;
-
+
if (chunks_in_file * 0x2000 + 0x09 != size)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "File corrupted");
return IMAGE_INIT_FAIL;
}
-
+
switch (header[0])
{
case 0x00: logerror ("DOCK cart\n");
@@ -643,7 +643,7 @@ DEVICE_IMAGE_LOAD_MEMBER( spectrum_state, timex_cart )
}
}
break;
-
+
default:
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Cart type not supported");
return IMAGE_INIT_FAIL;
diff --git a/src/mess/drivers/tsispch.c b/src/mess/drivers/tsispch.c
index 642a0fa9080..42096121f51 100644
--- a/src/mess/drivers/tsispch.c
+++ b/src/mess/drivers/tsispch.c
@@ -482,7 +482,7 @@ ROM_START( prose2k )
// 0 - to /CE of ROMs 12(U27) and 13(U50)
//
// Note U81 is optional; it can be replaced by a 74s138 instead of a prom,
- // with A19, A18, A17 as inputs, for decoding the roms as:
+ // with A19, A18, A17 as inputs, for decoding the roms as:
// 7 - to /CE of ROMs 0(U21) and 1(U44) (0xE0000-0xE3FFF)
// 6 - to /CE of ROMs 2(U22) and 3(U45) (0xE4000-0xE7FFF)
// 5 - to /CE of ROMs 4(U23) and 5(U46) (0xE8000-0xEBFFF)
@@ -490,8 +490,8 @@ ROM_START( prose2k )
// 3 - to /CE of ROMs 8(U25) and 9(U48) (0xF0000-0xF3FFF)
// 2 - to /CE of ROMs 10(U26) and 11(U49) (0xF4000-0xF7FFF)
// 1 - to /CE of ROMs 12(U27) and 13(U50) (0xF8000-0xFBFFF)
- // 0 - to /CE of ROMs 14(U28) and 15(U51) (0xFC000-0xFFFFF)
-
+ // 0 - to /CE of ROMs 14(U28) and 15(U51) (0xFC000-0xFFFFF)
+
ROM_REGION(0x1000, "proms", 0)
ROM_LOAD( "am27s19.u77", 0x0000, 0x0020, CRC(A88757FC) SHA1(9066D6DBC009D7A126D75B8461CA464DDF134412))
ROM_LOAD( "am27s19.u79", 0x0020, 0x0020, CRC(A165B090) SHA1(BFC413C79915C68906033741318C070AD5DD0F6B))
diff --git a/src/mess/drivers/tutor.c b/src/mess/drivers/tutor.c
index 7596e537774..4a437c9f950 100644
--- a/src/mess/drivers/tutor.c
+++ b/src/mess/drivers/tutor.c
@@ -196,7 +196,7 @@ public:
optional_device<cassette_image_device> m_cass;
optional_device<centronics_device> m_centronics;
optional_device<output_latch_device> m_cent_data_out;
- required_memory_bank m_bank1;
+ required_memory_bank m_bank1;
memory_region *m_cart_rom;
DECLARE_READ8_MEMBER(key_r);
@@ -223,9 +223,9 @@ void tutor_state::machine_start()
{
astring region_tag;
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
-
+
m_tape_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(tutor_state::tape_interrupt_handler),this));
-
+
m_bank1->configure_entry(0, memregion("maincpu")->base() + 0x8000);
m_bank1->set_entry(0);
diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c
index 28ec8948a2e..c588d8b084e 100644
--- a/src/mess/drivers/tvc.c
+++ b/src/mess/drivers/tvc.c
@@ -47,7 +47,7 @@ public:
m_palette(*this, "palette"),
m_keyboard(*this, "LINE")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<tvc_sound_device> m_sound;
@@ -65,7 +65,7 @@ public:
void machine_start();
void machine_reset();
-
+
void set_mem_page(UINT8 data);
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_WRITE8_MEMBER(vram_bank_w);
@@ -80,17 +80,17 @@ public:
DECLARE_READ8_MEMBER(_5b_r);
DECLARE_WRITE_LINE_MEMBER(int_ff_set);
DECLARE_WRITE_LINE_MEMBER(centronics_ack);
-
+
// expansions
DECLARE_WRITE8_MEMBER(expansion_w);
DECLARE_READ8_MEMBER(expansion_r);
DECLARE_READ8_MEMBER(exp_id_r);
DECLARE_WRITE8_MEMBER(expint_ack_w);
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( tvc64);
-
+
MC6845_UPDATE_ROW(crtc_update_row);
-
+
UINT8 m_video_mode;
UINT8 m_keyline;
UINT8 m_active_slot;
diff --git a/src/mess/drivers/uzebox.c b/src/mess/drivers/uzebox.c
index 2ab52e6944f..a5aea162589 100644
--- a/src/mess/drivers/uzebox.c
+++ b/src/mess/drivers/uzebox.c
@@ -273,7 +273,7 @@ UINT32 uzebox_state::screen_update_uzebox(screen_device &screen, bitmap_rgb32 &b
DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart)
{
UINT32 size = m_cart->common_get_size("rom");
-
+
m_cart->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_LITTLE);
if (image.software_entry() == NULL)
diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c
index 7dcfefd1f23..00db7737ac3 100644
--- a/src/mess/drivers/vboy.c
+++ b/src/mess/drivers/vboy.c
@@ -1112,7 +1112,7 @@ static ADDRESS_MAP_START( vboy_mem, AS_PROGRAM, 32, vboy_state )
//AM_RANGE( 0x04000000, 0x04ffffff ) // Expansion area
AM_RANGE( 0x05000000, 0x0500ffff ) AM_MIRROR(0x0ff0000) AM_RAM AM_SHARE("wram")// Main RAM - 64K mask 0xffff
AM_RANGE( 0x06000000, 0x06003fff ) AM_DEVREADWRITE("cartslot", vboy_cart_slot_device, read_eeprom, write_eeprom) // Cart RAM - 8K NVRAM
-// AM_RANGE( 0x07000000, 0x071fffff ) AM_MIRROR(0x0e00000) AM_DEVREAD("cartslot", vboy_cart_slot_device, read_cart) /* ROM */
+// AM_RANGE( 0x07000000, 0x071fffff ) AM_MIRROR(0x0e00000) AM_DEVREAD("cartslot", vboy_cart_slot_device, read_cart) /* ROM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( vboy_io, AS_IO, 32, vboy_state )
@@ -1141,7 +1141,7 @@ static ADDRESS_MAP_START( vboy_io, AS_IO, 32, vboy_state )
// AM_RANGE( 0x04000000, 0x04ffffff ) // Expansion area
AM_RANGE( 0x05000000, 0x0500ffff ) AM_MIRROR(0x0ff0000) AM_RAM AM_SHARE("wram") // Main RAM - 64K mask 0xffff
AM_RANGE( 0x06000000, 0x06003fff ) AM_NOP // Cart RAM - 8K NVRAM ?
-// AM_RANGE( 0x07000000, 0x071fffff ) AM_MIRROR(0x0e00000) AM_DEVREAD("cartslot", vboy_cart_slot_device, read_cart) /* ROM */
+// AM_RANGE( 0x07000000, 0x071fffff ) AM_MIRROR(0x0e00000) AM_DEVREAD("cartslot", vboy_cart_slot_device, read_cart) /* ROM */
ADDRESS_MAP_END
/* Input ports */
diff --git a/src/mess/drivers/vc4000.c b/src/mess/drivers/vc4000.c
index 085fb44ec62..727350c0456 100644
--- a/src/mess/drivers/vc4000.c
+++ b/src/mess/drivers/vc4000.c
@@ -378,12 +378,12 @@ void vc4000_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1800, 0x1bff, read8_delegate(FUNC(vc4000_cart_slot_device::read_ram),(vc4000_cart_slot_device*)m_cart), write8_delegate(FUNC(vc4000_cart_slot_device::write_ram),(vc4000_cart_slot_device*)m_cart));
break;
// undumped Radofin Hobby Module
-// case VC4000_HOBBY:
-// m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0x07ff, read8_delegate(FUNC(vc4000_cart_slot_device::read_rom),(vc4000_cart_slot_device*)m_cart));
-// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0800, 0x0fff, read8_delegate(FUNC(vc4000_cart_slot_device::read_ram),(vc4000_cart_slot_device*)m_cart), write8_delegate(FUNC(vc4000_cart_slot_device::write_ram),(vc4000_cart_slot_device*)m_cart));
-// break;
+// case VC4000_HOBBY:
+// m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0x07ff, read8_delegate(FUNC(vc4000_cart_slot_device::read_rom),(vc4000_cart_slot_device*)m_cart));
+// m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0800, 0x0fff, read8_delegate(FUNC(vc4000_cart_slot_device::read_ram),(vc4000_cart_slot_device*)m_cart), write8_delegate(FUNC(vc4000_cart_slot_device::write_ram),(vc4000_cart_slot_device*)m_cart));
+// break;
}
-
+
m_cart->save_ram();
}
}
@@ -398,7 +398,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
dynamic_buffer quick_data;
int read_;
int result = IMAGE_INIT_FAIL;
-
+
quick_length = image.length();
quick_data.resize(quick_length);
read_ = image.fread( quick_data, quick_length);
@@ -420,7 +420,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
{
int quick_addr = quick_data[1] * 256 + quick_data[2];
exec_addr = quick_data[3] * 256 + quick_data[4];
-
+
if (quick_length < 0x5)
{
image.seterror(IMAGE_ERROR_INVALIDIMAGE, "File too short");
@@ -436,13 +436,13 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
{
space.write_byte(0x08be, quick_data[3]);
space.write_byte(0x08bf, quick_data[4]);
-
+
for (i = 5; i < quick_length; i++)
space.write_byte(i - 5 + quick_addr, quick_data[i]);
-
+
/* display a message about the loaded quickload */
image.message(" Quickload: size=%04X : start=%04X : end=%04X : exec=%04X",quick_length-5,quick_addr,quick_addr+quick_length-5,exec_addr);
-
+
// Start the quickload
m_maincpu->set_state_int(S2650_PC, exec_addr);
result = IMAGE_INIT_PASS;
@@ -460,7 +460,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
else
{
exec_addr = quick_data[1] * 256 + quick_data[2];
-
+
if (exec_addr >= quick_length)
{
image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Exec address beyond end of file");
@@ -482,14 +482,14 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
{
space.write_byte(0x08be, quick_data[1]);
space.write_byte(0x08bf, quick_data[2]);
-
+
// load to 08C0-15FF (standard ram + extra)
int read_ = 0x1600;
if (quick_length < 0x1600)
read_ = quick_length;
for (i = 0x8c0; i < read_; i++)
space.write_byte(i, quick_data[i]);
-
+
// load to 1F50-1FAF (PVI regs)
read_ = 0x1FB0;
if (quick_length < 0x1FB0)
@@ -497,10 +497,10 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
if (quick_length > 0x1FC0)
for (i = 0x1F50; i < read_; i++)
vc4000_video_w(space, i-0x1f00, quick_data[i]);
-
+
/* display a message about the loaded quickload */
image.message(" Quickload: size=%04X : exec=%04X",quick_length,exec_addr);
-
+
// Start the quickload
m_maincpu->set_state_int(S2650_PC, exec_addr);
result = IMAGE_INIT_PASS;
diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c
index 572a94ab113..de9a14b866c 100644
--- a/src/mess/drivers/vii.c
+++ b/src/mess/drivers/vii.c
@@ -961,13 +961,13 @@ INPUT_PORTS_END
void vii_state::test_centered(UINT8 *ROM)
{
if (ROM[0x3cd808] == 0x99 &&
- ROM[0x3cd809] == 0x99 &&
- ROM[0x3cd80a] == 0x83 &&
- ROM[0x3cd80b] == 0x5e &&
- ROM[0x3cd80c] == 0x52 &&
- ROM[0x3cd80d] == 0x6b &&
- ROM[0x3cd80e] == 0x78 &&
- ROM[0x3cd80f] == 0x7f)
+ ROM[0x3cd809] == 0x99 &&
+ ROM[0x3cd80a] == 0x83 &&
+ ROM[0x3cd80b] == 0x5e &&
+ ROM[0x3cd80c] == 0x52 &&
+ ROM[0x3cd80d] == 0x6b &&
+ ROM[0x3cd80e] == 0x78 &&
+ ROM[0x3cd80f] == 0x7f)
{
m_centered_coordinates = 0;
}
@@ -982,10 +982,10 @@ DEVICE_IMAGE_LOAD_MEMBER( vii_state, vii_cart )
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
return IMAGE_INIT_FAIL;
}
-
+
m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
test_centered(m_cart->get_rom_base());
return IMAGE_INIT_PASS;
@@ -994,10 +994,10 @@ DEVICE_IMAGE_LOAD_MEMBER( vii_state, vii_cart )
DEVICE_IMAGE_LOAD_MEMBER( vii_state, vsmile_cart )
{
UINT32 size = m_cart->common_get_size("rom");
-
+
m_cart->rom_alloc(size, GENERIC_ROM16_WIDTH, ENDIANNESS_LITTLE);
- m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
-
+ m_cart->common_load_rom(m_cart->get_rom_base(), size, "rom");
+
return IMAGE_INIT_PASS;
}
@@ -1031,11 +1031,11 @@ void vii_state::machine_start()
m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG));
memcpy(m_p_cart, m_cart_rom->base(), 0x400000 * 2);
}
- else if (m_spg243_mode == SPG243_VII) // Vii bios is banked
+ else if (m_spg243_mode == SPG243_VII) // Vii bios is banked
memcpy(m_p_cart, m_bios_rom->base(), 0x400000 * 2);
else
memcpy(m_p_cart, memregion("maincpu")->base(), 0x400000 * 2);
-
+
m_video_regs[0x36] = 0xffff;
m_video_regs[0x37] = 0xffff;
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index 76e8fd57c4e..5ebc3ffd8ff 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1038,12 +1038,12 @@ inline void x07_state::draw_udk()
DEVICE_IMAGE_LOAD_MEMBER( x07_state, x07_card )
{
UINT32 size = m_card->common_get_size("rom");
-
+
// check card type
if (image.software_entry() != NULL)
{
const char *card_type = image.get_feature("card_type");
-
+
if (strcmp(card_type, "xp140"))
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported card type");
@@ -1052,7 +1052,7 @@ DEVICE_IMAGE_LOAD_MEMBER( x07_state, x07_card )
}
m_card->rom_alloc(size, GENERIC_ROM8_WIDTH, ENDIANNESS_BIG);
- m_card->common_load_rom(m_card->get_rom_base(), size, "rom");
+ m_card->common_load_rom(m_card->get_rom_base(), size, "rom");
m_card->ram_alloc(0x1000);