diff options
Diffstat (limited to 'src/emu/machine')
33 files changed, 223 insertions, 223 deletions
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c index 3a1434ff017..95e1d60572a 100644 --- a/src/emu/machine/53c810.c +++ b/src/emu/machine/53c810.c @@ -393,7 +393,7 @@ void lsi53c810_device::dma_exec() UINT8 lsi53c810_device::lsi53c810_reg_r( int offset ) { -// logerror("53c810: read reg %d:0x%x (PC=%x)\n", offset, offset, space->device().safe_pc()); +// logerror("53c810: read reg %d:0x%x (PC=%x)\n", offset, offset, space->device().safe_pc()); switch(offset) { case 0x00: /* SCNTL0 */ @@ -476,7 +476,7 @@ UINT8 lsi53c810_device::lsi53c810_reg_r( int offset ) void lsi53c810_device::lsi53c810_reg_w(int offset, UINT8 data) { -// logerror("53c810: %02x to reg %d:0x%x (PC=%x)\n", data, offset, offset, space->device().safe_pc()); +// logerror("53c810: %02x to reg %d:0x%x (PC=%x)\n", data, offset, offset, space->device().safe_pc()); switch(offset) { case 0x00: /* SCNTL0 */ diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h index b28952c4a2b..ea17eeae9d7 100644 --- a/src/emu/machine/6526cia.h +++ b/src/emu/machine/6526cia.h @@ -113,7 +113,7 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - + UINT8 reg_r(UINT8 offset); void reg_w(UINT8 offset, UINT8 data); diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index 45ecfa325bf..8257d562294 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -44,7 +44,7 @@ static const char *const duart68681_reg_write_names[0x10] = #define RX_FIFO_SIZE 3 -struct DUART68681_CHANNEL +struct DUART68681_CHANNEL { /* Registers */ UINT8 CR; /* Command register */ @@ -72,7 +72,7 @@ struct DUART68681_CHANNEL }; -struct duart68681_state +struct duart68681_state { /* device */ device_t *device; diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h index 607b931b727..a54c59f885b 100644 --- a/src/emu/machine/8042kbdc.h +++ b/src/emu/machine/8042kbdc.h @@ -10,7 +10,7 @@ #ifndef KBDC8042_H #define KBDC8042_H -enum kbdc8042_type_t +enum kbdc8042_type_t { KBDC8042_STANDARD, KBDC8042_PS2, /* another timing of integrated controller */ diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h index 2bd23c04ebf..a17b7a1839e 100644 --- a/src/emu/machine/latch8.h +++ b/src/emu/machine/latch8.h @@ -46,27 +46,27 @@ class latch8_device : public device_t public: latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~latch8_device() { global_free(m_token); } - + // access to legacy token void *token() const { assert(m_token != NULL); return m_token; } latch8_config m_inline_config; - - void set_maskout(UINT32 maskout) { m_inline_config.maskout = maskout; } - void set_xorvalue(UINT32 xorvalue) { m_inline_config.xorvalue = xorvalue; } - void set_nosync(UINT32 nosync) { m_inline_config.nosync = nosync; } - - void set_discrete_node(const char *dev_tag, int bit, UINT32 node) { m_inline_config.node_device[bit] = dev_tag; m_inline_config.node_map[bit] = node; } - void set_devread(int bit, const char *tag, read8_device_func handler, int from_bit) + + void set_maskout(UINT32 maskout) { m_inline_config.maskout = maskout; } + void set_xorvalue(UINT32 xorvalue) { m_inline_config.xorvalue = xorvalue; } + void set_nosync(UINT32 nosync) { m_inline_config.nosync = nosync; } + + void set_discrete_node(const char *dev_tag, int bit, UINT32 node) { m_inline_config.node_device[bit] = dev_tag; m_inline_config.node_map[bit] = node; } + void set_devread(int bit, const char *tag, read8_device_func handler, int from_bit) { - m_inline_config.devread[bit].from_bit = from_bit; - m_inline_config.devread[bit].tag = tag; - m_inline_config.devread[bit].devread_handler = handler; + m_inline_config.devread[bit].from_bit = from_bit; + m_inline_config.devread[bit].tag = tag; + m_inline_config.devread[bit].devread_handler = handler; } - void set_read(int bit, read8_space_func handler, int from_bit) + void set_read(int bit, read8_space_func handler, int from_bit) { - m_inline_config.devread[bit].from_bit = from_bit; - m_inline_config.devread[bit].read_handler = handler; - } + m_inline_config.devread[bit].from_bit = from_bit; + m_inline_config.devread[bit].read_handler = handler; + } protected: // device-level overrides virtual void device_config_complete(); @@ -88,7 +88,7 @@ extern const device_type LATCH8; /* Bit mask specifying bits to be masked *out* */ #define MCFG_LATCH8_MASKOUT(_maskout) \ - static_cast<latch8_device *>(device)->set_maskout(_maskout); + static_cast<latch8_device *>(device)->set_maskout(_maskout); /* Bit mask specifying bits to be inverted */ #define MCFG_LATCH8_INVERT(_xor) \ diff --git a/src/emu/machine/m6m80011ap.h b/src/emu/machine/m6m80011ap.h index 47abaf05c03..f84e7f59e12 100644 --- a/src/emu/machine/m6m80011ap.h +++ b/src/emu/machine/m6m80011ap.h @@ -24,7 +24,7 @@ Template for skeleton device // TYPE DEFINITIONS //************************************************************************** -enum eeprom_cmd_t +enum eeprom_cmd_t { EEPROM_GET_CMD = 0, EEPROM_READ, diff --git a/src/emu/machine/matsucd.c b/src/emu/machine/matsucd.c index f913812822b..55476a696ed 100644 --- a/src/emu/machine/matsucd.c +++ b/src/emu/machine/matsucd.c @@ -27,7 +27,7 @@ can be expanded with support for the other drives as needed. #define MATSU_STATUS_MEDIA ( 1 << 6 ) /* media present (in caddy or tray) */ #define MATSU_STATUS_DOORCLOSED ( 1 << 7 ) /* tray status */ -struct matsucd +struct matsucd { UINT8 enabled; /* /ENABLE - Unit enabled */ UINT8 cmd_signal; /* /CMD - Command mode */ diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h index 7e6fa35ad60..47bd8ed0ad3 100644 --- a/src/emu/machine/msm6242.h +++ b/src/emu/machine/msm6242.h @@ -30,7 +30,7 @@ struct msm6242_interface devcb_write_line m_out_int_cb; }; -struct rtc_regs_t +struct rtc_regs_t { UINT8 sec, min, hour, day, wday, month; UINT16 year; diff --git a/src/emu/machine/net_lib.c b/src/emu/machine/net_lib.c index 6d803178a5e..cd86c529566 100644 --- a/src/emu/machine/net_lib.c +++ b/src/emu/machine/net_lib.c @@ -910,11 +910,11 @@ static net_device_t_base_factory *netregistry[] = { ENTRY(netdev_ttl_const, NETDEV_TTL_CONST) ENTRY(netdev_analog_const, NETDEV_ANALOG_CONST) - ENTRY(netdev_logic_input, NETDEV_LOGIC_INPUT) + ENTRY(netdev_logic_input, NETDEV_LOGIC_INPUT) ENTRY(netdev_analog_input, NETDEV_ANALOG_INPUT) ENTRY(netdev_clock, NETDEV_CLOCK) - ENTRY(netdev_callback, NETDEV_CALLBACK) - ENTRY(nicMultiSwitch, NETDEV_SWITCH2) + ENTRY(netdev_callback, NETDEV_CALLBACK) + ENTRY(nicMultiSwitch, NETDEV_SWITCH2) ENTRY(nicRSFF, NETDEV_RSFF) ENTRY(nicMixer8, NETDEV_MIXER) ENTRY(nic7400, TTL_7400_NAND) diff --git a/src/emu/machine/net_lib.h b/src/emu/machine/net_lib.h index e99ec2ac05d..2b6c6801310 100644 --- a/src/emu/machine/net_lib.h +++ b/src/emu/machine/net_lib.h @@ -94,7 +94,7 @@ #define TTL_7402_NOR(_name, _I1, _I2) \ NET_REGISTER_DEV(nic7402, _name) \ - NET_CONNECT(_name, I1, _I1) \ + NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ #define TTL_7404_INVERT(_name, _I1) \ @@ -147,7 +147,7 @@ #define TTL_7486_XOR(_name, _I1, _I2) \ NET_REGISTER_DEV(nic7486, _name) \ - NET_CONNECT(_name, I1, _I1) \ + NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ #define TTL_7448(_name, _A0, _A1, _A2, _A3, _LTQ, _BIQ, _RBIQ) \ @@ -201,7 +201,7 @@ NET_CONNECT(_name, K, _K) \ NET_CONNECT(_name, CLRQ, _CLRQ) \ -#define TTL_74107(_name, _CLK, _J, _K, _CLRQ) \ +#define TTL_74107(_name, _CLK, _J, _K, _CLRQ) \ TTL_74107A(_name, _CLK, _J, _K, _CLRQ) #define TTL_74153(_name, _A1, _A2, _A3, _A4, _A, _B, _GA) \ @@ -408,7 +408,7 @@ class nic74107 : public nic74107A { public: nic74107() - : nic74107A() {} + : nic74107A() {} }; diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c index a0bd2065fb0..53f633a3cb0 100644 --- a/src/emu/machine/netlist.c +++ b/src/emu/machine/netlist.c @@ -68,7 +68,7 @@ #if KEEP_STATISTICS #define add_to_stat(v,x) do { v += (x); } while (0) #define inc_stat(v) add_to_stat(v, 1) -#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) +#define begin_timing(v) do { (v) -= get_profile_ticks(); } while (0) #define end_timing(v) do { (v) += get_profile_ticks(); } while (0) #else #define add_to_stat(v,x) do { } while (0) @@ -386,7 +386,7 @@ ATTR_HOT ATTR_ALIGN void netlist_base_t::process_list(INT32 &atime) while ( (atime > 0) && (m_queue.is_not_empty())) { queue_t::entry_t e = m_queue.pop(); - netlist_time delta = e.time() - m_time_ps + netlist_time::from_raw(m_rem); + netlist_time delta = e.time() - m_time_ps + netlist_time::from_raw(m_rem); atime -= divu_64x32_rem(delta.as_raw(), m_div, &m_rem); m_time_ps = e.time(); @@ -583,8 +583,8 @@ void netlist_setup_t::resolve_inputs(void) if (out.object_type(net_output_t::SIGNAL_MASK) == net_output_t::SIGNAL_ANALOG && in->object_type(net_output_t::SIGNAL_MASK) == net_output_t::SIGNAL_DIGITAL) { - // fatalerror("connecting analog output %s with %s\n", out.netdev()->name(), in->netdev()->name()); - // fatalerror("connecting analog output %s with %s\n", out.netdev()->name(), in->netdev()->name()); + // fatalerror("connecting analog output %s with %s\n", out.netdev()->name(), in->netdev()->name()); + // fatalerror("connecting analog output %s with %s\n", out.netdev()->name(), in->netdev()->name()); netdev_a_to_d_proxy *proxy = new netdev_a_to_d_proxy(*in); proxy->init(this, "abc"); proxy->start(); @@ -933,7 +933,7 @@ void netlist_mame_device::device_reset() void netlist_mame_device::device_stop() { m_setup->print_stats(); - + global_free(m_setup); global_free(m_netlist); } @@ -972,9 +972,9 @@ ATTR_HOT void netlist_mame_device::execute_run() //bool check_debugger = ((device_t::machine().debug_flags & DEBUG_FLAG_ENABLED) != 0); // debugging - //m_ppc = m_pc; // copy PC to previous PC + //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_list(m_icount); diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h index ae50b59c058..a73ce54b65b 100644 --- a/src/emu/machine/netlist.h +++ b/src/emu/machine/netlist.h @@ -58,7 +58,7 @@ #define USE_DELEGATES (1) #define USE_DELEGATES_A (0) -#define NETLIST_CLOCK (U64(1000000000)) +#define NETLIST_CLOCK (U64(1000000000)) #define NLTIME_FROM_NS(_t) netlist_time::from_ns(_t) #define NLTIME_FROM_US(_t) netlist_time::from_us(_t) @@ -100,11 +100,11 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ #define NETLIST_END } -#define NETLIST_INCLUDE(_name) \ +#define NETLIST_INCLUDE(_name) \ NETLIST_NAME(_name)(netlist); \ -#define NETLIST_MEMREGION(_name) \ +#define NETLIST_MEMREGION(_name) \ netlist.parse((char *)downcast<netlist_t &>(netlist.netlist()).machine().root_device().memregion(_name)->base()); \ #if defined(__GNUC__) && (__GNUC__ >= 3) @@ -129,7 +129,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ #define NETLIB_SIGNAL(_name, _num_input, _check) \ class _name : public net_signal_t<_num_input, _check> \ { \ - public: \ + public: \ _name () : net_signal_t<_num_input, _check>() { } \ }; \ @@ -168,15 +168,15 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ // MAME specific -#define MCFG_NETLIST_ADD(_tag, _setup ) \ - MCFG_DEVICE_ADD(_tag, NETLIST, NETLIST_CLOCK) \ - MCFG_NETLIST_SETUP(_setup) \ +#define MCFG_NETLIST_ADD(_tag, _setup ) \ + MCFG_DEVICE_ADD(_tag, NETLIST, NETLIST_CLOCK) \ + MCFG_NETLIST_SETUP(_setup) \ -#define MCFG_NETLIST_REPLACE(_tag, _setup) \ +#define MCFG_NETLIST_REPLACE(_tag, _setup) \ MCFG_DEVICE_REPLACE(_tag, NETLIST, NETLIST_CLOCK) \ - MCFG_NETLIST_SETUP(_setup) \ + MCFG_NETLIST_SETUP(_setup) \ -#define MCFG_NETLIST_SETUP(_setup) \ +#define MCFG_NETLIST_SETUP(_setup) \ netlist_mame_device::static_set_constructor(*device, NETLIST_NAME(_setup)); \ @@ -402,7 +402,7 @@ public: TYPE_MASK = 0x03, SIGNAL_DIGITAL = 0x00, SIGNAL_ANALOG = 0x10, - SIGNAL_MASK = 0x10, + SIGNAL_MASK = 0x10, }; net_object_t(int atype) @@ -510,8 +510,8 @@ public: friend net_sig_t logic_input_t::Q() const; - ATTR_HOT inline const net_sig_t last_Q() const { return m_last_Q; } - ATTR_HOT inline const net_sig_t new_Q() const { return m_new_Q; } + ATTR_HOT inline const net_sig_t last_Q() const { return m_last_Q; } + ATTR_HOT inline const net_sig_t new_Q() const { return m_new_Q; } ATTR_HOT inline const double Q_Analog() const { @@ -519,14 +519,14 @@ public: { case SIGNAL_DIGITAL: return m_Q ? m_high_V : m_low_V; case SIGNAL_ANALOG: return m_Q_analog; - default: assert(true); + default: assert(true); } return 0; } inline net_sig_t *Q_ptr() { return &m_Q; } - inline net_sig_t *new_Q_ptr() { return &m_new_Q; } + inline net_sig_t *new_Q_ptr() { return &m_new_Q; } ATTR_COLD void register_con(net_input_t &inp); @@ -544,9 +544,9 @@ public: protected: /* prohibit use in device functions - * current (pending) state can be inquired using new_Q() - */ - ATTR_HOT inline const net_sig_t Q() const { return m_Q; } + * current (pending) state can be inquired using new_Q() + */ + ATTR_HOT inline const net_sig_t Q() const { return m_Q; } ATTR_HOT inline void register_in_listPS(const netlist_time &delay_ps); @@ -612,8 +612,8 @@ public: } ATTR_COLD void initial(const net_sig_t val) { m_Q = val; m_new_Q = val; m_last_Q = !val; } - ATTR_HOT inline void clear() { set_Q_PS(0, netlist_time::zero); } - ATTR_HOT inline void set() { set_Q_PS(1, netlist_time::zero); } + ATTR_HOT inline void clear() { set_Q_PS(0, netlist_time::zero); } + ATTR_HOT inline void set() { set_Q_PS(1, netlist_time::zero); } ATTR_HOT inline void setToPS(const UINT8 val, const netlist_time &delay_ps) { set_Q_PS(val, delay_ps); } ATTR_HOT inline void setToNoCheckPS(const UINT8 val, const netlist_time &delay_ps) { set_Q_NoCheckPS(val, delay_ps); } ATTR_COLD inline void set_levels(const double low, const double high) @@ -768,7 +768,7 @@ public: inline void initial(const double val) { m_param = val; } inline void initial(const int val) { m_param = val; } - ATTR_HOT inline double Value() const { return m_param; } + ATTR_HOT inline double Value() const { return m_param; } ATTR_HOT inline int ValueInt() const { return (int) m_param; } ATTR_HOT inline net_core_device_t &netdev() const { return *m_netdev; } @@ -922,7 +922,7 @@ public: protected: netlist_time m_time_ps; UINT32 m_rem; - UINT32 m_div; + UINT32 m_div; queue_t m_queue; diff --git a/src/emu/machine/pc16552d.c b/src/emu/machine/pc16552d.c index 50cbb9cc71b..02ed609ba53 100644 --- a/src/emu/machine/pc16552d.c +++ b/src/emu/machine/pc16552d.c @@ -34,7 +34,7 @@ #define INT_ENABLE_RX_LINE_STATUS 0x04 #define INT_ENABLE_MODEM_STATUS 0x08 -struct PC16552D_CHANNEL +struct PC16552D_CHANNEL { UINT16 divisor; UINT8 reg[8]; @@ -50,7 +50,7 @@ struct PC16552D_CHANNEL emu_timer *tx_fifo_timer; }; -struct PC16552D_REGS +struct PC16552D_REGS { PC16552D_CHANNEL ch[2]; int frequency; diff --git a/src/emu/machine/pckeybrd.h b/src/emu/machine/pckeybrd.h index 28575cb151d..76c8366c505 100644 --- a/src/emu/machine/pckeybrd.h +++ b/src/emu/machine/pckeybrd.h @@ -12,7 +12,7 @@ #ifndef PCKEYBRD_H #define PCKEYBRD_H -enum AT_KEYBOARD_TYPE +enum AT_KEYBOARD_TYPE { AT_KEYBOARD_TYPE_PC, AT_KEYBOARD_TYPE_AT, diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c index e0e9bda9c70..d48f527d516 100644 --- a/src/emu/machine/pic8259.c +++ b/src/emu/machine/pic8259.c @@ -20,7 +20,7 @@ #define LOG_OCW 0 #define LOG_GENERAL 0 -enum pic8259_state_t +enum pic8259_state_t { STATE_ICW1, STATE_ICW2, diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index dfbe2b3df70..d4ba1b2ebaa 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -82,7 +82,7 @@ struct pit8253_timer UINT32 cycles_to_output; /* cycles until output callback called */ }; -struct pit8253_t +struct pit8253_t { const pit8253_config *config; int device_type; diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index 35e3f3fae5b..6a5bb9e2d63 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -2,9 +2,9 @@ RP5H01 - TODO: - - convert to modern and follow the datasheet better (all dumps - presumably needs to be redone from scratch?) + TODO: + - convert to modern and follow the datasheet better (all dumps + presumably needs to be redone from scratch?) 2009-06 Converted to be a device diff --git a/src/emu/machine/rtc9701.h b/src/emu/machine/rtc9701.h index 8f08891beed..5cc6bfbd387 100644 --- a/src/emu/machine/rtc9701.h +++ b/src/emu/machine/rtc9701.h @@ -26,7 +26,7 @@ //************************************************************************** -enum rtc9701_state_t +enum rtc9701_state_t { RTC9701_CMD_WAIT = 0, RTC9701_RTC_READ, @@ -37,7 +37,7 @@ enum rtc9701_state_t }; -struct rtc_regs_t +struct rtc_regs_t { UINT8 sec, min, hour, day, wday, month, year; }; diff --git a/src/emu/machine/s3520cf.c b/src/emu/machine/s3520cf.c index d178f474f62..16494011520 100644 --- a/src/emu/machine/s3520cf.c +++ b/src/emu/machine/s3520cf.c @@ -210,7 +210,7 @@ WRITE_LINE_MEMBER( s3520cf_device::set_cs_line ) WRITE_LINE_MEMBER( s3520cf_device::write_bit ) { m_latch = state; -// printf("%d LATCH LINE\n",state); +// printf("%d LATCH LINE\n",state); } WRITE_LINE_MEMBER( s3520cf_device::set_clock_line ) diff --git a/src/emu/machine/s3520cf.h b/src/emu/machine/s3520cf.h index 2f231f404b1..73a2b0a6e40 100644 --- a/src/emu/machine/s3520cf.h +++ b/src/emu/machine/s3520cf.h @@ -23,13 +23,13 @@ Template for skeleton device // TYPE DEFINITIONS //************************************************************************** -enum s3520cf_state_t +enum s3520cf_state_t { RTC_SET_ADDRESS = 0, RTC_SET_DATA }; -struct rtc_regs_t +struct rtc_regs_t { UINT8 sec, min, hour, day, wday, month, year; }; diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c index e1a35e54ffe..bca0e4614ff 100644 --- a/src/emu/machine/s3c2400.c +++ b/src/emu/machine/s3c2400.c @@ -62,7 +62,7 @@ DEVICE_START( s3c2400 ) space->install_legacy_readwrite_handler( *device, 0x15800000, 0x15800007, FUNC(s3c24xx_adc_r), FUNC(s3c24xx_adc_w)); space->install_legacy_readwrite_handler( *device, 0x15900000, 0x15900017, FUNC(s3c24xx_spi_0_r), FUNC(s3c24xx_spi_0_w)); space->install_legacy_readwrite_handler( *device, 0x15a00000, 0x15a0003f, FUNC(s3c24xx_mmc_r), FUNC(s3c24xx_mmc_w)); - + s3c24xx_video_start( device, device->machine()); } diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index d59e5ee4120..f1e1ee4f4d5 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -38,10 +38,10 @@ class s3c2400_device : public device_t public: s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2400_device() { global_free(m_token); } - + // access to legacy token void *token() const { assert(m_token != NULL); return m_token; } - + // device-level overrides virtual void device_config_complete(); virtual void device_start(); @@ -49,7 +49,7 @@ public: private: // internal state void *m_token; -public: +public: UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -407,17 +407,17 @@ void s3c2400_uart_fifo_w( device_t *device, int uart, UINT8 data); TYPE DEFINITIONS *******************************************************************************/ -struct s3c24xx_memcon_regs_t +struct s3c24xx_memcon_regs_t { UINT32 data[0x34/4]; }; -struct s3c24xx_usbhost_regs_t +struct s3c24xx_usbhost_regs_t { UINT32 data[0x5C/4]; }; -struct s3c24xx_irq_regs_t +struct s3c24xx_irq_regs_t { UINT32 srcpnd; UINT32 intmod; @@ -427,7 +427,7 @@ struct s3c24xx_irq_regs_t UINT32 intoffset; }; -struct s3c24xx_dma_regs_t +struct s3c24xx_dma_regs_t { UINT32 disrc; UINT32 didst; @@ -438,7 +438,7 @@ struct s3c24xx_dma_regs_t UINT32 dmasktrig; }; -struct s3c24xx_clkpow_regs_t +struct s3c24xx_clkpow_regs_t { UINT32 locktime; UINT32 mpllcon; @@ -448,7 +448,7 @@ struct s3c24xx_clkpow_regs_t UINT32 clkdivn; }; -struct s3c24xx_lcd_regs_t +struct s3c24xx_lcd_regs_t { UINT32 lcdcon1; UINT32 lcdcon2; @@ -466,12 +466,12 @@ struct s3c24xx_lcd_regs_t UINT32 tpal; }; -struct s3c24xx_lcdpal_regs_t +struct s3c24xx_lcdpal_regs_t { UINT32 data[0x400/4]; }; -struct s3c24xx_uart_regs_t +struct s3c24xx_uart_regs_t { UINT32 ulcon; UINT32 ucon; @@ -486,7 +486,7 @@ struct s3c24xx_uart_regs_t UINT32 ubrdiv; }; -struct s3c24xx_pwm_regs_t +struct s3c24xx_pwm_regs_t { UINT32 tcfg0; UINT32 tcfg1; @@ -507,19 +507,19 @@ struct s3c24xx_pwm_regs_t UINT32 tcnto4; }; -struct s3c24xx_usbdev_regs_t +struct s3c24xx_usbdev_regs_t { UINT32 data[0xBC/4]; }; -struct s3c24xx_wdt_regs_t +struct s3c24xx_wdt_regs_t { UINT32 wtcon; UINT32 wtdat; UINT32 wtcnt; }; -struct s3c24xx_iic_regs_t +struct s3c24xx_iic_regs_t { UINT32 iiccon; UINT32 iicstat; @@ -527,7 +527,7 @@ struct s3c24xx_iic_regs_t UINT32 iicds; }; -struct s3c24xx_iis_regs_t +struct s3c24xx_iis_regs_t { UINT32 iiscon; UINT32 iismod; @@ -536,7 +536,7 @@ struct s3c24xx_iis_regs_t UINT32 iisfifo; }; -struct s3c24xx_gpio_regs_t +struct s3c24xx_gpio_regs_t { UINT32 gpacon; UINT32 gpadat; @@ -563,7 +563,7 @@ struct s3c24xx_gpio_regs_t UINT32 extint; }; -struct s3c24xx_rtc_regs_t +struct s3c24xx_rtc_regs_t { UINT32 rtccon; UINT32 ticnt; @@ -585,13 +585,13 @@ struct s3c24xx_rtc_regs_t UINT32 bcdyear; }; -struct s3c24xx_adc_regs_t +struct s3c24xx_adc_regs_t { UINT32 adccon; UINT32 adcdat; }; -struct s3c24xx_spi_regs_t +struct s3c24xx_spi_regs_t { UINT32 spcon; UINT32 spsta; @@ -601,39 +601,39 @@ struct s3c24xx_spi_regs_t UINT32 sprdat; }; -struct s3c24xx_mmc_regs_t +struct s3c24xx_mmc_regs_t { UINT32 data[0x40/4]; }; -struct s3c24xx_memcon_t +struct s3c24xx_memcon_t { s3c24xx_memcon_regs_t regs; }; -struct s3c24xx_usbhost_t +struct s3c24xx_usbhost_t { s3c24xx_usbhost_regs_t regs; }; -struct s3c24xx_irq_t +struct s3c24xx_irq_t { s3c24xx_irq_regs_t regs; int line_irq, line_fiq; }; -struct s3c24xx_dma_t +struct s3c24xx_dma_t { s3c24xx_dma_regs_t regs; emu_timer *timer; }; -struct s3c24xx_clkpow_t +struct s3c24xx_clkpow_t { s3c24xx_clkpow_regs_t regs; }; -struct s3c24xx_lcd_t +struct s3c24xx_lcd_t { s3c24xx_lcd_regs_t regs; emu_timer *timer; @@ -652,17 +652,17 @@ struct s3c24xx_lcd_t UINT32 dma_data, dma_bits; }; -struct s3c24xx_lcdpal_t +struct s3c24xx_lcdpal_t { s3c24xx_lcdpal_regs_t regs; }; -struct s3c24xx_uart_t +struct s3c24xx_uart_t { s3c24xx_uart_regs_t regs; }; -struct s3c24xx_pwm_t +struct s3c24xx_pwm_t { s3c24xx_pwm_regs_t regs; emu_timer *timer[5]; @@ -671,25 +671,25 @@ struct s3c24xx_pwm_t UINT32 freq[5]; }; -struct s3c24xx_usbdev_t +struct s3c24xx_usbdev_t { s3c24xx_usbdev_regs_t regs; }; -struct s3c24xx_wdt_t +struct s3c24xx_wdt_t { s3c24xx_wdt_regs_t regs; emu_timer *timer; }; -struct s3c24xx_iic_t +struct s3c24xx_iic_t { s3c24xx_iic_regs_t regs; emu_timer *timer; int count; }; -struct s3c24xx_iis_t +struct s3c24xx_iis_t { s3c24xx_iis_regs_t regs; emu_timer *timer; @@ -697,34 +697,34 @@ struct s3c24xx_iis_t int fifo_index; }; -struct s3c24xx_gpio_t +struct s3c24xx_gpio_t { s3c24xx_gpio_regs_t regs; }; -struct s3c24xx_rtc_t +struct s3c24xx_rtc_t { s3c24xx_rtc_regs_t regs; emu_timer *timer_tick_count; emu_timer *timer_update; }; -struct s3c24xx_adc_t +struct s3c24xx_adc_t { s3c24xx_adc_regs_t regs; }; -struct s3c24xx_spi_t +struct s3c24xx_spi_t { s3c24xx_spi_regs_t regs; }; -struct s3c24xx_mmc_t +struct s3c24xx_mmc_t { s3c24xx_mmc_regs_t regs; }; -struct s3c24xx_t +struct s3c24xx_t { const s3c2400_interface *iface; s3c24xx_memcon_t memcon; diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c index cce1a811700..6cbbad3c2c6 100644 --- a/src/emu/machine/s3c2410.c +++ b/src/emu/machine/s3c2410.c @@ -65,7 +65,7 @@ DEVICE_START( s3c2410 ) space->install_legacy_readwrite_handler( *device, 0x59000000, 0x59000017, FUNC(s3c24xx_spi_0_r), FUNC(s3c24xx_spi_0_w)); space->install_legacy_readwrite_handler( *device, 0x59000020, 0x59000037, FUNC(s3c24xx_spi_1_r), FUNC(s3c24xx_spi_1_w)); space->install_legacy_readwrite_handler( *device, 0x5a000000, 0x5a000043, FUNC(s3c24xx_sdi_r), FUNC(s3c24xx_sdi_w)); - + s3c24xx_video_start( device, device->machine()); } diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index 0054f2c026c..0ed2cf85c2e 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -46,7 +46,7 @@ class s3c2410_device : public device_t public: s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2410_device() { global_free(m_token); } - + // access to legacy token void *token() const { assert(m_token != NULL); return m_token; } // device-level overrides @@ -56,7 +56,7 @@ public: private: // internal state void *m_token; -public: +public: UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -498,17 +498,17 @@ static const UINT32 MAP_SUBINT_TO_INT[11] = TYPE DEFINITIONS *******************************************************************************/ -struct s3c24xx_memcon_regs_t +struct s3c24xx_memcon_regs_t { UINT32 data[0x34/4]; }; -struct s3c24xx_usbhost_regs_t +struct s3c24xx_usbhost_regs_t { UINT32 data[0x5C/4]; }; -struct s3c24xx_irq_regs_t +struct s3c24xx_irq_regs_t { UINT32 srcpnd; UINT32 intmod; @@ -520,7 +520,7 @@ struct s3c24xx_irq_regs_t UINT32 intsubmsk; }; -struct s3c24xx_dma_regs_t +struct s3c24xx_dma_regs_t { UINT32 disrc; UINT32 disrcc; @@ -533,7 +533,7 @@ struct s3c24xx_dma_regs_t UINT32 dmasktrig; }; -struct s3c24xx_clkpow_regs_t +struct s3c24xx_clkpow_regs_t { UINT32 locktime; UINT32 mpllcon; @@ -543,7 +543,7 @@ struct s3c24xx_clkpow_regs_t UINT32 clkdivn; }; -struct s3c24xx_lcd_regs_t +struct s3c24xx_lcd_regs_t { UINT32 lcdcon1; UINT32 lcdcon2; @@ -565,12 +565,12 @@ struct s3c24xx_lcd_regs_t UINT32 lpcsel; }; -struct s3c24xx_lcdpal_regs_t +struct s3c24xx_lcdpal_regs_t { UINT32 data[0x400/4]; }; -struct s3c24xx_nand_regs_t +struct s3c24xx_nand_regs_t { UINT32 nfconf; UINT32 nfcmd; @@ -580,7 +580,7 @@ struct s3c24xx_nand_regs_t UINT32 nfecc; }; -struct s3c24xx_uart_regs_t +struct s3c24xx_uart_regs_t { UINT32 ulcon; UINT32 ucon; @@ -595,7 +595,7 @@ struct s3c24xx_uart_regs_t UINT32 ubrdiv; }; -struct s3c24xx_pwm_regs_t +struct s3c24xx_pwm_regs_t { UINT32 tcfg0; UINT32 tcfg1; @@ -616,19 +616,19 @@ struct s3c24xx_pwm_regs_t UINT32 tcnto4; }; -struct s3c24xx_usbdev_regs_t +struct s3c24xx_usbdev_regs_t { UINT32 data[0x130/4]; }; -struct s3c24xx_wdt_regs_t +struct s3c24xx_wdt_regs_t { UINT32 wtcon; UINT32 wtdat; UINT32 wtcnt; }; -struct s3c24xx_iic_regs_t +struct s3c24xx_iic_regs_t { UINT32 iiccon; UINT32 iicstat; @@ -636,7 +636,7 @@ struct s3c24xx_iic_regs_t UINT32 iicds; }; -struct s3c24xx_iis_regs_t +struct s3c24xx_iis_regs_t { UINT32 iiscon; UINT32 iismod; @@ -645,7 +645,7 @@ struct s3c24xx_iis_regs_t UINT32 iisfifo; }; -struct s3c24xx_gpio_regs_t +struct s3c24xx_gpio_regs_t { UINT32 gpacon; UINT32 gpadat; @@ -697,7 +697,7 @@ struct s3c24xx_gpio_regs_t UINT32 gstatus4; }; -struct s3c24xx_rtc_regs_t +struct s3c24xx_rtc_regs_t { UINT32 rtccon; UINT32 ticnt; @@ -719,7 +719,7 @@ struct s3c24xx_rtc_regs_t UINT32 bcdyear; }; -struct s3c24xx_adc_regs_t +struct s3c24xx_adc_regs_t { UINT32 adccon; UINT32 adctsc; @@ -728,7 +728,7 @@ struct s3c24xx_adc_regs_t UINT32 adcdat1; }; -struct s3c24xx_spi_regs_t +struct s3c24xx_spi_regs_t { UINT32 spcon; UINT32 spsta; @@ -738,39 +738,39 @@ struct s3c24xx_spi_regs_t UINT32 sprdat; }; -struct s3c24xx_sdi_regs_t +struct s3c24xx_sdi_regs_t { UINT32 data[0x44/4]; }; -struct s3c24xx_memcon_t +struct s3c24xx_memcon_t { s3c24xx_memcon_regs_t regs; }; -struct s3c24xx_usbhost_t +struct s3c24xx_usbhost_t { s3c24xx_usbhost_regs_t regs; }; -struct s3c24xx_irq_t +struct s3c24xx_irq_t { s3c24xx_irq_regs_t regs; int line_irq, line_fiq; }; -struct s3c24xx_dma_t +struct s3c24xx_dma_t { s3c24xx_dma_regs_t regs; emu_timer *timer; }; -struct s3c24xx_clkpow_t +struct s3c24xx_clkpow_t { s3c24xx_clkpow_regs_t regs; }; -struct s3c24xx_lcd_t +struct s3c24xx_lcd_t { s3c24xx_lcd_regs_t regs; emu_timer *timer; @@ -789,24 +789,24 @@ struct s3c24xx_lcd_t UINT32 dma_data, dma_bits; }; -struct s3c24xx_lcdpal_t +struct s3c24xx_lcdpal_t { s3c24xx_lcdpal_regs_t regs; }; -struct s3c24xx_nand_t +struct s3c24xx_nand_t { s3c24xx_nand_regs_t regs; UINT8 mecc[3]; int ecc_pos, data_count; }; -struct s3c24xx_uart_t +struct s3c24xx_uart_t { s3c24xx_uart_regs_t regs; }; -struct s3c24xx_pwm_t +struct s3c24xx_pwm_t { s3c24xx_pwm_regs_t regs; emu_timer *timer[5]; @@ -815,26 +815,26 @@ struct s3c24xx_pwm_t UINT32 freq[5]; }; -struct s3c24xx_usbdev_t +struct s3c24xx_usbdev_t { s3c24xx_usbdev_regs_t regs; }; -struct s3c24xx_wdt_t +struct s3c24xx_wdt_t { s3c24xx_wdt_regs_t regs; emu_timer *timer; UINT32 freq, cnt; }; -struct s3c24xx_iic_t +struct s3c24xx_iic_t { s3c24xx_iic_regs_t regs; emu_timer *timer; int count; }; -struct s3c24xx_iis_t +struct s3c24xx_iis_t { s3c24xx_iis_regs_t regs; emu_timer *timer; @@ -842,34 +842,34 @@ struct s3c24xx_iis_t int fifo_index; }; -struct s3c24xx_gpio_t +struct s3c24xx_gpio_t { s3c24xx_gpio_regs_t regs; }; -struct s3c24xx_rtc_t +struct s3c24xx_rtc_t { s3c24xx_rtc_regs_t regs; emu_timer *timer_tick_count; emu_timer *timer_update; }; -struct s3c24xx_adc_t +struct s3c24xx_adc_t { s3c24xx_adc_regs_t regs; }; -struct s3c24xx_spi_t +struct s3c24xx_spi_t { s3c24xx_spi_regs_t regs; }; -struct s3c24xx_sdi_t +struct s3c24xx_sdi_t { s3c24xx_sdi_regs_t regs; }; -struct s3c24xx_t +struct s3c24xx_t { const s3c2410_interface *iface; UINT8 steppingstone[4*1024]; diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c index 2ff3405cd4d..1c84ffed35b 100644 --- a/src/emu/machine/s3c2440.c +++ b/src/emu/machine/s3c2440.c @@ -67,7 +67,7 @@ DEVICE_START( s3c2440 ) space->install_legacy_readwrite_handler( *device, 0x5a000000, 0x5a000043, FUNC(s3c24xx_sdi_r), FUNC(s3c24xx_sdi_w)); space->install_legacy_readwrite_handler( *device, 0x5b000000, 0x5b00001f, FUNC(s3c24xx_ac97_r), FUNC(s3c24xx_ac97_w)); DEVICE_START_CALL(s3c24xx); - + s3c24xx_video_start( device, device->machine()); } diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index 3f386d77852..cffcd69b0d3 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -45,7 +45,7 @@ class s3c2440_device : public device_t public: s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~s3c2440_device() { global_free(m_token); } - + // access to legacy token void *token() const { assert(m_token != NULL); return m_token; } protected: @@ -56,7 +56,7 @@ protected: private: // internal state void *m_token; -public: +public: UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; @@ -527,17 +527,17 @@ static const UINT32 MAP_SUBINT_TO_INT[15] = TYPE DEFINITIONS *******************************************************************************/ -struct s3c24xx_memcon_regs_t +struct s3c24xx_memcon_regs_t { UINT32 data[0x34/4]; }; -struct s3c24xx_usbhost_regs_t +struct s3c24xx_usbhost_regs_t { UINT32 data[0x5C/4]; }; -struct s3c24xx_irq_regs_t +struct s3c24xx_irq_regs_t { UINT32 srcpnd; UINT32 intmod; @@ -549,7 +549,7 @@ struct s3c24xx_irq_regs_t UINT32 intsubmsk; }; -struct s3c24xx_dma_regs_t +struct s3c24xx_dma_regs_t { UINT32 disrc; UINT32 disrcc; @@ -562,7 +562,7 @@ struct s3c24xx_dma_regs_t UINT32 dmasktrig; }; -struct s3c24xx_clkpow_regs_t +struct s3c24xx_clkpow_regs_t { UINT32 locktime; UINT32 mpllcon; @@ -573,7 +573,7 @@ struct s3c24xx_clkpow_regs_t UINT32 camdivn; }; -struct s3c24xx_lcd_regs_t +struct s3c24xx_lcd_regs_t { UINT32 lcdcon1; UINT32 lcdcon2; @@ -595,12 +595,12 @@ struct s3c24xx_lcd_regs_t UINT32 tconsel; }; -struct s3c24xx_lcdpal_regs_t +struct s3c24xx_lcdpal_regs_t { UINT32 data[0x400/4]; }; -struct s3c24xx_nand_regs_t +struct s3c24xx_nand_regs_t { UINT32 nfconf; UINT32 nfcont; @@ -620,12 +620,12 @@ struct s3c24xx_nand_regs_t UINT32 nfeblk; }; -struct s3c24xx_cam_regs_t +struct s3c24xx_cam_regs_t { UINT32 data[0xA4/4]; }; -struct s3c24xx_uart_regs_t +struct s3c24xx_uart_regs_t { UINT32 ulcon; UINT32 ucon; @@ -640,7 +640,7 @@ struct s3c24xx_uart_regs_t UINT32 ubrdiv; }; -struct s3c24xx_pwm_regs_t +struct s3c24xx_pwm_regs_t { UINT32 tcfg0; UINT32 tcfg1; @@ -661,19 +661,19 @@ struct s3c24xx_pwm_regs_t UINT32 tcnto4; }; -struct s3c24xx_usbdev_regs_t +struct s3c24xx_usbdev_regs_t { UINT32 data[0x130/4]; }; -struct s3c24xx_wdt_regs_t +struct s3c24xx_wdt_regs_t { UINT32 wtcon; UINT32 wtdat; UINT32 wtcnt; }; -struct s3c24xx_iic_regs_t +struct s3c24xx_iic_regs_t { UINT32 iiccon; UINT32 iicstat; @@ -682,7 +682,7 @@ struct s3c24xx_iic_regs_t UINT32 iiclc; }; -struct s3c24xx_iis_regs_t +struct s3c24xx_iis_regs_t { UINT32 iiscon; UINT32 iismod; @@ -691,7 +691,7 @@ struct s3c24xx_iis_regs_t UINT32 iisfifo; }; -struct s3c24xx_gpio_regs_t +struct s3c24xx_gpio_regs_t { UINT32 gpacon; UINT32 gpadat; @@ -750,7 +750,7 @@ struct s3c24xx_gpio_regs_t UINT32 gpjup; }; -struct s3c24xx_rtc_regs_t +struct s3c24xx_rtc_regs_t { UINT32 rtccon; UINT32 ticnt; @@ -772,7 +772,7 @@ struct s3c24xx_rtc_regs_t UINT32 bcdyear; }; -struct s3c24xx_adc_regs_t +struct s3c24xx_adc_regs_t { UINT32 adccon; UINT32 adctsc; @@ -782,7 +782,7 @@ struct s3c24xx_adc_regs_t UINT32 adcupdn; }; -struct s3c24xx_spi_regs_t +struct s3c24xx_spi_regs_t { UINT32 spcon; UINT32 spsta; @@ -792,44 +792,44 @@ struct s3c24xx_spi_regs_t UINT32 sprdat; }; -struct s3c24xx_sdi_regs_t +struct s3c24xx_sdi_regs_t { UINT32 data[0x44/4]; }; -struct s3c24xx_ac97_regs_t +struct s3c24xx_ac97_regs_t { UINT32 data[0x20/4]; }; -struct s3c24xx_memcon_t +struct s3c24xx_memcon_t { s3c24xx_memcon_regs_t regs; }; -struct s3c24xx_usbhost_t +struct s3c24xx_usbhost_t { s3c24xx_usbhost_regs_t regs; }; -struct s3c24xx_irq_t +struct s3c24xx_irq_t { s3c24xx_irq_regs_t regs; int line_irq, line_fiq; }; -struct s3c24xx_dma_t +struct s3c24xx_dma_t { s3c24xx_dma_regs_t regs; emu_timer *timer; }; -struct s3c24xx_clkpow_t +struct s3c24xx_clkpow_t { s3c24xx_clkpow_regs_t regs; }; -struct s3c24xx_lcd_t +struct s3c24xx_lcd_t { s3c24xx_lcd_regs_t regs; emu_timer *timer; @@ -848,12 +848,12 @@ struct s3c24xx_lcd_t UINT32 dma_data, dma_bits; }; -struct s3c24xx_lcdpal_t +struct s3c24xx_lcdpal_t { s3c24xx_lcdpal_regs_t regs; }; -struct s3c24xx_nand_t +struct s3c24xx_nand_t { s3c24xx_nand_regs_t regs; UINT8 mecc[4]; @@ -861,17 +861,17 @@ struct s3c24xx_nand_t int ecc_pos, data_count; }; -struct s3c24xx_cam_t +struct s3c24xx_cam_t { s3c24xx_cam_regs_t regs; }; -struct s3c24xx_uart_t +struct s3c24xx_uart_t { s3c24xx_uart_regs_t regs; }; -struct s3c24xx_pwm_t +struct s3c24xx_pwm_t { s3c24xx_pwm_regs_t regs; emu_timer *timer[5]; @@ -880,25 +880,25 @@ struct s3c24xx_pwm_t UINT32 freq[5]; }; -struct s3c24xx_usbdev_t +struct s3c24xx_usbdev_t { s3c24xx_usbdev_regs_t regs; }; -struct s3c24xx_wdt_t +struct s3c24xx_wdt_t { s3c24xx_wdt_regs_t regs; emu_timer *timer; }; -struct s3c24xx_iic_t +struct s3c24xx_iic_t { s3c24xx_iic_regs_t regs; emu_timer *timer; int count; }; -struct s3c24xx_iis_t +struct s3c24xx_iis_t { s3c24xx_iis_regs_t regs; emu_timer *timer; @@ -906,39 +906,39 @@ struct s3c24xx_iis_t int fifo_index; }; -struct s3c24xx_gpio_t +struct s3c24xx_gpio_t { s3c24xx_gpio_regs_t regs; }; -struct s3c24xx_rtc_t +struct s3c24xx_rtc_t { s3c24xx_rtc_regs_t regs; emu_timer *timer_tick_count; emu_timer *timer_update; }; -struct s3c24xx_adc_t +struct s3c24xx_adc_t { s3c24xx_adc_regs_t regs; }; -struct s3c24xx_spi_t +struct s3c24xx_spi_t { s3c24xx_spi_regs_t regs; }; -struct s3c24xx_sdi_t +struct s3c24xx_sdi_t { s3c24xx_sdi_regs_t regs; }; -struct s3c24xx_ac97_t +struct s3c24xx_ac97_t { s3c24xx_ac97_regs_t regs; }; -struct s3c24xx_t +struct s3c24xx_t { const s3c2440_interface *iface; UINT8 steppingstone[4*1024]; diff --git a/src/emu/machine/scsibus.c b/src/emu/machine/scsibus.c index 9d74b051a7e..94af87de044 100644 --- a/src/emu/machine/scsibus.c +++ b/src/emu/machine/scsibus.c @@ -1,9 +1,9 @@ /* - SCSIBus.c + SCSIBus.c - Implementation of a raw SCSI/SASI bus for machines that don't use a SCSI - controler chip such as the RM Nimbus, which implements it as a bunch of - 74LS series chips. + Implementation of a raw SCSI/SASI bus for machines that don't use a SCSI + controler chip such as the RM Nimbus, which implements it as a bunch of + 74LS series chips. */ diff --git a/src/emu/machine/scsibus.h b/src/emu/machine/scsibus.h index 559507acad0..7ed35a1534d 100644 --- a/src/emu/machine/scsibus.h +++ b/src/emu/machine/scsibus.h @@ -100,7 +100,7 @@ #define SCSI_SENSE_SIZE 4 -struct adaptec_sense_t +struct adaptec_sense_t { // parameter list UINT8 reserved1[3]; diff --git a/src/emu/machine/seibu_cop.c b/src/emu/machine/seibu_cop.c index 6d39755c1da..65ca18efd0d 100644 --- a/src/emu/machine/seibu_cop.c +++ b/src/emu/machine/seibu_cop.c @@ -1,8 +1,8 @@ /*************************************************************************** - Seibu COP protection device + Seibu COP protection device - (this header needs expanding) + (this header needs expanding) ***************************************************************************/ @@ -116,14 +116,14 @@ WRITE16_MEMBER( seibu_cop_device::write ) case 0x074/2: /* - This sets up a DMA mode of some sort - 0x0e00: grainbow, cupsoc - 0x0a00: legionna, godzilla, denjinmk - 0x0600: heatbrl - 0x1e00: zeroteam, xsedae - raiden2 and raidendx doesn't set this up, this could indicate that this is related to the non-private buffer DMAs - (both only uses 0x14 and 0x15 as DMAs) - */ + This sets up a DMA mode of some sort + 0x0e00: grainbow, cupsoc + 0x0a00: legionna, godzilla, denjinmk + 0x0600: heatbrl + 0x1e00: zeroteam, xsedae + raiden2 and raidendx doesn't set this up, this could indicate that this is related to the non-private buffer DMAs + (both only uses 0x14 and 0x15 as DMAs) + */ COMBINE_DATA(&m_dma_unk_param); break; diff --git a/src/emu/machine/tms9901.h b/src/emu/machine/tms9901.h index 6f7be85bb1e..394555003bd 100644 --- a/src/emu/machine/tms9901.h +++ b/src/emu/machine/tms9901.h @@ -50,7 +50,7 @@ enum CLASS DEFINITION ***************************************************************************/ -struct tms9901_interface +struct tms9901_interface { int interrupt_mask; // a bit for each input pin whose state is always notified to the TMS9901 core devcb_read8 read_handler; // 4*8 bits, to be selected using the offset (0-3) diff --git a/src/emu/machine/tms9902.h b/src/emu/machine/tms9902.h index 9efb0ded5c1..16784d3aa2e 100644 --- a/src/emu/machine/tms9902.h +++ b/src/emu/machine/tms9902.h @@ -42,7 +42,7 @@ extern const device_type TMS9902; -struct tms9902_interface +struct tms9902_interface { devcb_write_line int_callback; devcb_write_line rcv_callback; diff --git a/src/emu/machine/v3021.h b/src/emu/machine/v3021.h index e67d0d3eced..b3934441f90 100644 --- a/src/emu/machine/v3021.h +++ b/src/emu/machine/v3021.h @@ -27,7 +27,7 @@ // TYPE DEFINITIONS //************************************************************************** -struct rtc_regs_t +struct rtc_regs_t { UINT8 sec, min, hour, day, wday, month, year; }; diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c index d15b04abced..2048d68f860 100644 --- a/src/emu/machine/wd33c93.c +++ b/src/emu/machine/wd33c93.c @@ -419,11 +419,11 @@ void wd33c93_device::dispatch_command() case WD_CMD_RESET: reset_cmd(); break; - + case WD_CMD_ABORT: abort_cmd(); break; - + case WD_CMD_NEGATE_ACK: negate_ack(); break; |
