diff options
| author | 2013-03-19 07:22:20 +0000 | |
|---|---|---|
| committer | 2013-03-19 07:22:20 +0000 | |
| commit | 0e1f5ad25b25df7c2ec707ec45c544288eb3c683 (patch) | |
| tree | eeef04fdf999692be30c25457fb9b329e1dbfdde /src/mess/includes | |
| parent | 86614c802b9d611d83520fdb43388ae51d31f553 (diff) | |
Cleanups and version bumpmame0148u2
Diffstat (limited to 'src/mess/includes')
| -rw-r--r-- | src/mess/includes/c65.h | 2 | ||||
| -rw-r--r-- | src/mess/includes/channelf.h | 2 | ||||
| -rw-r--r-- | src/mess/includes/fidelz80.h | 10 | ||||
| -rw-r--r-- | src/mess/includes/mikromik.h | 6 | ||||
| -rw-r--r-- | src/mess/includes/nes.h | 2 | ||||
| -rw-r--r-- | src/mess/includes/ob68k1a.h | 4 | ||||
| -rw-r--r-- | src/mess/includes/osi.h | 2 | ||||
| -rw-r--r-- | src/mess/includes/pet.h | 4 | ||||
| -rw-r--r-- | src/mess/includes/prof80.h | 4 | ||||
| -rw-r--r-- | src/mess/includes/psion.h | 14 | ||||
| -rw-r--r-- | src/mess/includes/special.h | 6 | ||||
| -rw-r--r-- | src/mess/includes/studio2.h | 12 | ||||
| -rw-r--r-- | src/mess/includes/super80.h | 2 | ||||
| -rw-r--r-- | src/mess/includes/svision.h | 90 | ||||
| -rw-r--r-- | src/mess/includes/vc4000.h | 4 | ||||
| -rw-r--r-- | src/mess/includes/wswan.h | 22 | ||||
| -rw-r--r-- | src/mess/includes/xerox820.h | 2 |
17 files changed, 94 insertions, 94 deletions
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h index aa8084ac063..e335d30058f 100644 --- a/src/mess/includes/c65.h +++ b/src/mess/includes/c65.h @@ -103,7 +103,7 @@ public: UINT8 *m_io_ram_w_ptr; UINT8 *m_io_ram_r_ptr; c64_cart_t m_cart; - int m_nmilevel; int m_charset_select; + int m_nmilevel; int m_charset_select; int m_c64mode; UINT8 m_6511_port; UINT8 m_keyline; diff --git a/src/mess/includes/channelf.h b/src/mess/includes/channelf.h index 461db0dea57..e3e21990128 100644 --- a/src/mess/includes/channelf.h +++ b/src/mess/includes/channelf.h @@ -29,7 +29,7 @@ class channelf_state : public driver_device public: channelf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_custom(*this,"custom") { } + m_custom(*this,"custom") { } DECLARE_READ8_MEMBER(channelf_port_0_r); DECLARE_READ8_MEMBER(channelf_port_1_r); diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h index da2e72231eb..d098a78d0b3 100644 --- a/src/mess/includes/fidelz80.h +++ b/src/mess/includes/fidelz80.h @@ -17,11 +17,11 @@ class fidelz80_state : public driver_device public: fidelz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_speech(*this, "speech"), - m_beep(*this, BEEPER_TAG), - m_i8041(*this, "mcu"), - m_i8243(*this, "i8243") + m_maincpu(*this, "maincpu"), + m_speech(*this, "speech"), + m_beep(*this, BEEPER_TAG), + m_i8041(*this, "mcu"), + m_i8243(*this, "i8243") { } required_device<cpu_device> m_maincpu; diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h index 3c82d06e2a5..b852a410672 100644 --- a/src/mess/includes/mikromik.h +++ b/src/mess/includes/mikromik.h @@ -26,9 +26,9 @@ #define I8275_TAG "ic59" #define UPD7201_TAG "ic11" #define UPD7220_TAG "ic101" -#define RS232_A_TAG "rs232a" -#define RS232_B_TAG "rs232b" -#define RS232_C_TAG "rs232c" +#define RS232_A_TAG "rs232a" +#define RS232_B_TAG "rs232b" +#define RS232_C_TAG "rs232c" class mm1_state : public driver_device { diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 0bc97034aeb..518f5f2197e 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -144,7 +144,7 @@ public: ioport_port *m_io_zapper2_y; ioport_port *m_io_paddle; - optional_device<nes_cart_slot_device> m_cartslot; //mandatory + optional_device<nes_cart_slot_device> m_cartslot; //mandatory private: /* devices */ diff --git a/src/mess/includes/ob68k1a.h b/src/mess/includes/ob68k1a.h index 1b33a8a8d03..785fcd8633f 100644 --- a/src/mess/includes/ob68k1a.h +++ b/src/mess/includes/ob68k1a.h @@ -19,8 +19,8 @@ #define MC6850_0_TAG "u34" #define MC6850_1_TAG "u26" #define COM8116_TAG "u56" -#define RS232_A_TAG "rs232a" -#define RS232_B_TAG "rs232b" +#define RS232_A_TAG "rs232a" +#define RS232_B_TAG "rs232b" class ob68k1a_state : public driver_device { diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h index c7fe1ce7f07..295c346ba9d 100644 --- a/src/mess/includes/osi.h +++ b/src/mess/includes/osi.h @@ -93,7 +93,7 @@ class c1p_state : public sb2m600_state public: c1p_state(const machine_config &mconfig, device_type type, const char *tag) : sb2m600_state(mconfig, type, tag), - m_beep(*this, BEEPER_TAG) + m_beep(*this, BEEPER_TAG) { } required_device<beep_device> m_beep; diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h index b99e292d500..8f0d1ceac79 100644 --- a/src/mess/includes/pet.h +++ b/src/mess/includes/pet.h @@ -24,8 +24,8 @@ #define M6520_2_TAG "b8" #define MC6845_TAG "ub13" #define SCREEN_TAG "screen" -#define PLA1_TAG "ue6" -#define PLA2_TAG "ue5" +#define PLA1_TAG "ue6" +#define PLA2_TAG "ue5" class pet_state : public driver_device { diff --git a/src/mess/includes/prof80.h b/src/mess/includes/prof80.h index 13be84c0888..681d44851f9 100644 --- a/src/mess/includes/prof80.h +++ b/src/mess/includes/prof80.h @@ -18,8 +18,8 @@ #define Z80_TAG "z1" #define UPD765_TAG "z38" #define UPD1990A_TAG "z43" -#define RS232_A_TAG "rs232a" -#define RS232_B_TAG "rs232b" +#define RS232_A_TAG "rs232a" +#define RS232_B_TAG "rs232b" // ------------------------------------------------------------------------ diff --git a/src/mess/includes/psion.h b/src/mess/includes/psion.h index 49de76d7799..f2db7fe48ad 100644 --- a/src/mess/includes/psion.h +++ b/src/mess/includes/psion.h @@ -22,13 +22,13 @@ class psion_state : public driver_device public: psion_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_lcdc(*this, "hd44780"), - m_beep(*this, BEEPER_TAG), - m_pack1(*this, "pack1"), - m_pack2(*this, "pack2"), - m_sys_register(*this, "sys_register"), - m_ram(*this, "ram"){ } + m_maincpu(*this, "maincpu"), + m_lcdc(*this, "hd44780"), + m_beep(*this, BEEPER_TAG), + m_pack1(*this, "pack1"), + m_pack2(*this, "pack2"), + m_sys_register(*this, "sys_register"), + m_ram(*this, "ram"){ } required_device<cpu_device> m_maincpu; required_device<hd44780_device> m_lcdc; diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h index 2c0004995c5..7e47e02f1ba 100644 --- a/src/mess/includes/special.h +++ b/src/mess/includes/special.h @@ -158,7 +158,7 @@ extern const rgb_t specimx_palette[16]; /*----------- defined in audio/special.c -----------*/ class specimx_sound_device : public device_t, - public device_sound_interface + public device_sound_interface { public: specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -172,10 +172,10 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - void set_input(int index, int state); + void set_input(int index, int state); private: - sound_stream *m_mixer_channel; + sound_stream *m_mixer_channel; int m_specimx_input[3]; }; diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h index 45d012b5e6e..2d336198113 100644 --- a/src/mess/includes/studio2.h +++ b/src/mess/includes/studio2.h @@ -22,12 +22,12 @@ class studio2_state : public driver_device public: studio2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, CDP1802_TAG), - m_speaker(*this, BEEPER_TAG), - m_vdc(*this, CDP1861_TAG), - m_clear(*this, "CLEAR"), - m_a(*this, "A"), - m_b(*this, "B") + m_maincpu(*this, CDP1802_TAG), + m_speaker(*this, BEEPER_TAG), + m_vdc(*this, CDP1861_TAG), + m_clear(*this, "CLEAR"), + m_a(*this, "A"), + m_b(*this, "B") { } required_device<cosmac_device> m_maincpu; diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h index 33d6ac23851..fac8471470c 100644 --- a/src/mess/includes/super80.h +++ b/src/mess/includes/super80.h @@ -120,4 +120,4 @@ MC6845_UPDATE_ROW( super80v_update_row ); /*----------- defined in machine/super80.c -----------*/ extern const z80pio_interface super80_pio_intf; -QUICKLOAD_LOAD( super80 );
\ No newline at end of file +QUICKLOAD_LOAD( super80 ); diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h index 143fb9c40e4..1906b4041fb 100644 --- a/src/mess/includes/svision.h +++ b/src/mess/includes/svision.h @@ -100,21 +100,21 @@ enum SVISION_NOISE_Type struct SVISION_NOISE { - SVISION_NOISE() : - on(0), - right(0), - left(0), - play(0), - type(SVISION_NOISE_Type7Bit), - state(0), - volume(0), - count(0), - step(0.0), - pos(0.0), - value(0) - { - memset(reg, 0, sizeof(UINT8)*3); - } + SVISION_NOISE() : + on(0), + right(0), + left(0), + play(0), + type(SVISION_NOISE_Type7Bit), + state(0), + volume(0), + count(0), + step(0.0), + pos(0.0), + value(0) + { + memset(reg, 0, sizeof(UINT8)*3); + } UINT8 reg[3]; int on, right, left, play; @@ -128,19 +128,19 @@ struct SVISION_NOISE struct SVISION_DMA { - SVISION_DMA() : - on(0), - right(0), - left(0), - ca14to16(0), - start(0), - size(0), - pos(0.0), - step(0.0), - finished(0) - { - memset(reg, 0, sizeof(UINT8)*5); - } + SVISION_DMA() : + on(0), + right(0), + left(0), + ca14to16(0), + start(0), + size(0), + pos(0.0), + step(0.0), + finished(0) + { + memset(reg, 0, sizeof(UINT8)*5); + } UINT8 reg[5]; int on, right, left; @@ -152,16 +152,16 @@ struct SVISION_DMA struct SVISION_CHANNEL { - SVISION_CHANNEL() : - on(0), - waveform(0), - volume(0), - pos(0), - size(0), - count(0) - { - memset(reg, 0, sizeof(UINT8)*4); - } + SVISION_CHANNEL() : + on(0), + waveform(0), + volume(0), + pos(0), + size(0), + count(0) + { + memset(reg, 0, sizeof(UINT8)*4); + } UINT8 reg[4]; int on; @@ -175,7 +175,7 @@ struct SVISION_CHANNEL // ======================> svision_sound_device class svision_sound_device : public device_t, - public device_sound_interface + public device_sound_interface { public: svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -189,13 +189,13 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( svision_sounddma_w ); - DECLARE_WRITE8_MEMBER( svision_noise_w ); - + DECLARE_WRITE8_MEMBER( svision_sounddma_w ); + DECLARE_WRITE8_MEMBER( svision_noise_w ); + public: - int *dma_finished(); - void sound_decrement(); - void soundport_w(int which, int offset, int data); + int *dma_finished(); + void sound_decrement(); + void soundport_w(int which, int offset, int data); private: sound_stream *m_mixer_channel; diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h index b416562f97a..040f1ccae4f 100644 --- a/src/mess/includes/vc4000.h +++ b/src/mess/includes/vc4000.h @@ -160,13 +160,13 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - void soundport_w(int mode, int data); + void soundport_w(int mode, int data); private: sound_stream *m_channel; UINT8 m_reg[1]; int m_size; - int m_pos; + int m_pos; unsigned m_level; }; diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h index cdea374b396..a1d1afb8465 100644 --- a/src/mess/includes/wswan.h +++ b/src/mess/includes/wswan.h @@ -191,15 +191,15 @@ void wswan_refresh_scanline( running_machine &machine ); struct CHAN { - CHAN() : - freq(0), - period(0), - pos(0), - vol_left(0), - vol_right(0), - on(0), - signal(0) { } - + CHAN() : + freq(0), + period(0), + pos(0), + vol_left(0), + vol_right(0), + on(0), + signal(0) { } + UINT16 freq; /* frequency */ UINT32 period; /* period */ UINT32 pos; /* position */ @@ -227,10 +227,10 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( wswan_sound_port_w ); + DECLARE_WRITE8_MEMBER( wswan_sound_port_w ); private: - void wswan_ch_set_freq( CHAN *ch, UINT16 freq ); + void wswan_ch_set_freq( CHAN *ch, UINT16 freq ); private: sound_stream *m_channel; diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h index 7522323f379..db4e426afe5 100644 --- a/src/mess/includes/xerox820.h +++ b/src/mess/includes/xerox820.h @@ -114,7 +114,7 @@ class bigboard_state : public xerox820_state public: bigboard_state(const machine_config &mconfig, device_type type, const char *tag) : xerox820_state(mconfig, type, tag), - m_beeper(*this, BEEPER_TAG) + m_beeper(*this, BEEPER_TAG) { } required_device<beep_device> m_beeper; |
