summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-03-19 07:22:20 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-03-19 07:22:20 +0000
commit0e1f5ad25b25df7c2ec707ec45c544288eb3c683 (patch)
treeeeef04fdf999692be30c25457fb9b329e1dbfdde /src/emu/machine
parent86614c802b9d611d83520fdb43388ae51d31f553 (diff)
Cleanups and version bumpmame0148u2
Diffstat (limited to 'src/emu/machine')
-rw-r--r--src/emu/machine/6840ptm.c2
-rw-r--r--src/emu/machine/mos6551.c4
-rw-r--r--src/emu/machine/mos6551.h2
-rw-r--r--src/emu/machine/nscsi_hd.c6
-rw-r--r--src/emu/machine/saturn.c62
-rw-r--r--src/emu/machine/smpc.c2
-rw-r--r--src/emu/machine/stvcd.c4
-rw-r--r--src/emu/machine/tms9901.c4
-rw-r--r--src/emu/machine/z80sti.c2
9 files changed, 44 insertions, 44 deletions
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index c234d60545d..ecd6815bf17 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -159,7 +159,7 @@ void ptm6840_device::device_reset()
m_t3_divisor = 1;
m_status_read_since_int = 0;
m_IRQ = 0;
- m_t3_scaler = 0;
+ m_t3_scaler = 0;
for (int i = 0; i < 3; i++)
{
m_counter[i] = 0xffff;
diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c
index 63436791ddd..46ab2323f08 100644
--- a/src/emu/machine/mos6551.c
+++ b/src/emu/machine/mos6551.c
@@ -242,7 +242,7 @@ void mos6551_device::update_serial()
m_connection_state &= ~SERIAL_STATE_RTS;
else
m_connection_state |= SERIAL_STATE_RTS;
-
+
m_write_rts((m_connection_state & SERIAL_STATE_RTS) ? 0 : 1);
serial_connection_out();
@@ -371,7 +371,7 @@ WRITE_LINE_MEMBER( mos6551_device::rxc_w )
WRITE_LINE_MEMBER( mos6551_device::cts_w )
{
- m_cts = state;
+ m_cts = state;
}
diff --git a/src/emu/machine/mos6551.h b/src/emu/machine/mos6551.h
index 1736d61c2bb..6f84e41b213 100644
--- a/src/emu/machine/mos6551.h
+++ b/src/emu/machine/mos6551.h
@@ -66,7 +66,7 @@ public:
mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); }
- template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) {
+ template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) {
m_read_rxd.set_callback(rxd);
m_write_txd.set_callback(txd);
}
diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c
index b6def37b0c9..8f1b3fd51b7 100644
--- a/src/emu/machine/nscsi_hd.c
+++ b/src/emu/machine/nscsi_hd.c
@@ -139,8 +139,8 @@ void nscsi_harddisk_device::scsi_command()
strcpy((char *)&scsi_cmdbuf[8], " SEAGATE");
strcpy((char *)&scsi_cmdbuf[15], " ST225N");
strcpy((char *)&scsi_cmdbuf[31], "1.00");
- scsi_cmdbuf[36] = 0x00; // # of extents high
- scsi_cmdbuf[37] = 0x08; // # of extents low
+ scsi_cmdbuf[36] = 0x00; // # of extents high
+ scsi_cmdbuf[37] = 0x08; // # of extents low
scsi_cmdbuf[38] = 0x00; // group 0 commands 0-1f
scsi_cmdbuf[39] = 0x99; // commands 0,3,4,7
scsi_cmdbuf[40] = 0xa0; // commands 8, a
@@ -156,7 +156,7 @@ void nscsi_harddisk_device::scsi_command()
scsi_cmdbuf[50] = 0xa0; // commands 8, a
scsi_cmdbuf[51] = 0x00;
scsi_cmdbuf[52] = 0x00;
- scsi_cmdbuf[53] = 0xff; // end of list
+ scsi_cmdbuf[53] = 0xff; // end of list
if(size > 54)
size = 54;
scsi_data_in(0, size);
diff --git a/src/emu/machine/saturn.c b/src/emu/machine/saturn.c
index e91e64ca174..e44137ff67f 100644
--- a/src/emu/machine/saturn.c
+++ b/src/emu/machine/saturn.c
@@ -1,39 +1,39 @@
/**************************************************************************************
- Sega Saturn (c) 1994 Sega
-
- List of things that needs to be implemented:
- - There's definitely an ack mechanism in SCU irqs. This is almost surely done via
- the ISM register (i.e. going 0->1 to the given bit acks it).
- - There might be a delay to exactly when SCU irqs happens. This is due to the basic
- fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the
- irq.
- - Vblank-Out actually happens at the last screen line, not at 0.
- - VDP2 V counter has a similar roll-back as MD correspondent register:
- vpos line 0 == 0x1ff (Vblank-Out happens here)
- vpos line 1 == 0
+ Sega Saturn (c) 1994 Sega
+
+ List of things that needs to be implemented:
+ - There's definitely an ack mechanism in SCU irqs. This is almost surely done via
+ the ISM register (i.e. going 0->1 to the given bit acks it).
+ - There might be a delay to exactly when SCU irqs happens. This is due to the basic
+ fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the
+ irq.
+ - Vblank-Out actually happens at the last screen line, not at 0.
+ - VDP2 V counter has a similar roll-back as MD correspondent register:
+ vpos line 0 == 0x1ff (Vblank-Out happens here)
+ vpos line 1 == 0
...
vpos line 241 == 0xf0 (Vblank-In happens here)
vpos line 246 == 0xf5
- vpos line 247 == 0x1ef (rolls back here)
- vpos line 263 == 0x1ff again
- - HBlank bit seems to follow a normal logic instead.
- - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy
- over this).
- - Timer 0 fires at the HBlank-In signal, not before.
- - VDP2 H Counter actually counts x2 in non Hi-Res mode.
- - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from
- that position.
- H counter value 0x282 (642) -> timer 1 fires at setting 1
- H counter value 0x284 (644) -> 2
- H counter value 0x2a0 (672) -> 0x10
+ vpos line 247 == 0x1ef (rolls back here)
+ vpos line 263 == 0x1ff again
+ - HBlank bit seems to follow a normal logic instead.
+ - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy
+ over this).
+ - Timer 0 fires at the HBlank-In signal, not before.
+ - VDP2 H Counter actually counts x2 in non Hi-Res mode.
+ - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from
+ that position.
+ H counter value 0x282 (642) -> timer 1 fires at setting 1
+ H counter value 0x284 (644) -> 2
+ H counter value 0x2a0 (672) -> 0x10
H counter value 0x2c0 (704) -> 0x20
H counter value 0x300 (768) -> 0x40
H counter value 0x340 (832) -> 0x60
- H counter value 0x352 (850) -> 0x69
- H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?)
- H counter value 0x02c (44) -> 0x80
- H counter value 0x0ec (236) -> 0xe0
+ H counter value 0x352 (850) -> 0x69
+ H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?)
+ H counter value 0x02c (44) -> 0x80
+ H counter value 0x0ec (236) -> 0xe0
H counter value 0x12c (300) -> 0x100
- Timer 1 seems to count backwards compared to Timer 0 from setting 0x6b onward.
@@ -250,9 +250,9 @@ READ32_MEMBER(saturn_state::saturn_scu_r)
case 0xa4/4:
if(LOG_SCU && !space.debugger_access()) logerror("(PC=%08x) IRQ status reg read MASK=%08x IST=%08x | ISM=%08x\n",space.device().safe_pc(),mem_mask,m_scu.ist,m_scu.ism);
/* TODO: Bug! trips an HW fault. Basically, it tries to read the IST bit 1 with that irq enabled.
- Densetsu no Ogre Battle doesn't like this, so it needs investigation ...
+ Densetsu no Ogre Battle doesn't like this, so it needs investigation ...
*/
-// res = m_scu.ist | ~m_scu.ism;
+// res = m_scu.ist | ~m_scu.ism;
res = m_scu.ist;
break;
case 0xc8/4:
@@ -474,7 +474,7 @@ void saturn_state::scu_dma_direct(address_space &space, UINT8 dma_ch)
}
/* Burning Rangers doesn't agree with this. */
-// m_scu.size[dma_ch] = 0;
+// m_scu.size[dma_ch] = 0;
if(!(DRUP(dma_ch))) m_scu.src[dma_ch] = tmp_src;
if(!(DWUP(dma_ch))) m_scu.dst[dma_ch] = tmp_dst;
diff --git a/src/emu/machine/smpc.c b/src/emu/machine/smpc.c
index 86e38bfe6fa..07dbec9f35f 100644
--- a/src/emu/machine/smpc.c
+++ b/src/emu/machine/smpc.c
@@ -299,7 +299,7 @@ static TIMER_CALLBACK( stv_smpc_intback )
saturn_state *state = machine.driver_data<saturn_state>();
int i;
-// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]);
+// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]);
if(state->m_smpc.intback_buf[0] != 0)
{
diff --git a/src/emu/machine/stvcd.c b/src/emu/machine/stvcd.c
index 1b36f1de64d..3d91387ca7f 100644
--- a/src/emu/machine/stvcd.c
+++ b/src/emu/machine/stvcd.c
@@ -721,10 +721,10 @@ void saturn_state::cd_exec_command( void )
CDROM_LOG(("%s:CD: Set Filter Connection %x => mode %x parm %04x\n", machine().describe_context(), fnum, cr1 & 0xf, cr2))
- if (cr1 & 1) // set true condition
+ if (cr1 & 1) // set true condition
filters[fnum].condtrue = (cr2>>8)&0xff;
- if (cr1 & 2) // set false condition
+ if (cr1 & 2) // set false condition
filters[fnum].condfalse = cr2&0xff;
hirqreg |= (CMOK|ESEL);
diff --git a/src/emu/machine/tms9901.c b/src/emu/machine/tms9901.c
index 7437e647882..b37f1e1ad7d 100644
--- a/src/emu/machine/tms9901.c
+++ b/src/emu/machine/tms9901.c
@@ -510,7 +510,7 @@ void tms9901_device::device_reset(void)
field_interrupts();
m_clock_mode = false;
-
+
m_clock_register = 0;
timer_reload();
}
@@ -537,7 +537,7 @@ void tms9901_device::device_start(void)
}
m_interrupt.resolve(intf->interrupt_callback, *this);
-
+
m_clock_register = 0;
}
diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c
index e48861668fe..14f75d1e8af 100644
--- a/src/emu/machine/z80sti.c
+++ b/src/emu/machine/z80sti.c
@@ -261,7 +261,7 @@ void z80sti_device::device_start()
void z80sti_device::device_reset()
{
memset(m_tmc, 0, sizeof(m_tmc));
- memset(m_to, 0, sizeof(m_to));
+ memset(m_to, 0, sizeof(m_to));
}