mirror of
https://github.com/holub/mame
synced 2025-07-04 01:18:59 +03:00
fixed faulty PALETTE_INIT modernization (nw)
This commit is contained in:
parent
2f1e78d892
commit
345d6a596c
@ -23,7 +23,7 @@
|
|||||||
#define HUC6260_HSYNC_START ( HUC6260_WPF - HUC6260_HSYNC_LENGTH )
|
#define HUC6260_HSYNC_START ( HUC6260_WPF - HUC6260_HSYNC_LENGTH )
|
||||||
|
|
||||||
|
|
||||||
void huc6260_device::palette_init()
|
PALETTE_INIT_MEMBER(huc6260_device, huc6260)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ public:
|
|||||||
void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect);
|
void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||||
DECLARE_READ8_MEMBER( read );
|
DECLARE_READ8_MEMBER( read );
|
||||||
DECLARE_WRITE8_MEMBER( write );
|
DECLARE_WRITE8_MEMBER( write );
|
||||||
|
DECLARE_PALETTE_INIT(huc6260);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// device-level overrides
|
// device-level overrides
|
||||||
@ -58,7 +59,6 @@ protected:
|
|||||||
virtual void device_start();
|
virtual void device_start();
|
||||||
virtual void device_reset();
|
virtual void device_reset();
|
||||||
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
|
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
|
||||||
virtual void palette_init();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int m_last_h;
|
int m_last_h;
|
||||||
|
@ -270,6 +270,7 @@ static MACHINE_CONFIG_START( ggconnie, ggconnie_state )
|
|||||||
MCFG_SCREEN_UPDATE_DRIVER( ggconnie_state, screen_update )
|
MCFG_SCREEN_UPDATE_DRIVER( ggconnie_state, screen_update )
|
||||||
|
|
||||||
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(huc6260_device, huc6260);
|
||||||
|
|
||||||
MCFG_HUC6260_ADD( "huc6260", PCE_MAIN_CLOCK/3, sgx_huc6260_config )
|
MCFG_HUC6260_ADD( "huc6260", PCE_MAIN_CLOCK/3, sgx_huc6260_config )
|
||||||
MCFG_HUC6270_ADD( "huc6270_0", sgx_huc6270_0_config )
|
MCFG_HUC6270_ADD( "huc6270_0", sgx_huc6270_0_config )
|
||||||
|
@ -843,6 +843,7 @@ MACHINE_CONFIG_END
|
|||||||
static MACHINE_CONFIG_DERIVED( ngp, ngp_common )
|
static MACHINE_CONFIG_DERIVED( ngp, ngp_common )
|
||||||
|
|
||||||
MCFG_PALETTE_LENGTH( 8 )
|
MCFG_PALETTE_LENGTH( 8 )
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(k1ge_device, k1ge)
|
||||||
|
|
||||||
MCFG_K1GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
|
MCFG_K1GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
|
||||||
|
|
||||||
@ -862,6 +863,7 @@ MACHINE_CONFIG_END
|
|||||||
static MACHINE_CONFIG_DERIVED( ngpc, ngp_common )
|
static MACHINE_CONFIG_DERIVED( ngpc, ngp_common )
|
||||||
|
|
||||||
MCFG_PALETTE_LENGTH( 4096 )
|
MCFG_PALETTE_LENGTH( 4096 )
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(k2ge_device, k2ge)
|
||||||
|
|
||||||
MCFG_K2GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
|
MCFG_K2GE_ADD( "k1ge", XTAL_6_144MHz, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
|
||||||
|
|
||||||
|
@ -380,6 +380,7 @@ static MACHINE_CONFIG_START( pce_common, pce_state )
|
|||||||
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
|
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
|
||||||
|
|
||||||
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(huc6260_device, huc6260);
|
||||||
|
|
||||||
MCFG_HUC6260_ADD( "huc6260", MAIN_CLOCK, pce_huc6260_config )
|
MCFG_HUC6260_ADD( "huc6260", MAIN_CLOCK, pce_huc6260_config )
|
||||||
MCFG_HUC6270_ADD( "huc6270", pce_huc6270_config )
|
MCFG_HUC6270_ADD( "huc6270", pce_huc6270_config )
|
||||||
@ -424,6 +425,7 @@ static MACHINE_CONFIG_START( sgx, pce_state )
|
|||||||
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
|
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
|
||||||
|
|
||||||
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
MCFG_PALETTE_LENGTH( HUC6260_PALETTE_SIZE )
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(huc6260_device, huc6260);
|
||||||
|
|
||||||
MCFG_HUC6260_ADD( "huc6260", MAIN_CLOCK, sgx_huc6260_config )
|
MCFG_HUC6260_ADD( "huc6260", MAIN_CLOCK, sgx_huc6260_config )
|
||||||
MCFG_HUC6270_ADD( "huc6270_0", sgx_huc6270_0_config )
|
MCFG_HUC6270_ADD( "huc6270_0", sgx_huc6270_0_config )
|
||||||
|
@ -232,6 +232,7 @@ static MACHINE_CONFIG_START( ti990_10, ti990_10_state )
|
|||||||
|
|
||||||
MCFG_GFXDECODE(vdt911)
|
MCFG_GFXDECODE(vdt911)
|
||||||
MCFG_PALETTE_LENGTH(8)
|
MCFG_PALETTE_LENGTH(8)
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(vdt911_device, vdt911)
|
||||||
|
|
||||||
MCFG_VDT911_VIDEO_ADD("vdt911", vdt911_intf)
|
MCFG_VDT911_VIDEO_ADD("vdt911", vdt911_intf)
|
||||||
|
|
||||||
|
@ -264,9 +264,11 @@ static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
|
|||||||
#if VIDEO_911
|
#if VIDEO_911
|
||||||
MCFG_GFXDECODE(vdt911)
|
MCFG_GFXDECODE(vdt911)
|
||||||
MCFG_PALETTE_LENGTH(8)
|
MCFG_PALETTE_LENGTH(8)
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(vdt911_device, vdt911)
|
||||||
#else
|
#else
|
||||||
MCFG_GFXDECODE(asr733)
|
MCFG_GFXDECODE(asr733)
|
||||||
MCFG_PALETTE_LENGTH(2)
|
MCFG_PALETTE_LENGTH(2)
|
||||||
|
MCFG_PALETTE_INIT_OVERRIDE(asr733_device, asr733)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if VIDEO_911
|
#if VIDEO_911
|
||||||
|
@ -93,7 +93,7 @@ GFXDECODE_START( asr733 )
|
|||||||
GFXDECODE_ENTRY( asr733_chr_region, 0, fontlayout, 0, 1 )
|
GFXDECODE_ENTRY( asr733_chr_region, 0, fontlayout, 0, 1 )
|
||||||
GFXDECODE_END
|
GFXDECODE_END
|
||||||
|
|
||||||
void asr733_device::palette_init()
|
PALETTE_INIT_MEMBER(asr733_device, asr733)
|
||||||
{
|
{
|
||||||
palette_set_color(machine(),0,RGB_WHITE); /* white */
|
palette_set_color(machine(),0,RGB_WHITE); /* white */
|
||||||
palette_set_color(machine(),1,RGB_BLACK); /* black */
|
palette_set_color(machine(),1,RGB_BLACK); /* black */
|
||||||
|
@ -23,6 +23,8 @@ public:
|
|||||||
asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
||||||
~asr733_device() { global_free(m_token); }
|
~asr733_device() { global_free(m_token); }
|
||||||
|
|
||||||
|
DECLARE_PALETTE_INIT(asr733);
|
||||||
|
|
||||||
// access to legacy token
|
// access to legacy token
|
||||||
void *token() const { assert(m_token != NULL); return m_token; }
|
void *token() const { assert(m_token != NULL); return m_token; }
|
||||||
protected:
|
protected:
|
||||||
@ -30,7 +32,6 @@ protected:
|
|||||||
virtual void device_config_complete();
|
virtual void device_config_complete();
|
||||||
virtual void device_start();
|
virtual void device_start();
|
||||||
virtual void device_reset();
|
virtual void device_reset();
|
||||||
virtual void palette_init();
|
|
||||||
private:
|
private:
|
||||||
// internal state
|
// internal state
|
||||||
void *m_token;
|
void *m_token;
|
||||||
|
@ -131,7 +131,7 @@ static TIMER_CALLBACK(beep_callback);
|
|||||||
/*
|
/*
|
||||||
Initialize vdt911 palette
|
Initialize vdt911 palette
|
||||||
*/
|
*/
|
||||||
void vdt911_device::palette_init()
|
PALETTE_INIT_MEMBER(vdt911_device, vdt911)
|
||||||
{
|
{
|
||||||
UINT8 i, r, g, b;
|
UINT8 i, r, g, b;
|
||||||
|
|
||||||
|
@ -47,13 +47,14 @@ public:
|
|||||||
vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
||||||
~vdt911_device() { global_free(m_token); }
|
~vdt911_device() { global_free(m_token); }
|
||||||
|
|
||||||
|
DECLARE_PALETTE_INIT(vdt911);
|
||||||
|
|
||||||
// access to legacy token
|
// access to legacy token
|
||||||
void *token() const { assert(m_token != NULL); return m_token; }
|
void *token() const { assert(m_token != NULL); return m_token; }
|
||||||
protected:
|
protected:
|
||||||
// device-level overrides
|
// device-level overrides
|
||||||
virtual void device_config_complete();
|
virtual void device_config_complete();
|
||||||
virtual void device_start();
|
virtual void device_start();
|
||||||
virtual void palette_init();
|
|
||||||
private:
|
private:
|
||||||
// internal state
|
// internal state
|
||||||
void *m_token;
|
void *m_token;
|
||||||
|
@ -11,7 +11,7 @@ used in the Neogeo pocket color.
|
|||||||
#include "k1ge.h"
|
#include "k1ge.h"
|
||||||
|
|
||||||
|
|
||||||
void k1ge_device::palette_init()
|
PALETTE_INIT_MEMBER(k1ge_device, k1ge)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ void k1ge_device::palette_init()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void k2ge_device::palette_init()
|
PALETTE_INIT_MEMBER(k2ge_device, k2ge)
|
||||||
{
|
{
|
||||||
int r,g,b;
|
int r,g,b;
|
||||||
|
|
||||||
|
@ -28,6 +28,8 @@ public:
|
|||||||
DECLARE_READ8_MEMBER( vram_read );
|
DECLARE_READ8_MEMBER( vram_read );
|
||||||
DECLARE_WRITE8_MEMBER( vram_write );
|
DECLARE_WRITE8_MEMBER( vram_write );
|
||||||
|
|
||||||
|
DECLARE_PALETTE_INIT(k1ge);
|
||||||
|
|
||||||
void update( bitmap_ind16 &bitmap, const rectangle &cliprect );
|
void update( bitmap_ind16 &bitmap, const rectangle &cliprect );
|
||||||
|
|
||||||
// Static methods
|
// Static methods
|
||||||
@ -39,7 +41,6 @@ protected:
|
|||||||
// device-level overrides
|
// device-level overrides
|
||||||
virtual void device_start();
|
virtual void device_start();
|
||||||
virtual void device_reset();
|
virtual void device_reset();
|
||||||
virtual void palette_init();
|
|
||||||
|
|
||||||
devcb2_write_line m_vblank_pin_w;
|
devcb2_write_line m_vblank_pin_w;
|
||||||
devcb2_write_line m_hblank_pin_w;
|
devcb2_write_line m_hblank_pin_w;
|
||||||
@ -64,10 +65,9 @@ class k2ge_device : public k1ge_device
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
|
||||||
|
|
||||||
|
DECLARE_PALETTE_INIT(k2ge);
|
||||||
protected:
|
protected:
|
||||||
virtual void palette_init();
|
|
||||||
|
|
||||||
virtual void draw(int line);
|
virtual void draw(int line);
|
||||||
|
|
||||||
void draw_scroll_plane( UINT16 *p, UINT16 base, int line, int scroll_x, int scroll_y, UINT16 pal_base );
|
void draw_scroll_plane( UINT16 *p, UINT16 base, int line, int scroll_x, int scroll_y, UINT16 pal_base );
|
||||||
|
Loading…
Reference in New Issue
Block a user