diff options
-rw-r--r-- | src/devices/bus/isa/mach32.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/isa/s3virge.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/isa/svga_cirrus.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/isa/svga_s3.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/isa/svga_trident.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/isa/svga_tseng.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/isa/trident.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/isa/vga.cpp | 1 | ||||
-rw-r--r-- | src/devices/bus/isa/vga_ati.cpp | 6 | ||||
-rw-r--r-- | src/devices/machine/i82371sb.cpp | 1 | ||||
-rw-r--r-- | src/devices/video/clgd542x.cpp | 2 | ||||
-rw-r--r-- | src/devices/video/pc_vga.cpp | 30 | ||||
-rw-r--r-- | src/devices/video/pc_vga.h | 6 | ||||
-rw-r--r-- | src/mame/drivers/bebox.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/dragon.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/gambl186.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/gamtor.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/photoply.cpp | 3 | ||||
-rw-r--r-- | src/mame/drivers/pntnpuzl.cpp | 1 | ||||
-rw-r--r-- | src/mame/drivers/vis.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/pcshare.cpp | 5 |
21 files changed, 28 insertions, 63 deletions
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 8f58eb4858c..f2aa9d49872 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -191,8 +191,8 @@ uint32_t mach32_device::screen_update(screen_device &screen, bitmap_rgb32 &bitma if(depth == 8) { - colour0 = m_palette->pen(m_cursor_colour0_b); - colour1 = m_palette->pen(m_cursor_colour1_b); + colour0 = pen(m_cursor_colour0_b); + colour1 = pen(m_cursor_colour1_b); } else // 16/24/32bpp { diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 7fbc8be6aff..2f55d51c55b 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -56,7 +56,7 @@ void s3virge_vga_device::device_start() int x; int i; for (i = 0; i < 0x100; i++) - m_palette->set_pen_color(i, 0, 0, 0); + set_pen_color(i, 0, 0, 0); // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index adb203a8c10..444acac7c1a 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -35,8 +35,6 @@ MACHINE_CONFIG_START(isa16_svga_cirrus_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", CIRRUS_GD5430, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -117,8 +115,6 @@ MACHINE_CONFIG_START(isa16_svga_cirrus_gd542x_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index 7b474ad0774..a9970d9d240 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -45,8 +45,6 @@ MACHINE_CONFIG_START(isa16_svga_s3_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", S3_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -153,8 +151,6 @@ MACHINE_CONFIG_START(isa16_s3virge_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virge_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", S3VIRGE, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -236,8 +232,6 @@ MACHINE_CONFIG_START(isa16_s3virgedx_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", S3VIRGEDX, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -320,8 +314,6 @@ MACHINE_CONFIG_START(isa16_stealth3d2kpro_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3virgedx_rev1_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", S3VIRGEDX1, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index c5d67e144bc..79aa1dfd55f 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -35,8 +35,6 @@ MACHINE_CONFIG_START(isa16_svga_tgui9680_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 952dd937954..73dbcb1af7c 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -34,8 +34,6 @@ MACHINE_CONFIG_START(isa8_svga_et4k_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", tseng_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", TSENG_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 2357f0cdfbc..a3cd123305b 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -162,7 +162,7 @@ void trident_vga_device::device_start() int i; for (i = 0; i < 0x100; i++) - m_palette->set_pen_color(i, 0, 0, 0); + set_pen_color(i, 0, 0, 0); // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; @@ -242,8 +242,8 @@ uint32_t trident_vga_device::screen_update(screen_device &screen, bitmap_rgb32 & } else /* TODO: other modes */ { - bg_col = m_palette->pen(tri.cursor_bg & 0xff); - fg_col = m_palette->pen(tri.cursor_fg & 0xff); + bg_col = pen(tri.cursor_bg & 0xff); + fg_col = pen(tri.cursor_fg & 0xff); } for(y=0;y<cursor_size;y++) diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index 0c6701cdc56..b8a86adbfe3 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -32,7 +32,6 @@ MACHINE_CONFIG_START(isa8_vga_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index d3a0850141a..e5bd0bc8f14 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -81,8 +81,6 @@ MACHINE_CONFIG_START(isa16_vga_gfxultra_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", ati_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", ATI_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -92,8 +90,6 @@ MACHINE_CONFIG_START(isa16_vga_gfxultrapro_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach32_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", ATIMACH32, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -103,8 +99,6 @@ MACHINE_CONFIG_START(isa16_vga_mach64_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", mach64_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEVICE_ADD("vga", ATIMACH64, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index ad96c2099ca..a53dfea077f 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -164,7 +164,6 @@ MACHINE_CONFIG_START(i82371sb_isa_device::device_add_mconfig) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") // end-VGA-HACK diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp index b5b17160a33..31b9f372225 100644 --- a/src/devices/video/clgd542x.cpp +++ b/src/devices/video/clgd542x.cpp @@ -72,7 +72,7 @@ void cirrus_gd5428_device::device_start() int i; for (i = 0; i < 0x100; i++) - m_palette->set_pen_color(i, 0, 0, 0); + set_pen_color(i, 0, 0, 0); // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; diff --git a/src/devices/video/pc_vga.cpp b/src/devices/video/pc_vga.cpp index 74945acd15b..1da79ab034a 100644 --- a/src/devices/video/pc_vga.cpp +++ b/src/devices/video/pc_vga.cpp @@ -133,7 +133,7 @@ DEFINE_DEVICE_TYPE(MACH8, mach8_device, "mach8", "Mach8") vga_device::vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) , device_video_interface(mconfig, *this) - , m_palette(*this, "^palette") + , device_palette_interface(mconfig, *this) { } @@ -244,7 +244,7 @@ void vga_device::device_start() int i; for (i = 0; i < 0x100; i++) - m_palette->set_pen_color(i, 0, 0, 0); + set_pen_color(i, 0, 0, 0); // Avoid an infinite loop when displaying. 0 is not possible anyway. vga.crtc.maximum_scan_line = 1; @@ -612,7 +612,7 @@ void vga_device::vga_vh_vga(bitmap_rgb32 &bitmap, const rectangle &cliprect) { if(!screen().visible_area().contains(c+xi-(pel_shift), line + yi)) continue; - bitmapline[c+xi-(pel_shift)] = m_palette->pen(vga.memory[(pos & 0xffff)+((xi >> 1)*0x10000)]); + bitmapline[c+xi-(pel_shift)] = pen(vga.memory[(pos & 0xffff)+((xi >> 1)*0x10000)]); } } } @@ -639,7 +639,7 @@ void vga_device::vga_vh_vga(bitmap_rgb32 &bitmap, const rectangle &cliprect) { if(!screen().visible_area().contains(c+xi-(pel_shift), line + yi)) continue; - bitmapline[c+xi-pel_shift] = m_palette->pen(vga.memory[(pos+(xi >> 1)) & 0xffff]); + bitmapline[c+xi-pel_shift] = pen(vga.memory[(pos+(xi >> 1)) & 0xffff]); } } } @@ -759,7 +759,7 @@ void svga_device::svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect) { if(!screen().visible_area().contains(c+xi, line + yi)) continue; - bitmapline[c+xi] = m_palette->pen(vga.memory[(pos+(xi))]); + bitmapline[c+xi] = pen(vga.memory[(pos+(xi))]); } } } @@ -948,7 +948,7 @@ uint8_t vga_device::pc_vga_choosevideomode() for (i=0; i<256;i++) { /* TODO: color shifters? */ - m_palette->set_pen_color(i, (vga.dac.color[3*(i & vga.dac.mask)] & 0x3f) << 2, + set_pen_color(i, (vga.dac.color[3*(i & vga.dac.mask)] & 0x3f) << 2, (vga.dac.color[3*(i & vga.dac.mask) + 1] & 0x3f) << 2, (vga.dac.color[3*(i & vga.dac.mask) + 2] & 0x3f) << 2); } @@ -959,7 +959,7 @@ uint8_t vga_device::pc_vga_choosevideomode() { for (i=0; i<16;i++) { - vga.pens[i] = m_palette->pen((vga.attribute.data[i]&0x0f) + vga.pens[i] = pen((vga.attribute.data[i]&0x0f) |((vga.attribute.data[0x14]&0xf)<<4)); } } @@ -967,7 +967,7 @@ uint8_t vga_device::pc_vga_choosevideomode() { for (i=0; i<16;i++) { - vga.pens[i]=m_palette->pen((vga.attribute.data[i]&0x3f) + vga.pens[i] = pen((vga.attribute.data[i]&0x3f) |((vga.attribute.data[0x14]&0xc)<<4)); } } @@ -1009,7 +1009,7 @@ uint8_t svga_device::pc_vga_choosevideomode() for (i=0; i<256;i++) { /* TODO: color shifters? */ - m_palette->set_pen_color(i, (vga.dac.color[3*(i & vga.dac.mask)] & 0x3f) << 2, + set_pen_color(i, (vga.dac.color[3*(i & vga.dac.mask)] & 0x3f) << 2, (vga.dac.color[3*(i & vga.dac.mask) + 1] & 0x3f) << 2, (vga.dac.color[3*(i & vga.dac.mask) + 2] & 0x3f) << 2); } @@ -1020,7 +1020,7 @@ uint8_t svga_device::pc_vga_choosevideomode() { for (i=0; i<16;i++) { - vga.pens[i] = m_palette->pen((vga.attribute.data[i]&0x0f) + vga.pens[i] = pen((vga.attribute.data[i]&0x0f) |((vga.attribute.data[0x14]&0xf)<<4)); } } @@ -1028,7 +1028,7 @@ uint8_t svga_device::pc_vga_choosevideomode() { for (i=0; i<16;i++) { - vga.pens[i]=m_palette->pen((vga.attribute.data[i]&0x3f) + vga.pens[i] = pen((vga.attribute.data[i]&0x3f) |((vga.attribute.data[0x14]&0xc)<<4)); } } @@ -1100,7 +1100,7 @@ uint32_t vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, uint8_t cur_mode = pc_vga_choosevideomode(); switch(cur_mode) { - case SCREEN_OFF: bitmap.fill (m_palette->black_pen(), cliprect);break; + case SCREEN_OFF: bitmap.fill (black_pen(), cliprect);break; case TEXT_MODE: vga_vh_text (bitmap, cliprect); break; case VGA_MODE: vga_vh_vga (bitmap, cliprect); break; case EGA_MODE: vga_vh_ega (bitmap, cliprect); break; @@ -1117,7 +1117,7 @@ uint32_t svga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, switch(cur_mode) { - case SCREEN_OFF: bitmap.fill (m_palette->black_pen(), cliprect);break; + case SCREEN_OFF: bitmap.fill (black_pen(), cliprect);break; case TEXT_MODE: vga_vh_text (bitmap, cliprect); break; case VGA_MODE: vga_vh_vga (bitmap, cliprect); break; case EGA_MODE: vga_vh_ega (bitmap, cliprect); break; @@ -1184,8 +1184,8 @@ uint32_t s3_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitma } else /* TODO: other modes */ { - bg_col = m_palette->pen(s3.cursor_bg[0]); - fg_col = m_palette->pen(s3.cursor_fg[0]); + bg_col = pen(s3.cursor_bg[0]); + fg_col = pen(s3.cursor_fg[0]); } //popmessage("%08x %08x",(s3.cursor_bg[0])|(s3.cursor_bg[1]<<8)|(s3.cursor_bg[2]<<16)|(s3.cursor_bg[3]<<24) diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 1325e34f058..c455b7ad68d 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -15,7 +15,7 @@ // ======================> vga_device -class vga_device : public device_t, public device_video_interface +class vga_device : public device_t, public device_video_interface, public device_palette_interface { friend class ibm8514a_device; @@ -62,6 +62,9 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // device_palette_interface overrides + virtual uint32_t palette_entries() const override { return 0x100; } + void vga_vh_text(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_ega(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_vga(bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -230,7 +233,6 @@ protected: } vga; emu_timer *m_vblank_timer; - required_device<palette_device> m_palette; }; diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp index f3bf56e8185..b98731e6378 100644 --- a/src/mame/drivers/bebox.cpp +++ b/src/mame/drivers/bebox.cpp @@ -191,7 +191,6 @@ MACHINE_CONFIG_START(bebox_state::bebox) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp index ecb5a8ef1dc..ecb9912fb42 100644 --- a/src/mame/drivers/dragon.cpp +++ b/src/mame/drivers/dragon.cpp @@ -377,6 +377,7 @@ MACHINE_CONFIG_START(dragon64_state::tanodr64h) // Replace M6809 CPU with HD6309 CPU MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1)) MCFG_CPU_PROGRAM_MAP(dragon_mem) + MCFG_DEVICE_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("64K") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index 42f8cbb7d1b..bcbb19d81cf 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -479,7 +479,6 @@ MACHINE_CONFIG_START(gambl186_state::gambl186) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index e4360d37986..ddcdaef3c0f 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -89,7 +89,6 @@ MACHINE_CONFIG_START(gaminator_state::gaminator) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", gamtor_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", GAMTOR_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp index 10f20ae46a0..47318715ca4 100644 --- a/src/mame/drivers/photoply.cpp +++ b/src/mame/drivers/photoply.cpp @@ -305,7 +305,7 @@ MACHINE_CONFIG_START(photoply_state::photoply) pcat_common(config); - MCFG_GFXDECODE_ADD("gfxdecode", "palette", photoply ) + MCFG_GFXDECODE_ADD("gfxdecode", "vga", photoply ) MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true) MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w)) @@ -320,7 +320,6 @@ MACHINE_CONFIG_START(photoply_state::photoply) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5446_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", CIRRUS_GD5446, 0) MCFG_VIDEO_SET_SCREEN("screen") diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp index 2c8ed6c2802..0e66912456c 100644 --- a/src/mame/drivers/pntnpuzl.cpp +++ b/src/mame/drivers/pntnpuzl.cpp @@ -369,7 +369,6 @@ MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp index 41c8228a7a6..3ecbc006231 100644 --- a/src/mame/drivers/vis.cpp +++ b/src/mame/drivers/vis.cpp @@ -255,7 +255,6 @@ vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, d device_isa16_card_interface(mconfig, *this), m_screen_tag(subtag("screen")) { - m_palette.set_tag("palette"); set_screen(m_screen_tag.c_str()); } @@ -263,7 +262,6 @@ MACHINE_CONFIG_START(vis_vga_device::device_add_mconfig) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, vis_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MACHINE_CONFIG_END void vis_vga_device::recompute_params() @@ -378,8 +376,6 @@ void vis_vga_device::vga_vh_yuv8(bitmap_rgb32 &bitmap, const rectangle &cliprect void vis_vga_device::device_start() { - if(!m_palette->started()) - throw device_missing_dependencies(); set_isa_device(); m_isa->install_device(0x03b0, 0x03df, read8_delegate(FUNC(vis_vga_device::vga_r), this), write8_delegate(FUNC(vis_vga_device::vga_w), this)); m_isa->install_memory(0x0a0000, 0x0bffff, read8_delegate(FUNC(vis_vga_device::visvgamem_r), this), write8_delegate(FUNC(vis_vga_device::visvgamem_w), this)); diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp index 52a8e79f9c9..3837eb41cd7 100644 --- a/src/mame/machine/pcshare.cpp +++ b/src/mame/machine/pcshare.cpp @@ -145,7 +145,6 @@ MACHINE_CONFIG_START(pcat_base_state::pcvideo_vga) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -155,7 +154,6 @@ MACHINE_CONFIG_START(pcat_base_state::pcvideo_trident_vga) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", trident_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", TRIDENT_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -165,7 +163,6 @@ MACHINE_CONFIG_START(pcat_base_state::pcvideo_s3_vga) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", s3_vga_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", S3_VGA, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -176,7 +173,6 @@ MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5428) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5428_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", CIRRUS_GD5428, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END @@ -186,7 +182,6 @@ MACHINE_CONFIG_START(pcat_base_state::pcvideo_cirrus_gd5430) MCFG_SCREEN_RAW_PARAMS(XTAL(25'174'800),900,0,640,526,0,480) MCFG_SCREEN_UPDATE_DEVICE("vga", cirrus_gd5430_device, screen_update) - MCFG_PALETTE_ADD("palette", 0x100) MCFG_DEVICE_ADD("vga", CIRRUS_GD5430, 0) MCFG_VIDEO_SET_SCREEN("screen") MACHINE_CONFIG_END |