diff options
author | 2016-03-12 02:34:23 +0100 | |
---|---|---|
committer | 2016-03-12 02:36:28 +0100 | |
commit | 75e5db381bd0cbd3fd664ebf83f518cdbd86b345 (patch) | |
tree | 7605cf6afe1d7fd1727544b14a55b534b705f25a /src | |
parent | 30b4c5e4c006090afbe47c28970e8e4041eb43e8 (diff) |
Add support to adjust the screen color
This is now used for monochrome screens instead of creating custom
palettes.
Diffstat (limited to 'src')
185 files changed, 332 insertions, 345 deletions
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp index c1f7fe0f1dd..5f4a1eaa285 100644 --- a/src/devices/bus/c64/xl80.cpp +++ b/src/devices/bus/c64/xl80.cpp @@ -122,14 +122,14 @@ GFXDECODE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( c64_xl80 ) - MCFG_SCREEN_ADD(MC6845_SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_UPDATE_DEVICE(HD46505SP_TAG, h46505_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1) MCFG_SCREEN_REFRESH_RATE(50) MCFG_GFXDECODE_ADD("gfxdecode", "palette", c64_xl80) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(HD46505SP_TAG, H46505, MC6845_SCREEN_TAG, XTAL_14_31818MHz / 8) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index bb0e38a22cb..6bc88abdadb 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -85,12 +85,12 @@ ADDRESS_MAP_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_a ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) MCFG_SCREEN_REFRESH_RATE(25) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9365_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) @@ -106,12 +106,12 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_hrg_b ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9366_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index b9cc57b836f..15aa7f88295 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -135,7 +135,7 @@ GFXDECODE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( comx_clm ) - MCFG_SCREEN_ADD(MC6845_SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(MC6845_SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(80*8, 24*8) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*8-1) @@ -143,7 +143,7 @@ static MACHINE_CONFIG_FRAGMENT( comx_clm ) MCFG_SCREEN_REFRESH_RATE(50) MCFG_GFXDECODE_ADD("gfxdecode", "palette", comx_clm) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, MC6845_SCREEN_TAG, XTAL_14_31818MHz/7) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 75ba3961754..ca0cd2a579a 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -459,14 +459,14 @@ static MACHINE_CONFIG_FRAGMENT( grip ) MCFG_CPU_IO_MAP(grip_io) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp index d0bd43d0020..e22f4041a73 100644 --- a/src/devices/bus/pet/hsg.cpp +++ b/src/devices/bus/pet/hsg.cpp @@ -87,12 +87,12 @@ ADDRESS_MAP_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_a ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 512) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) MCFG_SCREEN_REFRESH_RATE(25) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9365_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) @@ -108,12 +108,12 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm8000_hsg_b ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9365_device, screen_update) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_REFRESH_RATE(50) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(EF9366_TAG, EF9365, 1750000) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index efadfc332dc..519758ba12a 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -110,14 +110,14 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( wangpc_tig ) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update) MCFG_SCREEN_SIZE(80*10, 25*12) MCFG_SCREEN_VISIBLE_AREA(0, 80*10-1, 0, 25*12-1) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_REFRESH_RATE(60) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_DEVICE_ADD(UPD7720_0_TAG, UPD7220, XTAL_52_832MHz/28) MCFG_DEVICE_ADDRESS_MAP(AS_0, upd7220_0_map) diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index 6b1b26b8c85..86388182f15 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -319,14 +319,14 @@ WRITE8_MEMBER( generic_terminal_device::kbd_put ) ***************************************************************************/ static MACHINE_CONFIG_FRAGMENT( generic_terminal ) - MCFG_SCREEN_ADD(TERMINAL_SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(TERMINAL_SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(TERMINAL_WIDTH*8, TERMINAL_HEIGHT*10) MCFG_SCREEN_VISIBLE_AREA(0, TERMINAL_WIDTH*8-1, 0, TERMINAL_HEIGHT*10-1) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, generic_terminal_device, update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(generic_terminal_device, kbd_put)) diff --git a/src/emu/emupal.cpp b/src/emu/emupal.cpp index e3d2dcd97a1..ccd0b26d324 100644 --- a/src/emu/emupal.cpp +++ b/src/emu/emupal.cpp @@ -744,79 +744,44 @@ void palette_device::configure_rgb_shadows(int mode, float factor) void palette_device::palette_init_all_black(palette_device &palette) { - int i; - - for (i = 0; i < palette.entries(); i++) + for (int i = 0; i < palette.entries(); i++) { - palette.set_pen_color(i,rgb_t::black); // black + palette.set_pen_color(i, rgb_t::black); } } /*------------------------------------------------- - black_and_white - basic 2-color black & white --------------------------------------------------*/ - -void palette_device::palette_init_black_and_white(palette_device &palette) -{ - palette.set_pen_color(0,rgb_t::black); // black - palette.set_pen_color(1,rgb_t::white); // white -} - - -/*------------------------------------------------- - white_and_black - basic 2-color white & black --------------------------------------------------*/ - -void palette_device::palette_init_white_and_black(palette_device &palette) -{ - palette.set_pen_color(0,rgb_t::white); // white - palette.set_pen_color(1,rgb_t::black); // black -} - - -/*------------------------------------------------- - monochrome_amber - 2-color black & amber --------------------------------------------------*/ - -void palette_device::palette_init_monochrome_amber(palette_device &palette) -{ - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0xf7, 0xaa, 0x00)); // amber -} - - -/*------------------------------------------------- - monochrome_green - 2-color black & green + monochrome - 2-color black & white -------------------------------------------------*/ -void palette_device::palette_init_monochrome_green(palette_device &palette) +void palette_device::palette_init_monochrome(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0x00, 0xff, 0x00)); // green + palette.set_pen_color(0, rgb_t::black); + palette.set_pen_color(1, rgb_t::white); } /*------------------------------------------------- - monochrome_green_highlight - 3-color black & green + monochrome_inverted - 2-color white & black -------------------------------------------------*/ -void palette_device::palette_init_monochrome_green_highlight(palette_device &palette) +void palette_device::palette_init_monochrome_inverted(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0x00, 0xc0, 0x00)); // green - palette.set_pen_color(2, rgb_t(0x00, 0xff, 0x00)); // green + palette.set_pen_color(0, rgb_t::white); + palette.set_pen_color(1, rgb_t::black); } /*------------------------------------------------- - monochrome_yellow - 2-color black & yellow + monochrome_highlight - 3-color -------------------------------------------------*/ -void palette_device::palette_init_monochrome_yellow(palette_device &palette) +void palette_device::palette_init_monochrome_highlight(palette_device &palette) { - palette.set_pen_color(0, rgb_t::black); // black - palette.set_pen_color(1, rgb_t(0xff, 0xff, 0x00)); // yellow + palette.set_pen_color(0, rgb_t::black); + palette.set_pen_color(1, rgb_t(0xc0, 0xc0, 0xc0)); + palette.set_pen_color(2, rgb_t::white); } diff --git a/src/emu/emupal.h b/src/emu/emupal.h index b06a5b43d7f..57b6cecebdc 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -217,31 +217,20 @@ palette_device::static_enable_hilights(*device); -// standard palettes -#define MCFG_PALETTE_ADD_BLACK_AND_WHITE(_tag) \ +// monochrome palettes +#define MCFG_PALETTE_ADD_MONOCHROME(_tag) \ MCFG_PALETTE_ADD(_tag, 2) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_black_and_white), downcast<palette_device *>(device))); + palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome), downcast<palette_device *>(device))); -#define MCFG_PALETTE_ADD_WHITE_AND_BLACK(_tag) \ +#define MCFG_PALETTE_ADD_MONOCHROME_INVERTED(_tag) \ MCFG_PALETTE_ADD(_tag, 2) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_white_and_black), downcast<palette_device *>(device))); + palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_inverted), downcast<palette_device *>(device))); -#define MCFG_PALETTE_ADD_MONOCHROME_AMBER(_tag) \ - MCFG_PALETTE_ADD(_tag, 2) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_amber), downcast<palette_device *>(device))); - -#define MCFG_PALETTE_ADD_MONOCHROME_GREEN(_tag) \ - MCFG_PALETTE_ADD(_tag, 2) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_green), downcast<palette_device *>(device))); - -#define MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT(_tag) \ +#define MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT(_tag) \ MCFG_PALETTE_ADD(_tag, 3) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_green_highlight), downcast<palette_device *>(device))); - -#define MCFG_PALETTE_ADD_MONOCHROME_YELLOW(_tag) \ - MCFG_PALETTE_ADD(_tag, 2) \ - palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_yellow), downcast<palette_device *>(device))); + palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_monochrome_highlight), downcast<palette_device *>(device))); +// 8-bit palettes #define MCFG_PALETTE_ADD_3BIT_RGB(_tag) \ MCFG_PALETTE_ADD(_tag, 8) \ palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_3bit_rgb), downcast<palette_device *>(device))); @@ -266,10 +255,12 @@ MCFG_PALETTE_ADD(_tag, 8) \ palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_3bit_bgr), downcast<palette_device *>(device))); +// 15-bit palettes #define MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB(_tag) \ MCFG_PALETTE_ADD(_tag, 32768) \ palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_RRRRRGGGGGBBBBB), downcast<palette_device *>(device))); +// 16-bit palettes #define MCFG_PALETTE_ADD_BBBBBGGGGGRRRRR(_tag) \ MCFG_PALETTE_ADD(_tag, 32768) \ palette_device::static_set_init(*device, palette_init_delegate(FUNC(palette_device::palette_init_BBBBBGGGGGRRRRR), downcast<palette_device *>(device))); @@ -437,12 +428,9 @@ public: // generic palette init routines void palette_init_all_black(palette_device &palette); - void palette_init_black_and_white(palette_device &palette); - void palette_init_white_and_black(palette_device &palette); - void palette_init_monochrome_amber(palette_device &palette); - void palette_init_monochrome_green(palette_device &palette); - void palette_init_monochrome_green_highlight(palette_device &palette); - void palette_init_monochrome_yellow(palette_device &palette); + void palette_init_monochrome(palette_device &palette); + void palette_init_monochrome_inverted(palette_device &palette); + void palette_init_monochrome_highlight(palette_device &palette); void palette_init_3bit_rgb(palette_device &palette); void palette_init_3bit_rbg(palette_device &palette); void palette_init_3bit_brg(palette_device &palette); diff --git a/src/emu/screen.cpp b/src/emu/screen.cpp index 2ae1269cdd8..c286788ea37 100644 --- a/src/emu/screen.cpp +++ b/src/emu/screen.cpp @@ -240,6 +240,19 @@ void screen_device::static_set_video_attributes(device_t &device, UINT32 flags) screen_device &screen = downcast<screen_device &>(device); screen.m_video_attributes = flags; } + + +//------------------------------------------------- +// static_set_color - set the screen global color +//------------------------------------------------- + +void screen_device::static_set_color(device_t &device, rgb_t color) +{ + screen_device &screen = downcast<screen_device &>(device); + screen.m_color = color; +} + + //------------------------------------------------- // device_validity_check - verify device // configuration diff --git a/src/emu/screen.h b/src/emu/screen.h index 6a38b72f377..711602b0395 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -193,6 +193,7 @@ public: static void static_set_screen_vblank(device_t &device, screen_vblank_delegate callback); static void static_set_palette(device_t &device, const char *tag); static void static_set_video_attributes(device_t &device, UINT32 flags); + static void static_set_color(device_t &device, rgb_t color); // information getters render_container &container() const { assert(m_container != nullptr); return *m_container; } @@ -365,6 +366,12 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre #define MCFG_SCREEN_ADD(_tag, _type) \ MCFG_DEVICE_ADD(_tag, SCREEN, 0) \ MCFG_SCREEN_TYPE(_type) + +#define MCFG_SCREEN_ADD_MONOCHROME(_tag, _type, _color) \ + MCFG_DEVICE_ADD(_tag, SCREEN, 0) \ + MCFG_SCREEN_TYPE(_type) \ + MCFG_SCREEN_COLOR(_color) + #define MCFG_SCREEN_MODIFY(_tag) \ MCFG_DEVICE_MODIFY(_tag) @@ -442,6 +449,8 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre screen_device::static_set_palette(*device, FINDER_DUMMY_TAG); #define MCFG_SCREEN_VIDEO_ATTRIBUTES(_flags) \ screen_device::static_set_video_attributes(*device, _flags); +#define MCFG_SCREEN_COLOR(_color) \ + screen_device::static_set_color(*device, _color); //************************************************************************** diff --git a/src/lib/util/palette.cpp b/src/lib/util/palette.cpp index bd3c2d45ede..8c61c64a470 100644 --- a/src/lib/util/palette.cpp +++ b/src/lib/util/palette.cpp @@ -15,9 +15,17 @@ #include <math.h> +//************************************************************************** +// CONSTANTS +//************************************************************************** + const rgb_t rgb_t::black(0,0,0); const rgb_t rgb_t::white(255,255,255); +// the colors below are commonly used screen colors +const rgb_t rgb_t::green(0, 255, 0); +const rgb_t rgb_t::amber(247, 170, 0); + //************************************************************************** // INLINE FUNCTIONS diff --git a/src/lib/util/palette.h b/src/lib/util/palette.h index 9c6703119e1..2dfbac03a45 100644 --- a/src/lib/util/palette.h +++ b/src/lib/util/palette.h @@ -78,6 +78,8 @@ public: // constants static const rgb_t black; static const rgb_t white; + static const rgb_t green; + static const rgb_t amber; private: UINT32 m_data; diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index 4df457ce129..b5d7bbe462f 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -789,7 +789,7 @@ MACHINE_CONFIG_START( spacecom, _8080bw_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) MCFG_SCREEN_UPDATE_DRIVER(_8080bw_state, screen_update_spacecom) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_audio) @@ -2543,7 +2543,7 @@ MACHINE_CONFIG_START( shuttlei, _8080bw_state ) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1) MCFG_SCREEN_UPDATE_DRIVER(_8080bw_state, screen_update_shuttlei) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_FRAGMENT_ADD(invaders_samples_audio) diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp index 2284450bde4..5d51870eaad 100644 --- a/src/mame/drivers/a51xx.cpp +++ b/src/mame/drivers/a51xx.cpp @@ -128,7 +128,7 @@ static MACHINE_CONFIG_START( a5120, a51xx_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", a51xx) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp index 3559e6548b2..f6e4d8398fc 100644 --- a/src/mame/drivers/a7150.cpp +++ b/src/mame/drivers/a7150.cpp @@ -67,7 +67,7 @@ static MACHINE_CONFIG_START( a7150, a7150_state ) MCFG_SCREEN_UPDATE_DRIVER(a7150_state, screen_update_a7150) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp index bf67bbfff9e..ba3f64c8836 100644 --- a/src/mame/drivers/ac1.cpp +++ b/src/mame/drivers/ac1.cpp @@ -145,7 +145,7 @@ static MACHINE_CONFIG_START( ac1, ac1_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ac1 ) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp index 46b86ba5e09..ace8a5a1b07 100644 --- a/src/mame/drivers/ace.cpp +++ b/src/mame/drivers/ace.cpp @@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( ace, aceal_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ace) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ /* ???? */ diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index ceda2d749d8..132c60cc7bf 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -372,7 +372,7 @@ static MACHINE_CONFIG_START( hr16, alesis_state ) MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_PALETTE_INIT_OWNER(alesis_state, alesis) MCFG_CASSETTE_ADD( "cassette" ) diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index 7f1884639a5..a7007273401 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -270,7 +270,7 @@ static MACHINE_CONFIG_START( alto2, alto2_state ) MCFG_CPU_IO_MAP(alto2_iomem_map) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white) MCFG_SCREEN_RAW_PARAMS(XTAL_20_16MHz, ALTO2_DISPLAY_TOTAL_WIDTH, 0, ALTO2_DISPLAY_WIDTH, ALTO2_DISPLAY_TOTAL_HEIGHT, 0, ALTO2_DISPLAY_HEIGHT + ALTO2_FAKE_STATUS_H) @@ -282,7 +282,7 @@ static MACHINE_CONFIG_START( alto2, alto2_state ) MCFG_DEFAULT_LAYOUT( layout_vertical ) - MCFG_PALETTE_ADD_WHITE_AND_BLACK("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DIABLO_DRIVES_ADD() MACHINE_CONFIG_END diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp index 7f359feabcc..a827079b408 100644 --- a/src/mame/drivers/amust.cpp +++ b/src/mame/drivers/amust.cpp @@ -397,13 +397,13 @@ static MACHINE_CONFIG_START( amust, amust_state ) MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", amust) /* sound hardware */ diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index 51449676180..d2858672814 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -594,7 +594,7 @@ static MACHINE_CONFIG_START( apple1, apple1_state ) MCFG_SCREEN_UPDATE_DRIVER(apple1_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD( A1_PIA_TAG, PIA6821, 0) MCFG_PIA_READPA_HANDLER(READ8(apple1_state, pia_keyboard_r)) diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp index 126cd1d6452..2f185f1c8ac 100644 --- a/src/mame/drivers/apricot.cpp +++ b/src/mame/drivers/apricot.cpp @@ -392,13 +392,13 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) MCFG_RAM_DEFAULT_SIZE("256k") // video hardware - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_SIZE(800, 400) MCFG_SCREEN_VISIBLE_AREA(0, 800-1, 0, 400-1) MCFG_SCREEN_REFRESH_RATE(72) MCFG_SCREEN_UPDATE_DRIVER(apricot_state, screen_update_apricot) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_MC6845_ADD("ic30", HD6845, "screen", XTAL_15MHz / 10) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp index a9925128402..ccf0841218a 100644 --- a/src/mame/drivers/argo.cpp +++ b/src/mame/drivers/argo.cpp @@ -360,7 +360,7 @@ static MACHINE_CONFIG_START( argo, argo_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp index f06e1a98ed7..9a3fc88c5d3 100644 --- a/src/mame/drivers/atarist.cpp +++ b/src/mame/drivers/atarist.cpp @@ -2383,7 +2383,7 @@ static MACHINE_CONFIG_START( stbook, stbook_state ) MCFG_SCREEN_SIZE(640, 400) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 399) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index 0c6a1c9d3b5..69bcb219ee6 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -931,7 +931,7 @@ static MACHINE_CONFIG_START( attache, attache_state ) MCFG_QUANTUM_TIME(attotime::from_hz(60)) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(64)) /* not accurate */ MCFG_SCREEN_SIZE(640,240) @@ -939,7 +939,7 @@ static MACHINE_CONFIG_START( attache, attache_state ) MCFG_SCREEN_UPDATE_DRIVER(attache_state, screen_update) MCFG_SCREEN_VBLANK_DRIVER(attache_state, vblank_int) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("psg", AY8912, XTAL_8MHz / 4) diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index 5cf1b650dea..eb790c0ae00 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -458,7 +458,7 @@ static MACHINE_CONFIG_START( aussiebyte, aussiebyte_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", crt8002) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp index f51f0dc925c..8d5ca0fae06 100644 --- a/src/mame/drivers/ax20.cpp +++ b/src/mame/drivers/ax20.cpp @@ -128,6 +128,7 @@ static MACHINE_CONFIG_START( ax20, ax20_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_COLOR(rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(ax20_state, screen_update) @@ -135,7 +136,7 @@ static MACHINE_CONFIG_START( ax20, ax20_state ) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 24*12-1) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ax20) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_I8272A_ADD("fdc", true) diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp index cd885352dba..eab460c0cc3 100644 --- a/src/mame/drivers/bcs3.cpp +++ b/src/mame/drivers/bcs3.cpp @@ -389,7 +389,7 @@ static MACHINE_CONFIG_START( bcs3, bcs3_state ) MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_5MHz / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) @@ -416,7 +416,7 @@ static MACHINE_CONFIG_START( bcs3a, bcs3_state ) MCFG_SCREEN_UPDATE_DRIVER(bcs3_state, screen_update_bcs3a) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", bcs3) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_7MHz / 2) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp index e152a41cc54..6881abbf0bd 100644 --- a/src/mame/drivers/beehive.cpp +++ b/src/mame/drivers/beehive.cpp @@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( beehive, beehive_state ) MCFG_CPU_IO_MAP(beehive_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(beehive_state, screen_update) @@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( beehive, beehive_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp index 013e53c92e5..7b00129e939 100644 --- a/src/mame/drivers/bigbord2.cpp +++ b/src/mame/drivers/bigbord2.cpp @@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigbord2) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* keyboard */ MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bigbord2_state, ctc_tick, attotime::from_hz(MAIN_CLOCK)) diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp index ba135c2b0ed..fa05ab12f59 100644 --- a/src/mame/drivers/binbug.cpp +++ b/src/mame/drivers/binbug.cpp @@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_S2650_FLAG_HANDLER(WRITELINE(binbug_state, binbug_serial_w)) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update) @@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Keyboard */ MCFG_RS232_PORT_ADD(KEYBOARD_TAG, default_rs232_devices, "keyboard") @@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state ) MCFG_CPU_CONFIG(dg680_daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(binbug_state, screen_update) @@ -543,7 +543,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", dg640) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Keyboard */ MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0) diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp index 511f4fb2a1b..7a8e3231683 100644 --- a/src/mame/drivers/bitgraph.cpp +++ b/src/mame/drivers/bitgraph.cpp @@ -466,7 +466,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_motherboard ) MCFG_SCREEN_UPDATE_DRIVER(bitgraph_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(ACIA0_TAG, ACIA6850, 0) MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_H_TAG, rs232_port_device, write_txd)) diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp index 6248aceff65..adb25ef5bc2 100644 --- a/src/mame/drivers/bk.cpp +++ b/src/mame/drivers/bk.cpp @@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( bk0010, bk_state ) MCFG_SCREEN_UPDATE_DRIVER(bk_state, screen_update_bk0010) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp index 406444ec463..cba736f6139 100644 --- a/src/mame/drivers/blockade.cpp +++ b/src/mame/drivers/blockade.cpp @@ -477,7 +477,7 @@ static MACHINE_CONFIG_START( blockade, blockade_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", blockade) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp index e0b9a4584de..8942f44fe1d 100644 --- a/src/mame/drivers/bw12.cpp +++ b/src/mame/drivers/bw12.cpp @@ -544,7 +544,7 @@ static MACHINE_CONFIG_START( common, bw12_state ) MCFG_CPU_IO_MAP(bw12_io) /* video hardware */ - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) @@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( common, bw12_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", bw12) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp index a2333d810b7..b3826e30986 100644 --- a/src/mame/drivers/c10.cpp +++ b/src/mame/drivers/c10.cpp @@ -167,7 +167,7 @@ static MACHINE_CONFIG_START( c10, c10_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", c10) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END DRIVER_INIT_MEMBER(c10_state,c10) diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp index 18e5238c3eb..aa6f50ec20c 100644 --- a/src/mame/drivers/c900.cpp +++ b/src/mame/drivers/c900.cpp @@ -116,7 +116,7 @@ static MACHINE_CONFIG_START( c900, c900_state ) MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(c900_state, kbd_put)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", c900) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END ROM_START( c900 ) diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp index fd892b3b877..f85db656ba5 100644 --- a/src/mame/drivers/cat.cpp +++ b/src/mame/drivers/cat.cpp @@ -1050,7 +1050,7 @@ static MACHINE_CONFIG_START( cat, cat_state ) MCFG_SCREEN_UPDATE_DRIVER(cat_state, screen_update_cat) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_VIDEO_START_OVERRIDE(cat_state,cat) diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp index 4fe040e64f2..df8460f71d3 100644 --- a/src/mame/drivers/cbm2.cpp +++ b/src/mame/drivers/cbm2.cpp @@ -2230,7 +2230,7 @@ static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state ) MCFG_QUANTUM_PERFECT_CPU(M6509_TAG) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(MC68B45_TAG, mc6845_device, screen_update) MCFG_SCREEN_REFRESH_RATE(60) @@ -2238,7 +2238,7 @@ static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state ) MCFG_SCREEN_SIZE(768, 312) MCFG_SCREEN_VISIBLE_AREA(0, 768-1, 0, 312-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC68B45_TAG, MC6845, SCREEN_TAG, XTAL_18MHz/9) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp index 03cde2f4d6c..ac844445d72 100644 --- a/src/mame/drivers/cd2650.cpp +++ b/src/mame/drivers/cd2650.cpp @@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 159) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", cd2650) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* quickload */ MCFG_QUICKLOAD_ADD("quickload", cd2650_state, cd2650, "pgm", 1) diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp index eb51605922b..518fb0488e0 100644 --- a/src/mame/drivers/circus.cpp +++ b/src/mame/drivers/circus.cpp @@ -299,7 +299,7 @@ static MACHINE_CONFIG_START( circus, circus_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( robotbwl, circus_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", robotbwl) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( crash, circus_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -410,7 +410,7 @@ static MACHINE_CONFIG_START( ripcord, circus_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", circus) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp index 7432eba2781..063aae353ad 100644 --- a/src/mame/drivers/compis.cpp +++ b/src/mame/drivers/compis.cpp @@ -636,7 +636,7 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr1_w)) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate @@ -649,7 +649,7 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(compis_state, hgdc_display_pixels) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // devices MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL_16MHz/2) diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp index 5329f09e1d4..a4000192f2e 100644 --- a/src/mame/drivers/comquest.cpp +++ b/src/mame/drivers/comquest.cpp @@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( comquest, comquest_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", comquest ) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp index 5d10bf4e2f9..4d8bc11819b 100644 --- a/src/mame/drivers/concept.cpp +++ b/src/mame/drivers/concept.cpp @@ -221,7 +221,7 @@ static MACHINE_CONFIG_START( concept, concept_state ) MCFG_SCREEN_UPDATE_DRIVER(concept_state, screen_update_concept) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp index c53c4e8ecec..92177ecaea6 100644 --- a/src/mame/drivers/copsnrob.cpp +++ b/src/mame/drivers/copsnrob.cpp @@ -260,7 +260,7 @@ static MACHINE_CONFIG_START( copsnrob, copsnrob_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", copsnrob) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp index d1ed5d1b5e0..fa2a956b2fe 100644 --- a/src/mame/drivers/cxhumax.cpp +++ b/src/mame/drivers/cxhumax.cpp @@ -1067,7 +1067,7 @@ static MACHINE_CONFIG_START( cxhumax, cxhumax_state ) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 1080-1) MCFG_SCREEN_UPDATE_DRIVER(cxhumax_state, screen_update_cxhumax) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 03e9c0f94ce..af68192003d 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -391,7 +391,7 @@ static MACHINE_CONFIG_START( d6800, d6800_state ) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(25)) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp index 6140955e06a..a97bb28978b 100644 --- a/src/mame/drivers/dct11em.cpp +++ b/src/mame/drivers/dct11em.cpp @@ -65,7 +65,7 @@ static MACHINE_CONFIG_START( dct11em, dct11em_state ) MCFG_SCREEN_UPDATE_DRIVER(dct11em_state, screen_update_dct11em) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index 57ca5cba7d1..614bfd0e2a1 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -315,7 +315,7 @@ static MACHINE_CONFIG_START( dim68k, dim68k_state ) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 250-1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", dim68k) /* sound hardware */ diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp index 953f9aebe74..49ed1049d85 100644 --- a/src/mame/drivers/dms5000.cpp +++ b/src/mame/drivers/dms5000.cpp @@ -70,7 +70,7 @@ static MACHINE_CONFIG_START( dms5000, dms5000_state ) MCFG_SCREEN_UPDATE_DRIVER(dms5000_state, screen_update_dms5000) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 8940c1263fa..6683abc3ab2 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -727,7 +727,7 @@ static MACHINE_CONFIG_START( dmv, dmv_state ) MCFG_DMV_KEYBOARD_ADD("keyboard") /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) @@ -735,7 +735,7 @@ static MACHINE_CONFIG_START( dmv, dmv_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", dmv) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT(layout_dmv) // devices diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index a136035ca0f..9d1273c70ff 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( ksm, ksm_state ) MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", ksm_state, scanline_callback, attotime::from_hz(50*28*11)) MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_15_4MHz/KSM_HORZ_START)) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(ksm_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_15_4MHz, KSM_TOTAL_HORZ, KSM_HORZ_START, KSM_HORZ_START+KSM_DISP_HORZ, KSM_TOTAL_VERT, KSM_VERT_START, @@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( ksm, ksm_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ksm) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_PIC8259_ADD( "pic8259", INPUTLINE("maincpu", 0), VCC, NULL ) diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp index 8d458b174b7..f54762a053f 100644 --- a/src/mame/drivers/ec65.cpp +++ b/src/mame/drivers/ec65.cpp @@ -182,7 +182,7 @@ static MACHINE_CONFIG_START( ec65, ec65_state ) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL_16MHz / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( ec65k, ec65k_state ) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ec65) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, "screen", XTAL_16MHz / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index fad9c9eaf95..1dad27b04d5 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -661,7 +661,7 @@ MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastinvaders_state, scanline_timer, MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", fastinvaders) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ // TODO diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index 7b32ffc4a18..efe540eae31 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -523,8 +523,9 @@ static MACHINE_CONFIG_START( fc100, fc100_state ) // other lines not connected MCFG_SCREEN_MC6847_NTSC_ADD("screen", "vdg") + MCFG_SCREEN_COLOR(rgb_t::amber) MCFG_GFXDECODE_ADD("gfxdecode", "f4palette", fc100) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("f4palette") + MCFG_PALETTE_ADD_MONOCHROME("f4palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index e250aada256..d3d32f1dc5e 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( fk1, fk1_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(fk1_state, screen_update) @@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( fk1, fk1_state ) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(50) diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp index 7104b6f3bf9..8a6a884ea8d 100644 --- a/src/mame/drivers/galaxy.cpp +++ b/src/mame/drivers/galaxy.cpp @@ -187,7 +187,7 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state ) MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy) MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxy) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* snapshot */ @@ -229,7 +229,7 @@ static MACHINE_CONFIG_START( galaxyp, galaxy_state ) MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 208-1) MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* snapshot */ diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp index 64d24d912e0..d595a603966 100644 --- a/src/mame/drivers/galeb.cpp +++ b/src/mame/drivers/galeb.cpp @@ -143,7 +143,7 @@ static MACHINE_CONFIG_START( galeb, galeb_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", galeb ) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index 0855699da39..07c9b348eec 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( galaxygame, galaxygame_state ) MCFG_SCREEN_UPDATE_DRIVER(galaxygame_state, screen_update_galaxygame) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp index 89c06dd40dd..1dc26145819 100644 --- a/src/mame/drivers/gamepock.cpp +++ b/src/mame/drivers/gamepock.cpp @@ -59,7 +59,7 @@ static MACHINE_CONFIG_START( gamepock, gamepock_state ) MCFG_DEFAULT_LAYOUT(layout_lcd) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index cc9c16a74b2..cdbac8b8394 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -124,7 +124,7 @@ static MACHINE_CONFIG_START( grfd2301, grfd2301_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END ROM_START( grfd2301 ) diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index 75e725ce7df..e479dfd7e08 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -394,14 +394,14 @@ static MACHINE_CONFIG_START( h19, h19_state ) //MCFG_DEVICE_PERIODIC_INT_DRIVER(h19_state, irq0_line_hold, 50) // for testing, causes a keyboard scan /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", h19) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL_12_288MHz / 8) // clk taken from schematics MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 5eddfa20c66..58873339e8e 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( headonb, headonb_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", headonb) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ // TODO diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index 7f285a41cc5..b0f27566303 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( hitme, hitme_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", hitme) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index 0d6fc6735f1..7c1ab0eb2cc 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(40*8, 25*8) @@ -747,7 +747,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -768,7 +768,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state ) MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) @@ -778,7 +778,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -799,7 +799,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state ) MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(64*8, 32*8) @@ -809,7 +809,7 @@ static MACHINE_CONFIG_START( brailab4, homelab_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", homelab) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index ccddfcddccd..ea517b55d81 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -296,7 +296,7 @@ static MACHINE_CONFIG_START( homez80, homez80_state ) MCFG_SCREEN_VISIBLE_AREA(0, 344-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", homez80 ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 02f6fd696a1..d23e5525066 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -1350,11 +1350,11 @@ static MACHINE_CONFIG_START(hp64k , hp64k_state) MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w)) MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w)) - MCFG_SCREEN_ADD("screen" , RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(720 , 390) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index a8fb77fa17c..1387432ea85 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -695,11 +695,11 @@ static MACHINE_CONFIG_START( hp9845b, hp9845b_state ) MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845b_state , pa_w)) // video hardware - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(hp9845b_state, screen_update) MCFG_SCREEN_RAW_PARAMS(20849400 , 99 * 9 , 0 , 80 * 9 , 26 * 15 , 0 , 25 * 15) MCFG_SCREEN_VBLANK_DRIVER(hp9845b_state, vblank_w) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hp9845b_state, scanline_timer, "screen", 0, 1) diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index 9fa6ae09513..13972ae06b5 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -407,7 +407,7 @@ static MACHINE_CONFIG_START( hp9k, hp9k_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", hp9k) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("mc6845", MC6845, "screen", XTAL_16MHz / 16) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp index b3a3be497ce..1d5dda7ff73 100644 --- a/src/mame/drivers/huebler.cpp +++ b/src/mame/drivers/huebler.cpp @@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( amu880, amu880_state ) MCFG_SCREEN_RAW_PARAMS(9000000, 576, 0*6, 64*6, 320, 0*10, 24*10) MCFG_GFXDECODE_ADD("gfxdecode", "palette", amu880) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL_10MHz/4) diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index 9d2b6b708be..28c0304a1c4 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -615,7 +615,7 @@ static MACHINE_CONFIG_START( ie15, ie15_state ) MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL_30_8MHz/(2*IE15_HORZ_START))) /* Video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(ie15_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_30_8MHz/2, IE15_TOTAL_HORZ, IE15_HORZ_START, IE15_HORZ_START+IE15_DISP_HORZ, IE15_TOTAL_VERT, IE15_VERT_START, @@ -624,7 +624,7 @@ static MACHINE_CONFIG_START( ie15, ie15_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ie15) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT(layout_ie15) diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index 49667a8ebd6..40dc9bb8818 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -840,7 +840,7 @@ static MACHINE_CONFIG_START(imds2 , imds2_state) MCFG_SCREEN_UPDATE_DEVICE("ioccrtc" , i8275_device , screen_update) MCFG_SCREEN_REFRESH_RATE(50) MCFG_GFXDECODE_ADD("gfxdecode" , "palette" , imds2) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("iocbeep" , BEEP , IOC_BEEP_FREQ) diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index 00df139e72e..7dfb1398b31 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -133,14 +133,14 @@ static MACHINE_CONFIG_START( ipds, ipds_state ) MCFG_CPU_IO_MAP(ipds_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE("i8275", i8275_device, screen_update) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", ipds) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("i8275", I8275, XTAL_19_6608MHz / 4) MCFG_I8275_CHARACTER_WIDTH(6) diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp index 76986eae7f9..aa305ba859d 100644 --- a/src/mame/drivers/iq151.cpp +++ b/src/mame/drivers/iq151.cpp @@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(iq151_state, screen_update) @@ -393,7 +393,7 @@ static MACHINE_CONFIG_START( iq151, iq151_state ) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index bdb0a39dd36..5361fcb37af 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -400,7 +400,7 @@ static MACHINE_CONFIG_START( irisha, irisha_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", irisha) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index 9e2808396ee..1c7ed3aab7b 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -787,7 +787,7 @@ static MACHINE_CONFIG_START( itt3030, itt3030_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", itt3030) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD("mainram") diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index 657d2dca18b..8e9458f6e93 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -133,7 +133,7 @@ static MACHINE_CONFIG_START( jonos, jonos_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", jonos) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END DRIVER_INIT_MEMBER(jonos_state,jonos) diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index 4cd7cac2c4c..a8934dace89 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", jr100) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("via", VIA6522, XTAL_14_31818MHz / 16) MCFG_VIA6522_READPB_HANDLER(READ8(jr100_state,jr100_via_read_b)) diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp index 07114be0ac1..bcfd6864a5b 100644 --- a/src/mame/drivers/jtc.cpp +++ b/src/mame/drivers/jtc.cpp @@ -751,7 +751,7 @@ static MACHINE_CONFIG_DERIVED( jtc, basic ) MCFG_SCREEN_VISIBLE_AREA(0, 64-1, 0, 64-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -783,7 +783,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( jtces23, basic, jtces23_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", jtces23) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index 86ba95a41c6..802b0c68530 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -756,7 +756,7 @@ static MACHINE_CONFIG_START( ace, ace_state ) MCFG_TIMER_DRIVER_ADD_SCANLINE("set_irq", ace_state, set_irq, SCREEN_TAG, 31*8, 264) MCFG_TIMER_DRIVER_ADD_SCANLINE("clear_irq", ace_state, clear_irq, SCREEN_TAG, 32*8, 264) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ace) diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index e7e545ebd74..a9eb865b7d1 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -256,7 +256,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state ) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 320-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // devices MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771, 1000000) diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp index 568851f15e0..a4d9f0e1dd4 100644 --- a/src/mame/drivers/k8915.cpp +++ b/src/mame/drivers/k8915.cpp @@ -156,7 +156,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state ) MCFG_CPU_IO_MAP(k8915_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(k8915_state, screen_update) @@ -164,7 +164,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(k8915_state, kbd_put)) diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index 56c99399790..f8d78018e85 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro ) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(80*7, 24*10) @@ -212,7 +212,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", kayproii) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp index ac7c8a0d69c..09a732f4269 100644 --- a/src/mame/drivers/konin.cpp +++ b/src/mame/drivers/konin.cpp @@ -91,7 +91,7 @@ static MACHINE_CONFIG_START( konin, konin_state ) MCFG_SCREEN_UPDATE_DRIVER(konin_state, screen_update_konin) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp index db139591a34..b6b43e9f2d3 100644 --- a/src/mame/drivers/kramermc.cpp +++ b/src/mame/drivers/kramermc.cpp @@ -128,7 +128,7 @@ static MACHINE_CONFIG_START( kramermc, kramermc_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", kramermc ) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp index e7e06b5cb12..34e9b8bbe1f 100644 --- a/src/mame/drivers/lisa.cpp +++ b/src/mame/drivers/lisa.cpp @@ -121,7 +121,7 @@ static MACHINE_CONFIG_START( lisa, lisa_state ) MCFG_SCREEN_UPDATE_DRIVER(lisa_state, screen_update_lisa) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index 693e21e2478..183496a535c 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( llc1, llc_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT(layout_llc1) MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_3MHz) @@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( llc2, llc_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", llc2) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp index 89e792e83ad..f56d4d5004d 100644 --- a/src/mame/drivers/m20.cpp +++ b/src/mame/drivers/m20.cpp @@ -792,7 +792,7 @@ static MACHINE_CONFIG_START( m20, m20_state ) MCFG_SCREEN_SIZE(512, 256) MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_FD1797_ADD("fd1797", 1000000) diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp index 9cd9cb9acb8..6cc765a5fd0 100644 --- a/src/mame/drivers/m79152pc.cpp +++ b/src/mame/drivers/m79152pc.cpp @@ -126,7 +126,7 @@ static MACHINE_CONFIG_START( m79152pc, m79152pc_state ) MCFG_SCREEN_UPDATE_DRIVER(m79152pc_state, screen_update_m79152pc) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", m79152pc) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp index 3eea5fd31ad..69b79d6f386 100644 --- a/src/mame/drivers/macpci.cpp +++ b/src/mame/drivers/macpci.cpp @@ -101,7 +101,7 @@ static MACHINE_CONFIG_START( pippin, macpci_state ) MCFG_SCREEN_UPDATE_DRIVER(macpci_state, screen_update_pippin) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp index edd010e9a07..203646963cb 100644 --- a/src/mame/drivers/mbc200.cpp +++ b/src/mame/drivers/mbc200.cpp @@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mbc200) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_8MHz / 4) // HD46505SP MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp index 5518a87408a..48a237a56b3 100644 --- a/src/mame/drivers/mc80.cpp +++ b/src/mame/drivers/mc80.cpp @@ -178,7 +178,7 @@ static MACHINE_CONFIG_START( mc8020, mc80_state ) MCFG_SCREEN_UPDATE_DRIVER(mc80_state, screen_update_mc8020) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL_2_4576MHz) @@ -216,7 +216,7 @@ static MACHINE_CONFIG_START( mc8030, mc80_state ) MCFG_SCREEN_UPDATE_DRIVER(mc80_state, screen_update_mc8030) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_DEVICE_ADD("zve_pio", Z80PIO, XTAL_2_4576MHz) diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp index 801f779049a..cc808e5324f 100644 --- a/src/mame/drivers/meadows.cpp +++ b/src/mame/drivers/meadows.cpp @@ -628,7 +628,7 @@ static MACHINE_CONFIG_START( meadows, meadows_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -660,7 +660,7 @@ static MACHINE_CONFIG_START( minferno, meadows_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", minferno) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ // TODO @@ -689,7 +689,7 @@ static MACHINE_CONFIG_START( bowl3d, meadows_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp index 00091ddf3a4..7fba4e556b0 100644 --- a/src/mame/drivers/mes.cpp +++ b/src/mame/drivers/mes.cpp @@ -118,7 +118,7 @@ static MACHINE_CONFIG_START( mes, mes_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp index 743ee915080..3aca6e673ee 100644 --- a/src/mame/drivers/micral.cpp +++ b/src/mame/drivers/micral.cpp @@ -257,13 +257,13 @@ static MACHINE_CONFIG_START( micral, micral_state ) MCFG_MACHINE_RESET_OVERRIDE(micral_state, micral) // video hardware - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(250)) MCFG_SCREEN_UPDATE_DRIVER(micral_state, screen_update) MCFG_SCREEN_SIZE(64*6, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*6-1, 0, 32*8-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") //MCFG_GFXDECODE_ADD("gfxdecode", "palette", micral) MCFG_DEVICE_ADD("crtc", CRT5037, XTAL_17_9712MHz/2) // xtal freq unknown diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp index 5503e3285e8..fcf0676cb15 100644 --- a/src/mame/drivers/microtan.cpp +++ b/src/mame/drivers/microtan.cpp @@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( microtan, microtan_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", microtan) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp index 5fda3bf1ee6..ae543027dfc 100644 --- a/src/mame/drivers/mikro80.cpp +++ b/src/mame/drivers/mikro80.cpp @@ -179,7 +179,7 @@ static MACHINE_CONFIG_START( mikro80, mikro80_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mikro80) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp index 5ab8197a55a..2ac48fe1071 100644 --- a/src/mame/drivers/mk85.cpp +++ b/src/mame/drivers/mk85.cpp @@ -77,7 +77,7 @@ static MACHINE_CONFIG_START( mk85, mk85_state ) MCFG_SCREEN_UPDATE_DRIVER(mk85_state, screen_update_mk85) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp index ce3ffa2abd2..68134c41490 100644 --- a/src/mame/drivers/mk90.cpp +++ b/src/mame/drivers/mk90.cpp @@ -82,7 +82,7 @@ static MACHINE_CONFIG_START( mk90, mk90_state ) MCFG_SCREEN_UPDATE_DRIVER(mk90_state, screen_update_mk90) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp index 23eabd69770..0743a324e06 100644 --- a/src/mame/drivers/modellot.cpp +++ b/src/mame/drivers/modellot.cpp @@ -155,7 +155,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_CPU_IO_MAP(modellot_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(64*8, 16*16) @@ -164,7 +164,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", modellot ) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp index add947cbcdd..c0e09f69578 100644 --- a/src/mame/drivers/mx2178.cpp +++ b/src/mame/drivers/mx2178.cpp @@ -162,14 +162,14 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state ) MCFG_CPU_IO_MAP(mx2178_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not correct MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", mx2178) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_MC6845_ADD("crtc", MC6845, "screen", 18869600 / 8) // clk unknown diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp index 2eb5cba1dc7..283cb63d531 100644 --- a/src/mame/drivers/myb3k.cpp +++ b/src/mame/drivers/myb3k.cpp @@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", myb3k) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL_3_579545MHz/4) /* unknown clock, hand tuned to get ~60 fps */ diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp index efea8bc5bed..32df87b41f2 100644 --- a/src/mame/drivers/mycom.cpp +++ b/src/mame/drivers/mycom.cpp @@ -529,7 +529,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state ) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 192-1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mycom) /* Manual states clock is 1.008mhz for 40 cols, and 2.016 mhz for 80 cols. diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index dddf128c958..6546e3b3325 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -287,7 +287,7 @@ static MACHINE_CONFIG_START( mz80k, mz80_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", mz80k) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Audio */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp index a40db7653a9..e83f3074979 100644 --- a/src/mame/drivers/nanos.cpp +++ b/src/mame/drivers/nanos.cpp @@ -485,7 +485,7 @@ static MACHINE_CONFIG_START( nanos, nanos_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", nanos) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ MCFG_DEVICE_ADD("z80ctc_0", Z80CTC, XTAL_4MHz) diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index fc3497f3e70..ffe9b3b55e6 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -655,7 +655,7 @@ static MACHINE_CONFIG_START( nascom1, nascom1_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", nascom1) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // uart MCFG_DEVICE_ADD( "hd6402", AY31015, 0 ) diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp index a36b46ad204..34409ac6c1b 100644 --- a/src/mame/drivers/nitedrvr.cpp +++ b/src/mame/drivers/nitedrvr.cpp @@ -156,7 +156,7 @@ static MACHINE_CONFIG_START( nitedrvr, nitedrvr_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", nitedrvr) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp index 81f15a75ce7..a07d0579f9f 100644 --- a/src/mame/drivers/nokia_3310.cpp +++ b/src/mame/drivers/nokia_3310.cpp @@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( noki3310, noki3310_state ) MCFG_CPU_PROGRAM_MAP(noki3310_map) /* video hardware */ - MCFG_SCREEN_ADD("screen", LCD) + MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MCFG_SCREEN_SIZE(84, 48) @@ -700,7 +700,7 @@ static MACHINE_CONFIG_START( noki3310, noki3310_state ) MCFG_SCREEN_UPDATE_DEVICE("pcd8544", pcd8544_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_WHITE_AND_BLACK("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_PCD8544_ADD("pcd8544") MCFG_PCD8544_SCREEN_UPDATE_CALLBACK(noki3310_state, pcd8544_screen_update) diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp index 53971abc082..c5e12655e80 100644 --- a/src/mame/drivers/notetaker.cpp +++ b/src/mame/drivers/notetaker.cpp @@ -695,7 +695,7 @@ static MACHINE_CONFIG_START( notetakr, notetaker_state ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_DEVICE_ADD( "crt5027", CRT5027, (XTAL_36MHz/4)/8) // the clock for the crt5027 is configurable rate; 36MHz xtal divided by 1*, 2, 3, 4, 5, 6, 7, or 8 (* because this is a 74s163 this setting probably means divide by 1; documentation at http://bitsavers.trailing-edge.com/pdf/xerox/notetaker/memos/19790605_Definition_of_8086_Ports.pdf claims it is 1.5, which makes no sense) and secondarily divided by 8 (again by two to load the 16 bit output shifters after this) diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp index b219aa52261..7567722bfdd 100644 --- a/src/mame/drivers/octopus.cpp +++ b/src/mame/drivers/octopus.cpp @@ -179,7 +179,7 @@ static MACHINE_CONFIG_START( octopus, octopus_state ) MCFG_SCREEN_UPDATE_DRIVER(octopus_state, screen_update_octopus) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp index 8ad181fe10e..8c66709e4d4 100644 --- a/src/mame/drivers/okean240.cpp +++ b/src/mame/drivers/okean240.cpp @@ -488,7 +488,7 @@ static MACHINE_CONFIG_START( okean240t, okean240_state ) MCFG_SCREEN_UPDATE_DRIVER(okean240_state, screen_update_okean240) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(okean240_state, kbd_put)) diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp index 33c713902d1..b8c0402709b 100644 --- a/src/mame/drivers/ondra.cpp +++ b/src/mame/drivers/ondra.cpp @@ -131,7 +131,7 @@ static MACHINE_CONFIG_START( ondra, ondra_state ) MCFG_SCREEN_UPDATE_DRIVER(ondra_state, screen_update_ondra) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp index 4695e0855ff..46632ff1a2b 100644 --- a/src/mame/drivers/orao.cpp +++ b/src/mame/drivers/orao.cpp @@ -179,7 +179,7 @@ static MACHINE_CONFIG_START( orao, orao_state ) MCFG_SCREEN_UPDATE_DRIVER(orao_state, screen_update_orao) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index 248d818c497..94796573917 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( orbit, orbit_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", orbit) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index c21143bc676..226b4519128 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -530,11 +530,11 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state ) MCFG_CPU_IO_MAP( osbexec_io) MCFG_CPU_CONFIG( osbexec_daisy_config ) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(osbexec_state, screen_update) MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK/2, 768, 0, 640, 260, 0, 240 ) /* May not be correct */ MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_SPEAKER_STANDARD_MONO( "mono" ) MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp index 43bdd2417d3..2581c42b0a4 100644 --- a/src/mame/drivers/osborne1.cpp +++ b/src/mame/drivers/osborne1.cpp @@ -244,12 +244,12 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state ) MCFG_CPU_IO_MAP(osborne1_io) MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(osborne1_state, irqack_w)) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(osborne1_state, screen_update) MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK, 1024, 0, 104*8, 260, 0, 24*10 ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", osborne1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp index f67599bcdf7..cfd312e85ec 100644 --- a/src/mame/drivers/p112.cpp +++ b/src/mame/drivers/p112.cpp @@ -96,7 +96,7 @@ static MACHINE_CONFIG_START( p112, p112_state ) MCFG_SCREEN_UPDATE_DRIVER(p112_state, screen_update_p112) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp index 912256491f9..e11ff7b8da4 100644 --- a/src/mame/drivers/pcm.cpp +++ b/src/mame/drivers/pcm.cpp @@ -267,7 +267,7 @@ static MACHINE_CONFIG_START( pcm, pcm_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcm) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Sound */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index c4dd15ab4cd..5fe546c4e7b 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -212,7 +212,7 @@ static MACHINE_CONFIG_START( pda600, pda600_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pda600) MCFG_DEFAULT_LAYOUT(layout_lcd) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // NVRAM needs to be filled with random data to fail the checksum and be initialized correctly MCFG_NVRAM_ADD_RANDOM_FILL("nvram") diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index bb7d157b3b7..39e921783a7 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -496,7 +496,7 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state ) MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 16*16-1) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", pegasus) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp index 12149daa4fb..894017bd029 100644 --- a/src/mame/drivers/peoplepc.cpp +++ b/src/mame/drivers/peoplepc.cpp @@ -252,12 +252,12 @@ static MACHINE_CONFIG_START( olypeopl, peoplepc_state) MCFG_DEVICE_ADD("ppi8255", I8255, 0) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_RAW_PARAMS(XTAL_22MHz,640,0,640,475,0,475) MCFG_SCREEN_UPDATE_DEVICE( "h46505", mc6845_device, screen_update ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD("h46505", H46505, "screen", XTAL_22MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 3a25ac12358..4dd733c274b 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(320, 200) @@ -1489,7 +1489,7 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_SCREEN_UPDATE_DRIVER(pet_state, screen_update) MCFG_TIMER_DRIVER_ADD_PERIODIC("sync_timer", pet_state, sync_tick, attotime::from_hz(120)) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // devices MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_8MHz/8) @@ -1905,7 +1905,7 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(640, 250) @@ -1919,7 +1919,7 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_MC6845_UPDATE_ROW_CB(pet80_state, pet80_update_row) MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp index f621c73d92b..8ab84821f91 100644 --- a/src/mame/drivers/plan80.cpp +++ b/src/mame/drivers/plan80.cpp @@ -235,7 +235,7 @@ static MACHINE_CONFIG_START( plan80, plan80_state ) MCFG_CPU_IO_MAP(plan80_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(plan80_state, screen_update) @@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( plan80, plan80_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", plan80) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp index 04ba8217f70..5e5b091cb9f 100644 --- a/src/mame/drivers/pmd85.cpp +++ b/src/mame/drivers/pmd85.cpp @@ -600,7 +600,7 @@ static MACHINE_CONFIG_START( pmd85, pmd85_state ) MCFG_PIT8253_CLK2(1) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(0) MCFG_SCREEN_SIZE(288, 256) @@ -608,7 +608,7 @@ static MACHINE_CONFIG_START( pmd85, pmd85_state ) MCFG_SCREEN_UPDATE_DRIVER(pmd85_state, screen_update_pmd85) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp index 0662ab59f5b..5c90dcc56d0 100644 --- a/src/mame/drivers/pockstat.cpp +++ b/src/mame/drivers/pockstat.cpp @@ -991,7 +991,7 @@ static MACHINE_CONFIG_START( pockstat, pockstat_state ) MCFG_SCREEN_VISIBLE_AREA(0, 32-1, 0, 32-1) MCFG_SCREEN_UPDATE_DRIVER(pockstat_state, screen_update_pockstat) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("dac", DAC, 0) diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp index 79905bc2eea..1d3232bb06b 100644 --- a/src/mame/drivers/poly88.cpp +++ b/src/mame/drivers/poly88.cpp @@ -175,7 +175,7 @@ static MACHINE_CONFIG_START( poly88, poly88_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", poly88) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* audio hardware */ diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp index 7ad1739139c..021591cde2d 100644 --- a/src/mame/drivers/primo.cpp +++ b/src/mame/drivers/primo.cpp @@ -255,7 +255,7 @@ static MACHINE_CONFIG_START( primoa32, primo_state ) MCFG_SCREEN_UPDATE_DRIVER(primo_state, screen_update_primo) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 573b8772d52..760d0d10c4d 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -326,7 +326,7 @@ static MACHINE_CONFIG_START( proteus3, proteus3_state ) MCFG_SCREEN_UPDATE_DRIVER(proteus3_state, screen_update_proteus3) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", proteus3) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* Devices */ MCFG_DEVICE_ADD("pia", PIA6821, 0) diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp index 72384632812..d444a07fb45 100644 --- a/src/mame/drivers/ptcsol.cpp +++ b/src/mame/drivers/ptcsol.cpp @@ -737,7 +737,7 @@ static MACHINE_CONFIG_START( sol20, sol20_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", sol20) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp index 101dd0151cc..026ac632927 100644 --- a/src/mame/drivers/pv9234.cpp +++ b/src/mame/drivers/pv9234.cpp @@ -151,7 +151,7 @@ static MACHINE_CONFIG_START( pv9234, pv9234_state ) MCFG_SCREEN_UPDATE_DRIVER(pv9234_state, screen_update_pv9234) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp index 8da7b17d6ed..806c131c624 100644 --- a/src/mame/drivers/pyl601.cpp +++ b/src/mame/drivers/pyl601.cpp @@ -530,14 +530,14 @@ static MACHINE_CONFIG_START( pyl601, pyl601_state ) MCFG_CPU_VBLANK_INT_DRIVER("screen", pyl601_state, pyl601_interrupt) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pyl601) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp index 46c20ff62ce..c89951d57db 100644 --- a/src/mame/drivers/rd100.cpp +++ b/src/mame/drivers/rd100.cpp @@ -94,13 +94,13 @@ static MACHINE_CONFIG_START( rd100, rd100_state ) MCFG_MACHINE_RESET_OVERRIDE(rd100_state, rd100) // video hardware - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(250)) MCFG_SCREEN_UPDATE_DRIVER(rd100_state, screen_update) MCFG_SCREEN_SIZE(64*6, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 64*6-1, 0, 32*8-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") //MCFG_GFXDECODE_ADD("gfxdecode", "palette", rd100) MACHINE_CONFIG_END diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp index 659ec0dbe31..cb08fd5017a 100644 --- a/src/mame/drivers/rm380z.cpp +++ b/src/mame/drivers/rm380z.cpp @@ -144,7 +144,7 @@ static MACHINE_CONFIG_START( rm380z, rm380z_state ) MCFG_SCREEN_UPDATE_DRIVER(rm380z_state, screen_update_rm380z) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* RAM configurations */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index 732baca6c3e..a389456c315 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -549,7 +549,7 @@ static MACHINE_CONFIG_START( sapi1, sapi1_state ) MCFG_SCREEN_UPDATE_DRIVER(sapi1_state, screen_update_sapi1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp index 2994f754518..9bc9709113c 100644 --- a/src/mame/drivers/sbrain.cpp +++ b/src/mame/drivers/sbrain.cpp @@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( sbrain, sbrain_state ) MCFG_CPU_IO_MAP(sbrain_subio) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(sbrain_state, screen_update) @@ -332,7 +332,7 @@ static MACHINE_CONFIG_START( sbrain, sbrain_state ) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index 54bbf6c4e6e..69dd21dcbea 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -594,7 +594,7 @@ static MACHINE_CONFIG_START( sbrkout, sbrkout_state ) MCFG_SCREEN_UPDATE_DRIVER(sbrkout_state, screen_update_sbrkout) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp index 954bf30afeb..5418220ad83 100644 --- a/src/mame/drivers/sdk80.cpp +++ b/src/mame/drivers/sdk80.cpp @@ -178,7 +178,7 @@ static MACHINE_CONFIG_START( sdk80, sdk80_state ) // MCFG_GFXDECODE_ADD("gfxdecode", "palette", sdk80) -// MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") +// MCFG_PALETTE_ADD_MONOCHROME("palette") // Video board UART // MCFG_DEVICE_ADD( "hd6402", AY31015, 0 ) diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index 741a784045b..e4491eebc7f 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -413,7 +413,7 @@ static MACHINE_CONFIG_START( sorcerer, sorcerer_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", sorcerer) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp index a35cb104d92..278d02518fb 100644 --- a/src/mame/drivers/ssem.cpp +++ b/src/mame/drivers/ssem.cpp @@ -635,7 +635,7 @@ static MACHINE_CONFIG_START( ssem, ssem_state ) MCFG_SCREEN_SIZE(256, 280) MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 279) MCFG_SCREEN_UPDATE_DRIVER(ssem_state, screen_update_ssem) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* quickload */ MCFG_QUICKLOAD_ADD("quickload", ssem_state, ssem_store, "snp,asm", 1) diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp index 97075424ff0..cb87ec1187d 100644 --- a/src/mame/drivers/sshot.cpp +++ b/src/mame/drivers/sshot.cpp @@ -352,7 +352,7 @@ static MACHINE_CONFIG_START( supershot, supershot_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", supershot) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ //... diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp index f855f6eb459..9c42109b9f4 100644 --- a/src/mame/drivers/starcrus.cpp +++ b/src/mame/drivers/starcrus.cpp @@ -149,7 +149,7 @@ static MACHINE_CONFIG_START( starcrus, starcrus_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", starcrus) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index ad47e443f2a..8bbb6c194f7 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -699,13 +699,13 @@ static MACHINE_CONFIG_START( super80, super80_state ) MCFG_Z80PIO_OUT_PA_CB(WRITE8(super80_state, pio_port_a_w)) MCFG_Z80PIO_IN_PB_CB(READ8(super80_state,pio_port_b_r)) - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(48.8) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", super80) MCFG_DEFAULT_LAYOUT( layout_super80 ) diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp index 27827228b3b..8799893eded 100644 --- a/src/mame/drivers/swyft.cpp +++ b/src/mame/drivers/swyft.cpp @@ -783,7 +783,7 @@ static MACHINE_CONFIG_START( swyft, swyft_state ) MCFG_SCREEN_UPDATE_DRIVER(swyft_state, screen_update_swyft) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_VIDEO_START_OVERRIDE(swyft_state,swyft) diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp index 848ec90ff58..01192b40379 100644 --- a/src/mame/drivers/sys2900.cpp +++ b/src/mame/drivers/sys2900.cpp @@ -130,7 +130,7 @@ static MACHINE_CONFIG_START( sys2900, sys2900_state ) MCFG_SCREEN_UPDATE_DRIVER(sys2900_state, screen_update_sys2900) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp index d88f3120b98..61c26bce428 100644 --- a/src/mame/drivers/tandy2k.cpp +++ b/src/mame/drivers/tandy2k.cpp @@ -767,7 +767,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, tandy2k_state, irq_callback)) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(640, 400) @@ -775,7 +775,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state ) //MCFG_SCREEN_UPDATE_DEVICE(CRT9021B_TAG, crt9021_t, screen_update) MCFG_SCREEN_UPDATE_DRIVER(tandy2k_state, screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL_16MHz*28/20/8) MCFG_DEVICE_ADDRESS_MAP(AS_0, vpac_mem) diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 9c15b99f5c1..c6ccd0fb51a 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -349,7 +349,7 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 ) MCFG_SCREEN_SIZE(80*8, 25*10) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 25*10-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT(layout_tavernie) /* sound hardware */ diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp index 5d943ec505a..539d0f2e2aa 100644 --- a/src/mame/drivers/tdv2324.cpp +++ b/src/mame/drivers/tdv2324.cpp @@ -267,13 +267,13 @@ static MACHINE_CONFIG_START( tdv2324, tdv2324_state ) MCFG_CPU_PROGRAM_MAP(tdv2324_fdc_mem) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DRIVER(tdv2324_state, screen_update) MCFG_SCREEN_SIZE(800, 400) MCFG_SCREEN_VISIBLE_AREA(0, 800-1, 0, 400-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD(TMS9937NL_TAG, TMS9927, XTAL_25_39836MHz) MCFG_TMS9927_CHAR_WIDTH(8) diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp index a2e58454346..acec32694cd 100644 --- a/src/mame/drivers/tek405x.cpp +++ b/src/mame/drivers/tek405x.cpp @@ -1000,14 +1000,14 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) // video hardware MCFG_VECTOR_ADD("vector") - MCFG_SCREEN_ADD(SCREEN_TAG, VECTOR) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(1024, 780) MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 780-1) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") @@ -1107,14 +1107,14 @@ static MACHINE_CONFIG_START( tek4052, tek4052_state ) // video hardware MCFG_VECTOR_ADD("vector") - MCFG_SCREEN_ADD(SCREEN_TAG, VECTOR) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, VECTOR, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_SIZE(1024, 780) MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 780-1) MCFG_SCREEN_UPDATE_DEVICE("vector", vector_device, screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp index 714a2d3fcfb..7b747489cdd 100644 --- a/src/mame/drivers/terak.cpp +++ b/src/mame/drivers/terak.cpp @@ -104,7 +104,7 @@ static MACHINE_CONFIG_START( terak, terak_state ) MCFG_SCREEN_UPDATE_DRIVER(terak_state, screen_update_terak) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp index 2eaf0250d68..8bffc874560 100644 --- a/src/mame/drivers/ti99_2.cpp +++ b/src/mame/drivers/ti99_2.cpp @@ -376,7 +376,7 @@ static MACHINE_CONFIG_START( ti99_2, ti99_2_state ) /* video hardware */ /*MCFG_TMS9928A( &tms9918_interface )*/ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(256, 192) @@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( ti99_2, ti99_2_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ti99_2) - MCFG_PALETTE_ADD_WHITE_AND_BLACK("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp index 42e644bba84..218dc66c686 100644 --- a/src/mame/drivers/tim011.cpp +++ b/src/mame/drivers/tim011.cpp @@ -148,7 +148,7 @@ static MACHINE_CONFIG_START( tim011,tim011_state ) MCFG_SCREEN_UPDATE_DRIVER(tim011_state, screen_update_tim011) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp index 99d6f1f1db5..766a371e638 100644 --- a/src/mame/drivers/tk80bs.cpp +++ b/src/mame/drivers/tk80bs.cpp @@ -181,7 +181,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state ) MCFG_SCREEN_UPDATE_DRIVER(tk80bs_state, screen_update_tk80bs) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", tk80bs) /* Devices */ diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 8a9c0c3af24..a946124cbe4 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -574,7 +574,7 @@ static MACHINE_CONFIG_START( trs80, trs80_state ) // the original model I, MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", trs80) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp index 9c84301cc74..e642a894edd 100644 --- a/src/mame/drivers/trs80m2.cpp +++ b/src/mame/drivers/trs80m2.cpp @@ -706,14 +706,14 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) MCFG_CPU_IO_MAP(z80_io) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_UPDATE_DRIVER(trs80m2_state, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_12_48MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) @@ -796,14 +796,14 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) MCFG_DEVICE_DISABLE() // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_UPDATE_DRIVER(trs80m2_state, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_12_48MHz/8) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp index f706f95a693..c18f41cfda2 100644 --- a/src/mame/drivers/ts803.cpp +++ b/src/mame/drivers/ts803.cpp @@ -496,12 +496,12 @@ static MACHINE_CONFIG_START( ts803, ts803_state ) MCFG_CPU_CONFIG(daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_SIZE(640,240) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* crtc */ MCFG_MC6845_ADD("crtc", SY6545_1, "screen", 13608000 / 8) diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp index 44ede341caf..c667bce0570 100644 --- a/src/mame/drivers/tvgame.cpp +++ b/src/mame/drivers/tvgame.cpp @@ -105,7 +105,7 @@ static MACHINE_CONFIG_START( tvgame, tvgame_state ) MCFG_SCREEN_SIZE(216, 213) MCFG_SCREEN_VISIBLE_AREA(0, 215, 0, 212) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp index af546c28b6e..b7d97e481d2 100644 --- a/src/mame/drivers/uknc.cpp +++ b/src/mame/drivers/uknc.cpp @@ -76,7 +76,7 @@ static MACHINE_CONFIG_START( uknc, uknc_state ) MCFG_SCREEN_UPDATE_DRIVER(uknc_state, screen_update_uknc) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp index 588b2a1bc39..b8131c8c5cb 100644 --- a/src/mame/drivers/univac.cpp +++ b/src/mame/drivers/univac.cpp @@ -173,14 +173,14 @@ static MACHINE_CONFIG_START( uts20, univac_state ) MCFG_CPU_CONFIG(daisy_chain) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DRIVER(univac_state, screen_update) MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_NVRAM_ADD_1FILL("nvram") MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_4MHz) diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index 1e08d3b6574..4e8259840c7 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -200,7 +200,7 @@ static MACHINE_CONFIG_START( unixpc, unixpc_state ) MCFG_DEFAULT_LAYOUT(layout_unixpc) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // internal ram MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index adcb42cf7e6..8849215091a 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -194,7 +194,7 @@ static MACHINE_CONFIG_START( ut88, ut88_state ) MCFG_SCREEN_UPDATE_DRIVER(ut88_state, screen_update_ut88) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", ut88 ) /* audio hardware */ diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp index 6acbf18954e..df1ef0cb255 100644 --- a/src/mame/drivers/v6809.cpp +++ b/src/mame/drivers/v6809.cpp @@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state ) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", sy6545_1_device, screen_update) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", v6809) /* sound hardware */ diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp index 6c48143b051..b01d0d9fe37 100644 --- a/src/mame/drivers/victor9k.cpp +++ b/src/mame/drivers/victor9k.cpp @@ -464,14 +464,14 @@ static MACHINE_CONFIG_START( victor9k, victor9k_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_UPDATE_DEVICE(HD46505S_TAG, hd6845_device, screen_update) MCFG_SCREEN_SIZE(640, 480) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MCFG_MC6845_ADD(HD46505S_TAG, HD6845, SCREEN_TAG, XTAL_30MHz/11) // HD6845 == HD46505S MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 160a1b0307a..38b0603cd79 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -371,7 +371,7 @@ static MACHINE_CONFIG_START( videopin, videopin_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", videopin) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp index 0365076cb5f..d3c77194da5 100644 --- a/src/mame/drivers/vixen.cpp +++ b/src/mame/drivers/vixen.cpp @@ -740,13 +740,13 @@ static MACHINE_CONFIG_START( vixen, vixen_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack) // video hardware - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) MCFG_SCREEN_UPDATE_DRIVER(vixen_state, screen_update) MCFG_SCREEN_RAW_PARAMS(XTAL_23_9616MHz/2, 96*8, 0*8, 81*8, 27*10, 0*10, 26*10) MCFG_TIMER_DRIVER_ADD_SCANLINE("vsync", vixen_state, vsync_tick, SCREEN_TAG, 26*10, 27*10) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index 3561394bfbe..95791341fc3 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -405,7 +405,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vt100_state,vt100_irq_callback) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(80*10, 25*10) @@ -414,7 +414,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state ) MCFG_SCREEN_PALETTE("vt100_video:palette") MCFG_GFXDECODE_ADD("gfxdecode", "vt100_video:palette", vt100) -// MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") +// MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEFAULT_LAYOUT( layout_vt100 ) diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp index 42fcb2ea2c1..bdb1ebd9a99 100644 --- a/src/mame/drivers/vt220.cpp +++ b/src/mame/drivers/vt220.cpp @@ -74,7 +74,7 @@ static MACHINE_CONFIG_START( vt220, vt220_state ) MCFG_SCREEN_UPDATE_DRIVER(vt220_state, screen_update_vt220) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index 153cc6f249f..51a8e280393 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -219,7 +219,7 @@ static MACHINE_CONFIG_FRAGMENT( vt240_motherboard ) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) // MCFG_VIDEO_START_OVERRIDE(vt240_state,vt240) MCFG_SCREEN_UPDATE_DEVICE("upd7220", upd7220_device, screen_update) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", vt240) MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL_4MHz / 4) diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp index 5a661b962b6..cb40407e0ac 100644 --- a/src/mame/drivers/vt320.cpp +++ b/src/mame/drivers/vt320.cpp @@ -97,7 +97,7 @@ static MACHINE_CONFIG_START( vt320, vt320_state ) MCFG_SCREEN_UPDATE_DRIVER(vt320_state, screen_update_vt320) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp index c65c7ebe5ee..c9f88584245 100644 --- a/src/mame/drivers/vt520.cpp +++ b/src/mame/drivers/vt520.cpp @@ -88,7 +88,7 @@ static MACHINE_CONFIG_START( vt520, vt520_state ) MCFG_SCREEN_UPDATE_DRIVER(vt520_state, screen_update_vt520) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") // On the board there are two M5M44256BJ-7 chips // Which are DRAM 256K x 4bit diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index 81b17bb1bb2..207c048e7c8 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -874,13 +874,13 @@ static MACHINE_CONFIG_START( wicat, wicat_state ) MCFG_X2210_ADD("vsram") // XD2210 - MCFG_SCREEN_ADD("screen",RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_SIZE(720,300) MCFG_SCREEN_VISIBLE_AREA(0,720-1,0,300-1) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_UPDATE_DEVICE("video",i8275_device,screen_update) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_DEVICE_ADD("video", I8275, XTAL_19_6608MHz/8) MCFG_I8275_CHARACTER_WIDTH(9) diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp index bb35067b6a1..0e49169dd2d 100644 --- a/src/mame/drivers/xerox820.cpp +++ b/src/mame/drivers/xerox820.cpp @@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240) MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* devices */ MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL_20MHz/8) @@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_SCREEN_RAW_PARAMS(XTAL_10_69425MHz, 700, 0, 560, 260, 0, 240) MCFG_GFXDECODE_ADD("gfxdecode", "palette", xerox820ii) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp index ca1d5c3a3bf..160b2744960 100644 --- a/src/mame/drivers/z1013.cpp +++ b/src/mame/drivers/z1013.cpp @@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( z1013, z1013_state ) MCFG_SCREEN_PALETTE("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", z1013) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index d6ab846e84c..c2275dcf454 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -353,11 +353,11 @@ static MACHINE_CONFIG_START( zorba, zorba_state ) MCFG_CPU_PROGRAM_MAP(zorba_kbdmem) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_UPDATE_DEVICE("crtc", i8275_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", zorba) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp index dc895e73e9c..ed0cc48ea07 100644 --- a/src/mame/drivers/zrt80.cpp +++ b/src/mame/drivers/zrt80.cpp @@ -280,14 +280,14 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state ) MCFG_CPU_IO_MAP(zrt80_io) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_SCREEN_SIZE(640, 200) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 200 - 1) MCFG_GFXDECODE_ADD("gfxdecode", "palette", zrt80) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 60b05e4fc94..f7ca47d97bb 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -187,14 +187,14 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) static MACHINE_CONFIG_FRAGMENT( abc1600_mover ) MCFG_DEFAULT_LAYOUT(layout_abc1600) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate MCFG_SCREEN_UPDATE_DRIVER(abc1600_mover_device, screen_update) MCFG_SCREEN_SIZE(958, 1067) MCFG_SCREEN_VISIBLE_AREA(0, 958-1, 0, 1067-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_MC6845_ADD(SY6845E_TAG, SY6845E, SCREEN_TAG, XTAL_64MHz/32) MCFG_MC6845_SHOW_BORDER_AREA(true) diff --git a/src/mame/video/abc80.cpp b/src/mame/video/abc80.cpp index 30272f3b0ea..a267538093d 100644 --- a/src/mame/video/abc80.cpp +++ b/src/mame/video/abc80.cpp @@ -201,5 +201,5 @@ MACHINE_CONFIG_FRAGMENT( abc80_video ) MCFG_SCREEN_RAW_PARAMS(XTAL_11_9808MHz/2, ABC80_HTOTAL, ABC80_HBEND, ABC80_HBSTART, ABC80_VTOTAL, ABC80_VBEND, ABC80_VBSTART) MCFG_GFXDECODE_ADD("gfxdecode", "palette", abc80) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index ee9fc3a19de..422cf3ae6a0 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -300,12 +300,12 @@ MACHINE_CONFIG_FRAGMENT( abc800m_video ) MCFG_MC6845_UPDATE_ROW_CB(abc800m_state, abc800m_update_row) MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rib_w)) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t(0xff, 0xff, 0x00)) MCFG_SCREEN_UPDATE_DRIVER(abc800m_state, screen_update) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(768, 312) MCFG_SCREEN_VISIBLE_AREA(0,768-1, 0, 312-1) - MCFG_PALETTE_ADD_MONOCHROME_YELLOW("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp index 667f8cfe931..c2786d0b024 100644 --- a/src/mame/video/abc802.cpp +++ b/src/mame/video/abc802.cpp @@ -208,7 +208,7 @@ MACHINE_CONFIG_FRAGMENT( abc802_video ) MCFG_MC6845_UPDATE_ROW_CB(abc802_state, abc802_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(abc802_state, vs_w)) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber) MCFG_SCREEN_UPDATE_DRIVER(abc802_state, screen_update) MCFG_SCREEN_REFRESH_RATE(60) @@ -216,5 +216,5 @@ MACHINE_CONFIG_FRAGMENT( abc802_video ) MCFG_SCREEN_SIZE(768, 312) MCFG_SCREEN_VISIBLE_AREA(0,768-1, 0, 312-1) - MCFG_PALETTE_ADD_MONOCHROME_AMBER("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index 9735f0e334a..32f7256aa94 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1891,7 +1891,7 @@ void apollo_graphics_15i::device_reset() MACHINE_CONFIG_FRAGMENT( apollo_mono19i ) MCFG_DEFAULT_LAYOUT( layout_apollo ) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) MCFG_SCREEN_REFRESH_RATE(64) diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp index 8e6b9f0cc7a..3b39e206397 100644 --- a/src/mame/video/newbrain.cpp +++ b/src/mame/video/newbrain.cpp @@ -180,14 +180,14 @@ GFXDECODE_END MACHINE_CONFIG_FRAGMENT( newbrain_video ) MCFG_DEFAULT_LAYOUT(layout_newbrain) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DRIVER(newbrain_state, screen_update) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(640, 250) MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) - MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_GFXDECODE_ADD("gfxdecode", "palette", newbrain) MACHINE_CONFIG_END diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp index 94dd155454b..eea0822be61 100644 --- a/src/mame/video/osi.cpp +++ b/src/mame/video/osi.cpp @@ -153,7 +153,7 @@ MACHINE_CONFIG_FRAGMENT( osi600_video ) MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0, 32*8-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( uk101_video ) @@ -164,7 +164,7 @@ MACHINE_CONFIG_FRAGMENT( uk101_video ) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1) MCFG_SCREEN_PALETTE("palette") - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( osi630_video ) diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp index d8c6d2b95e5..66d4b288347 100644 --- a/src/mame/video/pcd.cpp +++ b/src/mame/video/pcd.cpp @@ -160,7 +160,7 @@ static MACHINE_CONFIG_FRAGMENT( pcx_video ) MCFG_SCREEN_UPDATE_DEVICE("crtc", scn2674_device, screen_update) MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcx) - MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCN2674_VIDEO_ADD("crtc", 0, INPUTLINE("graphics", MCS51_INT0_LINE)); MCFG_SCN2674_TEXT_CHARACTER_WIDTH(8) diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 2154b01fb42..a37fcae796b 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -113,12 +113,12 @@ MACHINE_CONFIG_FRAGMENT( v1050_video ) MCFG_MC6845_UPDATE_ROW_CB(v1050_state, crtc_update_row) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(v1050_state, crtc_vs_w)) - MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green) MCFG_SCREEN_UPDATE_DEVICE(H46505_TAG, h46505_device, screen_update) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(640, 400) MCFG_SCREEN_VISIBLE_AREA(0,640-1, 0, 400-1) - MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette") + MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") MACHINE_CONFIG_END diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp index b4d5b40ab55..45bcfe5da79 100644 --- a/src/mame/video/vtvideo.cpp +++ b/src/mame/video/vtvideo.cpp @@ -928,7 +928,7 @@ TIMER_CALLBACK_MEMBER(vt100_video_device::lba7_change) } static MACHINE_CONFIG_FRAGMENT(vt100_video) -MCFG_PALETTE_ADD_MONOCHROME_GREEN("palette") + MCFG_PALETTE_ADD_MONOCHROME("palette") MACHINE_CONFIG_END //------------------------------------------------- @@ -942,7 +942,7 @@ machine_config_constructor vt100_video_device::device_mconfig_additions() const } static MACHINE_CONFIG_FRAGMENT(rainbow_video) -MCFG_PALETTE_ADD("palette", 4) + MCFG_PALETTE_ADD("palette", 4) MACHINE_CONFIG_END //------------------------------------------------- |