summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-18 07:46:32 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-18 07:46:32 +0000
commit8196b6177882559f277b0688f4f210e352cce6be (patch)
treeb688d1d048bed62f86d5ee22fedc94db88365ce4
parent2a06847d59b27f9927caa22761514640dadb9c8a (diff)
Did some missed by code (no whatsnew)
-rw-r--r--src/mame/drivers/vsnes.c6
-rw-r--r--src/mame/includes/vsnes.h6
-rw-r--r--src/mame/video/vsnes.c9
-rw-r--r--src/mess/drivers/irisha.c2
-rw-r--r--src/mess/drivers/pmd85.c2
-rw-r--r--src/mess/includes/irisha.h2
-rw-r--r--src/mess/includes/pmd85.h2
-rw-r--r--src/mess/video/irisha.c4
-rw-r--r--src/mess/video/pmd85.c4
9 files changed, 17 insertions, 20 deletions
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 49a94c66dfd..4d186833f27 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -1699,7 +1699,7 @@ static MACHINE_CONFIG_START( vsnes, vsnes_state )
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MCFG_SCREEN_UPDATE_STATIC(vsnes)
+ MCFG_SCREEN_UPDATE_DRIVER(vsnes_state, screen_update_vsnes)
MCFG_PALETTE_LENGTH(8*4*16)
@@ -1763,13 +1763,13 @@ static MACHINE_CONFIG_START( vsdual, vsnes_state )
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MCFG_SCREEN_UPDATE_STATIC(vsnes)
+ MCFG_SCREEN_UPDATE_DRIVER(vsnes_state, screen_update_vsnes)
MCFG_SCREEN_ADD("screen2", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
- MCFG_SCREEN_UPDATE_STATIC(vsnes_bottom)
+ MCFG_SCREEN_UPDATE_DRIVER(vsnes_state, screen_update_vsnes_bottom)
MCFG_PALETTE_INIT_OVERRIDE(vsnes_state,vsdual)
MCFG_VIDEO_START_OVERRIDE(vsnes_state,vsdual)
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index 18df875b3d6..a9240080640 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -99,12 +99,10 @@ public:
DECLARE_MACHINE_RESET(vsdual);
DECLARE_VIDEO_START(vsdual);
DECLARE_PALETTE_INIT(vsdual);
+ UINT32 screen_update_vsnes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ UINT32 screen_update_vsnes_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
-
/*----------- defined in video/vsnes.c -----------*/
-SCREEN_UPDATE_IND16( vsnes );
-SCREEN_UPDATE_IND16( vsnes_bottom );
-
extern const ppu2c0x_interface vsnes_ppu_interface_1;
extern const ppu2c0x_interface vsnes_ppu_interface_2;
diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c
index f6a8c4d8b9d..fa490229b59 100644
--- a/src/mame/video/vsnes.c
+++ b/src/mame/video/vsnes.c
@@ -62,18 +62,17 @@ VIDEO_START_MEMBER(vsnes_state,vsdual )
Display refresh
***************************************************************************/
-SCREEN_UPDATE_IND16( vsnes )
+UINT32 vsnes_state::screen_update_vsnes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* render the ppu */
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu1");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu1");
ppu->render(bitmap, 0, 0, 0, 0);
return 0;
}
-
-SCREEN_UPDATE_IND16( vsnes_bottom )
+UINT32 vsnes_state::screen_update_vsnes_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu2");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu2");
ppu->render(bitmap, 0, 0, 0, 0);
return 0;
}
diff --git a/src/mess/drivers/irisha.c b/src/mess/drivers/irisha.c
index ecc9f986620..319ea47f9ce 100644
--- a/src/mess/drivers/irisha.c
+++ b/src/mess/drivers/irisha.c
@@ -165,7 +165,7 @@ static MACHINE_CONFIG_START( irisha, irisha_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_SIZE(320, 200)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
- MCFG_SCREEN_UPDATE_STATIC(irisha)
+ MCFG_SCREEN_UPDATE_DRIVER(irisha_state, screen_update_irisha)
MCFG_GFXDECODE(irisha)
MCFG_PALETTE_LENGTH(2)
diff --git a/src/mess/drivers/pmd85.c b/src/mess/drivers/pmd85.c
index a0671776b7e..347c51e1237 100644
--- a/src/mess/drivers/pmd85.c
+++ b/src/mess/drivers/pmd85.c
@@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( pmd85, pmd85_state )
MCFG_SCREEN_VBLANK_TIME(0)
MCFG_SCREEN_SIZE(288, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 256-1)
- MCFG_SCREEN_UPDATE_STATIC( pmd85 )
+ MCFG_SCREEN_UPDATE_DRIVER(pmd85_state, screen_update_pmd85)
MCFG_PALETTE_LENGTH(sizeof (pmd85_palette) / 3)
diff --git a/src/mess/includes/irisha.h b/src/mess/includes/irisha.h
index 26e8e41e0a0..fa14659ecfd 100644
--- a/src/mess/includes/irisha.h
+++ b/src/mess/includes/irisha.h
@@ -46,6 +46,7 @@ public:
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
+ UINT32 screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@@ -55,5 +56,4 @@ extern const i8255_interface irisha_ppi8255_interface;
extern const struct pit8253_config irisha_pit8253_intf;
extern const struct pic8259_interface irisha_pic8259_config;
-extern SCREEN_UPDATE_IND16( irisha );
#endif /* IRISHA_H_ */
diff --git a/src/mess/includes/pmd85.h b/src/mess/includes/pmd85.h
index fd1669fbfee..d6df21cea0d 100644
--- a/src/mess/includes/pmd85.h
+++ b/src/mess/includes/pmd85.h
@@ -39,6 +39,7 @@ public:
virtual void machine_reset();
virtual void video_start();
virtual void palette_init();
+ UINT32 screen_update_pmd85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
@@ -51,7 +52,6 @@ extern const i8255_interface mato_ppi8255_interface;
/*----------- defined in video/pmd85.c -----------*/
-extern SCREEN_UPDATE_IND16( pmd85 );
extern const unsigned char pmd85_palette[3*3];
diff --git a/src/mess/video/irisha.c b/src/mess/video/irisha.c
index 36129fcac03..854c4ce742b 100644
--- a/src/mess/video/irisha.c
+++ b/src/mess/video/irisha.c
@@ -15,12 +15,12 @@ void irisha_state::video_start()
{
}
-SCREEN_UPDATE_IND16( irisha )
+UINT32 irisha_state::screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
UINT8 code1; //, code2;
UINT8 col;
int y, x, b;
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
// draw image
for (y = 0; y < 200; y++)
diff --git a/src/mess/video/pmd85.c b/src/mess/video/pmd85.c
index 36fc4d71945..5b5ece2270b 100644
--- a/src/mess/video/pmd85.c
+++ b/src/mess/video/pmd85.c
@@ -56,11 +56,11 @@ static void pmd85_draw_scanline(running_machine &machine,bitmap_ind16 &bitmap, i
}
}
-SCREEN_UPDATE_IND16( pmd85 )
+UINT32 pmd85_state::screen_update_pmd85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int pmd85_scanline;
for (pmd85_scanline=0; pmd85_scanline<256; pmd85_scanline++)
- pmd85_draw_scanline (screen.machine(),bitmap, pmd85_scanline);
+ pmd85_draw_scanline (machine(),bitmap, pmd85_scanline);
return 0;
}