summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-05-20 06:51:25 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-05-20 06:51:25 +0000
commit1c05ccc93bd32a9bb5a50f18e2e8bd29c3511e25 (patch)
tree7133a7cea14e7c27e731c320b87663971b1a31d3 /src/mess
parentcae878c9b438a4b88678db213db9c4aed215b5cc (diff)
Cleanups and version bumpmame0148u5
Diffstat (limited to 'src/mess')
-rw-r--r--src/mess/audio/gb.c69
-rw-r--r--src/mess/audio/gb.h8
-rw-r--r--src/mess/audio/lynx.c40
-rw-r--r--src/mess/audio/lynx.h4
-rw-r--r--src/mess/audio/wswan.c6
-rw-r--r--src/mess/drivers/a7800.c2
-rw-r--r--src/mess/drivers/aim65.c22
-rw-r--r--src/mess/drivers/apollo.c12
-rw-r--r--src/mess/drivers/applix.c1
-rw-r--r--src/mess/drivers/d6800.c10
-rw-r--r--src/mess/drivers/esq1.c81
-rw-r--r--src/mess/drivers/horizon.c42
-rw-r--r--src/mess/drivers/ie15.c94
-rw-r--r--src/mess/drivers/microkit.c4
-rw-r--r--src/mess/drivers/ngp.c2
-rw-r--r--src/mess/drivers/pc.c4
-rw-r--r--src/mess/drivers/pet.c2
-rw-r--r--src/mess/drivers/sms.c24
-rw-r--r--src/mess/drivers/softbox.c26
-rw-r--r--src/mess/drivers/ts802.c6
-rw-r--r--src/mess/includes/gb.h14
-rw-r--r--src/mess/includes/lynx.h2
-rw-r--r--src/mess/includes/softbox.h12
-rw-r--r--src/mess/machine/apollo.c2
-rw-r--r--src/mess/machine/gb.c26
-rw-r--r--src/mess/machine/lynx.c6
-rw-r--r--src/mess/machine/md_stm95.h2
-rw-r--r--src/mess/machine/nes_bootleg.c28
-rw-r--r--src/mess/machine/nes_bootleg.h8
-rw-r--r--src/mess/machine/nes_kaiser.c20
-rw-r--r--src/mess/machine/nes_kaiser.h6
-rw-r--r--src/mess/machine/nes_mmc3_clones.c27
-rw-r--r--src/mess/machine/nes_slot.c2
-rw-r--r--src/mess/machine/nes_slot.h2
-rw-r--r--src/mess/machine/pc.c2
-rw-r--r--src/mess/machine/pc_joy_sw.c2
-rw-r--r--src/mess/machine/psxcard.c24
-rw-r--r--src/mess/machine/psxcd.c1
-rw-r--r--src/mess/machine/psxmultitap.h2
-rw-r--r--src/mess/machine/s100_nsmdsa.h2
-rw-r--r--src/mess/machine/s100_nsmdsad.h2
-rw-r--r--src/mess/machine/s100_wunderbus.c6
-rw-r--r--src/mess/machine/sms.c2
-rw-r--r--src/mess/machine/ti99/speech8.h10
-rw-r--r--src/mess/machine/wswan.c8
-rw-r--r--src/mess/video/a7800.c16
-rw-r--r--src/mess/video/apollo.c26
-rw-r--r--src/mess/video/gb.c24
-rw-r--r--src/mess/video/k1ge.c1
49 files changed, 368 insertions, 376 deletions
diff --git a/src/mess/audio/gb.c b/src/mess/audio/gb.c
index adb325206a7..a318e33d698 100644
--- a/src/mess/audio/gb.c
+++ b/src/mess/audio/gb.c
@@ -124,7 +124,7 @@ void gameboy_sound_device::device_config_complete()
//-------------------------------------------------
void gameboy_sound_device::device_start()
-{
+{
m_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
m_rate = machine().sample_rate();
@@ -249,14 +249,14 @@ void gameboy_sound_device::device_reset()
memset(&m_snd_2, 0, sizeof(m_snd_2));
memset(&m_snd_3, 0, sizeof(m_snd_3));
memset(&m_snd_4, 0, sizeof(m_snd_4));
-
+
/* Calculate the envelope and sweep tables */
for (int i = 0; i < 8; i++)
{
m_env_length_table[i] = (i * ((1 << FIXED_POINT) / 64) * m_rate) >> FIXED_POINT;
m_swp_time_table[i] = (((i << FIXED_POINT) / 128) * m_rate) >> (FIXED_POINT - 1);
}
-
+
/* Calculate the period tables */
for (int i = 0; i < MAX_FREQUENCIES; i++)
{
@@ -273,15 +273,15 @@ void gameboy_sound_device::device_reset()
m_period_mode4_table[i][j] = ((1 << FIXED_POINT) / (524288 / ((i == 0) ? 0.5 : i) / (1 << (j + 1)))) * m_rate;
}
}
-
+
/* Calculate the length table */
for (int i = 0; i < 64; i++)
m_length_table[i] = ((64 - i) * ((1 << FIXED_POINT)/256) * m_rate) >> FIXED_POINT;
-
+
/* Calculate the length table for mode 3 */
for (int i = 0; i < 256; i++)
m_length_mode3_table[i] = ((256 - i) * ((1 << FIXED_POINT)/256) * m_rate) >> FIXED_POINT;
-
+
sound_w_internal(NR52, 0x00);
m_snd_regs[AUD3W0] = 0xac;
m_snd_regs[AUD3W1] = 0xdd;
@@ -314,7 +314,7 @@ READ8_MEMBER( gameboy_sound_device::wave_r )
READ8_MEMBER( gameboy_sound_device::sound_r )
{
- switch (offset)
+ switch (offset)
{
case 0x05:
case 0x0f:
@@ -333,14 +333,13 @@ WRITE8_MEMBER( gameboy_sound_device::wave_w )
WRITE8_MEMBER( gameboy_sound_device::sound_w )
{
-
/* change in registers so update first */
m_channel->update();
-
+
/* Only register NR52 is accessible if the sound controller is disabled */
if (!m_snd_control.on && offset != NR52)
return;
-
+
sound_w_internal(offset, data);
}
@@ -536,7 +535,7 @@ void gameboy_sound_device::sound_w_internal( int offset, UINT8 data )
}
}
-
+
//-------------------------------------------------
// sound_stream_update - handle a stream update
//-------------------------------------------------
@@ -544,11 +543,11 @@ void gameboy_sound_device::sound_w_internal( int offset, UINT8 data )
void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
stream_sample_t sample, left, right, mode4_mask;
-
+
while (samples-- > 0)
{
left = right = 0;
-
+
/* Mode 1 - Wave with Envelope and Sweep */
if (m_snd_1.on)
{
@@ -563,7 +562,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_1.pos = 0;
m_snd_1.signal = -m_snd_1.signal;
}
-
+
if (m_snd_1.length && m_snd_1.mode)
{
m_snd_1.count++;
@@ -573,7 +572,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_regs[NR52] &= 0xFE;
}
}
-
+
if (m_snd_1.env_length)
{
m_snd_1.env_count++;
@@ -587,7 +586,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_1.env_value = 15;
}
}
-
+
if (m_snd_1.swp_time)
{
m_snd_1.swp_count++;
@@ -611,17 +610,17 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_1.frequency = MAX_FREQUENCIES - 1;
}
}
-
+
m_snd_1.period = m_period_table[m_snd_1.frequency];
}
}
-
+
if (m_snd_control.mode1_left)
left += sample;
if (m_snd_control.mode1_right)
right += sample;
}
-
+
/* Mode 2 - Wave with Envelope */
if (m_snd_2.on)
{
@@ -636,7 +635,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_2.pos = 0;
m_snd_2.signal = -m_snd_2.signal;
}
-
+
if (m_snd_2.length && m_snd_2.mode)
{
m_snd_2.count++;
@@ -646,7 +645,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_regs[NR52] &= 0xFD;
}
}
-
+
if (m_snd_2.env_length)
{
m_snd_2.env_count++;
@@ -660,13 +659,13 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_2.env_value = 15;
}
}
-
+
if (m_snd_control.mode2_left)
left += sample;
if (m_snd_control.mode2_right)
right += sample;
}
-
+
/* Mode 3 - Wave patterns from WaveRAM */
if (m_snd_3.on)
{
@@ -679,12 +678,12 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
sample >>= 4;
}
sample = (sample & 0xF) - 8;
-
+
if (m_snd_3.level)
sample >>= (m_snd_3.level - 1);
else
sample = 0;
-
+
m_snd_3.pos++;
if (m_snd_3.pos >= ((UINT32)(((m_snd_3.period) >> 21)) + m_snd_3.duty))
{
@@ -702,7 +701,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_3.dutycount = 0;
}
}
-
+
if (m_snd_3.length && m_snd_3.mode)
{
m_snd_3.count++;
@@ -712,13 +711,13 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_regs[NR52] &= 0xFB;
}
}
-
+
if (m_snd_control.mode3_left)
left += sample;
if (m_snd_control.mode3_right)
right += sample;
}
-
+
/* Mode 4 - Noise with Envelope */
if (m_snd_4.on)
{
@@ -745,7 +744,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_4.ply_value &= (m_snd_4.ply_step ? 0x7f : 0x7fff);
m_snd_4.signal = (INT8)m_snd_4.ply_value;
}
-
+
if (m_snd_4.length && m_snd_4.mode)
{
m_snd_4.count++;
@@ -755,7 +754,7 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_regs[NR52] &= 0xF7;
}
}
-
+
if (m_snd_4.env_length)
{
m_snd_4.env_count++;
@@ -769,26 +768,26 @@ void gameboy_sound_device::sound_stream_update(sound_stream &stream, stream_samp
m_snd_4.env_value = 15;
}
}
-
+
if (m_snd_control.mode4_left)
left += sample;
if (m_snd_control.mode4_right)
right += sample;
}
-
+
/* Adjust for master volume */
left *= m_snd_control.vol_left;
right *= m_snd_control.vol_right;
-
+
/* pump up the volume */
left <<= 6;
right <<= 6;
-
+
/* Update the buffers */
*(outputs[0]++) = left;
*(outputs[1]++) = right;
}
-
+
m_snd_regs[NR52] = (m_snd_regs[NR52]&0xf0) | m_snd_1.on | (m_snd_2.on << 1) | (m_snd_3.on << 2) | (m_snd_4.on << 3);
}
diff --git a/src/mess/audio/gb.h b/src/mess/audio/gb.h
index a12e089c267..f56ccce8c42 100644
--- a/src/mess/audio/gb.h
+++ b/src/mess/audio/gb.h
@@ -64,7 +64,7 @@ public:
DECLARE_READ8_MEMBER(wave_r);
DECLARE_WRITE8_MEMBER(sound_w);
DECLARE_WRITE8_MEMBER(wave_w);
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -80,7 +80,7 @@ private:
sound_stream *m_channel;
int m_rate;
-
+
INT32 m_env_length_table[8];
INT32 m_swp_time_table[8];
UINT32 m_period_table[MAX_FREQUENCIES];
@@ -88,13 +88,13 @@ private:
UINT32 m_period_mode4_table[8][16];
UINT32 m_length_table[64];
UINT32 m_length_mode3_table[256];
-
+
struct SOUND m_snd_1;
struct SOUND m_snd_2;
struct SOUND m_snd_3;
struct SOUND m_snd_4;
struct SOUNDC m_snd_control;
-
+
UINT8 m_snd_regs[0x30];
};
diff --git a/src/mess/audio/lynx.c b/src/mess/audio/lynx.c
index e1442998a76..74ebb659339 100644
--- a/src/mess/audio/lynx.c
+++ b/src/mess/audio/lynx.c
@@ -97,7 +97,7 @@ const device_type LYNX2_SND = &device_creator<lynx2_sound_device>;
lynx_sound_device::lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, LYNX_SND, "Mikey", tag, owner, clock, "lynx_sound", __FILE__),
device_sound_interface(mconfig, *this)
-{
+{
m_timer_delegate = lynx_sound_timer_delegate();
}
@@ -156,10 +156,10 @@ void lynx_sound_device::register_save()
}
void lynx_sound_device::init()
-{
+{
m_shift_mask = auto_alloc_array_clear(machine(), int, 512);
m_shift_xor = auto_alloc_array_clear(machine(), int, 4096);
-
+
for (int i = 0; i < 512; i++)
{
m_shift_mask[i] = 0;
@@ -173,7 +173,7 @@ void lynx_sound_device::init()
if (i & 0x80) m_shift_mask[i] |= 0x800;
if (i & 0x100) m_shift_mask[i] |= 0x80;
}
-
+
for (int i = 0; i < 4096; i++)
{
m_shift_xor[i] = 1;
@@ -182,7 +182,7 @@ void lynx_sound_device::init()
if (i & j)
m_shift_xor[i] ^= 1;
}
- }
+ }
}
void lynx_sound_device::device_start()
@@ -238,9 +238,9 @@ void lynx_sound_device::reset_channel(LYNX_AUDIO *channel)
void lynx_sound_device::count_down(int nr)
{
LYNX_AUDIO *channel = &m_audio[nr];
- if (channel->reg.control1 & 8 && (channel->reg.control1 & 7) != 7)
+ if (channel->reg.control1 & 8 && (channel->reg.control1 & 7) != 7)
return;
- if (nr == 0)
+ if (nr == 0)
m_mixer_channel->update();
//if ((channel->reg.control1 & 0x0f) == 0x0f) //count down if linking enabled and count enabled
channel->count--;
@@ -250,17 +250,17 @@ void lynx_sound_device::shift(int chan_nr)
{
INT16 out_temp;
LYNX_AUDIO *channel;
-
+
assert(chan_nr < 4);
- channel = &m_audio[chan_nr];
+ channel = &m_audio[chan_nr];
//channel->shifter = ((channel->shifter<<1)&0xffe) | (m_shift_xor[ channel->shifter & channel->mask ]&1);
// alternative method (functionally the same as above)
UINT8 xor_out = 0;
for (int bit = 0; bit < 12; bit++)
{
- if ((channel->mask >> bit) & 1)
+ if ((channel->mask >> bit) & 1)
xor_out ^= (channel->shifter >> bit) & 1;
}
channel->shifter = ((channel->shifter << 1) & 0xffe) | (xor_out ^ 1); // output of xor is inverted
@@ -284,7 +284,7 @@ void lynx_sound_device::shift(int chan_nr)
case 0: count_down(1); break;
case 1: count_down(2); break;
case 2: count_down(3); break;
- case 3:
+ case 3:
if (!m_timer_delegate.isnull())
m_timer_delegate();
break;
@@ -294,10 +294,10 @@ void lynx_sound_device::shift(int chan_nr)
void lynx_sound_device::execute(int chan_nr)
{
LYNX_AUDIO *channel;
-
+
assert(chan_nr < 4);
-
- channel = &m_audio[chan_nr];
+
+ channel = &m_audio[chan_nr];
if (channel->reg.control1 & 8) // count enable
{
@@ -320,7 +320,7 @@ void lynx_sound_device::execute(int chan_nr)
for (; (channel->ticks >= t) && (channel->count >= 0); channel->ticks -= t) // at least one sampled worth of time left, timer not expired
channel->count--;
- if (channel->ticks < t)
+ if (channel->ticks < t)
break;
if (channel->count < 0)
@@ -355,7 +355,7 @@ READ8_MEMBER(lynx_sound_device::read)
if (offset < 0x40)
{
- switch (offset & 7)
+ switch (offset & 7)
{
case 0:
value = channel->reg.volume;
@@ -418,7 +418,7 @@ WRITE8_MEMBER(lynx_sound_device::write)
if (offset < 0x40)
{
- switch (offset & 0x07)
+ switch (offset & 0x07)
{
// Volume control (signed)
case 0:
@@ -489,7 +489,7 @@ void lynx_sound_device::sound_stream_update(sound_stream &stream, stream_sample_
{
int v;
stream_sample_t *buffer = outputs[0];
-
+
for (int i = 0; i < samples; i++, buffer++)
{
*buffer = 0;
@@ -510,7 +510,7 @@ void lynx2_sound_device::sound_stream_update(sound_stream &stream, stream_sample
{
stream_sample_t *left=outputs[0], *right=outputs[1];
int v;
-
+
for (int i = 0; i < samples; i++, left++, right++)
{
*left = 0;
@@ -521,7 +521,7 @@ void lynx2_sound_device::sound_stream_update(sound_stream &stream, stream_sample
v = m_audio[channel].reg.output;
if (!(m_master_enable & (0x10 << channel)))
{
- if (m_attenuation_enable & (0x10 << channel))
+ if (m_attenuation_enable & (0x10 << channel))
*left += v * (m_audio[channel].attenuation >> 4);
else
*left += v * 15;
diff --git a/src/mess/audio/lynx.h b/src/mess/audio/lynx.h
index 5ef44cef5f4..583c6ec75d4 100644
--- a/src/mess/audio/lynx.h
+++ b/src/mess/audio/lynx.h
@@ -66,11 +66,11 @@ class lynx2_sound_device : public lynx_sound_device
{
public:
lynx2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
protected:
// device-level overrides
virtual void device_start();
-
+
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
};
diff --git a/src/mess/audio/wswan.c b/src/mess/audio/wswan.c
index 37a7f60cdc7..a44d6279818 100644
--- a/src/mess/audio/wswan.c
+++ b/src/mess/audio/wswan.c
@@ -81,7 +81,7 @@ void wswan_sound_device::device_start()
save_item(NAME(m_audio1.vol_right));
save_item(NAME(m_audio1.on));
save_item(NAME(m_audio1.signal));
-
+
save_item(NAME(m_audio2.freq));
save_item(NAME(m_audio2.period));
save_item(NAME(m_audio2.pos));
@@ -89,7 +89,7 @@ void wswan_sound_device::device_start()
save_item(NAME(m_audio2.vol_right));
save_item(NAME(m_audio2.on));
save_item(NAME(m_audio2.signal));
-
+
save_item(NAME(m_audio3.freq));
save_item(NAME(m_audio3.period));
save_item(NAME(m_audio3.pos));
@@ -97,7 +97,7 @@ void wswan_sound_device::device_start()
save_item(NAME(m_audio3.vol_right));
save_item(NAME(m_audio3.on));
save_item(NAME(m_audio3.signal));
-
+
save_item(NAME(m_audio4.freq));
save_item(NAME(m_audio4.period));
save_item(NAME(m_audio4.pos));
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index f40c1e1be0a..db69ae22df7 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -44,7 +44,7 @@
2013/04/07 Robert Tuccitto Address map locations for the XBOARD
added.
- 2013/05/01 Robert Tuccitto Red and Blue miscalculated proportions
+ 2013/05/01 Robert Tuccitto Red and Blue miscalculated proportions
fixed.
***************************************************************************/
diff --git a/src/mess/drivers/aim65.c b/src/mess/drivers/aim65.c
index e09f935cb0c..8eb10084eea 100644
--- a/src/mess/drivers/aim65.c
+++ b/src/mess/drivers/aim65.c
@@ -274,18 +274,18 @@ DEVICE_IMAGE_LOAD_MEMBER( aim65_state, aim65_cart )
UINT32 size;
UINT8 *temp_copy;
const struct aim_cart_range *aim_cart = &aim_cart_table[0], *this_cart;
-
+
/* First, determine where this cart has to be loaded */
while (aim_cart->tag)
{
if (strcmp(aim_cart->tag, image.device().tag()) == 0)
break;
-
+
aim_cart++;
}
-
+
this_cart = aim_cart;
-
+
if (!this_cart->tag)
{
astring errmsg;
@@ -293,19 +293,19 @@ DEVICE_IMAGE_LOAD_MEMBER( aim65_state, aim65_cart )
image.seterror(IMAGE_ERROR_UNSPECIFIED, errmsg.cstr());
return IMAGE_INIT_FAIL;
}
-
+
if (image.software_entry() == NULL)
{
size = image.length();
temp_copy = auto_alloc_array(machine(), UINT8, size);
-
+
if (size > 0x1000)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unsupported cartridge size");
auto_free(machine(), temp_copy);
return IMAGE_INIT_FAIL;
}
-
+
if (image.fread(temp_copy, size) != size)
{
image.seterror(IMAGE_ERROR_UNSPECIFIED, "Unable to fully read from file");
@@ -318,8 +318,8 @@ DEVICE_IMAGE_LOAD_MEMBER( aim65_state, aim65_cart )
if (image.get_software_region(this_cart->tag + 1) == NULL)
{
astring errmsg;
- errmsg.printf("Attempted to load file with wrong extension\nCartslot '%s' only accepts files with '.%s' extension",
- this_cart->tag, this_cart->tag + 1);
+ errmsg.printf("Attempted to load file with wrong extension\nCartslot '%s' only accepts files with '.%s' extension",
+ this_cart->tag, this_cart->tag + 1);
image.seterror(IMAGE_ERROR_UNSPECIFIED, errmsg.cstr());
return IMAGE_INIT_FAIL;
}
@@ -330,9 +330,9 @@ DEVICE_IMAGE_LOAD_MEMBER( aim65_state, aim65_cart )
}
memcpy(memregion("maincpu")->base() + this_cart->offset, temp_copy, size);
-
+
auto_free(machine(), temp_copy);
-
+
return IMAGE_INIT_PASS;
}
diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c
index d66a5826344..f049622ea2a 100644
--- a/src/mess/drivers/apollo.c
+++ b/src/mess/drivers/apollo.c
@@ -808,8 +808,8 @@ static ADDRESS_MAP_START(dsp3500_map, AS_PROGRAM, 32, apollo_state )
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
-// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
-// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
+// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
+// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
@@ -891,8 +891,8 @@ static ADDRESS_MAP_START(dsp3000_map, AS_PROGRAM, 32, apollo_state )
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
-// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
-// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
+// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
+// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
@@ -994,8 +994,8 @@ static ADDRESS_MAP_START(dsp5500_map, AS_PROGRAM, 32, apollo_state )
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
-// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
-// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
+// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
+// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c
index faee500e141..62b242a8e8d 100644
--- a/src/mess/drivers/applix.c
+++ b/src/mess/drivers/applix.c
@@ -241,7 +241,6 @@ static MC6845_UPDATE_ROW( applix_update_row )
for (x = 0; x < x_count; x++)
{
-
if (BIT(state->m_pa, 3))
// 640 x 200 x 4of16 mode
{
diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c
index 48787943f3a..b6088a133c8 100644
--- a/src/mess/drivers/d6800.c
+++ b/src/mess/drivers/d6800.c
@@ -287,10 +287,10 @@ READ8_MEMBER( d6800_state::d6800_cassette_r )
WRITE8_MEMBER( d6800_state::d6800_cassette_w )
{
/*
- A NE556 runs at either 1200 or 2400 Hz, depending on the state of bit 0.
- This output drives the speaker and the output signal to the cassette player.
- Bit 6 enables the speaker. Also the speaker is silenced when cassette operations
- are in progress (DMA/CB2 line low).
+ A NE556 runs at either 1200 or 2400 Hz, depending on the state of bit 0.
+ This output drives the speaker and the output signal to the cassette player.
+ Bit 6 enables the speaker. Also the speaker is silenced when cassette operations
+ are in progress (DMA/CB2 line low).
*/
m_beeper->set_frequency(BIT(data, 0) ? 2400 : 1200);
@@ -307,7 +307,7 @@ READ8_MEMBER( d6800_state::d6800_keyboard_r )
*/
UINT8 data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read()
- & m_io_y0->read() & m_io_y1->read() & m_io_y2->read() & m_io_y3->read();
+ & m_io_y0->read() & m_io_y1->read() & m_io_y2->read() & m_io_y3->read();
return data;
}
diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c
index 74a3dbb6a4c..23dff5bbdc4 100644
--- a/src/mess/drivers/esq1.c
+++ b/src/mess/drivers/esq1.c
@@ -170,8 +170,8 @@ NOTES:
Note that this may be incorrect, maybe to sum of squares should be
constant, the half-point should be at -3dB and the linearity in dB
space.
-
-
+
+
***************************************************************************/
#include "emu.h"
@@ -188,7 +188,7 @@ NOTES:
#define WD1772_TAG "wd1772"
class esq1_filters : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
// construction/destruction
@@ -225,7 +225,7 @@ static const device_type ESQ1_FILTERS = &device_creator<esq1_filters>;
esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1-filters", __FILE__),
- device_sound_interface(mconfig, *this)
+ device_sound_interface(mconfig, *this)
{
}
@@ -278,11 +278,11 @@ void esq1_filters::recalc_filter(filter &f)
double g = 6060*exp(vfc/28.5);
double zc = g/tan(g/2/44100);
-/* if(f.vfc) {
- double ff = g/(2*M_PI);
- double fzc = 2*M_PI*ff/tan(M_PI*ff/44100);
- fprintf(stderr, "%02x f=%f zc=%f zc1=%f\n", f.vfc, g/(2*M_PI), zc, fzc);
- }*/
+/* if(f.vfc) {
+ double ff = g/(2*M_PI);
+ double fzc = 2*M_PI*ff/tan(M_PI*ff/44100);
+ fprintf(stderr, "%02x f=%f zc=%f zc1=%f\n", f.vfc, g/(2*M_PI), zc, fzc);
+ }*/
double gzc = zc/g;
double gzc2 = gzc*gzc;
@@ -302,10 +302,10 @@ void esq1_filters::recalc_filter(filter &f)
f.b[3] = 4*(r1 - 2*gzc + 2*gzc3 - gzc4);
f.b[4] = r1 - 4*gzc + 6*gzc2 - 4*gzc3 + gzc4;
-/* if(f.vfc != 0)
- for(int i=0; i<5; i++)
- printf("a%d=%f\nb%d=%f\n",
- i, f.a[i], i, f.b[i]);*/
+/* if(f.vfc != 0)
+ for(int i=0; i<5; i++)
+ printf("a%d=%f\nb%d=%f\n",
+ i, f.a[i], i, f.b[i]);*/
// Amplification stage
double vca = f.vca*(5.0/255.0);
@@ -336,15 +336,15 @@ void esq1_filters::device_start()
void esq1_filters::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
-/* if(0) {
- for(int i=0; i<8; i++)
- fprintf(stderr, " [%02x %02x %02x %02x]",
- filters[i].vca,
- filters[i].vpan,
- filters[i].vq,
- filters[i].vfc);
- fprintf(stderr, "\n");
- }*/
+/* if(0) {
+ for(int i=0; i<8; i++)
+ fprintf(stderr, " [%02x %02x %02x %02x]",
+ filters[i].vca,
+ filters[i].vpan,
+ filters[i].vq,
+ filters[i].vfc);
+ fprintf(stderr, "\n");
+ }*/
for(int i=0; i<samples; i++) {
double l=0, r=0;
@@ -365,11 +365,11 @@ void esq1_filters::sound_stream_update(sound_stream &stream, stream_sample_t **i
static double maxl = 0;
if(l > maxl) {
maxl = l;
-// fprintf(stderr, "%f\n", maxl);
+// fprintf(stderr, "%f\n", maxl);
}
-// l *= 6553;
-// r *= 6553;
+// l *= 6553;
+// r *= 6553;
l *= 2;
r *= 2;
outputs[0][i] = l < -32768 ? -32768 : l > 32767 ? 32767 : int(l);
@@ -532,7 +532,7 @@ ADDRESS_MAP_END
WRITE_LINE_MEMBER(esq1_state::duart_irq_handler)
{
- m_maincpu->set_input_line(M6809_IRQ_LINE, state);
+ m_maincpu->set_input_line(M6809_IRQ_LINE, state);
};
READ8_MEMBER(esq1_state::duart_input)
@@ -555,31 +555,31 @@ WRITE8_MEMBER(esq1_state::duart_output)
// MIDI send
WRITE_LINE_MEMBER(esq1_state::duart_tx_a)
{
- m_mdout->tx(state);
+ m_mdout->tx(state);
}
WRITE_LINE_MEMBER(esq1_state::duart_tx_b)
{
- m_panel->rx_w(state);
+ m_panel->rx_w(state);
}
void esq1_state::send_through_panel(UINT8 data)
{
- m_panel->xmit_char(data);
+ m_panel->xmit_char(data);
}
INPUT_CHANGED_MEMBER(esq1_state::key_stroke)
{
- if (oldval == 0 && newval == 1)
- {
- send_through_panel((UINT8)(FPTR)param);
- send_through_panel((UINT8)(FPTR)0x00);
- }
- else if (oldval == 1 && newval == 0)
- {
- send_through_panel((UINT8)(FPTR)param&0x7f);
- send_through_panel((UINT8)(FPTR)0x00);
- }
+ if (oldval == 0 && newval == 1)
+ {
+ send_through_panel((UINT8)(FPTR)param);
+ send_through_panel((UINT8)(FPTR)0x00);
+ }
+ else if (oldval == 1 && newval == 0)
+ {
+ send_through_panel((UINT8)(FPTR)param&0x7f);
+ send_through_panel((UINT8)(FPTR)0x00);
+ }
}
static SLOT_INTERFACE_START(midiin_slot)
@@ -707,7 +707,7 @@ ROM_END
ROM_START( esqm )
ROM_REGION(0x10000, "osrom", 0)
- ROM_LOAD( "1355500157_d640_esq-m_oshi.u14", 0x8000, 0x008000, CRC(ea6a7bae) SHA1(2830f8c52dc443b4ca469dc190b33e2ff15b78e1) )
+ ROM_LOAD( "1355500157_d640_esq-m_oshi.u14", 0x8000, 0x008000, CRC(ea6a7bae) SHA1(2830f8c52dc443b4ca469dc190b33e2ff15b78e1) )
ROM_REGION(0x20000, "es5503", 0)
ROM_LOAD( "esq1wavlo.bin", 0x0000, 0x8000, CRC(4d04ac87) SHA1(867b51229b0a82c886bf3b216aa8893748236d8b) )
@@ -718,4 +718,3 @@ ROM_END
CONS( 1986, esq1, 0 , 0, esq1, esq1, driver_device, 0, "Ensoniq", "ESQ-1", GAME_NOT_WORKING )
CONS( 1986, esqm, esq1, 0, esq1, esq1, driver_device, 0, "Ensoniq", "ESQ-M", GAME_NOT_WORKING )
CONS( 1988, sq80, 0, 0, sq80, esq1, driver_device, 0, "Ensoniq", "SQ-80", GAME_NOT_WORKING )
-
diff --git a/src/mess/drivers/horizon.c b/src/mess/drivers/horizon.c
index f4ddb2498a0..92aa0c3faec 100644
--- a/src/mess/drivers/horizon.c
+++ b/src/mess/drivers/horizon.c
@@ -8,25 +8,25 @@
succesfully loaded. The memory range EA00-EB40 appears to be
used by devices, particularly the FDC.
- http://www.hartetechnologies.com/manuals/Northstar/
+ http://www.hartetechnologies.com/manuals/Northstar/
****************************************************************************/
/*
- TODO:
+ TODO:
- - connect to S-100 bus
- - USARTs
- - parallel I/O
- - motherboard ports
- - RTC
- - RAM boards
- - floppy boards
- - floating point board
- - SOROC IQ 120 CRT terminal
- - NEC 5530-2 SPINWRITER printer
- - Anadex DP-8000 printer
+ - connect to S-100 bus
+ - USARTs
+ - parallel I/O
+ - motherboard ports
+ - RTC
+ - RAM boards
+ - floppy boards
+ - floating point board
+ - SOROC IQ 120 CRT terminal
+ - NEC 5530-2 SPINWRITER printer
+ - Anadex DP-8000 printer
*/
@@ -38,20 +38,20 @@
#include "machine/s100_nsmdsa.h"
#include "machine/s100_nsmdsad.h"
-#define Z80_TAG "z80"
-#define I8251_L_TAG "3a"
-#define I8251_R_TAG "4a"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
+#define Z80_TAG "z80"
+#define I8251_L_TAG "3a"
+#define I8251_R_TAG "4a"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
class horizon_state : public driver_device
{
public:
horizon_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, Z80_TAG),
- m_usart_l(*this, I8251_L_TAG),
- m_usart_r(*this, I8251_L_TAG)
+ m_maincpu(*this, Z80_TAG),
+ m_usart_l(*this, I8251_L_TAG),
+ m_usart_r(*this, I8251_L_TAG)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/drivers/ie15.c b/src/mess/drivers/ie15.c
index 29b9550dfcb..49d832ad9cc 100644
--- a/src/mess/drivers/ie15.c
+++ b/src/mess/drivers/ie15.c
@@ -6,9 +6,9 @@
29/06/2012 Skeleton driver.
- A serial (RS232 or current loop) green-screen terminal, mostly VT52 compatible
- (no Hold Screen mode and no graphics character set, but has Cyrillic characters).
- The top line is a status line.
+ A serial (RS232 or current loop) green-screen terminal, mostly VT52 compatible
+ (no Hold Screen mode and no graphics character set, but has Cyrillic characters).
+ The top line is a status line.
****************************************************************************/
@@ -18,19 +18,19 @@
#include "machine/keyboard.h"
#include "sound/beep.h"
-#define SCREEN_PAGE (80*48)
+#define SCREEN_PAGE (80*48)
-#define IE_1 0x80
-#define IE_KB_ACK 1
+#define IE_1 0x80
+#define IE_KB_ACK 1
-#define IE15_TOTAL_HORZ 1000
-#define IE15_TOTAL_VERT 28*11
+#define IE15_TOTAL_HORZ 1000
+#define IE15_TOTAL_VERT 28*11
-#define IE15_DISP_HORZ 800
-#define IE15_DISP_VERT 25*11
+#define IE15_DISP_HORZ 800
+#define IE15_DISP_VERT 25*11
-#define IE15_HORZ_START 100
-#define IE15_VERT_START 2*11
+#define IE15_HORZ_START 100
+#define IE15_VERT_START 2*11
#define VERBOSE_DBG 1 /* general debug messages */
@@ -50,7 +50,7 @@
#define LOOPBACK (0)
#endif
-#define BITBANGER_TAG "bitbanger"
+#define BITBANGER_TAG "bitbanger"
class ie15_state : public driver_device
{
@@ -296,9 +296,9 @@ READ8_MEMBER( ie15_state::serial_r ) {
}
/*
- m_serial_rx_buffer incoming bits.
- m_serial_rx_bits number of bits in _buffer.
- m_serial_rx_data complete byte, ready to be read by host, or 0 if no data.
+ m_serial_rx_buffer incoming bits.
+ m_serial_rx_bits number of bits in _buffer.
+ m_serial_rx_data complete byte, ready to be read by host, or 0 if no data.
*/
WRITE_LINE_MEMBER( ie15_state::serial_rx_callback )
@@ -333,7 +333,7 @@ WRITE_LINE_MEMBER( ie15_state::serial_rx_callback )
// overflow
break;
}
- DBG_LOG(2,"serial",("r %d bits %02d->%02d buffer %02X data %02X\n",
+ DBG_LOG(2,"serial",("r %d bits %02d->%02d buffer %02X data %02X\n",
state, tmp, m_serial_rx_bits, m_serial_rx_buffer, m_serial_rx_data));
}
@@ -380,13 +380,13 @@ READ8_MEMBER( ie15_state::flag_r ) {
switch (offset)
{
- case 0: // hsync pulse (not hblank)
+ case 0: // hsync pulse (not hblank)
ret = machine().primary_screen->hpos() < IE15_HORZ_START;
break;
- case 1: // marker scanline
+ case 1: // marker scanline
ret = (machine().primary_screen->vpos() % 11) > 7;
break;
- case 2: // vblank
+ case 2: // vblank
ret = !machine().primary_screen->vblank();
break;
case 4:
@@ -436,22 +436,22 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(ie15_io, AS_IO, 8, ie15_state)
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(000, 000) AM_READ(mem_r) AM_WRITE(mem_w) // 00h W: memory request, R: memory data [6.1.2.2]
- AM_RANGE(001, 001) AM_READ(serial_rx_ready_r) AM_WRITENOP // 01h W: memory latch [6.1.2.2]
- AM_RANGE(002, 002) AM_WRITE(mem_addr_hi_w) // 02h W: memory address high [6.1.2.2]
- AM_RANGE(003, 003) AM_WRITE(mem_addr_lo_w) // 03h W: memory address low [6.1.2.2]
- AM_RANGE(004, 004) AM_WRITE(mem_addr_inc_w) // 04h W: memory address counter + [6.1.2.2]
- AM_RANGE(005, 005) AM_WRITE(mem_addr_dec_w) // 05h W: memory address counter - [6.1.2.2]
- AM_RANGE(006, 006) AM_READ(serial_r) AM_WRITE(serial_w) // 06h W: serial port data [6.1.5.4]
+ AM_RANGE(000, 000) AM_READ(mem_r) AM_WRITE(mem_w) // 00h W: memory request, R: memory data [6.1.2.2]
+ AM_RANGE(001, 001) AM_READ(serial_rx_ready_r) AM_WRITENOP // 01h W: memory latch [6.1.2.2]
+ AM_RANGE(002, 002) AM_WRITE(mem_addr_hi_w) // 02h W: memory address high [6.1.2.2]
+ AM_RANGE(003, 003) AM_WRITE(mem_addr_lo_w) // 03h W: memory address low [6.1.2.2]
+ AM_RANGE(004, 004) AM_WRITE(mem_addr_inc_w) // 04h W: memory address counter + [6.1.2.2]
+ AM_RANGE(005, 005) AM_WRITE(mem_addr_dec_w) // 05h W: memory address counter - [6.1.2.2]
+ AM_RANGE(006, 006) AM_READ(serial_r) AM_WRITE(serial_w) // 06h W: serial port data [6.1.5.4]
// port 7 is handled in cpu core
- AM_RANGE(010, 010) AM_READ(serial_tx_ready_r) AM_WRITE(beep_w) // 08h W: speaker control [6.1.5.4]
- AM_RANGE(011, 011) AM_READ(kb_r) // 09h R: keyboard data [6.1.5.2]
- AM_RANGE(012, 012) AM_READ(kb_s_red_r) // 0Ah I: keyboard mode "RED" [6.1.5.2]
- AM_RANGE(013, 013) AM_READ(kb_ready_r) // 0Bh R: keyboard data ready [6.1.5.2]
- AM_RANGE(014, 014) AM_READ(kb_s_sdv_r) AM_WRITENOP // 0Ch W: serial port speed [6.1.3.1], R: keyboard mode "SDV" [6.1.5.2]
- AM_RANGE(015, 015) AM_READ(kb_s_dk_r) AM_WRITE(kb_ready_w) // 0Dh I: keyboard mode "DK" [6.1.5.2]
- AM_RANGE(016, 016) AM_READ(kb_s_dupl_r) // 0Eh I: keyboard mode "DUPL" [6.1.5.2]
- AM_RANGE(017, 017) AM_READ(kb_s_lin_r) // 0Fh I: keyboard mode "LIN" [6.1.5.2]
+ AM_RANGE(010, 010) AM_READ(serial_tx_ready_r) AM_WRITE(beep_w) // 08h W: speaker control [6.1.5.4]
+ AM_RANGE(011, 011) AM_READ(kb_r) // 09h R: keyboard data [6.1.5.2]
+ AM_RANGE(012, 012) AM_READ(kb_s_red_r) // 0Ah I: keyboard mode "RED" [6.1.5.2]
+ AM_RANGE(013, 013) AM_READ(kb_ready_r) // 0Bh R: keyboard data ready [6.1.5.2]
+ AM_RANGE(014, 014) AM_READ(kb_s_sdv_r) AM_WRITENOP // 0Ch W: serial port speed [6.1.3.1], R: keyboard mode "SDV" [6.1.5.2]
+ AM_RANGE(015, 015) AM_READ(kb_s_dk_r) AM_WRITE(kb_ready_w) // 0Dh I: keyboard mode "DK" [6.1.5.2]
+ AM_RANGE(016, 016) AM_READ(kb_s_dupl_r) // 0Eh I: keyboard mode "DUPL" [6.1.5.2]
+ AM_RANGE(017, 017) AM_READ(kb_s_lin_r) // 0Fh I: keyboard mode "LIN" [6.1.5.2]
// simulation of flag registers
AM_RANGE(020, 027) AM_READ(flag_r) AM_WRITE(flag_w)
ADDRESS_MAP_END
@@ -531,12 +531,12 @@ UINT32 ie15_state::draw_scanline(UINT16 *p, UINT16 offset, UINT8 scanline, UINT8
gfx = m_p_chargen[chr | ra];
/*
- Cursor is a character with only 3 scan lines, and is
- not shown if flag 1 is not active on this scan line.
- It always blinks if shown.
+ Cursor is a character with only 3 scan lines, and is
+ not shown if flag 1 is not active on this scan line.
+ It always blinks if shown.
- Control characters blink if RED mode is on and they
- are not on status line; else they are blanked out.
+ Control characters blink if RED mode is on and they
+ are not on status line; else they are blanked out.
*/
if (scanline > 7 && (!m_cursor || blink))
@@ -577,8 +577,8 @@ UINT32 ie15_state::draw_scanline(UINT16 *p, UINT16 offset, UINT8 scanline, UINT8
TIMER_DEVICE_CALLBACK_MEMBER(ie15_state::scanline_callback)
{
UINT16 y = machine().primary_screen->vpos();
-// DBG_LOG(2,"scanline",
-// ("addr %03x frame %lld x %04d y %03d\n", m_videoptr_2, machine().primary_screen->frame_number(), machine().primary_screen->hpos(), y));
+// DBG_LOG(2,"scanline",
+// ("addr %03x frame %lld x %04d y %03d\n", m_videoptr_2, machine().primary_screen->frame_number(), machine().primary_screen->hpos(), y));
if (y>=IE15_VERT_START) {
y -= IE15_VERT_START;
if (y < IE15_DISP_VERT) {
@@ -597,15 +597,15 @@ UINT32 ie15_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
/* F4 Character Displayer */
static const gfx_layout ie15_charlayout =
{
- 7, 8, /* 7x8 pixels in 10x11 cell */
- 256, /* 256 characters */
- 1, /* 1 bits per pixel */
- { 0 }, /* no bitplanes */
+ 7, 8, /* 7x8 pixels in 10x11 cell */
+ 256, /* 256 characters */
+ 1, /* 1 bits per pixel */
+ { 0 }, /* no bitplanes */
/* x offsets */
{ 0, 1, 2, 3, 4, 5, 6 },
/* y offsets */
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
- 8*8 /* every char takes 8 bytes */
+ 8*8 /* every char takes 8 bytes */
};
static GFXDECODE_START( ie15 )
diff --git a/src/mess/drivers/microkit.c b/src/mess/drivers/microkit.c
index 00563144ba3..fb4c59c6d43 100644
--- a/src/mess/drivers/microkit.c
+++ b/src/mess/drivers/microkit.c
@@ -1,8 +1,8 @@
/*
- RCA COSMAC Microkit
+ RCA COSMAC Microkit
- http://www.vintagecomputer.net/browse_thread.cfm?id=511
+ http://www.vintagecomputer.net/browse_thread.cfm?id=511
*/
diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c
index e6e5e8ecf8f..939450f4fdd 100644
--- a/src/mess/drivers/ngp.c
+++ b/src/mess/drivers/ngp.c
@@ -677,7 +677,7 @@ void ngp_state::machine_start()
m_seconds_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ngp_state::ngp_seconds_callback),this));
m_seconds_timer->adjust( attotime::from_seconds(1), 0, attotime::from_seconds(1) );
-
+
save_item(NAME(m_io_reg));
save_item(NAME(m_old_to3));
// TODO: check if these are handled correctly...
diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c
index 0a78a125b04..13c092e0f2c 100644
--- a/src/mess/drivers/pc.c
+++ b/src/mess/drivers/pc.c
@@ -1419,7 +1419,7 @@ static MACHINE_CONFIG_START( mc1502, pc_state )
MCFG_FLOPPY_DRIVE_ADD("fd1", mc1502_floppies, "525qd", 0, pc_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","mc1502_flop")
-// MCFG_SOFTWARE_LIST_ADD("cass_list","mc1502_cass")
+// MCFG_SOFTWARE_LIST_ADD("cass_list","mc1502_cass")
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -2169,7 +2169,7 @@ ROM_START( ec1845 )
ROMX_LOAD( "184505.bin", 0xfe001, 0x0800, CRC(c807e3f5) SHA1(08117e449f0d04f96041cff8d34893f500f3760d), ROM_SKIP(1))
ROMX_LOAD( "184506.bin", 0xff000, 0x0800, CRC(24f5c27c) SHA1(7822dd7f715ef00ccf6d8408be8bbfe01c2eba20), ROM_SKIP(1))
ROMX_LOAD( "184507.bin", 0xff001, 0x0800, CRC(75122203) SHA1(7b0fbdf1315230633e39574ac7360163bc7361e1), ROM_SKIP(1))
- ROM_REGION(0x2000,"gfx1", ROMREGION_ERASE00)
+ ROM_REGION(0x2000,"gfx1", ROMREGION_ERASE00)
ROM_END
ROM_START( asst128 )
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index a2f96f94895..065285b0052 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -462,7 +462,7 @@ WRITE8_MEMBER( cbm8296_state::write )
if (!endra)
{
//logerror("%s write %04x : cswff %u cs9 %u csa %u csio %u cse %u cskb %u fa12 %u casena1 %u endra %u noscreen %u casena2 %u fa15 %u\n",machine().describe_context(),offset,cswff,cs9,csa,csio,cse,cskb,fa12,casena1,endra,noscreen,casena2,fa15);
-
+
offs_t drma = fa15 << 15 | (offset & 0x7e00) | BIT(offset, 0) << 8 | (offset & 0x1fe) >> 1;
if (!casena1)
diff --git a/src/mess/drivers/sms.c b/src/mess/drivers/sms.c
index 87635621cfb..ac20862c916 100644
--- a/src/mess/drivers/sms.c
+++ b/src/mess/drivers/sms.c
@@ -87,7 +87,7 @@ Notes: (All ICs shown)
IC6/IC7 D4168- NEC D4168 8k x8 SRAM (DIP28)
IC8 7805 - Motorola MC7805 voltage regulator (7v to 25v input, 5v output)
IC9 CXA1145 - Sony CXA1145 RGB to composite video encoder IC (DIP24)
- POWER_IN - Power input from AC/DC power pack. System requires 9VDC at 500mA. Center pin is negative and
+ POWER_IN - Power input from AC/DC power pack. System requires 9VDC at 500mA. Center pin is negative and
outer barrel is positive. Note this is opposite to regular DC power packs
RF_OUT - RF modulator with RF signal output to TV
POWER_SW - Power on/off switch
@@ -97,16 +97,16 @@ Notes: (All ICs shown)
VSync - 49.7015Hz
-Cart PCB Examples
+Cart PCB Examples
-----------------
-Note! There are many more types of PCBs & custom chip matching variations. This document
-is not meant to provide all details of every type in existence. Some games have been
+Note! There are many more types of PCBs & custom chip matching variations. This document
+is not meant to provide all details of every type in existence. Some games have been
found on different types of ROM boards with and without bankswitching hardware.
Type with no bankswitching hardware
171-5519 \ no visible difference?
-171-5519D/
+171-5519D/
|------------------|
||----------| |
|| DIP28 | |
@@ -123,8 +123,8 @@ Notes:
World Grand Prix MPR-11074
Black Belt MPR-10150
Ghost House MPR-12586
-
-
+
+
Types with bankswitching hardware
171-5713D (uses 315-5235)
@@ -142,7 +142,7 @@ Types with bankswitching hardware
|IC2 |
|------------------|
Notes:
- SDIP42 - Custom Sega bankswitch chip at location IC1. There are several different
+ SDIP42 - Custom Sega bankswitch chip at location IC1. There are several different
types of these chips with different 315-xxxx numbers
These include 315-5235 (DIP42), 315-5208 (DIP28) and 315-5365 (DIP42) and possibly others.
DIP32 - 1MBit/2MBit/4MBit mask ROM (DIP32) at location IC2
@@ -167,7 +167,7 @@ Notes:
| |
|----------------|
Notes:
- SDIP42 - Custom Sega bankswitch chip at location IC1. There are several different
+ SDIP42 - Custom Sega bankswitch chip at location IC1. There are several different
types of these chips with different 315-xxxx numbers
These include 315-5235 (DIP42), 315-5208 (DIP28) and 315-5365 (DIP42) and possibly others.
DIP40 - 2MBit/4Mbit 16-bit mask ROM (DIP40) at location IC2
@@ -175,10 +175,10 @@ Notes:
Game Name Sega ROM ID Bank Chip
-----------------------------------------
Space Harrier MPR-10410 315-5235
-
-Another ROM board 171-5497 used by Monopoly has 315-5235 DIP42 mapper chip, DIP28 mask ROM, a DIP8 chip (unknown),
+
+Another ROM board 171-5497 used by Monopoly has 315-5235 DIP42 mapper chip, DIP28 mask ROM, a DIP8 chip (unknown),
DIP28 SRAM (likely 8k) and a 3V coin battery.
-Yet another type of ROM board with unknown PCB number used by Phantasy Star has 315-5235 DIP42 mapper chip, DIP32 mask
+Yet another type of ROM board with unknown PCB number used by Phantasy Star has 315-5235 DIP42 mapper chip, DIP32 mask
ROM and DIP28 SRAM (likely 8k) and a 3V coin battery.
Unfortunatley the majority of these ROM boards, ROM types and MPR-xxxxx Sega part numbers are undocumented because they
were mostly dumped from the edge connector without being opened.
diff --git a/src/mess/drivers/softbox.c b/src/mess/drivers/softbox.c
index aed5c083622..807a2f78f8f 100644
--- a/src/mess/drivers/softbox.c
+++ b/src/mess/drivers/softbox.c
@@ -1,8 +1,8 @@
/*
- SSE SoftBox
+ SSE SoftBox
- http://mikenaberezny.com/hardware/pet-cbm/sse-softbox-z80-computer/
+ http://mikenaberezny.com/hardware/pet-cbm/sse-softbox-z80-computer/
*/
@@ -193,14 +193,14 @@ READ8_MEMBER( softbox_state::pia1_pc_r )
bit description
- PC0
- PC1
- PC2
- PC3
+ PC0
+ PC1
+ PC2
+ PC3
PC4 Corvus READY
PC5 Corvus ACTIVE
- PC6
- PC7
+ PC6
+ PC7
*/
@@ -216,11 +216,11 @@ WRITE8_MEMBER( softbox_state::pia1_pc_w )
PC0 LED "A"
PC1 LED "B"
PC2 LED "READY"
- PC3
- PC4
- PC5
- PC6
- PC7
+ PC3
+ PC4
+ PC5
+ PC6
+ PC7
*/
diff --git a/src/mess/drivers/ts802.c b/src/mess/drivers/ts802.c
index 68e5be8598a..43193e28f17 100644
--- a/src/mess/drivers/ts802.c
+++ b/src/mess/drivers/ts802.c
@@ -7,10 +7,10 @@
TODO:
- Everything - this is just a skeleton
-
+
Technical manual at:
http://bitsavers.org/pdf/televideo/TS800A_TS802_TS802H_Maintenance_Manual_1982.pdf
-
+
includes in-depth discussion of the inner workings of the WD1000 HDD controller.
****************************************************************************/
@@ -49,7 +49,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(ts802_io, AS_IO, 8, ts802_state)
//ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(port00_r) // DIP switches
+ AM_RANGE(0x00, 0x00) AM_READ(port00_r) // DIP switches
// 04 - written once after OS boot to bank in RAM from 0000-3FFF instead of ROM. 4000-FFFF is always RAM.
// 08-0B: Z80 CTC
// 0C-0F: Z80 SIO #1
diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h
index 3e44670c0d2..bbe8d220505 100644
--- a/src/mess/includes/gb.h
+++ b/src/mess/includes/gb.h
@@ -96,12 +96,12 @@ struct gb_lcd_t {
UINT8 *gb_vram; // Pointer to VRAM
UINT8 *gb_oam; // Pointer to OAM memory
UINT8 gb_tile_no_mod;
- UINT32 gb_chrgen_offs; // GB Character generator
- UINT32 gb_bgdtab_offs; // GB Background character table
- UINT32 gb_wndtab_offs; // GB Window character table
- UINT32 gbc_chrgen_offs; // CGB Character generator
- UINT32 gbc_bgdtab_offs; // CGB Background character table
- UINT32 gbc_wndtab_offs; // CGB Window character table
+ UINT32 gb_chrgen_offs; // GB Character generator
+ UINT32 gb_bgdtab_offs; // GB Background character table
+ UINT32 gb_wndtab_offs; // GB Window character table
+ UINT32 gbc_chrgen_offs; // CGB Character generator
+ UINT32 gbc_bgdtab_offs; // CGB Background character table
+ UINT32 gbc_wndtab_offs; // CGB Window character table
int gb_vram_bank;
};
@@ -234,7 +234,7 @@ protected:
void gb_increment_scanline();
void gb_lcd_switch_on();
inline void gb_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
-
+
void save_gb_base();
void save_gb_video();
void save_gbc_only();
diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h
index 3a5406ae3f3..31ef7b9a4bb 100644
--- a/src/mess/includes/lynx.h
+++ b/src/mess/includes/lynx.h
@@ -116,7 +116,7 @@ public:
required_shared_ptr<UINT8> m_mem_fffa;
required_device<cpu_device> m_maincpu;
required_device<lynx_sound_device> m_sound;
-
+
UINT16 m_granularity;
int m_sign_AB;
int m_sign_CD;
diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h
index 3ecc1c53497..e8cc9d68757 100644
--- a/src/mess/includes/softbox.h
+++ b/src/mess/includes/softbox.h
@@ -16,18 +16,18 @@
#define I8251_TAG "i8251"
#define I8255_0_TAG "ic17"
#define I8255_1_TAG "ic16"
-#define COM8116_TAG "ic14"
-#define RS232_TAG "rs232"
+#define COM8116_TAG "ic14"
+#define RS232_TAG "rs232"
class softbox_state : public driver_device
{
public:
softbox_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, Z80_TAG),
- m_usart(*this, I8251_TAG),
- m_dbrg(*this, COM8116_TAG),
- m_ieee(*this, IEEE488_TAG)
+ m_maincpu(*this, Z80_TAG),
+ m_usart(*this, I8251_TAG),
+ m_dbrg(*this, COM8116_TAG),
+ m_ieee(*this, IEEE488_TAG)
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 704be74a5c7..f26b6e61186 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -97,7 +97,7 @@ INPUT_PORTS_START( apollo_config )
PORT_CONFSETTING(APOLLO_CONF_8_PLANES, "8-Plane Color")
PORT_CONFSETTING(APOLLO_CONF_4_PLANES, "4-Plane Color")
PORT_CONFSETTING(APOLLO_CONF_MONO_15I, "15\" Monochrome")
-// PORT_CONFSETTING(APOLLO_CONF_MONO_19I, "19\" Monochrome")
+// PORT_CONFSETTING(APOLLO_CONF_MONO_19I, "19\" Monochrome")
PORT_CONFNAME(APOLLO_CONF_GERMAN_KBD, 0x00, "German Keyboard")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c
index 687297b9eca..45df99d4b57 100644
--- a/src/mess/machine/gb.c
+++ b/src/mess/machine/gb.c
@@ -134,7 +134,7 @@ void gb_state::save_gbc_only()
}
void gb_state::save_sgb_only()
-{
+{
save_item(NAME(m_sgb_pal_data));
save_item(NAME(m_sgb_pal));
save_item(NAME(m_sgb_tile_map));
@@ -194,7 +194,7 @@ MACHINE_START_MEMBER(gb_state,gbpocket)
/* Allocate the serial timer, and disable it */
m_gb_serial_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gb_state::gb_serial_timer_proc),this));
m_gb_serial_timer->enable( 0 );
-
+
save_gb_base();
gb_video_start(GB_VIDEO_MGB);
}
@@ -231,12 +231,12 @@ MACHINE_START_MEMBER(gb_state,sgb)
MACHINE_RESET_MEMBER(gb_state,gb)
{
gb_init();
-
+
gb_video_reset(GB_VIDEO_DMG);
-
+
/* Enable BIOS rom */
m_bios_disable = 0;
-
+
m_divcount = 0x0004;
}
@@ -276,21 +276,21 @@ MACHINE_RESET_MEMBER(gb_state,gbc)
MACHINE_RESET_MEMBER(gb_state,sgb)
{
gb_init();
-
+
gb_video_reset(GB_VIDEO_SGB);
-
+
gb_init_regs();
-
-
+
+
/* Enable BIOS rom */
m_bios_disable = 0;
-
+
memset(m_sgb_tile_data, 0, 0x2000);
-
+
m_sgb_window_mask = 0;
memset(m_sgb_pal_map, 0, sizeof(m_sgb_pal_map));
memset(m_sgb_atf_data, 0, sizeof(m_sgb_atf_data));
-
+
m_divcount = 0x0004;
}
@@ -1072,7 +1072,7 @@ MACHINE_START_MEMBER(megaduck_state,megaduck)
/* Allocate the serial timer, and disable it */
m_gb_serial_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gb_state::gb_serial_timer_proc),this));
m_gb_serial_timer->enable( 0 );
-
+
save_gb_base();
gb_video_start(GB_VIDEO_DMG);
}
diff --git a/src/mess/machine/lynx.c b/src/mess/machine/lynx.c
index ea536791cf1..8334f171230 100644
--- a/src/mess/machine/lynx.c
+++ b/src/mess/machine/lynx.c
@@ -558,7 +558,7 @@ void lynx_state::lynx_blit_lines()
m_blitter.height_accumulator += m_blitter.height;
for (int j = 0; j < (m_blitter.height_accumulator >> 8); j++, y += ydir)
- {
+ {
if (y >= 0 && y < 102)
{
if (m_blitter.use_rle)
@@ -729,7 +729,7 @@ void lynx_state::lynx_blitter()
m_blitter.mode = m_blitter.spr_ctl0 & 0x07;
m_blitter.use_rle = m_blitter.spr_ctl1 & 0x80 ? 0 : 1;
m_blitter.line_color = (m_blitter.spr_ctl0 >> 6) & 0x03;
-
+
m_blitter.sprite_collide = !(m_blitter.spr_coll & 0x20);
m_blitter.spritenr = m_blitter.spr_coll & 0x0f;
m_blitter.fred = 0;
@@ -1986,7 +1986,7 @@ void lynx_state::machine_start()
save_item(NAME(m_uart.received));
save_item(NAME(m_uart.sending));
save_item(NAME(m_uart.buffer_loaded));
-
+
machine().save().register_postload(save_prepost_delegate(FUNC(lynx_state::lynx_postload), this));
membank("bank3")->configure_entry(0, memregion("maincpu")->base() + 0x0000);
diff --git a/src/mess/machine/md_stm95.h b/src/mess/machine/md_stm95.h
index 6bd0a07c1a7..a67a0d82aff 100644
--- a/src/mess/machine/md_stm95.h
+++ b/src/mess/machine/md_stm95.h
@@ -46,7 +46,7 @@ protected:
int stream_pos;
int stream_data;
int eeprom_addr;
-
+
running_machine& m_machine;
};
diff --git a/src/mess/machine/nes_bootleg.c b/src/mess/machine/nes_bootleg.c
index 6916240c468..652127e8fb4 100644
--- a/src/mess/machine/nes_bootleg.c
+++ b/src/mess/machine/nes_bootleg.c
@@ -430,7 +430,7 @@ void nes_lh53_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_reg));
@@ -439,10 +439,10 @@ void nes_lh53_device::device_start()
void nes_lh53_device::pcb_reset()
{
chr8(0, CHRRAM);
-
+
prg8_89(0xc);
- prg8_ab(0xd); // last 2K are overlayed by WRAM
- prg8_cd(0xe); // first 6K are overlayed by WRAM
+ prg8_ab(0xd); // last 2K are overlayed by WRAM
+ prg8_cd(0xe); // first 6K are overlayed by WRAM
prg8_ef(0xf);
m_reg = 0;
m_irq_count = 0;
@@ -1305,18 +1305,18 @@ WRITE8_MEMBER(nes_lh10_device::write_h)
}
/*-------------------------------------------------
-
+
UNL-LH53
-
+
Games: Nazo no Murasamejou (FDS conversion)
-
- This PCB maps WRAM (w/battery) in 0xb800-0xd7ff and
+
+ This PCB maps WRAM (w/battery) in 0xb800-0xd7ff and
PRG in 0x6000-0x7fff
iNES:
-
+
In MESS: Preliminar Support only.
-
+
-------------------------------------------------*/
void nes_lh53_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -1344,20 +1344,20 @@ READ8_MEMBER(nes_lh53_device::read_m)
READ8_MEMBER(nes_lh53_device::read_h)
{
LOG_MMC(("lh53 read_h, offset: %04x\n", offset));
-
+
if (offset >= 0x3800 && offset < 0x5800)
return m_battery[offset & 0x1fff];
-
+
return hi_access_rom(offset);
}
WRITE8_MEMBER(nes_lh53_device::write_h)
{
LOG_MMC(("lh53 write_h, offset: %04x, data: %02x\n", offset, data));
-
+
if (offset >= 0x3800 && offset < 0x5800)
m_battery[offset & 0x1fff] = data;
-
+
else
{
switch (offset & 0x7000)
diff --git a/src/mess/machine/nes_bootleg.h b/src/mess/machine/nes_bootleg.h
index da87dfa8b77..13a41d684a8 100644
--- a/src/mess/machine/nes_bootleg.h
+++ b/src/mess/machine/nes_bootleg.h
@@ -327,7 +327,7 @@ class nes_lh53_device : public nes_nrom_device
public:
// construction/destruction
nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -335,14 +335,14 @@ public:
virtual DECLARE_READ8_MEMBER(read_h);
virtual DECLARE_WRITE8_MEMBER(write_m) {}
virtual DECLARE_WRITE8_MEMBER(write_h);
-
+
virtual void pcb_reset();
-
+
private:
UINT16 m_irq_count;
int m_irq_enable;
UINT8 m_reg;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
attotime timer_freq;
diff --git a/src/mess/machine/nes_kaiser.c b/src/mess/machine/nes_kaiser.c
index ed237169b65..b425fb9120e 100644
--- a/src/mess/machine/nes_kaiser.c
+++ b/src/mess/machine/nes_kaiser.c
@@ -218,9 +218,9 @@ void nes_ks7031_device::device_start()
void nes_ks7031_device::pcb_reset()
{
- prg32(0); // not really used...
+ prg32(0); // not really used...
chr8(0, CHRRAM);
-
+
m_reg[0] = 0;
m_reg[1] = 0;
m_reg[2] = 0;
@@ -525,15 +525,15 @@ WRITE8_MEMBER(nes_ks7012_device::write_h)
/*-------------------------------------------------
-
+
Kaiser Board KS7013B
-
+
Games: Highway Star FDS Conversion
-
+
iNES:
-
+
In MESS: Supported.
-
+
-------------------------------------------------*/
WRITE8_MEMBER(nes_ks7013b_device::write_m)
@@ -556,13 +556,13 @@ WRITE8_MEMBER(nes_ks7013b_device::write_h)
Games: Dracula II FDS Conversion
This board is quite weird. It handles 2K PRG chunks
- and the chip contains chunks in reverse order, so
+ and the chip contains chunks in reverse order, so
that the first 2K are actually loaded at the top
of the 0x8000-0xffff region. Main bank is fixed, while
the 8K mapped at 0x6000-0x7fff varies with reg writes.
TODO: understand how SRAM is handled...
-
+
iNES:
In MESS: Supported.
@@ -571,7 +571,7 @@ WRITE8_MEMBER(nes_ks7013b_device::write_h)
READ8_MEMBER(nes_ks7031_device::read_m)
{
-// LOG_MMC(("ks7031 read_m, offset: %04x\n", offset));
+// LOG_MMC(("ks7031 read_m, offset: %04x\n", offset));
return m_prg[(m_reg[(offset >> 11) & 3] * 0x0800) + (offset & 0x7ff)];
}
diff --git a/src/mess/machine/nes_kaiser.h b/src/mess/machine/nes_kaiser.h
index 374fee9c833..07f6f0707ab 100644
--- a/src/mess/machine/nes_kaiser.h
+++ b/src/mess/machine/nes_kaiser.h
@@ -154,15 +154,15 @@ class nes_ks7031_device : public nes_nrom_device
public:
// construction/destruction
nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual DECLARE_READ8_MEMBER(read_m);
virtual DECLARE_READ8_MEMBER(read_h);
virtual DECLARE_WRITE8_MEMBER(write_h);
-
+
virtual void pcb_reset();
-
+
private:
UINT8 m_reg[4];
};
diff --git a/src/mess/machine/nes_mmc3_clones.c b/src/mess/machine/nes_mmc3_clones.c
index 9b57cfb9816..13a788d586b 100644
--- a/src/mess/machine/nes_mmc3_clones.c
+++ b/src/mess/machine/nes_mmc3_clones.c
@@ -167,7 +167,7 @@ nes_sachen_shero_device::nes_sachen_shero_device(const machine_config &mconfig,
}
//nes_a9746_device::nes_a9746_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-// : nes_txrom_device(mconfig, NES_A9746, "NES Cart A-9746 PCB", tag, owner, clock, "nes_bmc_a9746", __FILE__)
+// : nes_txrom_device(mconfig, NES_A9746, "NES Cart A-9746 PCB", tag, owner, clock, "nes_bmc_a9746", __FILE__)
//{
//}
@@ -2498,16 +2498,16 @@ WRITE8_MEMBER(nes_pjoy84_device::write_m)
#ifdef UNUSED_FUNCTION
/*-------------------------------------------------
-
+
UNL-A9746
-
-
+
+
MMC3 clone
-
-
+
+
Preliminary emulation based on Cah4e3's code
No dump is available (yet) for this.
-
+
-------------------------------------------------*/
void nes_a9746_device::device_start()
@@ -2519,7 +2519,7 @@ void nes_a9746_device::device_start()
void nes_a9746_device::pcb_reset()
{
m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM;
-
+
m_reg[0] = 0;
m_reg[1] = 0;
m_reg[2] = 0;
@@ -2529,7 +2529,7 @@ void nes_a9746_device::pcb_reset()
void nes_a9746_device::update_banks(UINT8 value)
{
UINT8 bank = BITSWAP8(value & 0x3c,7,6,0,1,2,3,4,5);
-
+
switch (m_reg[0])
{
case 0x26: prg8_89(bank); break;
@@ -2537,7 +2537,7 @@ void nes_a9746_device::update_banks(UINT8 value)
case 0x24: prg8_cd(bank); break;
case 0x23: prg8_ef(bank); break;
}
-
+
switch (m_reg[1])
{
case 0x08: case 0x0a: case 0x0c: case 0x0e:
@@ -2559,7 +2559,7 @@ void nes_a9746_device::update_banks(UINT8 value)
WRITE8_MEMBER(nes_a9746_device::write_h)
{
LOG_MMC(("unl_a9746 write_h, offset: %04x, data: %02x\n", offset, data));
-
+
switch (offset & 0x6003)
{
case 0x0000:
@@ -2573,18 +2573,17 @@ WRITE8_MEMBER(nes_a9746_device::write_h)
m_reg[0] = data;
m_reg[1] = 0;
break;
-
+
case 0x0003:
case 0x2000:
case 0x2001:
case 0x2002:
case 0x2003:
break;
-
+
default:
txrom_write(space, offset, data, mem_mask);
break;
}
}
#endif
-
diff --git a/src/mess/machine/nes_slot.c b/src/mess/machine/nes_slot.c
index bf93f3fdbfd..89881d07d92 100644
--- a/src/mess/machine/nes_slot.c
+++ b/src/mess/machine/nes_slot.c
@@ -768,7 +768,7 @@ void device_nes_cart_interface::pcb_start(running_machine &machine, UINT8 *ciram
if (m_vram_size)
state_save_register_item_pointer(machine, "NES_CART", NULL, 0, m_vram, m_vram_size);
if (m_battery_size)
- state_save_register_item_pointer(machine, "NES_CART", NULL, 0, m_battery, m_battery_size);
+ state_save_register_item_pointer(machine, "NES_CART", NULL, 0, m_battery, m_battery_size);
}
void device_nes_cart_interface::pcb_reg_postload(running_machine &machine)
diff --git a/src/mess/machine/nes_slot.h b/src/mess/machine/nes_slot.h
index b5a5049ec0b..0fe9e24ea60 100644
--- a/src/mess/machine/nes_slot.h
+++ b/src/mess/machine/nes_slot.h
@@ -107,7 +107,7 @@ enum
OPENCORP_DAOU306, HES_BOARD, SVISION16_BOARD, RUMBLESTATION_BOARD, JYCOMPANY_A, JYCOMPANY_B, JYCOMPANY_C,
MAGICSERIES_MD, KASING_BOARD, FUTUREMEDIA_BOARD, FUKUTAKE_BOARD, SOMARI_SL12,
HENGG_SRICH, HENGG_XHZS, HENGG_SHJY3, SUBOR_TYPE0, SUBOR_TYPE1,
- KAISER_KS7058, KAISER_KS7032, KAISER_KS7022, KAISER_KS7017,
+ KAISER_KS7058, KAISER_KS7032, KAISER_KS7022, KAISER_KS7017,
KAISER_KS7012, KAISER_KS7013B, KAISER_KS202, KAISER_KS7031,
CNE_DECATHLON, CNE_FSB, CNE_SHLZ, CONY_BOARD, YOKO_BOARD,
RCM_GS2015, RCM_GS2004, RCM_GS2013, RCM_TF9IN1, RCM_3DBLOCK,
diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c
index cbbe5891bec..2cc69ebf736 100644
--- a/src/mess/machine/pc.c
+++ b/src/mess/machine/pc.c
@@ -56,7 +56,7 @@
#define DBG_LOG(N,M,A) \
do { \
- if(VERBOSE_DBG>=N) \
+ if(VERBOSE_DBG>=N) \
{ \
if( M ) \
logerror("%11.6f at %s: %-24s",machine().time().as_double(),machine().describe_context(),(char*)M ); \
diff --git a/src/mess/machine/pc_joy_sw.c b/src/mess/machine/pc_joy_sw.c
index 256834f3bdf..9ebd173d513 100644
--- a/src/mess/machine/pc_joy_sw.c
+++ b/src/mess/machine/pc_joy_sw.c
@@ -173,5 +173,3 @@ ioport_constructor pc_mssw_pad_device::device_input_ports() const
{
return INPUT_PORTS_NAME( sidewinder_pad );
}
-
-
diff --git a/src/mess/machine/psxcard.c b/src/mess/machine/psxcard.c
index a952d247c60..18b4c1e4ebb 100644
--- a/src/mess/machine/psxcard.c
+++ b/src/mess/machine/psxcard.c
@@ -54,18 +54,18 @@ void psxcard_device::device_start()
m_disabled = false;
// save state registrations
- save_item(NAME(pkt));
- save_item(NAME(pkt_ptr));
- save_item(NAME(pkt_sz));
- save_item(NAME(cmd));
- save_item(NAME(addr));
- save_item(NAME(state));
- save_item(NAME(m_disabled));
- save_item(NAME(m_odata));
- save_item(NAME(m_idata));
- save_item(NAME(m_bit));
- save_item(NAME(m_count));
- save_item(NAME(m_pad));
+ save_item(NAME(pkt));
+ save_item(NAME(pkt_ptr));
+ save_item(NAME(pkt_sz));
+ save_item(NAME(cmd));
+ save_item(NAME(addr));
+ save_item(NAME(state));
+ save_item(NAME(m_disabled));
+ save_item(NAME(m_odata));
+ save_item(NAME(m_idata));
+ save_item(NAME(m_bit));
+ save_item(NAME(m_count));
+ save_item(NAME(m_pad));
}
void psxcard_device::device_reset()
diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c
index 7c4cc5b108d..cefce2e7497 100644
--- a/src/mess/machine/psxcd.c
+++ b/src/mess/machine/psxcd.c
@@ -1219,4 +1219,3 @@ int psxcd_device::add_system_event(int type, UINT64 t, void *ptr)
fatalerror("psxcd: out of timers\n");
return 0;
}
-
diff --git a/src/mess/machine/psxmultitap.h b/src/mess/machine/psxmultitap.h
index ca696c58376..35ec57098dc 100644
--- a/src/mess/machine/psxmultitap.h
+++ b/src/mess/machine/psxmultitap.h
@@ -5,7 +5,7 @@
SLOT_INTERFACE_EXTERN(psx_controllers_nomulti);
-class psx_multitap_device : public device_t,
+class psx_multitap_device : public device_t,
public device_psx_controller_interface
{
public:
diff --git a/src/mess/machine/s100_nsmdsa.h b/src/mess/machine/s100_nsmdsa.h
index fc9e7f79b08..d47ef5c4720 100644
--- a/src/mess/machine/s100_nsmdsa.h
+++ b/src/mess/machine/s100_nsmdsa.h
@@ -25,7 +25,7 @@
// ======================> s100_mds_a_device
class s100_mds_a_device : public device_t,
- public device_s100_card_interface
+ public device_s100_card_interface
{
public:
// construction/destruction
diff --git a/src/mess/machine/s100_nsmdsad.h b/src/mess/machine/s100_nsmdsad.h
index 8dfa900d768..098a6dd6010 100644
--- a/src/mess/machine/s100_nsmdsad.h
+++ b/src/mess/machine/s100_nsmdsad.h
@@ -25,7 +25,7 @@
// ======================> s100_mds_ad_device
class s100_mds_ad_device : public device_t,
- public device_s100_card_interface
+ public device_s100_card_interface
{
public:
// construction/destruction
diff --git a/src/mess/machine/s100_wunderbus.c b/src/mess/machine/s100_wunderbus.c
index 5b1305ccad4..85859307b28 100644
--- a/src/mess/machine/s100_wunderbus.c
+++ b/src/mess/machine/s100_wunderbus.c
@@ -19,9 +19,9 @@
#define INS8250_1_TAG "6d"
#define INS8250_2_TAG "5d"
#define INS8250_3_TAG "4d"
-#define RS232_A_TAG "rs232a"
-#define RS232_B_TAG "rs232b"
-#define RS232_C_TAG "rs232c"
+#define RS232_A_TAG "rs232a"
+#define RS232_B_TAG "rs232b"
+#define RS232_C_TAG "rs232c"
#define UPD1990C_TAG "12a"
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 3933f1bc6c9..8755a622b31 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -330,7 +330,7 @@ int sms_state::lgun_bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y )
/* Caculate distance in x of the radius, relative to beam's y distance.
First try some shortcuts. */
switch (dy)
- {
+ {
case LGUN_RADIUS:
dx_radius = 0;
break;
diff --git a/src/mess/machine/ti99/speech8.h b/src/mess/machine/ti99/speech8.h
index 51cd2b99a65..6f4537ac4e2 100644
--- a/src/mess/machine/ti99/speech8.h
+++ b/src/mess/machine/ti99/speech8.h
@@ -54,11 +54,11 @@ protected:
private:
tms5220_device *m_vsp;
-// UINT8 *m_speechrom; // pointer to speech ROM data
-// int m_load_pointer; // which 4-bit nibble will be affected by load address
-// int m_rombits_count; // current bit position in ROM
-// UINT32 m_sprom_address; // 18 bit pointer in ROM
-// UINT32 m_sprom_length; // length of data pointed by speechrom_data, from 0 to 2^18
+// UINT8 *m_speechrom; // pointer to speech ROM data
+// int m_load_pointer; // which 4-bit nibble will be affected by load address
+// int m_rombits_count; // current bit position in ROM
+// UINT32 m_sprom_address; // 18 bit pointer in ROM
+// UINT32 m_sprom_length; // length of data pointed by speechrom_data, from 0 to 2^18
// Ready line to the CPU
devcb_resolved_write_line m_ready;
diff --git a/src/mess/machine/wswan.c b/src/mess/machine/wswan.c
index 1bbbf4fe567..5643547c85d 100644
--- a/src/mess/machine/wswan.c
+++ b/src/mess/machine/wswan.c
@@ -201,7 +201,7 @@ void wswan_state::wswan_setup_bios()
void wswan_state::wswan_setup_banks()
{
- static const char *rom_bank_tags[14] = { "rom1", "rom2", "rom3", "rom4", "rom5", "rom6", "rom7",
+ static const char *rom_bank_tags[14] = { "rom1", "rom2", "rom3", "rom4", "rom5", "rom6", "rom7",
"rom8", "rom9", "rom10", "rom11", "rom12", "rom13", "rom14" };
for (int i = 0; i < 14; i++)
m_rom_bank[i] = membank(rom_bank_tags[i]);
@@ -214,7 +214,7 @@ void wswan_state::wswan_register_save()
save_item(NAME(m_bios_disabled));
save_item(NAME(m_rotate));
save_item(NAME(m_bank_base));
-
+
save_item(NAME(m_vdp.layer_bg_enable));
save_item(NAME(m_vdp.layer_fg_enable));
save_item(NAME(m_vdp.sprites_enable));
@@ -262,7 +262,7 @@ void wswan_state::wswan_register_save()
save_item(NAME(m_eeprom.size));
if (m_eeprom.size)
save_pointer(NAME(m_eeprom.data), m_eeprom.size);
-
+
save_item(NAME(m_rtc.present));
save_item(NAME(m_rtc.setting));
save_item(NAME(m_rtc.year));
@@ -273,7 +273,7 @@ void wswan_state::wswan_register_save()
save_item(NAME(m_rtc.minute));
save_item(NAME(m_rtc.second));
save_item(NAME(m_rtc.index));
-
+
save_item(NAME(m_sound_dma.source));
save_item(NAME(m_sound_dma.size));
save_item(NAME(m_sound_dma.enable));
diff --git a/src/mess/video/a7800.c b/src/mess/video/a7800.c
index 9c47501fa92..b2d1fc5ae9b 100644
--- a/src/mess/video/a7800.c
+++ b/src/mess/video/a7800.c
@@ -7,8 +7,8 @@
TODO:
precise DMA cycle stealing
- 2013-05-08 huygens rewrite to emulate line ram buffers (mostly fixes Kung-Fu Master
- Started DMA cycle stealing implementation
+ 2013-05-08 huygens rewrite to emulate line ram buffers (mostly fixes Kung-Fu Master
+ Started DMA cycle stealing implementation
2003-06-23 ericball Kangaroo mode & 320 mode & other stuff
@@ -47,13 +47,13 @@ void a7800_state::video_start()
{
m_maria_palette[i]=0;
}
-
+
for(i=0; i<2; i++)
{
for(j=0; j<160; j++)
m_line_ram[i][j] = 0;
}
-
+
m_active_buffer = 0;
m_maria_write_mode=0;
@@ -199,7 +199,7 @@ void a7800_state::maria_draw_scanline()
}
}
m_maincpu->eat_cycles(maria_cycles/4); // Maria clock rate is 4 times that of CPU
-
+
// draw line buffer to screen
m_active_buffer = !m_active_buffer; // switch buffers
UINT16 *scanline;
@@ -250,7 +250,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(a7800_state::a7800_interrupt)
machine().scheduler().trigger( TRIGGER_HSYNC );
m_maria_wsync = 0;
}
-
+
int frame_scanline = m_screen->vpos() % ( m_lines + 1 );
if (frame_scanline == 16)
m_maria_vblank = 0x00;
@@ -304,7 +304,7 @@ TIMER_CALLBACK_MEMBER(a7800_state::a7800_maria_startdma)
m_maria_offset--;
}
}
-
+
if( m_maria_nmi )
{
m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
@@ -343,7 +343,7 @@ READ8_MEMBER(a7800_state::a7800_MARIA_r)
WRITE8_MEMBER(a7800_state::a7800_MARIA_w)
{
int i;
-
+
if ((offset & 3) != 0)
m_maria_palette[offset] = data;
diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c
index 9f7290fd086..8325e6813ad 100644
--- a/src/mess/video/apollo.c
+++ b/src/mess/video/apollo.c
@@ -43,15 +43,15 @@
#define SR_BLANK 0x80
#define SR_V_BLANK 0x40
#define SR_H_SYNC 0x20
-#define SR_DONE 0x20 // 4- and 8-plane color
+#define SR_DONE 0x20 // 4- and 8-plane color
#define SR_R_M_W 0x10
#define SR_ALT 0x08
#define SR_V_SYNC 0x04
-#define SR_SYNC 0x04 // 4- and 8-plane color
+#define SR_SYNC 0x04 // 4- and 8-plane color
#define SR_H_CK 0x02
#define SR_V_DATA 0x01
-#define SR_V_FLAG 0x01 // 4-plane color
-#define SR_LUT_OK 0x01 // 8-plane color
+#define SR_V_FLAG 0x01 // 4-plane color
+#define SR_LUT_OK 0x01 // 8-plane color
// control register 0
#define CR0_MODE(a) ((a) >> 5)
#define CR0_MODE_0 0
@@ -64,9 +64,9 @@
// control register 1
#define CR1_INV 0x80
-#define CR1_AD_BIT 0x80 // 4- and 8-plane color
+#define CR1_AD_BIT 0x80 // 4- and 8-plane color
#define CR1_DADDR_16 0x40
-#define CR1_DV_CK 0x40 // 4- and 8-plane color
+#define CR1_DV_CK 0x40 // 4- and 8-plane color
#define CR1_DH_CK 0x20
#define CR1_ROP_EN 0x10
#define CR1_RESET 0x08
@@ -96,7 +96,7 @@
#define LUT_C0 0x01
#define LUT_C1_C0(a) ((a)& (LUT_C1|LUT_C0))
-#define LUT_FIFO_SIZE 1024
+#define LUT_FIFO_SIZE 1024
//**************************************************************************
// class apollo_graphics
@@ -235,9 +235,9 @@ private:
running_machine *m_machine;
};
- //**************************************************************************
- // class LUT Fifo
- //**************************************************************************
+ //**************************************************************************
+ // class LUT Fifo
+ //**************************************************************************
class apollo_graphics::lut_fifo
{
@@ -490,7 +490,7 @@ UINT8 apollo_graphics::bt458::read(UINT8 c10)
break;
}
-// MLOG1(("reading Bt458 data=%02x cs=%d", m_data, c10));
+// MLOG1(("reading Bt458 data=%02x cs=%d", m_data, c10));
return data;
}
@@ -629,7 +629,7 @@ void apollo_graphics::device_reset()
memset(m_color_lookup_table, 0, sizeof(m_color_lookup_table));
memset(m_image_memory, 0, m_image_memory_size * 2);
- // register_vblank_callback(this);
+ // register_vblank_callback(this);
}
void apollo_graphics::device_reset_mono19i()
@@ -912,7 +912,7 @@ void apollo_graphics::increment_p_clock()
// FIXME: ok for DEX Test 5 6 17 20 - nok for 19
// Note: for dn3500_19i DEX Test 17 18 20 will fail !!!!
// Note: must NOT reset m_data_clock in increment_p_clock !
-// int pixel_addr = m_data_clock * 32;
+// int pixel_addr = m_data_clock * 32;
UINT16 pixel = m_image_memory[pixel_addr / 16] & (0x8000 >> (pixel_addr % 16));
diff --git a/src/mess/video/gb.c b/src/mess/video/gb.c
index 8f50a2ab262..042d487c766 100644
--- a/src/mess/video/gb.c
+++ b/src/mess/video/gb.c
@@ -1204,14 +1204,14 @@ void gb_state::save_gb_video()
save_item(NAME(m_lcd.window_lines_drawn));
save_item(NAME(m_lcd.gb_vid_regs));
save_item(NAME(m_lcd.bg_zbuf));
-
+
save_item(NAME(m_lcd.cgb_bpal));
save_item(NAME(m_lcd.cgb_spal));
-
+
save_item(NAME(m_lcd.gb_bpal));
save_item(NAME(m_lcd.gb_spal0));
save_item(NAME(m_lcd.gb_spal1));
-
+
save_item(NAME(m_lcd.current_line));
save_item(NAME(m_lcd.cmp_line));
save_item(NAME(m_lcd.sprCount));
@@ -1244,7 +1244,7 @@ void gb_state::save_gb_video()
save_item(NAME(m_lcd.gbc_chrgen_offs));
save_item(NAME(m_lcd.gbc_bgdtab_offs));
save_item(NAME(m_lcd.gbc_wndtab_offs));
-
+
save_item(NAME(m_lcd.layer[0].enabled));
save_item(NAME(m_lcd.layer[0].xindex));
save_item(NAME(m_lcd.layer[0].xshift));
@@ -1269,8 +1269,8 @@ void gb_state::gb_video_start( int mode )
save_pointer(NAME(m_lcd.gb_vram), vram_size);
save_pointer(NAME(m_lcd.gb_oam), 0x100);
- save_gb_video();
-
+ save_gb_video();
+
if (mode == GB_VIDEO_CGB)
{
m_lcd.lcd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gb_state::gbc_lcd_timer_proc),this));
@@ -1281,11 +1281,11 @@ void gb_state::gb_video_start( int mode )
m_lcd.lcd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gb_state::gb_lcd_timer_proc),this));
machine().save().register_postload(save_prepost_delegate(FUNC(gb_state::gb_videoptr_restore), this));
}
-
+
switch (mode)
{
case GB_VIDEO_DMG:
- memcpy(m_lcd.gb_oam, dmg_oam_fingerprint, 0x100);
+ memcpy(m_lcd.gb_oam, dmg_oam_fingerprint, 0x100);
break;
case GB_VIDEO_MGB:
/* Initialize part of VRAM. This code must be deleted when we have added the bios dump */
@@ -1298,7 +1298,7 @@ void gb_state::gb_video_start( int mode )
memcpy(m_lcd.gb_oam, mgb_oam_fingerprint, 0x100);
break;
case GB_VIDEO_SGB:
- break;
+ break;
case GB_VIDEO_CGB:
memcpy(m_lcd.gb_oam, cgb_oam_fingerprint, 0x100);
break;
@@ -1317,7 +1317,7 @@ void gb_state::gb_video_reset( int mode )
address_space &space = m_maincpu->space(AS_PROGRAM);
m_lcd.window_lines_drawn = 0;
-
+
m_lcd.current_line = 0;
m_lcd.cmp_line = 0;
m_lcd.sprCount = 0;
@@ -1340,11 +1340,11 @@ void gb_state::gb_video_reset( int mode )
m_lcd.gbc_mode = 0;
m_lcd.gb_tile_no_mod = 0;
m_lcd.gb_vram_bank = 0;
-
+
m_lcd.gb_chrgen_offs = 0;
m_lcd.gb_bgdtab_offs = 0x1c00;
m_lcd.gb_wndtab_offs = 0x1c00;
-
+
memset(&m_lcd.gb_vid_regs, 0, sizeof(m_lcd.gb_vid_regs));
memset(&m_lcd.bg_zbuf, 0, sizeof(m_lcd.bg_zbuf));
memset(&m_lcd.cgb_bpal, 0, sizeof(m_lcd.cgb_bpal));
diff --git a/src/mess/video/k1ge.c b/src/mess/video/k1ge.c
index 86984e4f8a7..e0d1309c2d7 100644
--- a/src/mess/video/k1ge.c
+++ b/src/mess/video/k1ge.c
@@ -893,4 +893,3 @@ k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_
: k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock)
{
}
-