summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/machine')
-rw-r--r--src/emu/machine/mc2661.c8
-rw-r--r--src/emu/machine/netlist.c156
-rw-r--r--src/emu/machine/netlist.h182
-rw-r--r--src/emu/machine/nscsi_cb.c18
-rw-r--r--src/emu/machine/nscsi_s1410.c12
-rw-r--r--src/emu/machine/nscsi_s1410.h60
-rw-r--r--src/emu/machine/t10mmc.c8
-rw-r--r--src/emu/machine/t10sbc.c4
-rw-r--r--src/emu/machine/tmp68301.c18
-rw-r--r--src/emu/machine/tmp68301.h2
-rw-r--r--src/emu/machine/upd4992.c14
-rw-r--r--src/emu/machine/upd4992.h4
-rw-r--r--src/emu/machine/z80dart.c5
-rw-r--r--src/emu/machine/z80dma.c2
14 files changed, 246 insertions, 247 deletions
diff --git a/src/emu/machine/mc2661.c b/src/emu/machine/mc2661.c
index 8bca28a21af..8232fc9fbe2 100644
--- a/src/emu/machine/mc2661.c
+++ b/src/emu/machine/mc2661.c
@@ -370,8 +370,8 @@ WRITE8_MEMBER( mc2661_device::write )
UINT32 tx_baud = baud_rates[data & 0x0f];
if(data & 0x10) // internal receiver clock
{
-// if((m_mr[0] & 0x03) != 0)
-// rx_baud *= 16;
+// if((m_mr[0] & 0x03) != 0)
+// rx_baud *= 16;
}
else // external receiver clock
{
@@ -390,8 +390,8 @@ WRITE8_MEMBER( mc2661_device::write )
}
if(data & 0x20) // internal transmitter clock
{
-// if((m_mr[0] & 0x03) != 0)
-// tx_baud *= 16;
+// if((m_mr[0] & 0x03) != 0)
+// tx_baud *= 16;
}
else // external transmitter clock
{
diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c
index e88e7b3e7df..0eb037f7324 100644
--- a/src/emu/machine/netlist.c
+++ b/src/emu/machine/netlist.c
@@ -63,7 +63,7 @@ const device_type NETLIST = &device_creator<netlist_mame_device>;
netlist_mame_device::netlist_mame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NETLIST, "netlist", tag, owner, clock, "netlist_mame", __FILE__),
device_execute_interface(mconfig, *this),
- //device_state_interface(mconfig, *this),
+ //device_state_interface(mconfig, *this),
m_device_start_list(100),
m_netlist(NULL),
m_setup(NULL),
@@ -81,21 +81,21 @@ void netlist_mame_device::static_set_constructor(device_t &device, void (*setup_
void netlist_mame_device::device_config_complete()
{
- LOG_DEV_CALLS(("device_config_complete\n"));
+ LOG_DEV_CALLS(("device_config_complete\n"));
}
void netlist_mame_device::device_start()
{
- LOG_DEV_CALLS(("device_start\n"));
+ LOG_DEV_CALLS(("device_start\n"));
m_netlist = global_alloc_clear(netlist_mame_t(*this));
m_setup = global_alloc_clear(netlist_setup_t(*m_netlist));
- m_netlist->init_object(*m_netlist, "netlist");
- m_setup->init();
+ m_netlist->init_object(*m_netlist, "netlist");
+ m_setup->init();
- m_netlist->set_clock_freq(this->clock());
+ m_netlist->set_clock_freq(this->clock());
- // register additional devices
+ // register additional devices
m_setup->factory().register_device<nld_analog_callback>( "NETDEV_CALLBACK", "nld_analog_callback");
@@ -104,12 +104,12 @@ void netlist_mame_device::device_start()
m_setup->start_devices();
m_setup->resolve_inputs();
- bool allok = true;
- for (device_start_list_t::entry_t *ods = m_device_start_list.first(); ods != NULL; ods = m_device_start_list.next(ods))
- allok &= ods->object()->OnDeviceStart();
+ bool allok = true;
+ for (device_start_list_t::entry_t *ods = m_device_start_list.first(); ods != NULL; ods = m_device_start_list.next(ods))
+ allok &= ods->object()->OnDeviceStart();
- if (!allok)
- m_netlist->xfatalerror("required elements not found\n");
+ if (!allok)
+ m_netlist->xfatalerror("required elements not found\n");
save_state();
@@ -119,13 +119,13 @@ void netlist_mame_device::device_start()
void netlist_mame_device::device_reset()
{
- LOG_DEV_CALLS(("device_reset\n"));
+ LOG_DEV_CALLS(("device_reset\n"));
m_netlist->reset();
}
void netlist_mame_device::device_stop()
{
- LOG_DEV_CALLS(("device_stop\n"));
+ LOG_DEV_CALLS(("device_stop\n"));
m_setup->print_stats();
global_free(m_setup);
@@ -136,38 +136,38 @@ void netlist_mame_device::device_stop()
ATTR_COLD void netlist_mame_device::device_post_load()
{
- LOG_DEV_CALLS(("device_post_load\n"));
- m_netlist->queue().clear();
- NL_VERBOSE_OUT(("current time %f qsize %d\n", m_netlist->time().as_double(), qsize));
- for (int i = 0; i < qsize; i++ )
- {
- netlist_net_t *n = m_netlist->find_net(qtemp[i].m_name);
- NL_VERBOSE_OUT(("Got %s ==> %p\n", qtemp[i].m_name, n));
- NL_VERBOSE_OUT(("schedule time %f (%f)\n", n->time().as_double(), qtemp[i].m_time.as_double()));
- m_netlist->queue().push(netlist_base_t::queue_t::entry_t(qtemp[i].m_time, *n));
- }
+ LOG_DEV_CALLS(("device_post_load\n"));
+ m_netlist->queue().clear();
+ NL_VERBOSE_OUT(("current time %f qsize %d\n", m_netlist->time().as_double(), qsize));
+ for (int i = 0; i < qsize; i++ )
+ {
+ netlist_net_t *n = m_netlist->find_net(qtemp[i].m_name);
+ NL_VERBOSE_OUT(("Got %s ==> %p\n", qtemp[i].m_name, n));
+ NL_VERBOSE_OUT(("schedule time %f (%f)\n", n->time().as_double(), qtemp[i].m_time.as_double()));
+ m_netlist->queue().push(netlist_base_t::queue_t::entry_t(qtemp[i].m_time, *n));
+ }
}
ATTR_COLD void netlist_mame_device::device_pre_save()
{
- LOG_DEV_CALLS(("device_pre_save\n"));
-
- qsize = m_netlist->queue().count();
- NL_VERBOSE_OUT(("current time %f qsize %d\n", m_netlist->time().as_double(), qsize));
- for (int i = 0; i < qsize; i++ )
- {
- qtemp[i].m_time = m_netlist->queue().listptr()[i].time();
- const char *p = m_netlist->queue().listptr()[i].object().name().cstr();
- int n = MIN(63, strlen(p));
- strncpy(qtemp[i].m_name, p, n);
- qtemp[i].m_name[n] = 0;
- }
+ LOG_DEV_CALLS(("device_pre_save\n"));
+
+ qsize = m_netlist->queue().count();
+ NL_VERBOSE_OUT(("current time %f qsize %d\n", m_netlist->time().as_double(), qsize));
+ for (int i = 0; i < qsize; i++ )
+ {
+ qtemp[i].m_time = m_netlist->queue().listptr()[i].time();
+ const char *p = m_netlist->queue().listptr()[i].object().name().cstr();
+ int n = MIN(63, strlen(p));
+ strncpy(qtemp[i].m_name, p, n);
+ qtemp[i].m_name[n] = 0;
+ }
#if 0
- netlist_time *nlt = (netlist_time *) ;
- netlist_base_t::queue_t::entry_t *p = m_netlist->queue().listptr()[i];
- netlist_time *nlt = (netlist_time *) p->time_ptr();
- save_pointer(nlt->get_internaltype_ptr(), "queue", 1, i);
+ netlist_time *nlt = (netlist_time *) ;
+ netlist_base_t::queue_t::entry_t *p = m_netlist->queue().listptr()[i];
+ netlist_time *nlt = (netlist_time *) p->time_ptr();
+ save_pointer(nlt->get_internaltype_ptr(), "queue", 1, i);
#endif
}
@@ -179,43 +179,43 @@ void netlist_mame_device::device_timer(emu_timer &timer, device_timer_id id, int
ATTR_COLD void netlist_mame_device::save_state()
{
- for (pstate_entry_t::list_t::entry_t *p = m_netlist->save_list().first(); p != NULL; p = m_netlist->save_list().next(p))
- {
- pstate_entry_t *s = p->object();
- NL_VERBOSE_OUT(("saving state for %s\n", s->m_name.cstr()));
- switch (s->m_dt)
- {
- case DT_DOUBLE:
- save_pointer((double *) s->m_ptr, s->m_name, s->m_count);
- break;
- case DT_INT64:
- save_pointer((INT64 *) s->m_ptr, s->m_name, s->m_count);
- break;
- case DT_INT8:
- save_pointer((INT8 *) s->m_ptr, s->m_name, s->m_count);
- break;
- case DT_INT:
- save_pointer((int *) s->m_ptr, s->m_name, s->m_count);
- break;
- case DT_BOOLEAN:
- save_pointer((bool *) s->m_ptr, s->m_name, s->m_count);
- break;
- case NOT_SUPPORTED:
- default:
- m_netlist->xfatalerror("found unsupported save element %s\n", s->m_name.cstr());
- break;
- }
- }
-
- // handle the queue
-
- save_item(NAME(qsize));
- for (int i = 0; i < m_netlist->queue().capacity(); i++ )
- {
- save_pointer(qtemp[i].m_time.get_internaltype_ptr(), "queue_time", 1, i);
- save_pointer(qtemp[i].m_name, "queue_name", sizeof(qtemp[i].m_name), i);
-
- }
+ for (pstate_entry_t::list_t::entry_t *p = m_netlist->save_list().first(); p != NULL; p = m_netlist->save_list().next(p))
+ {
+ pstate_entry_t *s = p->object();
+ NL_VERBOSE_OUT(("saving state for %s\n", s->m_name.cstr()));
+ switch (s->m_dt)
+ {
+ case DT_DOUBLE:
+ save_pointer((double *) s->m_ptr, s->m_name, s->m_count);
+ break;
+ case DT_INT64:
+ save_pointer((INT64 *) s->m_ptr, s->m_name, s->m_count);
+ break;
+ case DT_INT8:
+ save_pointer((INT8 *) s->m_ptr, s->m_name, s->m_count);
+ break;
+ case DT_INT:
+ save_pointer((int *) s->m_ptr, s->m_name, s->m_count);
+ break;
+ case DT_BOOLEAN:
+ save_pointer((bool *) s->m_ptr, s->m_name, s->m_count);
+ break;
+ case NOT_SUPPORTED:
+ default:
+ m_netlist->xfatalerror("found unsupported save element %s\n", s->m_name.cstr());
+ break;
+ }
+ }
+
+ // handle the queue
+
+ save_item(NAME(qsize));
+ for (int i = 0; i < m_netlist->queue().capacity(); i++ )
+ {
+ save_pointer(qtemp[i].m_time.get_internaltype_ptr(), "queue_time", 1, i);
+ save_pointer(qtemp[i].m_name, "queue_name", sizeof(qtemp[i].m_name), i);
+
+ }
}
ATTR_COLD UINT64 netlist_mame_device::execute_clocks_to_cycles(UINT64 clocks) const
@@ -235,7 +235,7 @@ ATTR_HOT void netlist_mame_device::execute_run()
// debugging
//m_ppc = m_pc; // copy PC to previous PC
if (check_debugger)
- debugger_instruction_hook(this, 0); //m_pc);
+ debugger_instruction_hook(this, 0); //m_pc);
m_netlist->process_queue(m_icount);
}
diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h
index 1ad5588bb00..7ac6cb53b90 100644
--- a/src/emu/machine/netlist.h
+++ b/src/emu/machine/netlist.h
@@ -70,18 +70,18 @@
// ----------------------------------------------------------------------------------------
#define NETLIST_MEMREGION(_name) \
- netlist.parse((char *)downcast<netlist_mame_t &>(netlist.netlist()).machine().root_device().memregion(_name)->base());
+ netlist.parse((char *)downcast<netlist_mame_t &>(netlist.netlist()).machine().root_device().memregion(_name)->base());
#define NETDEV_ANALOG_CALLBACK(_name, _IN, _class, _member, _tag) \
- { \
- NETLIB_NAME(analog_callback) *dev = downcast<NETLIB_NAME(analog_callback) *>(netlist.register_dev(NET_NEW(analog_callback), # _name)); \
- netlist_analog_output_delegate d = netlist_analog_output_delegate(& _class :: _member, # _class "::" # _member, _tag, (_class *) 0); \
- dev->register_callback(d); \
- } \
- NET_CONNECT(_name, IN, _IN)
+ { \
+ NETLIB_NAME(analog_callback) *dev = downcast<NETLIB_NAME(analog_callback) *>(netlist.register_dev(NET_NEW(analog_callback), # _name)); \
+ netlist_analog_output_delegate d = netlist_analog_output_delegate(& _class :: _member, # _class "::" # _member, _tag, (_class *) 0); \
+ dev->register_callback(d); \
+ } \
+ NET_CONNECT(_name, IN, _IN)
#define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \
- void _name(const double data, const attotime &time)
+ void _name(const double data, const attotime &time)
class netlist_mame_device;
@@ -89,26 +89,26 @@ class netlist_mame_t : public netlist_base_t
{
public:
- netlist_mame_t(netlist_mame_device &parent)
- : netlist_base_t(),
- m_parent(parent)
- {}
- virtual ~netlist_mame_t() { };
+ netlist_mame_t(netlist_mame_device &parent)
+ : netlist_base_t(),
+ m_parent(parent)
+ {}
+ virtual ~netlist_mame_t() { };
- inline running_machine &machine();
+ inline running_machine &machine();
- netlist_mame_device &parent() { return m_parent; }
+ netlist_mame_device &parent() { return m_parent; }
protected:
- void vfatalerror(const char *format, va_list ap) const
- {
- emu_fatalerror error(format, ap);
- throw error;
- }
+ void vfatalerror(const char *format, va_list ap) const
+ {
+ emu_fatalerror error(format, ap);
+ throw error;
+ }
private:
- netlist_mame_device &m_parent;
+ netlist_mame_device &m_parent;
};
// ----------------------------------------------------------------------------------------
@@ -121,21 +121,21 @@ private:
// ======================> netlist_mame_device
class netlist_mame_device : public device_t,
- public device_execute_interface
- //public device_state_interface
- //, public device_memory_interface
+ public device_execute_interface
+ //public device_state_interface
+ //, public device_memory_interface
{
public:
template<bool _Required, class _NETClass>
class output_finder;
- template<class C>
+ template<class C>
class optional_output;
template<class C>
class required_output;
- template<class C>
+ template<class C>
class optional_param;
- template<class C>
+ template<class C>
class required_param;
class on_device_start;
@@ -159,7 +159,7 @@ protected:
virtual void device_stop();
virtual void device_reset();
virtual void device_post_load();
- virtual void device_pre_save();
+ virtual void device_pre_save();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const;
virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const;
@@ -173,8 +173,8 @@ protected:
// more save state ... needs to go somewhere else
struct qentry {
- netlist_time m_time;
- char m_name[64];
+ netlist_time m_time;
+ char m_name[64];
};
qentry qtemp[1024];
@@ -193,7 +193,7 @@ private:
inline running_machine &netlist_mame_t::machine()
{
- return m_parent.machine();
+ return m_parent.machine();
}
// ----------------------------------------------------------------------------------------
@@ -205,75 +205,75 @@ typedef device_delegate<void (const double, const attotime &)> netlist_analog_ou
class NETLIB_NAME(analog_callback) : public netlist_device_t
{
public:
- NETLIB_NAME(analog_callback)()
- : netlist_device_t() { }
-
- ATTR_COLD void start()
- {
- register_input("IN", m_in);
- m_callback.bind_relative_to(downcast<netlist_mame_t &>(netlist()).machine().root_device());
- }
-
- ATTR_COLD void register_callback(netlist_analog_output_delegate callback)
- {
- m_callback = callback;
- }
-
- ATTR_HOT void update()
- {
- // FIXME: Remove after device cleanup
- if (!m_callback.isnull())
- m_callback(INPANALOG(m_in), downcast<netlist_mame_t &>(netlist()).parent().local_time());
- }
+ NETLIB_NAME(analog_callback)()
+ : netlist_device_t() { }
+
+ ATTR_COLD void start()
+ {
+ register_input("IN", m_in);
+ m_callback.bind_relative_to(downcast<netlist_mame_t &>(netlist()).machine().root_device());
+ }
+
+ ATTR_COLD void register_callback(netlist_analog_output_delegate callback)
+ {
+ m_callback = callback;
+ }
+
+ ATTR_HOT void update()
+ {
+ // FIXME: Remove after device cleanup
+ if (!m_callback.isnull())
+ m_callback(INPANALOG(m_in), downcast<netlist_mame_t &>(netlist()).parent().local_time());
+ }
private:
- netlist_analog_input_t m_in;
- netlist_analog_output_delegate m_callback;
+ netlist_analog_input_t m_in;
+ netlist_analog_output_delegate m_callback;
};
class NETLIB_NAME(sound) : public netlist_device_t
{
public:
- NETLIB_NAME(sound)()
- : netlist_device_t() { }
-
- static const int BUFSIZE = 2048;
-
- ATTR_COLD void start()
- {
- register_input("IN", m_in);
- m_cur = 0;
- m_last_pos = 0;
- m_last_buffer = netlist_time::zero;
- m_sample = netlist_time::zero; // FIXME: divide by zero
- }
-
- ATTR_HOT void sound_update()
- {
- netlist_time current = netlist().time();
- int pos = (current - m_last_buffer) / m_sample;
- if (pos >= BUFSIZE)
- netlist().xfatalerror("sound %s: exceeded BUFSIZE\n", name().cstr());
- while (m_last_pos < pos )
- {
- m_buffer[m_last_pos++] = m_cur;
- }
- }
-
- ATTR_HOT void update()
- {
- double val = INPANALOG(m_in);
- sound_update();
- m_cur = val;
- }
+ NETLIB_NAME(sound)()
+ : netlist_device_t() { }
+
+ static const int BUFSIZE = 2048;
+
+ ATTR_COLD void start()
+ {
+ register_input("IN", m_in);
+ m_cur = 0;
+ m_last_pos = 0;
+ m_last_buffer = netlist_time::zero;
+ m_sample = netlist_time::zero; // FIXME: divide by zero
+ }
+
+ ATTR_HOT void sound_update()
+ {
+ netlist_time current = netlist().time();
+ int pos = (current - m_last_buffer) / m_sample;
+ if (pos >= BUFSIZE)
+ netlist().xfatalerror("sound %s: exceeded BUFSIZE\n", name().cstr());
+ while (m_last_pos < pos )
+ {
+ m_buffer[m_last_pos++] = m_cur;
+ }
+ }
+
+ ATTR_HOT void update()
+ {
+ double val = INPANALOG(m_in);
+ sound_update();
+ m_cur = val;
+ }
private:
- netlist_analog_input_t m_in;
- netlist_time m_sample;
- double m_cur;
- int m_last_pos;
- netlist_time m_last_buffer;
- stream_sample_t m_buffer[BUFSIZE];
+ netlist_analog_input_t m_in;
+ netlist_time m_sample;
+ double m_cur;
+ int m_last_pos;
+ netlist_time m_last_buffer;
+ stream_sample_t m_buffer[BUFSIZE];
};
diff --git a/src/emu/machine/nscsi_cb.c b/src/emu/machine/nscsi_cb.c
index 35d7e873d5f..bd828cac1e4 100644
--- a/src/emu/machine/nscsi_cb.c
+++ b/src/emu/machine/nscsi_cb.c
@@ -4,15 +4,15 @@ const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
nscsi_callback_device::nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: nscsi_device(mconfig, NSCSI_CB, "SCSI callback (new)", tag, owner, clock, "nscsi_cb", __FILE__),
- m_write_rst(*this),
- m_write_atn(*this),
- m_write_ack(*this),
- m_write_req(*this),
- m_write_msg(*this),
- m_write_io(*this),
- m_write_cd(*this),
- m_write_sel(*this),
- m_write_bsy(*this)
+ m_write_rst(*this),
+ m_write_atn(*this),
+ m_write_ack(*this),
+ m_write_req(*this),
+ m_write_msg(*this),
+ m_write_io(*this),
+ m_write_cd(*this),
+ m_write_sel(*this),
+ m_write_bsy(*this)
{
}
diff --git a/src/emu/machine/nscsi_s1410.c b/src/emu/machine/nscsi_s1410.c
index e38fc7135ed..d3f3defd95e 100644
--- a/src/emu/machine/nscsi_s1410.c
+++ b/src/emu/machine/nscsi_s1410.c
@@ -10,7 +10,7 @@ nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char
void nscsi_s1410_device::device_reset()
{
nscsi_harddisk_device::device_reset();
-
+
// initialize drive characteristics
params[0] = 0;
params[1] = 153;
@@ -44,7 +44,7 @@ void nscsi_s1410_device::scsi_command()
scsi_status_complete(SS_NOT_READY);
return;
}
-
+
scsi_status_complete(SS_GOOD);
break;
@@ -56,7 +56,7 @@ void nscsi_s1410_device::scsi_command()
lba = ((scsi_cmdbuf[1] & 0x1f)<<16) | (scsi_cmdbuf[2]<<8) | scsi_cmdbuf[3];
blocks = (bytes_per_sector == 256) ? 32 : 17;
-
+
int track_length = blocks*bytes_per_sector;
UINT8 *data = global_alloc_array(UINT8,track_length);
memset(data, 0xc6, track_length);
@@ -76,7 +76,7 @@ void nscsi_s1410_device::scsi_command()
scsi_status_complete(SS_NOT_READY);
return;
}
-
+
scsi_data_in(2, 3);
scsi_status_complete(SS_GOOD);
break;
@@ -103,7 +103,7 @@ void nscsi_s1410_device::scsi_command()
}
scsi_status_complete(SS_GOOD);
break;
-
+
case SC_READ_ECC_BURST:
case SC_RAM_DIAG:
case SC_DRIVE_DIAG:
@@ -135,7 +135,7 @@ void nscsi_s1410_device::scsi_put_data(int id, int pos, UINT8 data)
switch(scsi_cmdbuf[0]) {
case SC_FORMAT_ALT_TRACK:
break;
-
+
case SC_INIT_DRIVE_PARAMS:
params[pos] = data;
break;
diff --git a/src/emu/machine/nscsi_s1410.h b/src/emu/machine/nscsi_s1410.h
index 7409b6c6f0b..0af6963950d 100644
--- a/src/emu/machine/nscsi_s1410.h
+++ b/src/emu/machine/nscsi_s1410.h
@@ -12,42 +12,42 @@ public:
protected:
// SCSI status returns
enum {
- SS_GOOD = 0x00,
- SS_NO_INDEX = 0x01,
- SS_NO_SEEK_COMPLETE = 0x02,
- SS_WRITE_FAULT = 0x03,
- SS_NOT_READY = 0x04,
- SS_TK00_NOT_FOUND = 0x06,
- SS_SEEK_IN_PROGRESS = 0x08,
- SS_ID_FIELD_ERROR = 0x10,
- SS_DATA_ERROR = 0x11,
- SS_SAM_NOT_FOUND = 0x12,
- SS_SECTOR_NOT_FOUND = 0x14,
- SS_SEEK_ERROR = 0x15,
- SS_ECC = 0x18,
- SS_BAD_TRACK = 0x19,
- SS_FORMAT_ERROR = 0x1a,
- SS_ALT_TRACK = 0x1c,
- SS_ALT_TRACK_DEFECT = 0x1d,
+ SS_GOOD = 0x00,
+ SS_NO_INDEX = 0x01,
+ SS_NO_SEEK_COMPLETE = 0x02,
+ SS_WRITE_FAULT = 0x03,
+ SS_NOT_READY = 0x04,
+ SS_TK00_NOT_FOUND = 0x06,
+ SS_SEEK_IN_PROGRESS = 0x08,
+ SS_ID_FIELD_ERROR = 0x10,
+ SS_DATA_ERROR = 0x11,
+ SS_SAM_NOT_FOUND = 0x12,
+ SS_SECTOR_NOT_FOUND = 0x14,
+ SS_SEEK_ERROR = 0x15,
+ SS_ECC = 0x18,
+ SS_BAD_TRACK = 0x19,
+ SS_FORMAT_ERROR = 0x1a,
+ SS_ALT_TRACK = 0x1c,
+ SS_ALT_TRACK_DEFECT = 0x1d,
SS_ALT_TRACK_NOT_FOUND = 0x1e,
SS_ALT_TRACK_SAME = 0x1f,
- SS_RAM_ERROR = 0x30,
- SS_ROM_ERROR = 0x31,
- SS_ECC_CHECK_FAILURE = 0x32
+ SS_RAM_ERROR = 0x30,
+ SS_ROM_ERROR = 0x31,
+ SS_ECC_CHECK_FAILURE = 0x32
};
// SCSI commands
enum {
- SC_TEST_UNIT_READY = 0x00,
- SC_REZERO = 0x01,
- SC_REQUEST_SENSE = 0x03,
- SC_FORMAT_UNIT = 0x04,
- SC_CHECK_TRACK_FORMAT = 0x05,
- SC_FORMAT_TRACK = 0x06,
- SC_REASSIGN_BLOCKS = 0x07,
- SC_READ = 0x08,
- SC_WRITE = 0x0a,
- SC_SEEK = 0x0b,
+ SC_TEST_UNIT_READY = 0x00,
+ SC_REZERO = 0x01,
+ SC_REQUEST_SENSE = 0x03,
+ SC_FORMAT_UNIT = 0x04,
+ SC_CHECK_TRACK_FORMAT = 0x05,
+ SC_FORMAT_TRACK = 0x06,
+ SC_REASSIGN_BLOCKS = 0x07,
+ SC_READ = 0x08,
+ SC_WRITE = 0x0a,
+ SC_SEEK = 0x0b,
SC_INIT_DRIVE_PARAMS = 0x0c,
SC_READ_ECC_BURST = 0x0d,
SC_FORMAT_ALT_TRACK = 0x0e,
diff --git a/src/emu/machine/t10mmc.c b/src/emu/machine/t10mmc.c
index 84ff5f72667..aee65ffb5ce 100644
--- a/src/emu/machine/t10mmc.c
+++ b/src/emu/machine/t10mmc.c
@@ -550,10 +550,10 @@ void t10mmc::ReadData( UINT8 *data, int dataLength )
case T10MMC_CMD_READ_TOC_PMA_ATIP:
/*
- Track numbers are problematic here: 0 = lead-in, 0xaa = lead-out.
- That makes sense in terms of how real-world CDs are referred to, but
- our internal routines for tracks use "0" as track 1. That probably
- should be fixed...
+ Track numbers are problematic here: 0 = lead-in, 0xaa = lead-out.
+ That makes sense in terms of how real-world CDs are referred to, but
+ our internal routines for tracks use "0" as track 1. That probably
+ should be fixed...
*/
{
bool msf = (command[1] & 0x2) != 0;
diff --git a/src/emu/machine/t10sbc.c b/src/emu/machine/t10sbc.c
index 59e421ca16b..204046e39d6 100644
--- a/src/emu/machine/t10sbc.c
+++ b/src/emu/machine/t10sbc.c
@@ -42,9 +42,9 @@ void t10sbc::ExecCommand()
case T10SBC_CMD_SEEK_6:
m_lba = (command[1]&0x1f)<<16 | command[2]<<8 | command[3];
-
+
logerror("S1410: SEEK to LBA %x\n", m_lba);
-
+
m_phase = SCSI_PHASE_STATUS;
m_transfer_length = 0;
break;
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 1065c8b01bd..134578c2678 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -6,11 +6,11 @@
3 timers, address decoder, wait generator, interrupt controller,
all integrated in a single chip.
- TODO:
- - Interrupt generation: handle pending / in-service mechanisms
- - Parallel port: handle timing latency
- - Serial port: not done at all
- - (and many other things)
+ TODO:
+ - Interrupt generation: handle pending / in-service mechanisms
+ - Parallel port: handle timing latency
+ - Serial port: not done at all
+ - (and many other things)
***************************************************************************/
@@ -20,7 +20,7 @@
const device_type TMP68301 = &device_creator<tmp68301_device>;
static ADDRESS_MAP_START( tmp68301_regs, AS_0, 16, tmp68301_device )
-// AM_RANGE(0x000,0x3ff) AM_RAM
+// AM_RANGE(0x000,0x3ff) AM_RAM
AM_RANGE(0x094,0x095) AM_READWRITE(imr_r,imr_w)
AM_RANGE(0x098,0x099) AM_READWRITE(iisr_r,iisr_w)
@@ -63,9 +63,9 @@ READ16_MEMBER(tmp68301_device::scr_r)
WRITE16_MEMBER(tmp68301_device::scr_w)
{
/*
- *--- ---- CKSE
- --*- ---- RES
- ---- ---* INTM
+ *--- ---- CKSE
+ --*- ---- RES
+ ---- ---* INTM
*/
COMBINE_DATA(&m_scr);
diff --git a/src/emu/machine/tmp68301.h b/src/emu/machine/tmp68301.h
index 5ed7aab2d0d..31811342f42 100644
--- a/src/emu/machine/tmp68301.h
+++ b/src/emu/machine/tmp68301.h
@@ -29,7 +29,7 @@ struct tmp68301_interface
{
devcb_read16 m_in_parallel_cb;
devcb_write16 m_out_parallel_cb;
-// TODO: serial ports
+// TODO: serial ports
};
class tmp68301_device : public device_t,
diff --git a/src/emu/machine/upd4992.c b/src/emu/machine/upd4992.c
index 95a2db0e01c..7a56bb678a3 100644
--- a/src/emu/machine/upd4992.c
+++ b/src/emu/machine/upd4992.c
@@ -2,13 +2,13 @@
// copyright-holders: Angelo Salese
/***************************************************************************
- uPD4992 parallel RTC
+ uPD4992 parallel RTC
- TODO:
- - Add timers
- - Add leap year count
- - Add 12 hours mode
- - Add mode/control register
+ TODO:
+ - Add timers
+ - Add leap year count
+ - Add 12 hours mode
+ - Add mode/control register
***************************************************************************/
@@ -35,7 +35,7 @@ const device_type UPD4992 = &device_creator<upd4992_device>;
upd4992_device::upd4992_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, UPD4992, "uPD4992", tag, owner, clock, "upd4992", __FILE__),
- device_rtc_interface(mconfig, *this)
+ device_rtc_interface(mconfig, *this)
{
}
diff --git a/src/emu/machine/upd4992.h b/src/emu/machine/upd4992.h
index b94f0fee763..17feb7a942a 100644
--- a/src/emu/machine/upd4992.h
+++ b/src/emu/machine/upd4992.h
@@ -2,7 +2,7 @@
// copyright-holders: Angelo Salese
/***************************************************************************
- uPD4992 RTC
+ uPD4992 RTC
***************************************************************************/
@@ -27,7 +27,7 @@
// ======================> upd4992_device
class upd4992_device : public device_t,
- public device_rtc_interface
+ public device_rtc_interface
{
public:
// construction/destruction
diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c
index f770e6b7c30..1e7da115a54 100644
--- a/src/emu/machine/z80dart.c
+++ b/src/emu/machine/z80dart.c
@@ -1227,7 +1227,7 @@ WRITE_LINE_MEMBER( z80dart_channel::rxc_w )
m_rx_clock++;
if (m_rx_clock == clocks)
m_rx_clock = 0;
-
+
}
}
@@ -1249,7 +1249,7 @@ WRITE_LINE_MEMBER( z80dart_channel::txc_w )
m_tx_clock++;
if (m_tx_clock == clocks)
m_tx_clock = 0;
-
+
}
}
@@ -1339,4 +1339,3 @@ WRITE_LINE_MEMBER(z80dart_channel::write_rx)
input_callback(m_input_state & ~RX);
}
}
-
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index df0803ad196..846ea1ce794 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -123,7 +123,7 @@ const int TM_SEARCH_TRANSFER = 0x03;
#define EOB_F_CLEAR (m_status |= 0x20)
#define READY_ACTIVE_HIGH ((WR5>>3) & 0x01)
-#define AUTO_RESTART ((WR5>>5) & 0x01)
+#define AUTO_RESTART ((WR5>>5) & 0x01)
#define INTERRUPT_ENABLE (WR3 & 0x20)
#define INT_ON_MATCH (INTERRUPT_CTRL & 0x01)