summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-07-29 08:34:21 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-07-29 08:34:21 +0200
commit1b452e3bfb48e9c77e705a60ab285c382d457e8a (patch)
treeec86ee0e176d53492a6f034a473c728cc6896ad7 /src/emu/machine
parentb038bdab5ba511f2af2c23e24b3508062a42b3b3 (diff)
Cleanups and version bumpmame0164
Diffstat (limited to 'src/emu/machine')
-rw-r--r--src/emu/machine/68230pit.c214
-rw-r--r--src/emu/machine/68230pit.h4
-rw-r--r--src/emu/machine/atapihle.c2
-rw-r--r--src/emu/machine/nvram.c1
-rw-r--r--src/emu/machine/pci.c2
-rw-r--r--src/emu/machine/saturn.c2
-rw-r--r--src/emu/machine/smpc.c4
-rw-r--r--src/emu/machine/stvcd.c2
-rw-r--r--src/emu/machine/tms6100.c4
-rw-r--r--src/emu/machine/wd_fdc.h2
10 files changed, 117 insertions, 120 deletions
diff --git a/src/emu/machine/68230pit.c b/src/emu/machine/68230pit.c
index 9c99baa4f16..d0c50a2c535 100644
--- a/src/emu/machine/68230pit.c
+++ b/src/emu/machine/68230pit.c
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edström
+// copyright-holders:Joakim Larsson Edstr??m
/**********************************************************************
Motorola MC68230 PI/T Parallell Interface and Timer
@@ -46,130 +46,128 @@ const device_type PIT68230 = &device_creator<pit68230_device>;
//-------------------------------------------------
pit68230_device::pit68230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, PIT68230, "Motorola 68230 PI/T", tag, owner, clock, "pit68230", __FILE__)
+ : device_t(mconfig, PIT68230, "Motorola 68230 PI/T", tag, owner, clock, "pit68230", __FILE__)
{
}
void pit68230_device::device_start()
{
- printf("PIT68230 device started\n");
+ printf("PIT68230 device started\n");
}
void pit68230_device::device_reset()
{
- printf("PIT68230 device reseted\n");
- m_pgcr = 0;
- m_psrr = 0;
- m_paddr = 0;
- m_pbddr = 0;
- m_pcddr = 0;
- m_pacr = 0;
- m_pbcr = 0;
- m_padr = 0;
- m_pbdr = 0;
- m_psr = 0;
+ printf("PIT68230 device reseted\n");
+ m_pgcr = 0;
+ m_psrr = 0;
+ m_paddr = 0;
+ m_pbddr = 0;
+ m_pcddr = 0;
+ m_pacr = 0;
+ m_pbcr = 0;
+ m_padr = 0;
+ m_pbdr = 0;
+ m_psr = 0;
}
WRITE8_MEMBER( pit68230_device::data_w )
{
- printf("data_w: %04x -> ", data);
- switch (offset)
- {
- case PIT_68230_PGCR:
- printf("PGCR");
- m_pgcr = data;
- break;
- case PIT_68230_PSRR:
- printf("PSRR");
- m_psrr = data;
- break;
- case PIT_68230_PADDR:
- printf("PADDR");
- m_paddr = data;
- break;
- case PIT_68230_PBDDR:
- printf("PBDDR");
- m_pbddr = data;
- break;
- case PIT_68230_PACR:
- printf("PACR");
- m_pacr = data;
- break;
- case PIT_68230_PBCR:
- printf("PBCR");
- m_pbcr = data;
- break;
- case PIT_68230_PADR:
- printf("PADR");
- m_padr = data;
- break;
- case PIT_68230_PSR:
- printf("PSR");
- m_padr = data;
- break;
- default:
- printf("unhandled register %02x", offset);
- }
- printf("\n");
+ printf("data_w: %04x -> ", data);
+ switch (offset)
+ {
+ case PIT_68230_PGCR:
+ printf("PGCR");
+ m_pgcr = data;
+ break;
+ case PIT_68230_PSRR:
+ printf("PSRR");
+ m_psrr = data;
+ break;
+ case PIT_68230_PADDR:
+ printf("PADDR");
+ m_paddr = data;
+ break;
+ case PIT_68230_PBDDR:
+ printf("PBDDR");
+ m_pbddr = data;
+ break;
+ case PIT_68230_PACR:
+ printf("PACR");
+ m_pacr = data;
+ break;
+ case PIT_68230_PBCR:
+ printf("PBCR");
+ m_pbcr = data;
+ break;
+ case PIT_68230_PADR:
+ printf("PADR");
+ m_padr = data;
+ break;
+ case PIT_68230_PSR:
+ printf("PSR");
+ m_padr = data;
+ break;
+ default:
+ printf("unhandled register %02x", offset);
+ }
+ printf("\n");
}
READ8_MEMBER( pit68230_device::data_r )
{
- UINT8 data = 0;
-
- printf("data_r: ");
- switch (offset)
- {
- case PIT_68230_PGCR:
- printf("PGCR");
- data = m_pgcr;
- break;
- case PIT_68230_PSRR:
- printf("PSRR");
- data = m_psrr;
- break;
- case PIT_68230_PADDR:
- printf("PADDR");
- data = m_paddr;
- break;
- case PIT_68230_PBDDR:
- printf("PBDDR");
- data = m_pbddr;
- break;
- case PIT_68230_PACR:
- printf("PACR");
- data = m_pacr;
- break;
- case PIT_68230_PBCR:
- printf("PBCR");
- data = m_pbcr;
- break;
- case PIT_68230_PADR:
- printf("PADR");
- data = m_padr;
- break;
- case PIT_68230_PBDR:
- /* 4.6.2. PORT B DATA REGISTER (PBDR). The port B data register is a holding register for moving data
+ UINT8 data = 0;
+
+ printf("data_r: ");
+ switch (offset)
+ {
+ case PIT_68230_PGCR:
+ printf("PGCR");
+ data = m_pgcr;
+ break;
+ case PIT_68230_PSRR:
+ printf("PSRR");
+ data = m_psrr;
+ break;
+ case PIT_68230_PADDR:
+ printf("PADDR");
+ data = m_paddr;
+ break;
+ case PIT_68230_PBDDR:
+ printf("PBDDR");
+ data = m_pbddr;
+ break;
+ case PIT_68230_PACR:
+ printf("PACR");
+ data = m_pacr;
+ break;
+ case PIT_68230_PBCR:
+ printf("PBCR");
+ data = m_pbcr;
+ break;
+ case PIT_68230_PADR:
+ printf("PADR");
+ data = m_padr;
+ break;
+ case PIT_68230_PBDR:
+ /* 4.6.2. PORT B DATA REGISTER (PBDR). The port B data register is a holding register for moving data
to and from port B pins. The port B data direction register determines whether each pin is an input (zero)
-or an output (one). This register is readable and writable at all times. Depending on the chosen mode/submode,
+or an output (one). This register is readable and writable at all times. Depending on the chosen mode/submode,
reading or writing may affect the double-buffered handshake mechanism. The port B data register is not affected
-by the assertion of the RESET pin. PB0-PB7 sits on pins 17-24 on a 48 pin DIP package */
- printf("PBDR");
- data = m_pbdr;
- // data = (m_pbdr & 0xfc) | 1; // CPU-1 centronics interface expects to see 2 lowest bits equal 1 for printer
- break;
- case PIT_68230_PSR:
- printf("PSR");
- data = m_psr;
- // data = m_psr | 1; // CPU-1 centronics interface expects status to be non zero
- break;
- default:
- printf("unhandled register %02x", offset);
- data = 0;
- }
- printf("\n");
-
- return data;
+by the assertion of the RESET pin. PB0-PB7 sits on pins 17-24 on a 48 pin DIP package */
+ printf("PBDR");
+ data = m_pbdr;
+ // data = (m_pbdr & 0xfc) | 1; // CPU-1 centronics interface expects to see 2 lowest bits equal 1 for printer
+ break;
+ case PIT_68230_PSR:
+ printf("PSR");
+ data = m_psr;
+ // data = m_psr | 1; // CPU-1 centronics interface expects status to be non zero
+ break;
+ default:
+ printf("unhandled register %02x", offset);
+ data = 0;
+ }
+ printf("\n");
+
+ return data;
}
-
-
diff --git a/src/emu/machine/68230pit.h b/src/emu/machine/68230pit.h
index b299ca868f9..dcb5b81bb88 100644
--- a/src/emu/machine/68230pit.h
+++ b/src/emu/machine/68230pit.h
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edström
+// copyright-holders:Joakim Larsson Edstr??m
/**********************************************************************
Motorola MC68230 PI/T Parallell Interface and Timer
@@ -56,7 +56,7 @@ protected:
virtual void device_reset();
private:
- UINT8 m_pgcr; // Port General Control register
+ UINT8 m_pgcr; // Port General Control register
UINT8 m_psrr; // Port Service Request register
UINT8 m_paddr; // Port A Data Direction register
UINT8 m_pbddr; // Port B Data Direction register
diff --git a/src/emu/machine/atapihle.c b/src/emu/machine/atapihle.c
index 4b749ee36e6..dcbc00fb26c 100644
--- a/src/emu/machine/atapihle.c
+++ b/src/emu/machine/atapihle.c
@@ -246,7 +246,7 @@ void atapi_hle_device::process_command()
case IDE_COMMAND_CHECK_POWER_MODE:
m_status = IDE_STATUS_DRDY;
- m_sector_count = 0xff; // Power mode: 0x00 = Standby, 0x80 = Idle mode, 0xff = Active mode or Idle mode
+ m_sector_count = 0xff; // Power mode: 0x00 = Standby, 0x80 = Idle mode, 0xff = Active mode or Idle mode
set_irq(ASSERT_LINE);
break;
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index 343d246176c..a1c9d734e2e 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -179,4 +179,3 @@ void nvram_device::determine_final_base()
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
#endif
-
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index ef2e0f4ee0e..a5c95198c75 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -905,4 +905,4 @@ void pci_root_device::device_reset()
#if (defined(__MINGW32__) && (__GNUC__ >= 5))
#pragma GCC diagnostic pop
-#endif \ No newline at end of file
+#endif
diff --git a/src/emu/machine/saturn.c b/src/emu/machine/saturn.c
index a9ad0638c68..cf79fdc26a2 100644
--- a/src/emu/machine/saturn.c
+++ b/src/emu/machine/saturn.c
@@ -38,7 +38,7 @@
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.
- - Yabause claims that if VDP2 DISP bit isn't enabled then vblank irqs (hblank too?)
+ - Yabause claims that if VDP2 DISP bit isn't enabled then vblank irqs (hblank too?)
doesn't happen.
**************************************************************************************/
diff --git a/src/emu/machine/smpc.c b/src/emu/machine/smpc.c
index effb6ba9841..caf0834da5a 100644
--- a/src/emu/machine/smpc.c
+++ b/src/emu/machine/smpc.c
@@ -686,7 +686,7 @@ void saturn_state::smpc_comreg_exec(address_space &space, UINT8 data, UINT8 is_s
case 0x0a:
case 0x0b:
popmessage ("SMPC: NETLINK %s, contact MAMEdev",(data & 1) ? "off" : "on");
- break; case 0x0d:
+ break; case 0x0d:
if(LOG_SMPC) printf ("SMPC: System Reset\n");
smpc_system_reset();
break;
@@ -943,7 +943,7 @@ UINT8 saturn_state::smpc_th_control_mode(UINT8 pad_n)
res|= 0xc;
break;
}
-
+
return res;
}
diff --git a/src/emu/machine/stvcd.c b/src/emu/machine/stvcd.c
index 2c2422cfde4..eebb8d11cb4 100644
--- a/src/emu/machine/stvcd.c
+++ b/src/emu/machine/stvcd.c
@@ -866,7 +866,7 @@ void saturn_state::cd_exec_command( void )
if(cr4 == 0)
hirqreg |= (CMOK);
else
- hirqreg |= (CMOK|DRDY);
+ hirqreg |= (CMOK|DRDY);
status_type = 1;
}
break;
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index c0b355feee5..9cedc12c10a 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -201,11 +201,11 @@ WRITE_LINE_MEMBER(tms6100_device::tms6100_romclock_w)
/* read bit at address */
/* if (m_variant == TMS6110_IS_M58819)
{
- m_data = (m_rom[m_address >> 3] >> (7-(m_address & 0x07))) & 1;
+ m_data = (m_rom[m_address >> 3] >> (7-(m_address & 0x07))) & 1;
}
else // m_variant == (TMS6110_IS_TMS6100 || TMS6110_IS_TMS6125)
{
- */
+ */
m_data = (m_rom[m_address >> 3] >> (m_address & 0x07)) & 1;
/* } */
m_address++;
diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h
index 1aa0e1b13dc..7af735a7bef 100644
--- a/src/emu/machine/wd_fdc.h
+++ b/src/emu/machine/wd_fdc.h
@@ -179,7 +179,7 @@ public:
void hlt_w(bool state);
bool enp_r();
-
+
void index_callback(floppy_image_device *floppy, int state);
protected: