summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/video/scn2674.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2018-01-06 10:04:12 -0500
committer AJR <ajrhacker@users.noreply.github.com>2018-01-06 10:04:15 -0500
commitf4f8d79998be331823988593e0c007938e00cd71 (patch)
tree1a9bed0e8d41576043e18196463c5861cc4bd460 /src/devices/video/scn2674.cpp
parent8ab5ac014c772d71bb6a87931be9dce133006b7d (diff)
scn2674: Split up logging (nw)
mt420: Hook up SCN2674 (nw)
Diffstat (limited to 'src/devices/video/scn2674.cpp')
-rw-r--r--src/devices/video/scn2674.cpp184
1 files changed, 94 insertions, 90 deletions
diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp
index 7a74bf19ad1..8a3d1e5bf25 100644
--- a/src/devices/video/scn2674.cpp
+++ b/src/devices/video/scn2674.cpp
@@ -9,7 +9,11 @@
#include "screen.h"
-//#define VERBOSE 1
+#define LOG_IR (1 << 0)
+#define LOG_COMMAND (1 << 1)
+#define LOG_INTR (1 << 2)
+#define LOG_READ (1 << 3)
+#define VERBOSE (0)
#include "logmacro.h"
@@ -141,7 +145,7 @@ void scn2674_device::device_reset()
// 15 Initialization Registers (8-bit each)
void scn2674_device::write_init_regs(uint8_t data)
{
- LOG("scn2674_write_init_regs %02x %02x\n",m_IR_pointer,data);
+ LOGMASKED(LOG_COMMAND, "scn2674_write_init_regs %02x %02x\n",m_IR_pointer,data);
switch ( m_IR_pointer) /* display some debug info, set mame specific variables */
{
@@ -151,18 +155,18 @@ void scn2674_device::write_init_regs(uint8_t data)
m_IR0_sync_select = (data&0x04)>>2;
m_IR0_buffer_mode_select = (data&0x03);
- LOG("IR0 - Double Ht Wd %02x\n",m_IR0_double_ht_wd);//affects IR14 as well
- LOG("IR0 - Scanlines per Character Row %02x\n",m_IR0_scanline_per_char_row);//value+1 = scanlines
- LOG("IR0 - Sync Select %02x\n",m_IR0_sync_select);//1 = csync
- LOG("IR0 - Buffer Mode Select %02x\n",m_IR0_buffer_mode_select); //0 independent 1 transparent 2 shared 3 row
+ LOGMASKED(LOG_IR, "IR0 - Double Ht Wd %02x\n",m_IR0_double_ht_wd);//affects IR14 as well
+ LOGMASKED(LOG_IR, "IR0 - Scanlines per Character Row %02x\n",m_IR0_scanline_per_char_row);//value+1 = scanlines
+ LOGMASKED(LOG_IR, "IR0 - Sync Select %02x\n",m_IR0_sync_select);//1 = csync
+ LOGMASKED(LOG_IR, "IR0 - Buffer Mode Select %02x\n",m_IR0_buffer_mode_select); //0 independent 1 transparent 2 shared 3 row
break;
case 1:
m_IR1_interlace_enable = (data&0x80)>>7;
m_IR1_equalizing_constant = (data&0x7f)+1;
- LOG("IR1 - Interlace Enable %02x\n",m_IR1_interlace_enable);
- LOG("IR1 - Equalizing Constant %02i CCLKs\n",m_IR1_equalizing_constant);
+ LOGMASKED(LOG_IR, "IR1 - Interlace Enable %02x\n",m_IR1_interlace_enable);
+ LOGMASKED(LOG_IR, "IR1 - Equalizing Constant %02i CCLKs\n",m_IR1_equalizing_constant);
break;
case 2:
@@ -170,25 +174,25 @@ void scn2674_device::write_init_regs(uint8_t data)
m_IR2_horz_sync_width = (((data&0x78)>>3)*2) + 2;
m_IR2_horz_back_porch = ((data&0x07)*4) - 1;
- LOG("IR2 - Row Table %02x\n",m_IR2_row_table);
- LOG("IR2 - Horizontal Sync Width %02i CCLKs\n",m_IR2_horz_sync_width);
- LOG("IR2 - Horizontal Back Porch %02i CCLKs\n",m_IR2_horz_back_porch);
+ LOGMASKED(LOG_IR, "IR2 - Row Table %02x\n",m_IR2_row_table);
+ LOGMASKED(LOG_IR, "IR2 - Horizontal Sync Width %02i CCLKs\n",m_IR2_horz_sync_width);
+ LOGMASKED(LOG_IR, "IR2 - Horizontal Back Porch %02i CCLKs\n",m_IR2_horz_back_porch);
break;
case 3:
m_IR3_vert_front_porch = (((data&0xe0)>>5) * 4)+4 ;
m_IR3_vert_back_porch = ((data&0x1f) * 2) + 4;
- LOG("IR3 - Vertical Front Porch %02i Lines\n",m_IR3_vert_front_porch);
- LOG("IR3 - Vertical Back Porch %02i Lines\n",m_IR3_vert_back_porch);
+ LOGMASKED(LOG_IR, "IR3 - Vertical Front Porch %02i Lines\n",m_IR3_vert_front_porch);
+ LOGMASKED(LOG_IR, "IR3 - Vertical Back Porch %02i Lines\n",m_IR3_vert_back_porch);
break;
case 4:
m_IR4_rows_per_screen = (data&0x7f) + 1;
m_IR4_character_blink_rate_divisor = ((data & 0x80)>>7 ? 128:64);
- LOG("IR4 - Rows Per Screen %02i\n",m_IR4_rows_per_screen);
- LOG("IR4 - Character Blink Rate = 1/%02i\n",m_IR4_character_blink_rate_divisor);
+ LOGMASKED(LOG_IR, "IR4 - Rows Per Screen %02i\n",m_IR4_rows_per_screen);
+ LOGMASKED(LOG_IR, "IR4 - Character Blink Rate = 1/%02i\n",m_IR4_character_blink_rate_divisor);
break;
case 5:
@@ -196,14 +200,14 @@ void scn2674_device::write_init_regs(uint8_t data)
cccc cccc
c = Characters Per Row */
m_IR5_character_per_row = data + 1;
- LOG("IR5 - Active Characters Per Row %02i\n",m_IR5_character_per_row);
+ LOGMASKED(LOG_IR, "IR5 - Active Characters Per Row %02i\n",m_IR5_character_per_row);
break;
case 6:
m_IR6_cursor_last_scanline = (data & 0x0f);
m_IR6_cursor_first_scanline = (data & 0xf0)>>4;
- LOG("IR6 - First Line of Cursor %02x\n",m_IR6_cursor_first_scanline);
- LOG("IR6 - Last Line of Cursor %02x\n",m_IR6_cursor_last_scanline);
+ LOGMASKED(LOG_IR, "IR6 - First Line of Cursor %02x\n",m_IR6_cursor_first_scanline);
+ LOGMASKED(LOG_IR, "IR6 - Last Line of Cursor %02x\n",m_IR6_cursor_last_scanline);
break;
case 7:
@@ -215,28 +219,28 @@ void scn2674_device::write_init_regs(uint8_t data)
m_IR7_vsync_width = vsync_table[(data & 0xC0)>>6];
- LOG("IR7 - Underline Position %02x\n",m_IR7_cursor_underline_position);
- LOG("IR7 - Cursor rate 1/%02i\n",m_IR7_cursor_rate_divisor);
- LOG("IR7 - Cursor blink %02x\n",m_IR7_cursor_blink);
- LOG("IR7 - Vsync Width %02i Lines\n",m_IR7_vsync_width);
+ LOGMASKED(LOG_IR, "IR7 - Underline Position %02x\n",m_IR7_cursor_underline_position);
+ LOGMASKED(LOG_IR, "IR7 - Cursor rate 1/%02i\n",m_IR7_cursor_rate_divisor);
+ LOGMASKED(LOG_IR, "IR7 - Cursor blink %02x\n",m_IR7_cursor_blink);
+ LOGMASKED(LOG_IR, "IR7 - Vsync Width %02i Lines\n",m_IR7_vsync_width);
break;
}
case 8:
m_IR8_display_buffer_first_address_LSB = data;
- LOG("IR8 - Display Buffer First Address LSB %02x\n",m_IR8_display_buffer_first_address_LSB);
+ LOGMASKED(LOG_IR, "IR8 - Display Buffer First Address LSB %02x\n",m_IR8_display_buffer_first_address_LSB);
break;
case 9:
m_IR9_display_buffer_first_address_MSB = data & 0x0f;
m_IR9_display_buffer_last_address = (data & 0xf0)>>4;
- LOG("IR9 - Display Buffer First Address MSB %02x\n",m_IR9_display_buffer_first_address_MSB);
- LOG("IR9 - Display Buffer Last Address %02x\n",m_IR9_display_buffer_last_address);
+ LOGMASKED(LOG_IR, "IR9 - Display Buffer First Address MSB %02x\n",m_IR9_display_buffer_first_address_MSB);
+ LOGMASKED(LOG_IR, "IR9 - Display Buffer Last Address %02x\n",m_IR9_display_buffer_last_address);
break;
case 10:
m_IR10_display_pointer_address_lower = data;
- LOG("IR10 - Display Pointer Address Lower %02x\n",m_IR10_display_pointer_address_lower);
+ LOGMASKED(LOG_IR, "IR10 - Display Pointer Address Lower %02x\n",m_IR10_display_pointer_address_lower);
break;
case 11:
@@ -244,23 +248,23 @@ void scn2674_device::write_init_regs(uint8_t data)
m_IR11_reset_scanline_counter_on_scrollup= (data&0x40 >> 6);
m_IR11_reset_scanline_counter_on_scrolldown= (data&0x80 >> 7);
- LOG("IR11 - Display Pointer Address Lower %02x\n",m_IR11_display_pointer_address_upper);
- LOG("IR11 - Reset Scanline Counter on Scroll Up %02x\n",m_IR11_reset_scanline_counter_on_scrollup);
- LOG("IR11 - Reset Scanline Counter on Scroll Down %02x\n",m_IR11_reset_scanline_counter_on_scrolldown);
+ LOGMASKED(LOG_IR, "IR11 - Display Pointer Address Lower %02x\n",m_IR11_display_pointer_address_upper);
+ LOGMASKED(LOG_IR, "IR11 - Reset Scanline Counter on Scroll Up %02x\n",m_IR11_reset_scanline_counter_on_scrollup);
+ LOGMASKED(LOG_IR, "IR11 - Reset Scanline Counter on Scroll Down %02x\n",m_IR11_reset_scanline_counter_on_scrolldown);
break;
case 12:
m_IR12_scroll_start = (data & 0x80)>>7;
m_IR12_split_register_1 = (data & 0x7f);
- LOG("IR12 - Scroll Start %02x\n",m_IR12_scroll_start);
- LOG("IR12 - Split Register 1 %02x\n",m_IR12_split_register_1);
+ LOGMASKED(LOG_IR, "IR12 - Scroll Start %02x\n",m_IR12_scroll_start);
+ LOGMASKED(LOG_IR, "IR12 - Split Register 1 %02x\n",m_IR12_split_register_1);
break;
case 13:
m_IR13_scroll_end = (data & 0x80)>>7;
m_IR13_split_register_2 = (data & 0x7f);
- LOG("IR13 - Scroll End %02x\n",m_IR13_scroll_end);
- LOG("IR13 - Split Register 2 %02x\n",m_IR13_split_register_2);
+ LOGMASKED(LOG_IR, "IR13 - Scroll End %02x\n",m_IR13_scroll_end);
+ LOGMASKED(LOG_IR, "IR13 - Split Register 2 %02x\n",m_IR13_split_register_2);
break;
case 14:
@@ -268,15 +272,15 @@ void scn2674_device::write_init_regs(uint8_t data)
if (!m_IR0_double_ht_wd)
{
m_IR14_double_2 = (data & 0x30)>>4;
- LOG("IR14 - Double 2 %02x\n",m_IR14_double_2);
+ LOGMASKED(LOG_IR, "IR14 - Double 2 %02x\n",m_IR14_double_2);
}
//0 normal, 1, double width, 2, double width and double tops 3, double width and double bottoms
//1 affects SSR1, 2 affects SSR2
//If Double Height enabled in IR0, Screen start 1 upper (bits 7 and 6)replace Double 1, and Double 2 is unused
m_IR14_double_1 = (data & 0xc0)>>6;
- LOG("IR14 - Double 1 %02x\n",m_IR14_double_1);
+ LOGMASKED(LOG_IR, "IR14 - Double 1 %02x\n",m_IR14_double_1);
- LOG("IR14 - Scroll Lines %02i\n",m_IR14_scroll_lines);
+ LOGMASKED(LOG_IR, "IR14 - Scroll Lines %02i\n",m_IR14_scroll_lines);
break;
case 15: /* not valid! */
@@ -298,7 +302,7 @@ void scn2674_device::write_command(uint8_t data)
if (data==0x00)
{
/* master reset, configures registers */
- LOG("master reset\n");
+ LOGMASKED(LOG_COMMAND, "master reset\n");
m_IR_pointer=0;
m_irq_register = 0x00;
m_status_register = 0x20;//RDFLG activated
@@ -314,7 +318,7 @@ void scn2674_device::write_command(uint8_t data)
{
/* set IR pointer */
operand = data & 0x0f;
- LOG("set IR pointer %02x\n",operand);
+ LOGMASKED(LOG_COMMAND, "set IR pointer %02x\n",operand);
m_IR_pointer=operand;
@@ -325,7 +329,7 @@ void scn2674_device::write_command(uint8_t data)
if ((data&0xe3)==0x22)
{
/* Disable GFX */
- LOG("disable GFX %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "disable GFX %02x\n",data);
m_gfx_enabled = 0;
recompute_parameters();
}
@@ -333,7 +337,7 @@ void scn2674_device::write_command(uint8_t data)
if ((data&0xe3)==0x23)
{
/* Enable GFX */
- LOG("enable GFX %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "enable GFX %02x\n",data);
m_gfx_enabled = 1;
recompute_parameters();
}
@@ -346,9 +350,9 @@ void scn2674_device::write_command(uint8_t data)
m_display_enabled = 0;
if (operand)
- LOG("display OFF - float DADD bus %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "display OFF - float DADD bus %02x\n",data);
else
- LOG("display OFF - no float DADD bus %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "display OFF - no float DADD bus %02x\n",data);
}
if ((data&0xe9)==0x29)
@@ -359,12 +363,12 @@ void scn2674_device::write_command(uint8_t data)
if (operand)
{
m_display_enabled_field = 1;
- LOG("display ON - next field %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "display ON - next field %02x\n",data);
}
else
{
m_display_enabled_scanline = 1;
- LOG("display ON - next scanline %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "display ON - next scanline %02x\n",data);
}
recompute_parameters(); // start the scanline timer
}
@@ -372,14 +376,14 @@ void scn2674_device::write_command(uint8_t data)
if ((data&0xf1)==0x30)
{
/* Cursor Off */
- LOG("cursor off %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "cursor off %02x\n",data);
m_cursor_enabled = 0;
}
if ((data&0xf1)==0x31)
{
/* Cursor On */
- LOG("cursor on %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "cursor on %02x\n",data);
m_cursor_enabled = 1;
}
@@ -389,17 +393,17 @@ void scn2674_device::write_command(uint8_t data)
{
/* Reset Interrupt / Status bit */
operand = data & 0x1f;
- LOG("reset interrupt / status bit %02x\n",operand);
+ LOGMASKED(LOG_COMMAND, "reset interrupt / status bit %02x\n",operand);
m_irq_register &= ~(data & 0x1f);
m_status_register &= ~(data & 0x1f);
- LOG("IRQ Status after reset\n");
- LOG("Split 2 IRQ: %d Active\n",(m_irq_register>>0)&1);
- LOG("Ready IRQ: %d Active\n",(m_irq_register>>1)&1);
- LOG("Split 1 IRQ: %d Active\n",(m_irq_register>>2)&1);
- LOG("Line Zero IRQ: %d Active\n",(m_irq_register>>3)&1);
- LOG("V-Blank IRQ: %d Active\n",(m_irq_register>>4)&1);
+ LOGMASKED(LOG_INTR, "IRQ Status after reset\n");
+ LOGMASKED(LOG_INTR, "Split 2 IRQ: %d Active\n",(m_irq_register>>0)&1);
+ LOGMASKED(LOG_INTR, "Ready IRQ: %d Active\n",(m_irq_register>>1)&1);
+ LOGMASKED(LOG_INTR, "Split 1 IRQ: %d Active\n",(m_irq_register>>2)&1);
+ LOGMASKED(LOG_INTR, "Line Zero IRQ: %d Active\n",(m_irq_register>>3)&1);
+ LOGMASKED(LOG_INTR, "V-Blank IRQ: %d Active\n",(m_irq_register>>4)&1);
m_irq_state = 0;
@@ -418,12 +422,12 @@ void scn2674_device::write_command(uint8_t data)
/* Disable Interrupt mask*/
operand = data & 0x1f;
m_irq_mask &= ~(operand);
- LOG("IRQ Mask after disable %x\n",operand);
- LOG("Split 2 IRQ: %d Unmasked\n",(m_irq_mask>>0)&1);
- LOG("Ready IRQ: %d Unmasked\n",(m_irq_mask>>1)&1);
- LOG("Split 1 IRQ: %d Unmasked\n",(m_irq_mask>>2)&1);
- LOG("Line Zero IRQ: %d Unmasked\n",(m_irq_mask>>3)&1);
- LOG("V-Blank IRQ: %d Unmasked\n",(m_irq_mask>>4)&1);
+ LOGMASKED(LOG_INTR, "IRQ Mask after disable %x\n",operand);
+ LOGMASKED(LOG_INTR, "Split 2 IRQ: %d Unmasked\n",(m_irq_mask>>0)&1);
+ LOGMASKED(LOG_INTR, "Ready IRQ: %d Unmasked\n",(m_irq_mask>>1)&1);
+ LOGMASKED(LOG_INTR, "Split 1 IRQ: %d Unmasked\n",(m_irq_mask>>2)&1);
+ LOGMASKED(LOG_INTR, "Line Zero IRQ: %d Unmasked\n",(m_irq_mask>>3)&1);
+ LOGMASKED(LOG_INTR, "V-Blank IRQ: %d Unmasked\n",(m_irq_mask>>4)&1);
}
@@ -433,12 +437,12 @@ void scn2674_device::write_command(uint8_t data)
operand = data & 0x1f;
m_irq_mask |= (data & 0x1f);
- LOG("IRQ Mask after enable %x\n",operand);
- LOG("Split 2 IRQ: %d Unmasked\n",(m_irq_mask>>0)&1);
- LOG("Ready IRQ: %d Unmasked\n",(m_irq_mask>>1)&1);
- LOG("Split 1 IRQ: %d Unmasked\n",(m_irq_mask>>2)&1);
- LOG("Line Zero IRQ: %d Unmasked\n",(m_irq_mask>>3)&1);
- LOG("V-Blank IRQ: %d Unmasked\n",(m_irq_mask>>4)&1);
+ LOGMASKED(LOG_INTR, "IRQ Mask after enable %x\n",operand);
+ LOGMASKED(LOG_INTR, "Split 2 IRQ: %d Unmasked\n",(m_irq_mask>>0)&1);
+ LOGMASKED(LOG_INTR, "Ready IRQ: %d Unmasked\n",(m_irq_mask>>1)&1);
+ LOGMASKED(LOG_INTR, "Split 1 IRQ: %d Unmasked\n",(m_irq_mask>>2)&1);
+ LOGMASKED(LOG_INTR, "Line Zero IRQ: %d Unmasked\n",(m_irq_mask>>3)&1);
+ LOGMASKED(LOG_INTR, "V-Blank IRQ: %d Unmasked\n",(m_irq_mask>>4)&1);
}
@@ -450,38 +454,38 @@ void scn2674_device::write_command(uint8_t data)
case 0xa4:
/* read at pointer address */
m_buffer = space().read_byte(m_screen2_l | (m_screen2_h << 8));
- LOG("DELAYED read at pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED read at pointer address %02x\n",data);
break;
case 0xa2:
/* write at pointer address */
space().write_byte(m_screen2_l | (m_screen2_h << 8), m_buffer);
- LOG("DELAYED write at pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write at pointer address %02x\n",data);
break;
case 0xa6: // used by the Octopus
/* write at pointer address */
space().write_byte((m_IR10_display_pointer_address_lower | (m_IR11_display_pointer_address_upper << 8)), m_buffer);
- LOG("DELAYED write at display pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write at display pointer address %02x\n",data);
break;
case 0xa9:
/* increment cursor address */
if(!(++m_cursor_l))
m_cursor_h++;
- LOG("DELAYED increase cursor address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED increase cursor address %02x\n",data);
break;
case 0xac:
/* read at cursor address */
m_buffer = space().read_byte(m_cursor_l | (m_cursor_h << 8));
- LOG("DELAYED read at cursor address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED read at cursor address %02x\n",data);
break;
case 0xaa:
/* write at cursor address */
space().write_byte(m_cursor_l | (m_cursor_h << 8), m_buffer);
- LOG("DELAYED write at cursor address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write at cursor address %02x\n",data);
break;
case 0xad:
@@ -489,7 +493,7 @@ void scn2674_device::write_command(uint8_t data)
m_buffer = space().read_byte(m_cursor_l | (m_cursor_h << 8));
if(!(++m_cursor_l))
m_cursor_h++;
- LOG("DELAYED read at cursor address+increment %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED read at cursor address+increment %02x\n",data);
break;
case 0xab:
@@ -498,7 +502,7 @@ void scn2674_device::write_command(uint8_t data)
space().write_byte(m_cursor_l | (m_cursor_h << 8), m_buffer);
if(!(++m_cursor_l))
m_cursor_h++;
- LOG("DELAYED write at cursor address+increment %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write at cursor address+increment %02x\n",data);
break;
case 0xbb:
@@ -508,12 +512,12 @@ void scn2674_device::write_command(uint8_t data)
space().write_byte(i, m_buffer); // get the last
m_cursor_l = m_screen2_l;
m_cursor_h = m_screen2_h;
- LOG("DELAYED write from cursor address to pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write from cursor address to pointer address %02x\n",data);
break;
case 0xbd:
/* read from cursor address to pointer address */
- LOG("DELAYED read from cursor address to pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED read from cursor address to pointer address %02x\n",data);
break;
case 0xbf:
@@ -523,7 +527,7 @@ void scn2674_device::write_command(uint8_t data)
space().write_byte(i, m_buffer); // get the last
m_cursor_l = m_IR10_display_pointer_address_lower;
m_cursor_h = m_IR11_display_pointer_address_upper;
- LOG("DELAYED write from cursor address to pointer address %02x\n",data);
+ LOGMASKED(LOG_COMMAND, "DELAYED write from cursor address to pointer address %02x\n",data);
break;
}
}
@@ -559,19 +563,19 @@ READ8_MEMBER( scn2674_device::read )
*/
case 0:
- LOG("Read Irq Register %02x %s\n",m_irq_register,machine().describe_context());
+ LOGMASKED(LOG_READ, "Read Irq Register %02x %s\n",m_irq_register,machine().describe_context());
return m_irq_register;
case 1:
- LOG("Read Status Register %02X %s\n",m_status_register,machine().describe_context());
+ LOGMASKED(LOG_READ, "Read Status Register %02X %s\n",m_status_register,machine().describe_context());
return m_status_register;
- case 2: LOG("Read Screen1_l Register %s\n",machine().describe_context());return m_screen1_l;
- case 3: LOG("Read Screen1_h Register %s\n",machine().describe_context());return m_screen1_h & 0x3f;
- case 4: LOG("Read Cursor_l Register %s\n",machine().describe_context());return m_cursor_l;
- case 5: LOG("Read Cursor_h Register %s\n",machine().describe_context());return m_cursor_h;
- case 6: LOG("Read Screen2_l Register %s\n",machine().describe_context());return m_screen2_l;
- case 7: LOG("Read Screen2_h Register %s\n",machine().describe_context());return m_screen2_h;
+ case 2: LOGMASKED(LOG_READ, "Read Screen1_l Register %s\n",machine().describe_context());return m_screen1_l;
+ case 3: LOGMASKED(LOG_READ, "Read Screen1_h Register %s\n",machine().describe_context());return m_screen1_h & 0x3f;
+ case 4: LOGMASKED(LOG_READ, "Read Cursor_l Register %s\n",machine().describe_context());return m_cursor_l;
+ case 5: LOGMASKED(LOG_READ, "Read Cursor_h Register %s\n",machine().describe_context());return m_cursor_h;
+ case 6: LOGMASKED(LOG_READ, "Read Screen2_l Register %s\n",machine().describe_context());return m_screen2_l;
+ case 7: LOGMASKED(LOG_READ, "Read Screen2_h Register %s\n",machine().describe_context());return m_screen2_h;
}
return 0xff;
@@ -614,7 +618,7 @@ WRITE8_MEMBER( scn2674_device::write )
{
m_IR14_double_1 = m_dbl1;
m_screen1_h &= 0x3f;
- LOG("IR14 - Double 1 overridden %02x\n",m_IR14_double_1);
+ LOGMASKED(LOG_IR, "IR14 - Double 1 overridden %02x\n",m_IR14_double_1);
}
if(!screen().vblank())
m_start1change = (m_linecounter / m_IR0_scanline_per_char_row) + 1;
@@ -646,7 +650,7 @@ void scn2674_device::recompute_parameters()
return;
}
- LOG("width %u height %u max_x %u max_y %u refresh %f\n", horiz_pix_total, vert_pix_total, max_visible_x, max_visible_y, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
+ LOGMASKED(LOG_IR, "width %u height %u max_x %u max_y %u refresh %f\n", horiz_pix_total, vert_pix_total, max_visible_x, max_visible_y, 1 / ATTOSECONDS_TO_DOUBLE(refresh));
rectangle visarea;
visarea.set(0, max_visible_x, 0, max_visible_y);
@@ -682,7 +686,7 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_status_register |= 0x10;
if(m_irq_mask & 0x10)
{
- LOG("vblank irq\n");
+ LOGMASKED(LOG_INTR, "vblank irq\n");
m_irq_state = 1;
m_irq_register |= 0x10;
m_intr_cb(ASSERT_LINE);
@@ -701,7 +705,7 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_status_register |= 0x08;
if (m_irq_mask & 0x08)
{
- LOG("SCN2674 Line Zero\n");
+ LOGMASKED(LOG_INTR, "SCN2674 Line Zero\n");
m_irq_state = 1;
m_irq_register |= 0x08;
m_intr_cb(ASSERT_LINE);
@@ -713,7 +717,7 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_status_register |= 0x04;
if(m_irq_mask & 0x04)
{
- LOG("SCN2674 Split Screen 1 irq\n");
+ LOGMASKED(LOG_INTR, "SCN2674 Split Screen 1 irq\n");
m_irq_state = 1;
m_irq_register |= 0x04;
m_intr_cb(ASSERT_LINE);
@@ -729,7 +733,7 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para
m_status_register |= 0x01;
if(m_irq_mask & 0x01)
{
- LOG("SCN2674 Split Screen 2 irq\n");
+ LOGMASKED(LOG_INTR, "SCN2674 Split Screen 2 irq\n");
m_irq_state = 1;
m_irq_register |= 0x01;
m_intr_cb(ASSERT_LINE);