Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

thomson: minor cleanup, convert video logging to logmacro.h (nw)

Browse Source
This commit is contained in:
Vas Crabb 2019-01-13 02:03:40 +11:00
parent 36450e02cd
commit 8b9c0940cf
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/machine/thomson.cpp
View File

@ -1713,14 +1713,14 @@ void thomson_state::to9_set_video_mode( uint8_t data, int style )
thom_set_video_mode( THOM_VMODE_TO9 );
break;
// undocumented, but tested on a real TO8D
case 0x20: thom_set_video_mode( THOM_VMODE_MO5_ALT ); break;
// undocumented, but tested on a real TO8D
case 0x20: thom_set_video_mode( THOM_VMODE_MO5_ALT ); break;
case 0x21: thom_set_video_mode( THOM_VMODE_BITMAP4 ); break;
case 0x41: thom_set_video_mode( THOM_VMODE_BITMAP4_ALT ); break;
// also undocumented but tested
// also undocumented but tested
case 0x59: thom_set_video_mode( THOM_VMODE_BITMAP4_ALT_HALF ); break;
case 0x2a:
@ -1743,9 +1743,9 @@ void thomson_state::to9_set_video_mode( uint8_t data, int style )
case 0x3f: thom_set_video_mode( THOM_VMODE_OVERLAY3 ); break;
// undocumented variant enconding for bitmap16
case 0x5b: thom_set_video_mode( THOM_VMODE_BITMAP16_ALT ); break;
// undocumented variant enconding for bitmap16
case 0x5b: thom_set_video_mode( THOM_VMODE_BITMAP16_ALT ); break;
default:
logerror( "to9_set_video_mode: unknown mode $%02X tr=%i phi=%i mod=%i\n", data, (data >> 5) & 3, (data >> 3) & 2, data & 7 );
}

66
src/mame/video/thomson.cpp
View File

@ -9,12 +9,12 @@
**********************************************************************/
#include "emu.h"
#include <math.h>
#include "includes/thomson.h"
#include <math.h>
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
//#define VERBOSE 1
#include "logmacro.h"
/* One GPL is what is drawn in 1 us by the video system in the active window.
@ -162,7 +162,7 @@ struct thom_vsignal thomson_state::thom_get_lightpen_vsignal( int xdec, int ydec
void thomson_state::thom_set_lightpen_callback( int nb )
{
LOG (( "%f thom_set_lightpen_callback called\n", machine().time().as_double()));
LOG("%f thom_set_lightpen_callback called\n", machine().time().as_double());
m_thom_lightpen_nb = nb;
}
@ -268,7 +268,7 @@ void thomson_state::thom_set_border_color( unsigned index )
assert( index < 16 );
if ( index != m_thom_border_index )
{
LOG (( "thom_set_border_color: %i at line %i col %i\n", index, thom_video_elapsed() / 64, thom_video_elapsed() % 64 ));
LOG("thom_set_border_color: %i at line %i col %i\n", index, thom_video_elapsed() / 64, thom_video_elapsed() % 64);
m_thom_border_index = index;
thom_border_changed();
}
@ -286,7 +286,7 @@ void thomson_state::thom_set_palette( unsigned index, uint16_t color )
if ( m_thom_pal[ index ] == color )
return;
LOG (( "thom_set_palette: %i to %03x at line %i col %i\n", index, color, thom_video_elapsed() / 64, thom_video_elapsed() % 64 ));
LOG("thom_set_palette: %i to %03x at line %i col %i\n", index, color, thom_video_elapsed() / 64, thom_video_elapsed() % 64);
m_thom_pal[ index ] = color;
if ( index == m_thom_border_index )
@ -303,7 +303,7 @@ void thomson_state::thom_set_video_mode( unsigned mode )
if ( mode != m_thom_vmode )
{
LOG (( "thom_set_video_mode: %i at line %i, col %i\n", mode, thom_video_elapsed() / 64, thom_video_elapsed() % 64 ));
LOG("thom_set_video_mode: %i at line %i, col %i\n", mode, thom_video_elapsed() / 64, thom_video_elapsed() % 64);
m_thom_vmode = mode;
thom_gplinfo_changed();
m_thom_vstate_dirty = 1;
@ -315,10 +315,11 @@ void thomson_state::thom_set_video_mode( unsigned mode )
void thomson_state::thom_set_video_page( unsigned page )
{
assert( page < THOM_NB_PAGES )
;
if ( page != m_thom_vpage ) {
LOG (( "thom_set_video_page: %i at line %i col %i\n", page, thom_video_elapsed() / 64, thom_video_elapsed() % 64 ));
assert( page < THOM_NB_PAGES );
if ( page != m_thom_vpage )
{
LOG("thom_set_video_page: %i at line %i col %i\n", page, thom_video_elapsed() / 64, thom_video_elapsed() % 64);
m_thom_vpage = page;
thom_gplinfo_changed();
m_thom_vstate_dirty = 1;
@ -570,19 +571,18 @@ END_UPDATE
/* 160x200, 16-colors, no constraint, alternate encoding, undocumented, tested */
static const unsigned tbl_bit16[4][4] = {
{ 0, 2, 8, 10 },
{ 1, 3, 9, 11 },
{ 4, 6, 12, 14 },
{ 5, 7, 13, 15 }
};
static constexpr unsigned tbl_bit16[4][4] = {
{ 0, 2, 8, 10 },
{ 1, 3, 9, 11 },
{ 4, 6, 12, 14 },
{ 5, 7, 13, 15 } };
UPDATE_HI( bitmap16alt )
{
unsigned p0 = tbl_bit16[ramb >> 6][rama >> 6];
unsigned p1 = tbl_bit16[(ramb >> 4) & 3][(rama >> 4) & 3];
unsigned p2 = tbl_bit16[(ramb >> 2) & 3][(rama >> 2) & 3];
unsigned p3 = tbl_bit16[ramb & 3][rama & 3];
unsigned p0 = tbl_bit16[ramb >> 6][rama >> 6];
unsigned p1 = tbl_bit16[(ramb >> 4) & 3][(rama >> 4) & 3];
unsigned p2 = tbl_bit16[(ramb >> 2) & 3][(rama >> 2) & 3];
unsigned p3 = tbl_bit16[ramb & 3][rama & 3];
dst[ 0] = dst[ 1] = dst[ 2] = dst[ 3] = pal[ p0 ];
dst[ 4] = dst[ 5] = dst[ 6] = dst[ 7] = pal[ p1 ];
dst[ 8] = dst[ 9] = dst[10] = dst[11] = pal[ p2 ];
@ -592,10 +592,10 @@ END_UPDATE
UPDATE_LOW( bitmap16alt )
{
unsigned p0 = tbl_bit16[ramb >> 6][rama >> 6];
unsigned p1 = tbl_bit16[(ramb >> 4) & 3][(rama >> 4) & 3];
unsigned p2 = tbl_bit16[(ramb >> 2) & 3][(rama >> 2) & 3];
unsigned p3 = tbl_bit16[ramb & 3][rama & 3];
unsigned p0 = tbl_bit16[ramb >> 6][rama >> 6];
unsigned p1 = tbl_bit16[(ramb >> 4) & 3][(rama >> 4) & 3];
unsigned p2 = tbl_bit16[(ramb >> 2) & 3][(rama >> 2) & 3];
unsigned p3 = tbl_bit16[ramb & 3][rama & 3];
dst[0] = dst[1] = pal[ p0 ];
dst[2] = dst[3] = pal[ p1 ];
dst[4] = dst[5] = pal[ p2 ];
@ -821,8 +821,8 @@ static const thom_scandraw thom_scandraw_funcs[THOM_VMODE_NB][2] =
FUN(to770), FUN(mo5), FUN(bitmap4), FUN(bitmap4alt), FUN(mode80),
FUN(bitmap16), FUN(page1), FUN(page2), FUN(overlay), FUN(overlay3),
FUN(to9), FUN(mode80_to9),
FUN(bitmap4althalf), FUN(mo5alt), FUN(overlayhalf),
FUN(bitmap16alt)
FUN(bitmap4althalf), FUN(mo5alt), FUN(overlayhalf),
FUN(bitmap16alt)
};
@ -952,7 +952,7 @@ uint32_t thomson_state::screen_update_thom(screen_device &screen, bitmap_ind16 &
rectangle lrect(0, xbleft - 1, 0, 0);
rectangle rrect(xbright, xright - 1, 0, 0);
//LOG (( "%f thom: video update called\n", machine().time().as_double()));
//LOG("%f thom: video update called\n", machine().time().as_double());
/* upper border */
for ( y = 0; y < THOM_BORDER_HEIGHT - m_thom_bheight; y++ )
@ -1050,7 +1050,7 @@ uint32_t thomson_state::screen_update_thom(screen_device &screen, bitmap_ind16 &
TIMER_CALLBACK_MEMBER( thomson_state::thom_set_init )
{
int init = param;
LOG (( "%f thom_set_init: %i, at line %i col %i\n", machine().time().as_double(), init, thom_video_elapsed() / 64, thom_video_elapsed() % 64 ));
LOG("%f thom_set_init: %i, at line %i col %i\n", machine().time().as_double(), init, thom_video_elapsed() / 64, thom_video_elapsed() % 64);
if ( m_thom_init_cb )
(this->*m_thom_init_cb)( init );
@ -1069,7 +1069,7 @@ WRITE_LINE_MEMBER(thomson_state::thom_vblank)
uint16_t b = 0;
struct thom_vsignal l = thom_get_lightpen_vsignal( 0, -1, 0 );
LOG (( "%f thom: video eof called\n", machine().time().as_double() ));
LOG("%f thom: video eof called\n", machine().time().as_double());
/* floppy indicator count */
if ( m_thom_floppy_wcount )
@ -1157,7 +1157,7 @@ static const uint16_t mo5_pal_init[16] =
VIDEO_START_MEMBER( thomson_state, thom )
{
LOG (( "thom: video start called\n" ));
LOG("thom: video start called\n");
/* scan-line state */
memset( m_thom_border_l, 0xff, sizeof( m_thom_border_l ) );
@ -1237,7 +1237,7 @@ void thomson_state::thom_configure_palette(double gamma, const uint16_t* pal, pa
void thomson_state::thom_palette(palette_device &palette)
{
LOG (( "thom: palette init called\n" ));
LOG("thom: palette init called\n");
/* TO8 and later use an EF9369 color palette chip
The spec shows a built-in gamma correction for gamma=2.8
@ -1253,7 +1253,7 @@ void thomson_state::thom_palette(palette_device &palette)
void thomson_state::mo5_palette(palette_device &palette)
{
LOG (( "thom: MO5 palette init called\n" ));
LOG("thom: MO5 palette init called\n");
/* The MO5 has a different fixed palette than the TO7/70.
We use a smaller gamma correction which gives intutively better