summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-12-17 07:22:20 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-12-17 07:22:20 +0000
commit436d2f757f0c32573ea41013e8b10ca07ed6fc08 (patch)
tree77fc28a1edb618f19ae38071ed1b7c3316d41f5e /src/mess/machine
parent449da4bc62a76ac132892d0f9e7e506fdf5eb586 (diff)
Cleanups and version bumpmame0147u4
Diffstat (limited to 'src/mess/machine')
-rw-r--r--src/mess/machine/b2m.c14
-rw-r--r--src/mess/machine/c1581.c86
-rw-r--r--src/mess/machine/c8280.c8
-rw-r--r--src/mess/machine/cmdhd.c26
-rw-r--r--src/mess/machine/comx_fd.c16
-rw-r--r--src/mess/machine/comx_prn.c48
-rw-r--r--src/mess/machine/comx_ram.h2
-rw-r--r--src/mess/machine/comx_thm.c22
-rw-r--r--src/mess/machine/comxpl80.h2
-rw-r--r--src/mess/machine/fd2000.c124
-rw-r--r--src/mess/machine/iq151_disc2.h2
-rw-r--r--src/mess/machine/lux10828.c2
-rw-r--r--src/mess/machine/mackbd.c4
-rw-r--r--src/mess/machine/nes.c4
-rw-r--r--src/mess/machine/nubus_image.c4
-rw-r--r--src/mess/machine/orion.c2
-rw-r--r--src/mess/machine/pc.c6
-rw-r--r--src/mess/machine/sms.c2
-rw-r--r--src/mess/machine/special.c14
19 files changed, 194 insertions, 194 deletions
diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c
index bf319478434..15b2a6b7976 100644
--- a/src/mess/machine/b2m.c
+++ b/src/mess/machine/b2m.c
@@ -224,17 +224,17 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w)
if (m_b2m_drive!=drive) {
m_b2m_drive = drive;
}
-
+
if (m_b2m_side!=side) {
m_b2m_side = side;
- floppy->ss_w(side);
+ floppy->ss_w(side);
}
/*
- When bit 5 is set CPU is in HALT state and stay there until
- DRQ is triggered from floppy side
- */
-
- if ((data & 0xf0)==0x20) {
+ When bit 5 is set CPU is in HALT state and stay there until
+ DRQ is triggered from floppy side
+ */
+
+ if ((data & 0xf0)==0x20) {
m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
}
diff --git a/src/mess/machine/c1581.c b/src/mess/machine/c1581.c
index 11e7d9171ef..ca056529390 100644
--- a/src/mess/machine/c1581.c
+++ b/src/mess/machine/c1581.c
@@ -8,10 +8,10 @@
**********************************************************************/
/*
-
- TODO:
- - wd_fdc drops the busy bit too soon, c1581 aborts reading the sector ID after the first CRC byte @CD17
+ TODO:
+
+ - wd_fdc drops the busy bit too soon, c1581 aborts reading the sector ID after the first CRC byte @CD17
*/
@@ -146,18 +146,18 @@ READ8_MEMBER( base_c1581_device::cia_pa_r )
{
/*
- bit description
+ bit description
- PA0
- PA1 /RDY
- PA2
- PA3 DEV# SEL (SW1)
- PA4 DEV# SEL (SW1)
- PA5
- PA6
- PA7 /DISK CHNG
+ PA0
+ PA1 /RDY
+ PA2
+ PA3 DEV# SEL (SW1)
+ PA4 DEV# SEL (SW1)
+ PA5
+ PA6
+ PA7 /DISK CHNG
- */
+ */
UINT8 data = 0;
@@ -177,18 +177,18 @@ WRITE8_MEMBER( base_c1581_device::cia_pa_w )
{
/*
- bit description
+ bit description
- PA0 SIDE0
- PA1
- PA2 /MOTOR
- PA3
- PA4
- PA5 POWER LED
- PA6 ACT LED
- PA7
+ PA0 SIDE0
+ PA1
+ PA2 /MOTOR
+ PA3
+ PA4
+ PA5 POWER LED
+ PA6 ACT LED
+ PA7
- */
+ */
// side select
m_floppy->ss_w(BIT(data, 0));
@@ -207,18 +207,18 @@ READ8_MEMBER( base_c1581_device::cia_pb_r )
{
/*
- bit description
+ bit description
- PB0 DATA IN
- PB1
- PB2 CLK IN
- PB3
- PB4
- PB5
- PB6 /WPRT
- PB7 ATN IN
+ PB0 DATA IN
+ PB1
+ PB2 CLK IN
+ PB3
+ PB4
+ PB5
+ PB6 /WPRT
+ PB7 ATN IN
- */
+ */
UINT8 data = 0;
@@ -241,18 +241,18 @@ WRITE8_MEMBER( base_c1581_device::cia_pb_w )
{
/*
- bit description
+ bit description
- PB0
- PB1 DATA OUT
- PB2
- PB3 CLK OUT
- PB4 ATN ACK
- PB5 FAST SER DIR
- PB6
- PB7
+ PB0
+ PB1 DATA OUT
+ PB2
+ PB3 CLK OUT
+ PB4 ATN ACK
+ PB5 FAST SER DIR
+ PB6
+ PB7
- */
+ */
// data out
m_data_out = BIT(data, 1);
diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c
index 734778c4a5b..b641881d404 100644
--- a/src/mess/machine/c8280.c
+++ b/src/mess/machine/c8280.c
@@ -9,11 +9,11 @@
/*
- TODO:
+ TODO:
- - format
-
- wd1772: track description 80x4e 12x00 3xf6 fc 50x4e 12x00 3xf5 fe 2x00 2x01 f7 22x4e 12x00 3xf5 fb 256xaa f7 54x4e
+ - format
+
+ wd1772: track description 80x4e 12x00 3xf6 fc 50x4e 12x00 3xf5 fe 2x00 2x01 f7 22x4e 12x00 3xf5 fb 256xaa f7 54x4e
*/
diff --git a/src/mess/machine/cmdhd.c b/src/mess/machine/cmdhd.c
index ce01bde8d63..17d2878425e 100644
--- a/src/mess/machine/cmdhd.c
+++ b/src/mess/machine/cmdhd.c
@@ -247,17 +247,17 @@ void cmd_hd_device::cbm_iec_reset(int state)
WRITE8_MEMBER( cmd_hd_device::led_w )
{
/*
-
- bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
-
- */
+
+ bit description
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+
+ */
}
diff --git a/src/mess/machine/comx_fd.c b/src/mess/machine/comx_fd.c
index 06b0910dade..fff28fd1df7 100644
--- a/src/mess/machine/comx_fd.c
+++ b/src/mess/machine/comx_fd.c
@@ -261,16 +261,16 @@ void comx_fd_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
{
/*
- bit description
+ bit description
- 0 FDC A0
- 1 FDC A1
- 2 DRIVE0
- 3 DRIVE1
- 4 F9 DISB
- 5 SIDE SELECT
+ 0 FDC A0
+ 1 FDC A1
+ 2 DRIVE0
+ 3 DRIVE1
+ 4 F9 DISB
+ 5 SIDE SELECT
- */
+ */
// latch data to F3
m_addr = data & 0x03;
diff --git a/src/mess/machine/comx_prn.c b/src/mess/machine/comx_prn.c
index de2484a4c3f..8053010806d 100644
--- a/src/mess/machine/comx_prn.c
+++ b/src/mess/machine/comx_prn.c
@@ -140,33 +140,33 @@ UINT8 comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset)
{
/*
- Parallel:
+ Parallel:
- INP 2 for the printer status, where:
- b0=1: Acknowledge Fault
- b1=0: Device Busy
- b2=0: Paper Empty
- b3=1: Device Not Selected
+ INP 2 for the printer status, where:
+ b0=1: Acknowledge Fault
+ b1=0: Device Busy
+ b2=0: Paper Empty
+ b3=1: Device Not Selected
- Serial:
+ Serial:
- INP 2 for the printer status and to start a new range of bits for the next byte.
- */
+ INP 2 for the printer status and to start a new range of bits for the next byte.
+ */
/*
- bit description
+ bit description
- 0 Acknowledge Fault
- 1 Device Busy
- 2 Paper Empty
- 3 Device Not Selected
- 4
- 5
- 6
- 7
+ 0 Acknowledge Fault
+ 1 Device Busy
+ 2 Paper Empty
+ 3 Device Not Selected
+ 4
+ 5
+ 6
+ 7
- */
+ */
UINT8 data = 0;
@@ -186,14 +186,14 @@ UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset)
void comx_prn_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
{
/*
- Parallel:
+ Parallel:
- OUT 2 is used to send a byte to the printer
+ OUT 2 is used to send a byte to the printer
- Serial:
+ Serial:
- OUT 2 is used to send a bit to the printer
- */
+ OUT 2 is used to send a bit to the printer
+ */
m_centronics->write(data);
}
diff --git a/src/mess/machine/comx_ram.h b/src/mess/machine/comx_ram.h
index 805677cb1c7..95b86205f41 100644
--- a/src/mess/machine/comx_ram.h
+++ b/src/mess/machine/comx_ram.h
@@ -44,7 +44,7 @@ protected:
private:
optional_shared_ptr<UINT8> m_ram;
-
+
int m_bank;
};
diff --git a/src/mess/machine/comx_thm.c b/src/mess/machine/comx_thm.c
index ea2f90411d2..ffb6b78f787 100644
--- a/src/mess/machine/comx_thm.c
+++ b/src/mess/machine/comx_thm.c
@@ -102,11 +102,11 @@ UINT8 comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extr
UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset)
{
/*
- INP 2 is used for the printer status, where:
- b0=1: Printer Not Ready
- b1=1: Energizing Head
- b2=1: Head At Position 0
- */
+ INP 2 is used for the printer status, where:
+ b0=1: Printer Not Ready
+ b1=1: Energizing Head
+ b2=1: Head At Position 0
+ */
return 0;
}
@@ -119,10 +119,10 @@ UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset)
void comx_thm_device::comx_io_w(address_space &space, offs_t offset, UINT8 data)
{
/*
- OUT 2 is used to control the thermal printer where:
- Q = 0, b0-7: Pixel 1 to 8
- Q = 1, b7: Pixel 9 (if b0-6=#21)
- Q = 1, b3=1: Move head right
- Q = 1, b0-7=#12: Move head left
- */
+ OUT 2 is used to control the thermal printer where:
+ Q = 0, b0-7: Pixel 1 to 8
+ Q = 1, b7: Pixel 9 (if b0-6=#21)
+ Q = 1, b3=1: Move head right
+ Q = 1, b0-7=#12: Move head left
+ */
}
diff --git a/src/mess/machine/comxpl80.h b/src/mess/machine/comxpl80.h
index c5bed225cb7..abb5e928dd2 100644
--- a/src/mess/machine/comxpl80.h
+++ b/src/mess/machine/comxpl80.h
@@ -30,7 +30,7 @@ class comx_pl80_device : public device_t,
public:
// construction/destruction
comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// optional information overrides
virtual const rom_entry *device_rom_region() const;
virtual machine_config_constructor device_mconfig_additions() const;
diff --git a/src/mess/machine/fd2000.c b/src/mess/machine/fd2000.c
index cda3dd961b1..1605952bbcb 100644
--- a/src/mess/machine/fd2000.c
+++ b/src/mess/machine/fd2000.c
@@ -9,12 +9,12 @@
/*
- TODO:
+ TODO:
- - IEC
- - VIA
- - DP8473/PC8477A command extensions to upd765
- - D1M/D2M/D4M image format (http://ist.uwaterloo.ca/~schepers/formats/D2M-DNP.TXT)
+ - IEC
+ - VIA
+ - DP8473/PC8477A command extensions to upd765
+ - D1M/D2M/D4M image format (http://ist.uwaterloo.ca/~schepers/formats/D2M-DNP.TXT)
*/
@@ -81,7 +81,7 @@ const rom_entry *fd2000_device::device_rom_region() const
{
default:
return ROM_NAME( fd2000 );
-
+
case TYPE_FD4000:
return ROM_NAME( fd4000 );
}
@@ -121,19 +121,19 @@ ADDRESS_MAP_END
READ8_MEMBER( fd2000_device::via_pa_r )
{
/*
-
- bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7
-
- */
+
+ bit description
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+
+ */
return 0;
}
@@ -141,37 +141,37 @@ READ8_MEMBER( fd2000_device::via_pa_r )
WRITE8_MEMBER( fd2000_device::via_pa_w )
{
/*
-
- bit description
-
- 0
- 1
- 2
- 3
- 4
- 5 FAST DIR
- 6
- 7
-
- */
+
+ bit description
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5 FAST DIR
+ 6
+ 7
+
+ */
}
READ8_MEMBER( fd2000_device::via_pb_r )
{
/*
-
- bit description
-
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- 7 FDC INTRQ
-
- */
+
+ bit description
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7 FDC INTRQ
+
+ */
UINT8 data = 0;
@@ -184,19 +184,19 @@ READ8_MEMBER( fd2000_device::via_pb_r )
WRITE8_MEMBER( fd2000_device::via_pb_w )
{
/*
-
- bit description
-
- 0
- 1
- 2
- 3
- 4
- 5 LED
- 6 LED
- 7
-
- */
+
+ bit description
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5 LED
+ 6 LED
+ 7
+
+ */
}
static const via6522_interface via_intf =
@@ -227,8 +227,8 @@ static SLOT_INTERFACE_START( fd4000_floppies )
SLOT_INTERFACE_END
/*
FLOPPY_FORMATS_MEMBER( fd2000_device::floppy_formats )
- FLOPPY_D81_FORMAT
- FLOPPY_D2M_FORMAT
+ FLOPPY_D81_FORMAT
+ FLOPPY_D2M_FORMAT
FLOPPY_FORMATS_END
*/
@@ -273,7 +273,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const
{
default:
return MACHINE_CONFIG_NAME( fd2000 );
-
+
case TYPE_FD4000:
return MACHINE_CONFIG_NAME( fd4000 );
}
@@ -293,7 +293,7 @@ void fd2000_device::device_config_complete()
default:
m_shortname = "fd2000";
break;
-
+
case TYPE_FD4000:
m_shortname = "fd4000";
break;
diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h
index 5ead712023e..bfb513f9b01 100644
--- a/src/mess/machine/iq151_disc2.h
+++ b/src/mess/machine/iq151_disc2.h
@@ -24,7 +24,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
-
+
DECLARE_FLOPPY_FORMATS( floppy_formats );
protected:
diff --git a/src/mess/machine/lux10828.c b/src/mess/machine/lux10828.c
index c7b5f0fc595..97d1c825390 100644
--- a/src/mess/machine/lux10828.c
+++ b/src/mess/machine/lux10828.c
@@ -676,7 +676,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r )
if (!m_wait_enable && !m_fdc_irq && !m_fdc_drq)
{
fatalerror("Z80 WAIT not supported by MAME core\n");
-
+
m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE);
}
diff --git a/src/mess/machine/mackbd.c b/src/mess/machine/mackbd.c
index 769eff4a417..6eb60eb66f2 100644
--- a/src/mess/machine/mackbd.c
+++ b/src/mess/machine/mackbd.c
@@ -44,8 +44,8 @@
---x Data to Mac
The T1 line is "Option".
-
- There is a later M0110 keyboard version which uses a GI PIC1657; we do not have a dump of that version.
+
+ There is a later M0110 keyboard version which uses a GI PIC1657; we do not have a dump of that version.
*/
diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c
index f9e82afdffb..14ada5774b3 100644
--- a/src/mess/machine/nes.c
+++ b/src/mess/machine/nes.c
@@ -1,8 +1,8 @@
/*****************************************************************************
- nes.c
+ nes.c
- Nintendo Entertainment System (Famicom)
+ Nintendo Entertainment System (Famicom)
****************************************************************************/
diff --git a/src/mess/machine/nubus_image.c b/src/mess/machine/nubus_image.c
index 701d7015101..4204a7c39aa 100644
--- a/src/mess/machine/nubus_image.c
+++ b/src/mess/machine/nubus_image.c
@@ -206,7 +206,7 @@ void nubus_image_device::device_start()
slotspace = get_slotspace();
superslotspace = get_super_slotspace();
-// printf("[image %p] slotspace = %x, super = %x\n", this, slotspace, superslotspace);
+// printf("[image %p] slotspace = %x, super = %x\n", this, slotspace, superslotspace);
m_nubus->install_device(slotspace, slotspace+3, read32_delegate(FUNC(nubus_image_device::image_r), this), write32_delegate(FUNC(nubus_image_device::image_w), this));
m_nubus->install_device(slotspace+4, slotspace+7, read32_delegate(FUNC(nubus_image_device::image_status_r), this), write32_delegate(FUNC(nubus_image_device::image_status_w), this));
@@ -263,6 +263,6 @@ READ32_MEMBER( nubus_image_device::image_super_r )
{
UINT32 *image = (UINT32*)m_image->data;
UINT32 data = image[offset];
- return ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
+ return ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
}
diff --git a/src/mess/machine/orion.c b/src/mess/machine/orion.c
index 8b45ab024f0..545f3ae2894 100644
--- a/src/mess/machine/orion.c
+++ b/src/mess/machine/orion.c
@@ -172,7 +172,7 @@ WRITE8_MEMBER(orion_state::orion_disk_control_w)
m_fdc->set_floppy(floppy);
floppy->mon_w(0);
- floppy->ss_w(((data & 0x10) >> 4) ^ 1);
+ floppy->ss_w(((data & 0x10) >> 4) ^ 1);
}
READ8_MEMBER(orion_state::orion128_floppy_r)
diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c
index 0c138749c77..dff2bf082c4 100644
--- a/src/mess/machine/pc.c
+++ b/src/mess/machine/pc.c
@@ -1182,7 +1182,7 @@ WRITE8_MEMBER(pc_state::pcjr_fdc_dor_w)
UINT8 pdor = m_pcjr_dor;
upd765a_device *fdc = machine().device<upd765a_device>("upd765");
floppy_image_device *floppy = machine().device<floppy_connector>("upd765:0")->get_device();
- m_pcjr_dor = data;
+ m_pcjr_dor = data;
if(floppy)
floppy->mon_w(!(m_pcjr_dor & 1));
@@ -1194,7 +1194,7 @@ WRITE8_MEMBER(pc_state::pcjr_fdc_dor_w)
if((pdor^m_pcjr_dor) & 0x80)
fdc->reset();
-
+
if(m_pcjr_dor & 0x20) {
if((pdor & 0x40) && !(m_pcjr_dor & 0x40))
m_pcjr_watchdog->adjust(attotime::from_seconds(3));
@@ -1468,7 +1468,7 @@ MACHINE_START_MEMBER(pc_state,pcjr)
m_maincpu->set_irq_acknowledge_callback(pc_irq_callback);
machine().device<upd765a_device>("upd765")->set_ready_line_connected(false);
-
+
m_pic8259 = machine().device("pic8259");
m_dma8237 = NULL;
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 32a02e8771a..7169c7f4902 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -885,7 +885,7 @@ READ8_MEMBER(sms_state::sms_sscope_r)
WRITE8_MEMBER(sms_state::sms_sscope_w)
{
screen_device *screen = machine().first_screen();
-
+
m_sscope_state = data;
// There are occurrences when Sega Scope's state changes after VBLANK, or at
diff --git a/src/mess/machine/special.c b/src/mess/machine/special.c
index 3ead45b349f..bfe357c9ace 100644
--- a/src/mess/machine/special.c
+++ b/src/mess/machine/special.c
@@ -266,7 +266,7 @@ WRITE8_MEMBER( special_state::specimx_disk_ctrl_w )
switch(offset)
{
- case 0 :
+ case 0 :
m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
break;
case 2 :
@@ -400,10 +400,10 @@ READ8_MEMBER( special_state::erik_disk_reg_r )
WRITE8_MEMBER( special_state::erik_disk_reg_w )
{
/*
- wd17xx_set_side (m_fdc,data & 1);
- wd17xx_set_drive(m_fdc,(data >> 1) & 1);
- wd17xx_dden_w(m_fdc, BIT(data, 2));
- floppy_mon_w(floppy_get_device(machine(), BIT(data, 1)), 0);
- floppy_mon_w(floppy_get_device(machine(), BIT(data, 1) ^ 1), 1);
- floppy_drive_set_ready_state(floppy_get_device(machine(), BIT(data, 1)), 1, 1);*/
+ wd17xx_set_side (m_fdc,data & 1);
+ wd17xx_set_drive(m_fdc,(data >> 1) & 1);
+ wd17xx_dden_w(m_fdc, BIT(data, 2));
+ floppy_mon_w(floppy_get_device(machine(), BIT(data, 1)), 0);
+ floppy_mon_w(floppy_get_device(machine(), BIT(data, 1) ^ 1), 1);
+ floppy_drive_set_ready_state(floppy_get_device(machine(), BIT(data, 1)), 1, 1);*/
}