From 99c536be34ee14c32a130e15eb06c410bb07f6b2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 12 Sep 2012 17:34:06 +0000 Subject: removed local macros since macros with same name but different syntax will be used in general (no whatsnew) --- src/mess/drivers/68ksbc.c | 3 +-- src/mess/drivers/a5105.c | 6 ++---- src/mess/drivers/a7000.c | 6 ++---- src/mess/drivers/alphatro.c | 4 +--- src/mess/drivers/argo.c | 9 +++------ src/mess/drivers/b16.c | 6 ++---- src/mess/drivers/babbage.c | 6 ++---- src/mess/drivers/bcs3.c | 6 ++---- src/mess/drivers/beehive.c | 9 +++------ src/mess/drivers/c10.c | 9 +++------ src/mess/drivers/ccs2422.c | 3 +-- src/mess/drivers/ccs2810.c | 3 +-- src/mess/drivers/cd2650.c | 9 +++------ src/mess/drivers/czk80.c | 3 +-- src/mess/drivers/dim68k.c | 6 ++---- src/mess/drivers/eacc.c | 3 +-- src/mess/drivers/fk1.c | 6 ++---- src/mess/drivers/geniusiq.c | 3 +-- src/mess/drivers/h19.c | 6 ++---- src/mess/drivers/h8.c | 3 +-- src/mess/drivers/homez80.c | 9 +++------ src/mess/drivers/hpz80unk.c | 3 +-- src/mess/drivers/imds.c | 3 +-- src/mess/drivers/ipc.c | 3 +-- src/mess/drivers/ipds.c | 3 +-- src/mess/drivers/iq151.c | 6 ++---- src/mess/drivers/isbc.c | 3 +-- src/mess/drivers/jupiter.c | 7 ++----- src/mess/drivers/k8915.c | 9 +++------ src/mess/drivers/mccpm.c | 3 +-- src/mess/drivers/mes.c | 9 +++------ src/mess/drivers/mits680b.c | 3 +-- src/mess/drivers/mycom.c | 9 +++------ src/mess/drivers/nanos.c | 12 ++++-------- src/mess/drivers/okean240.c | 6 ++---- src/mess/drivers/pcm.c | 9 +++------ src/mess/drivers/pegasus.c | 12 ++++-------- src/mess/drivers/phunsy.c | 9 +++------ src/mess/drivers/pimps.c | 3 +-- src/mess/drivers/plan80.c | 9 +++------ src/mess/drivers/ptcsol.c | 12 ++++-------- src/mess/drivers/qtsbc.c | 3 +-- src/mess/drivers/rx78.c | 9 +++------ src/mess/drivers/savia84.c | 3 +-- src/mess/drivers/sitcom.c | 3 +-- src/mess/drivers/slc1.c | 6 ++---- src/mess/drivers/sm1800.c | 3 +-- src/mess/drivers/sorcerer.c | 4 ++-- src/mess/drivers/sun1.c | 3 +-- src/mess/drivers/sun2.c | 3 +-- src/mess/drivers/sun3.c | 3 +-- src/mess/drivers/sun4.c | 3 +-- src/mess/drivers/supercon.c | 3 +-- src/mess/drivers/tec1.c | 6 ++---- src/mess/drivers/univac.c | 9 +++------ src/mess/drivers/vt240.c | 1 - src/mess/drivers/z9001.c | 9 +++------ src/mess/drivers/zrt80.c | 6 ++---- src/mess/includes/pokemini.h | 1 - src/mess/includes/sorcerer.h | 2 -- src/mess/machine/pokemini.c | 2 +- 61 files changed, 110 insertions(+), 223 deletions(-) (limited to 'src') diff --git a/src/mess/drivers/68ksbc.c b/src/mess/drivers/68ksbc.c index 630d54e6571..affd7bf060f 100644 --- a/src/mess/drivers/68ksbc.c +++ b/src/mess/drivers/68ksbc.c @@ -29,7 +29,6 @@ #include "cpu/m68000/m68000.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class c68ksbc_state : public driver_device { @@ -77,7 +76,7 @@ static INPUT_PORTS_START( c68ksbc ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( c68ksbc_state ) +void c68ksbc_state::machine_reset() { m_term_data = 0; } diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c index 5d4045731e3..12f87003219 100644 --- a/src/mess/drivers/a5105.c +++ b/src/mess/drivers/a5105.c @@ -30,8 +30,6 @@ ToDo: #include "formats/basicdsk.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() class a5105_state : public driver_device { @@ -453,7 +451,7 @@ static INPUT_PORTS_START( a5105 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(a5105_state) +void a5105_state::machine_reset() { address_space *space = m_maincpu->space(AS_PROGRAM); a5105_ab_w(*space, 0, 9); // turn motor off @@ -500,7 +498,7 @@ static PALETTE_INIT( gdc ) } } -VIDEO_START_MEMBER( a5105_state ) +void a5105_state::video_start() { // find memory regions m_char_rom = memregion("pcg")->base(); diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c index d2676e64d58..0ea2f6954b3 100644 --- a/src/mess/drivers/a7000.c +++ b/src/mess/drivers/a7000.c @@ -15,8 +15,6 @@ #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() class a7000_state : public driver_device { @@ -766,7 +764,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( a7000 ) INPUT_PORTS_END -MACHINE_START_MEMBER( a7000_state ) +void a7000_state::machine_start() { m_IOMD_timer[0] = machine().scheduler().timer_alloc(FUNC(IOMD_timer0_callback)); m_IOMD_timer[1] = machine().scheduler().timer_alloc(FUNC(IOMD_timer1_callback)); @@ -775,7 +773,7 @@ MACHINE_START_MEMBER( a7000_state ) m_io_id = 0xd4e7; } -MACHINE_RESET_MEMBER( a7000_state ) +void a7000_state::machine_reset() { m_IOMD_IO_ctrl = 0x0b | 0x34; //bit 0,1 and 3 set high on reset plus 2,4,5 always high // m_IRQ_status_A = 0x10; // set POR bit ON diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c index 8fb00b9cb4c..a5dc2665a35 100644 --- a/src/mess/drivers/alphatro.c +++ b/src/mess/drivers/alphatro.c @@ -30,8 +30,6 @@ #define MAIN_CLOCK XTAL_4MHz -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class alphatro_state : public driver_device { @@ -133,7 +131,7 @@ WRITE_LINE_MEMBER( alphatro_state::txdata_callback ) m_cass->output( (state) ? 0.8 : -0.8); } -VIDEO_START_MEMBER( alphatro_state ) +void alphatro_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/drivers/argo.c b/src/mess/drivers/argo.c index b228667fee6..13ce4a0b5d1 100644 --- a/src/mess/drivers/argo.c +++ b/src/mess/drivers/argo.c @@ -24,9 +24,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class argo_state : public driver_device { @@ -258,7 +255,7 @@ static TIMER_CALLBACK( argo_boot ) state->membank("boot")->set_entry(0); } -MACHINE_RESET_MEMBER(argo_state) +void argo_state::machine_reset() { membank("boot")->set_entry(1); machine().scheduler().timer_set(attotime::from_usec(5), FUNC(argo_boot)); @@ -270,12 +267,12 @@ DRIVER_INIT_MEMBER(argo_state,argo) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0xf800); } -VIDEO_START_MEMBER( argo_state ) +void argo_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( argo_state ) +UINT32 argo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c index 9dc3cad31a8..40b6371baff 100644 --- a/src/mess/drivers/b16.c +++ b/src/mess/drivers/b16.c @@ -16,8 +16,6 @@ #include "video/mc6845.h" #include "machine/8237dma.h" -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class b16_state : public driver_device @@ -63,14 +61,14 @@ public: #define mc6845_update_addr (((m_crtc_vreg[0x12]<<8) & 0x3f00) | (m_crtc_vreg[0x13] & 0xff)) -VIDEO_START_MEMBER( b16_state ) +void b16_state::video_start() { // find memory regions m_char_rom = memregion("pcg")->base(); } -SCREEN_UPDATE16_MEMBER( b16_state ) +UINT32 b16_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { b16_state *state = machine().driver_data(); int x,y; diff --git a/src/mess/drivers/babbage.c b/src/mess/drivers/babbage.c index 53527fc3180..b9d0f479389 100644 --- a/src/mess/drivers/babbage.c +++ b/src/mess/drivers/babbage.c @@ -27,8 +27,6 @@ #include "cpu/z80/z80daisy.h" #include "babbage.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() #define MAIN_CLOCK 25e5 class babbage_state : public driver_device @@ -68,11 +66,11 @@ public: ***************************************************************************/ -MACHINE_START_MEMBER( babbage_state ) +void babbage_state::machine_start() { } -MACHINE_RESET_MEMBER( babbage_state ) +void babbage_state::machine_reset() { } diff --git a/src/mess/drivers/bcs3.c b/src/mess/drivers/bcs3.c index 26801668a69..da8f8f78352 100644 --- a/src/mess/drivers/bcs3.c +++ b/src/mess/drivers/bcs3.c @@ -16,8 +16,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() class bcs3_state : public driver_device { @@ -209,11 +207,11 @@ static INPUT_PORTS_START( bcs3 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(bcs3_state) +void bcs3_state::machine_reset() { } -VIDEO_START_MEMBER( bcs3_state ) +void bcs3_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/drivers/beehive.c b/src/mess/drivers/beehive.c index 79bf20a0355..2b8f42924a4 100644 --- a/src/mess/drivers/beehive.c +++ b/src/mess/drivers/beehive.c @@ -21,9 +21,6 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class beehive_state : public driver_device { @@ -226,18 +223,18 @@ static INPUT_PORTS_START( beehive ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(beehive_state) +void beehive_state::machine_reset() { } -VIDEO_START_MEMBER( beehive_state ) +void beehive_state::video_start() { m_p_chargen = memregion("chargen")->base(); } /* This system appears to have inline attribute bytes of unknown meaning. Currently they are ignored. */ -SCREEN_UPDATE16_MEMBER( beehive_state ) +UINT32 beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT16 cursor_pos = (m_p_videoram[0xcaf] | (m_p_videoram[0xcb0] << 8)) & 0xfff; UINT16 p_linelist; diff --git a/src/mess/drivers/c10.c b/src/mess/drivers/c10.c index d0f08bb2253..aaf52759d5c 100644 --- a/src/mess/drivers/c10.c +++ b/src/mess/drivers/c10.c @@ -13,9 +13,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class c10_state : public driver_device { @@ -60,20 +57,20 @@ static TIMER_CALLBACK( c10_reset ) state->membank("boot")->set_entry(0); } -MACHINE_RESET_MEMBER(c10_state) +void c10_state::machine_reset() { membank("boot")->set_entry(1); machine().scheduler().timer_set(attotime::from_usec(4), FUNC(c10_reset)); } -VIDEO_START_MEMBER( c10_state ) +void c10_state::video_start() { m_p_chargen = memregion("chargen")->base(); } /* This system appears to have inline attribute bytes of unknown meaning. Currently they are ignored. The word at FAB5 looks like it might be cursor location. */ -SCREEN_UPDATE16_MEMBER( c10_state ) +UINT32 c10_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { //static UINT8 framecnt=0; UINT8 y,ra,chr,gfx; diff --git a/src/mess/drivers/ccs2422.c b/src/mess/drivers/ccs2422.c index 890ae12143c..27db157ab79 100644 --- a/src/mess/drivers/ccs2422.c +++ b/src/mess/drivers/ccs2422.c @@ -12,7 +12,6 @@ It requires a floppy disk to boot from. #include "cpu/z80/z80.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class ccs2422_state : public driver_device { @@ -70,7 +69,7 @@ static INPUT_PORTS_START( ccs2422 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(ccs2422_state) +void ccs2422_state::machine_reset() { UINT8* user1 = memregion("user1")->base(); memcpy((UINT8*)m_ccs_ram, user1, 0x0800); diff --git a/src/mess/drivers/ccs2810.c b/src/mess/drivers/ccs2810.c index 56b1b4e9318..74dfe514ecb 100644 --- a/src/mess/drivers/ccs2810.c +++ b/src/mess/drivers/ccs2810.c @@ -35,7 +35,6 @@ Z Zleep (lock terminal). Press control+G twice to unlock. #include "machine/ins8250.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class ccs2810_state : public driver_device { @@ -110,7 +109,7 @@ static GENERIC_TERMINAL_INTERFACE( terminal_intf ) DEVCB_DRIVER_MEMBER(ccs2810_state, kbd_put) }; -MACHINE_RESET_MEMBER(ccs2810_state) +void ccs2810_state::machine_reset() { m_maincpu->set_state_int(Z80_PC, 0xf000); m_26_count = 0x41; diff --git a/src/mess/drivers/cd2650.c b/src/mess/drivers/cd2650.c index 1cf4c1b82b1..9726e0c9db3 100644 --- a/src/mess/drivers/cd2650.c +++ b/src/mess/drivers/cd2650.c @@ -30,9 +30,6 @@ #include "imagedev/cassette.h" #include "sound/wave.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class cd2650_state : public driver_device { @@ -96,17 +93,17 @@ static INPUT_PORTS_START( cd2650 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(cd2650_state) +void cd2650_state::machine_reset() { m_term_data = 0x80; } -VIDEO_START_MEMBER(cd2650_state) +void cd2650_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER(cd2650_state) +UINT32 cd2650_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* The video is unusual in that the characters in each line are spaced at 16 bytes in memory, thus line 1 starts at 1000, line 2 at 1001, etc. There are 16 lines of 80 characters. diff --git a/src/mess/drivers/czk80.c b/src/mess/drivers/czk80.c index e1116ca7742..48fad777066 100644 --- a/src/mess/drivers/czk80.c +++ b/src/mess/drivers/czk80.c @@ -17,7 +17,6 @@ #include "cpu/z80/z80.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class czk80_state : public driver_device { @@ -74,7 +73,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( czk80 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(czk80_state) +void czk80_state::machine_reset() { UINT8* bios = memregion("maincpu")->base() + 0xe000; memcpy(m_p_ram, bios, 0x2000); diff --git a/src/mess/drivers/dim68k.c b/src/mess/drivers/dim68k.c index 1ba9b2f91b8..043fdf2bea2 100644 --- a/src/mess/drivers/dim68k.c +++ b/src/mess/drivers/dim68k.c @@ -36,8 +36,6 @@ #include "sound/speaker.h" #include "video/mc6845.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() class dim68k_state : public driver_device { @@ -200,7 +198,7 @@ static INPUT_PORTS_START( dim68k ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(dim68k_state) +void dim68k_state::machine_reset() { UINT8* ROM = memregion("bootrom")->base(); @@ -209,7 +207,7 @@ MACHINE_RESET_MEMBER(dim68k_state) machine().device("maincpu")->reset(); } -VIDEO_START_MEMBER( dim68k_state ) +void dim68k_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c index 7e2666ee3d5..b23b35b15a3 100644 --- a/src/mess/drivers/eacc.c +++ b/src/mess/drivers/eacc.c @@ -51,7 +51,6 @@ #include "machine/6821pia.h" #include "machine/nvram.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class eacc_state : public driver_device { @@ -128,7 +127,7 @@ static INPUT_PORTS_START(eacc) PORT_BIT( 0xf8, 0, IPT_UNUSED ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(eacc_state) +void eacc_state::machine_reset() { m_cb2 = 0; } diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c index 80b86c3d9f9..4596a9762f3 100644 --- a/src/mess/drivers/fk1.c +++ b/src/mess/drivers/fk1.c @@ -13,8 +13,6 @@ #include "machine/i8251.h" #include "machine/ram.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class fk1_state : public driver_device { @@ -423,7 +421,7 @@ static TIMER_DEVICE_CALLBACK( vsync_callback ) } -MACHINE_RESET_MEMBER( fk1_state ) +void fk1_state::machine_reset() { address_space *space = m_maincpu->space(AS_PROGRAM); UINT8 *ram = machine().device(RAM_TAG)->pointer(); @@ -437,7 +435,7 @@ MACHINE_RESET_MEMBER( fk1_state ) machine().device("maincpu")->execute().set_irq_acknowledge_callback(fk1_irq_callback); } -SCREEN_UPDATE16_MEMBER( fk1_state ) +UINT32 fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 code; int y, x, b; diff --git a/src/mess/drivers/geniusiq.c b/src/mess/drivers/geniusiq.c index c8a02dfa6e2..e9657ed7903 100644 --- a/src/mess/drivers/geniusiq.c +++ b/src/mess/drivers/geniusiq.c @@ -91,7 +91,6 @@ PCB - German Version: #include "cpu/m68000/m68000.h" #include "machine/intelfsh.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() #define KEYBOARD_QUEUE_SIZE 0x80 @@ -559,7 +558,7 @@ static INPUT_PORTS_START( geniusiq_de ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( geniusiq_state ) +void geniusiq_state::machine_reset() { m_keyboard.head = m_keyboard.tail = 0; diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c index fc57d252a45..6fc646cca86 100644 --- a/src/mess/drivers/h19.c +++ b/src/mess/drivers/h19.c @@ -36,8 +36,6 @@ #include "machine/ins8250.h" #include "machine/keyboard.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() #define H19_CLOCK (XTAL_12_288MHz / 6) #define H19_BEEP_FRQ (H19_CLOCK / 1024) @@ -290,12 +288,12 @@ static INPUT_PORTS_START( h19 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(h19_state) +void h19_state::machine_reset() { beep_set_frequency(m_beep, H19_BEEP_FRQ); } -VIDEO_START_MEMBER( h19_state ) +void h19_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/drivers/h8.c b/src/mess/drivers/h8.c index a2d518e4f07..bb58f59bdb8 100644 --- a/src/mess/drivers/h8.c +++ b/src/mess/drivers/h8.c @@ -20,7 +20,6 @@ #include "sound/beep.h" #include "h8.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class h8_state : public driver_device { @@ -166,7 +165,7 @@ static INPUT_PORTS_START( h8 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("@ REG") PORT_CODE(KEYCODE_R) INPUT_PORTS_END -MACHINE_RESET_MEMBER(h8_state) +void h8_state::machine_reset() { beep_set_frequency(m_beep, H8_BEEP_FRQ); output_set_value("pwr_led", 0); diff --git a/src/mess/drivers/homez80.c b/src/mess/drivers/homez80.c index e607313122d..aadaa81caf8 100644 --- a/src/mess/drivers/homez80.c +++ b/src/mess/drivers/homez80.c @@ -21,9 +21,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class homez80_state : public driver_device { @@ -213,17 +210,17 @@ INPUT_PORTS_START( homez80 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( homez80_state ) +void homez80_state::machine_reset() { m_irq = 0; } -VIDEO_START_MEMBER( homez80_state ) +void homez80_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( homez80_state ) +UINT32 homez80_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/hpz80unk.c b/src/mess/drivers/hpz80unk.c index adcf1d81d01..d2798997e96 100644 --- a/src/mess/drivers/hpz80unk.c +++ b/src/mess/drivers/hpz80unk.c @@ -34,7 +34,6 @@ Z nothing #include "cpu/z80/z80.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class hpz80unk_state : public driver_device { @@ -102,7 +101,7 @@ static INPUT_PORTS_START( hpz80unk ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( hpz80unk_state ) +void hpz80unk_state::machine_reset() { UINT8* user1 = memregion("user1")->base(); memcpy((UINT8*)m_p_rom, user1, 0x4000); diff --git a/src/mess/drivers/imds.c b/src/mess/drivers/imds.c index e7dd301f797..614a9856bca 100644 --- a/src/mess/drivers/imds.c +++ b/src/mess/drivers/imds.c @@ -20,7 +20,6 @@ real hardware. //#include "machine/ins8250.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class imds_state : public driver_device { @@ -77,7 +76,7 @@ static GENERIC_TERMINAL_INTERFACE( terminal_intf ) DEVCB_DRIVER_MEMBER(imds_state, kbd_put) }; -MACHINE_RESET_MEMBER( imds_state ) +void imds_state::machine_reset() { m_term_data = 0; } diff --git a/src/mess/drivers/ipc.c b/src/mess/drivers/ipc.c index 41ca1b9d3c8..b8c2484e6e8 100644 --- a/src/mess/drivers/ipc.c +++ b/src/mess/drivers/ipc.c @@ -41,7 +41,6 @@ #include "cpu/i8085/i8085.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class ipc_state : public driver_device @@ -95,7 +94,7 @@ static INPUT_PORTS_START( ipc ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(ipc_state) +void ipc_state::machine_reset() { machine().device("maincpu")->state().set_state_int(I8085_PC, 0xE800); } diff --git a/src/mess/drivers/ipds.c b/src/mess/drivers/ipds.c index e8f97385d0e..02d3f44b7aa 100644 --- a/src/mess/drivers/ipds.c +++ b/src/mess/drivers/ipds.c @@ -11,7 +11,6 @@ #include "video/i8275.h" #include "machine/keyboard.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class ipds_state : public driver_device { @@ -74,7 +73,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( ipds ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(ipds_state) +void ipds_state::machine_reset() { } diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c index ef39937b339..8e6710758a4 100644 --- a/src/mess/drivers/iq151.c +++ b/src/mess/drivers/iq151.c @@ -59,8 +59,6 @@ ToDo: #include "video/iq151_video32.h" #include "video/iq151_video64.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class iq151_state : public driver_device @@ -362,7 +360,7 @@ DRIVER_INIT_MEMBER(iq151_state,iq151) m_carts[4] = machine().device("slot5"); } -MACHINE_RESET_MEMBER( iq151_state ) +void iq151_state::machine_reset() { membank("boot")->set_entry(0); @@ -370,7 +368,7 @@ MACHINE_RESET_MEMBER( iq151_state ) } // this machine don't have a built-in video controller, but uses external cartridge -SCREEN_UPDATE16_MEMBER( iq151_state ) +UINT32 iq151_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { bitmap.fill(0, cliprect); diff --git a/src/mess/drivers/isbc.c b/src/mess/drivers/isbc.c index 824f8ebb0d3..8eca35c97b0 100644 --- a/src/mess/drivers/isbc.c +++ b/src/mess/drivers/isbc.c @@ -15,7 +15,6 @@ isbc86 commands: BYTE WORD REAL EREAL ROMTEST. ROMTEST works, the others hang. #include "cpu/i86/i286.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class isbc_state : public driver_device { @@ -96,7 +95,7 @@ static INPUT_PORTS_START( isbc ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(isbc_state) +void isbc_state::machine_reset() { m_term_data = 0; } diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c index 99d54e0d686..7ab4cc6a942 100644 --- a/src/mess/drivers/jupiter.c +++ b/src/mess/drivers/jupiter.c @@ -16,9 +16,6 @@ ToDo: ***************************************************************************/ -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) - #include "emu.h" #include "cpu/m6800/m6800.h" #include "cpu/z80/z80.h" @@ -131,12 +128,12 @@ WRITE8_MEMBER( jupiter3_state::kbd_put ) // VIDEO //************************************************************************** -VIDEO_START_MEMBER( jupiter3_state ) +void jupiter3_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE_MEMBER( jupiter3_state ) +UINT32 jupiter3_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/k8915.c b/src/mess/drivers/k8915.c index f628fcf6109..9c457c8b59f 100644 --- a/src/mess/drivers/k8915.c +++ b/src/mess/drivers/k8915.c @@ -12,9 +12,6 @@ #include "cpu/z80/z80.h" #include "machine/keyboard.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class k8915_state : public driver_device { @@ -81,7 +78,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( k8915 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(k8915_state) +void k8915_state::machine_reset() { membank("boot")->set_entry(1); } @@ -92,12 +89,12 @@ DRIVER_INIT_MEMBER(k8915_state,k8915) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0x10000); } -VIDEO_START_MEMBER( k8915_state ) +void k8915_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( k8915_state ) +UINT32 k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/mccpm.c b/src/mess/drivers/mccpm.c index 2e990fbc39c..2489441a4aa 100644 --- a/src/mess/drivers/mccpm.c +++ b/src/mess/drivers/mccpm.c @@ -55,7 +55,6 @@ PIO A-Data 0F4h, A-Command 0F5h, B-Data 0F6h, B-Command 0F7h #include "cpu/z80/z80.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class mccpm_state : public driver_device { @@ -110,7 +109,7 @@ static INPUT_PORTS_START( mccpm ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( mccpm_state ) +void mccpm_state::machine_reset() { UINT8* bios = memregion("maincpu")->base(); memcpy(m_p_ram, bios, 0x1000); diff --git a/src/mess/drivers/mes.c b/src/mess/drivers/mes.c index bc4976b9e9f..c2188f37bca 100644 --- a/src/mess/drivers/mes.c +++ b/src/mess/drivers/mes.c @@ -9,9 +9,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class mes_state : public driver_device { @@ -46,18 +43,18 @@ ADDRESS_MAP_END static INPUT_PORTS_START( mes ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(mes_state) +void mes_state::machine_reset() { } -VIDEO_START_MEMBER( mes_state ) +void mes_state::video_start() { m_p_chargen = memregion("chargen")->base(); } /* This system appears to have 2 screens. Not implemented. Also the screen dimensions are a guess. */ -SCREEN_UPDATE16_MEMBER( mes_state ) +UINT32 mes_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { //static UINT8 framecnt=0; UINT8 y,ra,chr,gfx; diff --git a/src/mess/drivers/mits680b.c b/src/mess/drivers/mits680b.c index 26dc3447a9c..104da27658e 100644 --- a/src/mess/drivers/mits680b.c +++ b/src/mess/drivers/mits680b.c @@ -25,7 +25,6 @@ ToDo: #include "machine/6551acia.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class mits680b_state : public driver_device { @@ -79,7 +78,7 @@ static INPUT_PORTS_START( mits680b ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( mits680b_state ) +void mits680b_state::machine_reset() { m_term_data = 0; } diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 44bd180d299..3cb3cc213b4 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -57,9 +57,6 @@ #include "imagedev/flopdrv.h" #include "formats/basicdsk.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() -#define VIDEO_START_MEMBER(name) void name::video_start() #define MSM5832RS_TAG "rtc" class mycom_state : public driver_device @@ -117,7 +114,7 @@ public: -VIDEO_START_MEMBER( mycom_state ) +void mycom_state::video_start() { m_p_videoram = memregion("vram")->base(); m_p_chargen = memregion("chargen")->base(); @@ -566,12 +563,12 @@ static const sn76496_config psg_intf = }; -MACHINE_START_MEMBER(mycom_state) +void mycom_state::machine_start() { m_p_ram = memregion("maincpu")->base(); } -MACHINE_RESET_MEMBER(mycom_state) +void mycom_state::machine_reset() { membank("boot")->set_entry(1); m_upper_sw = 0x10000; diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index ca2b22f03b3..a283fff3bfe 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -17,10 +17,6 @@ #include "formats/basicdsk.h" #include "machine/ram.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class nanos_state : public driver_device { @@ -263,12 +259,12 @@ static INPUT_PORTS_START( nanos ) INPUT_PORTS_END -VIDEO_START_MEMBER( nanos_state ) +void nanos_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( nanos_state ) +UINT32 nanos_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // static UINT8 framecnt=0; UINT8 y,ra,chr,gfx; @@ -436,12 +432,12 @@ static TIMER_DEVICE_CALLBACK(keyboard_callback) } } -MACHINE_START_MEMBER(nanos_state) +void nanos_state::machine_start() { m_key_pressed = 0xff; } -MACHINE_RESET_MEMBER(nanos_state) +void nanos_state::machine_reset() { address_space *space = machine().device("maincpu")->memory().space(AS_PROGRAM); diff --git a/src/mess/drivers/okean240.c b/src/mess/drivers/okean240.c index 1dd0c695e5c..fd6297c79b0 100644 --- a/src/mess/drivers/okean240.c +++ b/src/mess/drivers/okean240.c @@ -52,8 +52,6 @@ Usage of terminal: #include "machine/keyboard.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() class okean240_state : public driver_device { @@ -363,7 +361,7 @@ static TIMER_CALLBACK( okean240_boot ) state->membank("boot")->set_entry(0); } -MACHINE_RESET_MEMBER( okean240_state ) +void okean240_state::machine_reset() { machine().scheduler().timer_set(attotime::from_usec(10), FUNC(okean240_boot)); membank("boot")->set_entry(1); @@ -388,7 +386,7 @@ DRIVER_INIT_MEMBER(okean240_state,okean240) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0xe000); } -VIDEO_START_MEMBER( okean240_state ) +void okean240_state::video_start() { } diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c index 798b527296f..bf969becbda 100644 --- a/src/mess/drivers/pcm.c +++ b/src/mess/drivers/pcm.c @@ -61,9 +61,6 @@ #include "sound/wave.h" #include "machine/k7659kb.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class pcm_state : public driver_device { @@ -180,16 +177,16 @@ ADDRESS_MAP_END static INPUT_PORTS_START( pcm ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(pcm_state) +void pcm_state::machine_reset() { } -VIDEO_START_MEMBER( pcm_state ) +void pcm_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( pcm_state ) +UINT32 pcm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0x400,x; diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c index e8f20f696af..6197a425e83 100644 --- a/src/mess/drivers/pegasus.c +++ b/src/mess/drivers/pegasus.c @@ -44,10 +44,6 @@ #include "sound/wave.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class pegasus_state : public driver_device { @@ -318,7 +314,7 @@ static const cassette_interface pegasus_cassette_interface = }; -VIDEO_START_MEMBER( pegasus_state ) +void pegasus_state::video_start() { m_p_chargen = memregion("chargen")->base(); } @@ -336,7 +332,7 @@ static const UINT8 mcm6571a_shift[] = }; -SCREEN_UPDATE16_MEMBER( pegasus_state ) +UINT32 pegasus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx,inv; UINT16 sy=0,ma=0,x; @@ -476,12 +472,12 @@ static DEVICE_IMAGE_LOAD( pegasus_cart_5 ) return IMAGE_INIT_PASS; } -MACHINE_START_MEMBER( pegasus_state ) +void pegasus_state::machine_start() { m_p_pcgram = memregion("pcg")->base(); } -MACHINE_RESET_MEMBER( pegasus_state ) +void pegasus_state::machine_reset() { m_kbd_row = 0; m_kbd_irq = 1; diff --git a/src/mess/drivers/phunsy.c b/src/mess/drivers/phunsy.c index 1c6a2767c23..f7679ec9eee 100644 --- a/src/mess/drivers/phunsy.c +++ b/src/mess/drivers/phunsy.c @@ -23,9 +23,6 @@ #include "imagedev/cassette.h" #include "sound/wave.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) #define LOG 1 @@ -198,7 +195,7 @@ static ASCII_KEYBOARD_INTERFACE( keyboard_intf ) }; -MACHINE_RESET_MEMBER(phunsy_state) +void phunsy_state::machine_reset() { membank( "bank1" )->set_base( m_ram_1800 ); membank( "bank2" )->set_base( memregion("ram_4000")->base() ); @@ -220,13 +217,13 @@ static PALETTE_INIT( phunsy ) } -VIDEO_START_MEMBER( phunsy_state ) +void phunsy_state::video_start() { m_p_chargen = memregion( "chargen" )->base(); } -SCREEN_UPDATE16_MEMBER( phunsy_state ) +UINT32 phunsy_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx,col; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/pimps.c b/src/mess/drivers/pimps.c index 7b37325acde..1a1c8bccba0 100644 --- a/src/mess/drivers/pimps.c +++ b/src/mess/drivers/pimps.c @@ -24,7 +24,6 @@ V Virtual Memory #include "cpu/i8085/i8085.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class pimps_state : public driver_device { @@ -75,7 +74,7 @@ static INPUT_PORTS_START( pimps ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( pimps_state ) +void pimps_state::machine_reset() { m_term_data = 0; } diff --git a/src/mess/drivers/plan80.c b/src/mess/drivers/plan80.c index 9c537957bb8..c06cbd83f89 100644 --- a/src/mess/drivers/plan80.c +++ b/src/mess/drivers/plan80.c @@ -24,9 +24,6 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class plan80_state : public driver_device { @@ -149,7 +146,7 @@ static TIMER_CALLBACK( plan80_boot ) state->membank("boot")->set_entry(0); } -MACHINE_RESET_MEMBER( plan80_state ) +void plan80_state::machine_reset() { membank("boot")->set_entry(1); machine().scheduler().timer_set(attotime::from_usec(10), FUNC(plan80_boot)); @@ -161,12 +158,12 @@ DRIVER_INIT_MEMBER(plan80_state,plan80) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0xf800); } -VIDEO_START_MEMBER( plan80_state ) +void plan80_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( plan80_state ) +UINT32 plan80_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c index 45640832df7..29d3fabe1ee 100644 --- a/src/mess/drivers/ptcsol.c +++ b/src/mess/drivers/ptcsol.c @@ -107,10 +107,6 @@ #include "imagedev/cassette.h" #include "machine/ay31015.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) typedef struct { struct { @@ -548,12 +544,12 @@ static TIMER_CALLBACK( sol20_boot ) state->membank("boot")->set_entry(0); } -MACHINE_START_MEMBER( sol20_state ) +void sol20_state::machine_start() { m_cassette_timer = machine().scheduler().timer_alloc(FUNC(sol20_cassette_tc)); } -MACHINE_RESET_MEMBER( sol20_state ) +void sol20_state::machine_reset() { UINT8 data = 0, s_count = 0; int s_clock; @@ -611,12 +607,12 @@ DRIVER_INIT_MEMBER(sol20_state,sol20) membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0xc000); } -VIDEO_START_MEMBER( sol20_state ) +void sol20_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER( sol20_state ) +UINT32 sol20_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { // Visible screen is 64 x 16, with start position controlled by scroll register. // Each character is 9 pixels wide (blank ones at the right) and 13 lines deep. diff --git a/src/mess/drivers/qtsbc.c b/src/mess/drivers/qtsbc.c index c977a731903..caaf3b7300f 100644 --- a/src/mess/drivers/qtsbc.c +++ b/src/mess/drivers/qtsbc.c @@ -12,7 +12,6 @@ #include "cpu/z80/z80.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class qtsbc_state : public driver_device { @@ -64,7 +63,7 @@ static INPUT_PORTS_START( qtsbc ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(qtsbc_state) +void qtsbc_state::machine_reset() { UINT8* bios = memregion("maincpu")->base()+0x10000; memcpy(m_p_ram, bios, 0x800); diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c index c23d020c724..cf1433c633b 100644 --- a/src/mess/drivers/rx78.c +++ b/src/mess/drivers/rx78.c @@ -50,9 +50,6 @@ #include "sound/wave.h" #include "machine/ram.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class rx78_state : public driver_device { @@ -109,11 +106,11 @@ READ8_MEMBER( rx78_state::rx78_f0_r ) } -VIDEO_START_MEMBER( rx78_state ) +void rx78_state::video_start() { } -SCREEN_UPDATE16_MEMBER( rx78_state ) +UINT32 rx78_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 *vram = memregion("vram")->base(); int x,y,count; @@ -411,7 +408,7 @@ static INPUT_PORTS_START( rx78 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(rx78_state) +void rx78_state::machine_reset() { } diff --git a/src/mess/drivers/savia84.c b/src/mess/drivers/savia84.c index 9be4f05c95f..d9f57da318f 100644 --- a/src/mess/drivers/savia84.c +++ b/src/mess/drivers/savia84.c @@ -31,7 +31,6 @@ #include "machine/i8255.h" #include "savia84.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class savia84_state : public driver_device { @@ -122,7 +121,7 @@ static INPUT_PORTS_START( savia84 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( savia84_state ) +void savia84_state::machine_reset() { m_digit_last = 0; } diff --git a/src/mess/drivers/sitcom.c b/src/mess/drivers/sitcom.c index eedce8c4d7d..a19a64fb898 100644 --- a/src/mess/drivers/sitcom.c +++ b/src/mess/drivers/sitcom.c @@ -33,7 +33,6 @@ #include "video/dl1416.h" #include "sitcom.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sitcom_state : public driver_device @@ -72,7 +71,7 @@ ADDRESS_MAP_END static INPUT_PORTS_START( sitcom ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( sitcom_state ) +void sitcom_state::machine_reset() { dl1416_ce_w(m_ds0, 0); // enable dl1416_wr_w(m_ds0, 0); diff --git a/src/mess/drivers/slc1.c b/src/mess/drivers/slc1.c index 903ab16ccf6..5280d267dee 100644 --- a/src/mess/drivers/slc1.c +++ b/src/mess/drivers/slc1.c @@ -51,8 +51,6 @@ Pasting doesn't work, but if it did... #include "sound/speaker.h" #include "slc1.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() class slc1_state : public driver_device { @@ -162,11 +160,11 @@ READ8_MEMBER( slc1_state::io_r ) ***************************************************************************/ -MACHINE_START_MEMBER( slc1_state ) +void slc1_state::machine_start() { } -MACHINE_RESET_MEMBER( slc1_state ) +void slc1_state::machine_reset() { } diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c index c966c3028c6..e9bbe899d80 100644 --- a/src/mess/drivers/sm1800.c +++ b/src/mess/drivers/sm1800.c @@ -19,7 +19,6 @@ #include "machine/i8251.h" #include "video/i8275.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sm1800_state : public driver_device { @@ -72,7 +71,7 @@ static IRQ_CALLBACK(sm1800_irq_callback) return 0xff; } -MACHINE_RESET_MEMBER(sm1800_state) +void sm1800_state::machine_reset() { m_maincpu->set_irq_acknowledge_callback(sm1800_irq_callback); } diff --git a/src/mess/drivers/sorcerer.c b/src/mess/drivers/sorcerer.c index 1b7dd03aa83..8198435c277 100644 --- a/src/mess/drivers/sorcerer.c +++ b/src/mess/drivers/sorcerer.c @@ -342,12 +342,12 @@ static GFXDECODE_START( sorcerer ) GFXDECODE_ENTRY( "maincpu", 0xf800, sorcerer_charlayout, 0, 1 ) GFXDECODE_END -VIDEO_START_MEMBER( sorcerer_state ) +void sorcerer_state::video_start() { m_p_videoram = memregion("maincpu")->base()+0xf000; } -SCREEN_UPDATE_MEMBER( sorcerer_state ) +UINT32 sorcerer_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0x80,x; diff --git a/src/mess/drivers/sun1.c b/src/mess/drivers/sun1.c index 6b4a4ef633a..68c007393b5 100644 --- a/src/mess/drivers/sun1.c +++ b/src/mess/drivers/sun1.c @@ -52,7 +52,6 @@ #include "machine/upd7201.h" #include "machine/terminal.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sun1_state : public driver_device { @@ -110,7 +109,7 @@ static INPUT_PORTS_START( sun1 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(sun1_state) +void sun1_state::machine_reset() { UINT8* user1 = memregion("user1")->base(); diff --git a/src/mess/drivers/sun2.c b/src/mess/drivers/sun2.c index 4e9197adf9d..46df0922fa8 100644 --- a/src/mess/drivers/sun2.c +++ b/src/mess/drivers/sun2.c @@ -72,7 +72,6 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sun2_state : public driver_device { @@ -100,7 +99,7 @@ static INPUT_PORTS_START( sun2 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(sun2_state) +void sun2_state::machine_reset() { UINT8* user1 = memregion("user1")->base(); diff --git a/src/mess/drivers/sun3.c b/src/mess/drivers/sun3.c index 90cea27af94..b629d63678d 100644 --- a/src/mess/drivers/sun3.c +++ b/src/mess/drivers/sun3.c @@ -212,7 +212,6 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sun3_state : public driver_device { @@ -245,7 +244,7 @@ static INPUT_PORTS_START( sun3 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(sun3_state) +void sun3_state::machine_reset() { UINT8* user1 = memregion("user1")->base(); diff --git a/src/mess/drivers/sun4.c b/src/mess/drivers/sun4.c index 607ef80315d..89a9fe28152 100644 --- a/src/mess/drivers/sun4.c +++ b/src/mess/drivers/sun4.c @@ -386,7 +386,6 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class sun4_state : public driver_device { @@ -407,7 +406,7 @@ static INPUT_PORTS_START( sun4 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(sun4_state) +void sun4_state::machine_reset() { } diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c index 12df54c5fd5..8127678e62b 100644 --- a/src/mess/drivers/supercon.c +++ b/src/mess/drivers/supercon.c @@ -22,7 +22,6 @@ #include "sound/beep.h" #include "supercon.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() class supercon_state : public driver_device { @@ -553,7 +552,7 @@ static MACHINE_START( supercon ) machine.save().register_presave(save_prepost_delegate(FUNC(board_presave),state)); } -MACHINE_RESET_MEMBER( supercon_state ) +void supercon_state::machine_reset() { set_board(); set_pieces(); diff --git a/src/mess/drivers/tec1.c b/src/mess/drivers/tec1.c index a3e5d4e1457..26ea2b82a33 100644 --- a/src/mess/drivers/tec1.c +++ b/src/mess/drivers/tec1.c @@ -76,8 +76,6 @@ JMON ToDo: #include "imagedev/cassette.h" #include "tec1.lh" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define MACHINE_START_MEMBER(name) void name::machine_start() class tec1_state : public driver_device { @@ -264,13 +262,13 @@ static TIMER_CALLBACK( tec1_kbd_callback ) ***************************************************************************/ -MACHINE_START_MEMBER( tec1_state ) +void tec1_state::machine_start() { m_kbd_timer = machine().scheduler().timer_alloc(FUNC(tec1_kbd_callback)); m_kbd_timer->adjust( attotime::zero, 0, attotime::from_hz(500) ); } -MACHINE_RESET_MEMBER( tec1_state ) +void tec1_state::machine_reset() { m_kbd = 0; } diff --git a/src/mess/drivers/univac.c b/src/mess/drivers/univac.c index cf77b3768c4..6d9e2d72675 100644 --- a/src/mess/drivers/univac.c +++ b/src/mess/drivers/univac.c @@ -16,9 +16,6 @@ #include "emu.h" #include "cpu/z80/z80.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class univac_state : public driver_device { @@ -79,17 +76,17 @@ static INPUT_PORTS_START( uts20 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER(univac_state) +void univac_state::machine_reset() { m_screen_num = 0; } -VIDEO_START_MEMBER(univac_state) +void univac_state::video_start() { m_p_chargen = memregion("chargen")->base(); } -SCREEN_UPDATE16_MEMBER(univac_state) +UINT32 univac_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { UINT8 y,ra,chr,gfx; UINT16 sy=0,ma=0,x; diff --git a/src/mess/drivers/vt240.c b/src/mess/drivers/vt240.c index 43c2188f9a8..18cf422ced7 100644 --- a/src/mess/drivers/vt240.c +++ b/src/mess/drivers/vt240.c @@ -23,7 +23,6 @@ #include "machine/ram.h" #include "video/upd7220.h" -#define SCREEN_UPDATE16_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) class vt240_state : public driver_device { diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c index 7a2e610d1dd..6d3cb09f07d 100644 --- a/src/mess/drivers/z9001.c +++ b/src/mess/drivers/z9001.c @@ -37,10 +37,7 @@ ToDo: // temporary #include "machine/keyboard.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -//#define MACHINE_START_MEMBER(name) void name::machine_start() -#define VIDEO_START_MEMBER(name) void name::video_start() - +// class z9001_state : public driver_device { public: @@ -150,13 +147,13 @@ static TIMER_DEVICE_CALLBACK( timer_callback ) state->m_maincpu->space(AS_PROGRAM)->write_byte(0x006a, 0); } -MACHINE_RESET_MEMBER( z9001_state ) +void z9001_state::machine_reset() { beep_set_frequency(m_beeper, 800); m_maincpu->set_state_int(Z80_PC, 0xf000); } -VIDEO_START_MEMBER( z9001_state ) +void z9001_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c index 23129afe9c0..8fca3aa978e 100644 --- a/src/mess/drivers/zrt80.c +++ b/src/mess/drivers/zrt80.c @@ -21,8 +21,6 @@ #include "machine/keyboard.h" #include "sound/beep.h" -#define MACHINE_RESET_MEMBER(name) void name::machine_reset() -#define VIDEO_START_MEMBER(name) void name::video_start() class zrt80_state : public driver_device { @@ -181,13 +179,13 @@ static INPUT_PORTS_START( zrt80 ) INPUT_PORTS_END -MACHINE_RESET_MEMBER( zrt80_state ) +void zrt80_state::machine_reset() { beep_set_frequency(m_beep, 800); m_term_data = 0; } -VIDEO_START_MEMBER( zrt80_state ) +void zrt80_state::video_start() { m_p_chargen = memregion("chargen")->base(); } diff --git a/src/mess/includes/pokemini.h b/src/mess/includes/pokemini.h index 993c5998e33..06239c47238 100644 --- a/src/mess/includes/pokemini.h +++ b/src/mess/includes/pokemini.h @@ -13,7 +13,6 @@ #include "imagedev/cartslot.h" #include "rendlay.h" -#define MACHINE_START_MEMBER(name) void name::machine_start() typedef struct { diff --git a/src/mess/includes/sorcerer.h b/src/mess/includes/sorcerer.h index 3fc2a631364..e23e37e2557 100644 --- a/src/mess/includes/sorcerer.h +++ b/src/mess/includes/sorcerer.h @@ -22,8 +22,6 @@ #include "machine/micropolis.h" #define SORCERER_USING_RS232 0 -#define SCREEN_UPDATE_MEMBER(name) UINT32 name::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -#define VIDEO_START_MEMBER(name) void name::video_start() typedef struct { struct { diff --git a/src/mess/machine/pokemini.c b/src/mess/machine/pokemini.c index 3f4b26c80c4..f9010140ef8 100644 --- a/src/mess/machine/pokemini.c +++ b/src/mess/machine/pokemini.c @@ -1556,7 +1556,7 @@ static TIMER_CALLBACK( pokemini_prc_counter_callback ) } -MACHINE_START_MEMBER( pokemini_state ) +void pokemini_state::machine_start() { /* Clear internal structures */ memset( &m_prc, 0, sizeof(m_prc) ); -- cgit v1.2.3