summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/s3c24xx.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-12-31 07:52:26 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-12-31 07:52:26 +0000
commit9cae38e0d82a71a20619c5ba49dce4eaa0bb0cc2 (patch)
tree56135caff0d5610acb3b1fc34b640853fe27b104 /src/emu/machine/s3c24xx.c
parent384b14a64b7e2a732b9b3429fc6d7aa443486c6c (diff)
Converted bitmap_t and rectangle into proper classes. Replaced BITMAP_ADDR*
macros with bitmap->pix* functions, and moved bitmap_fill() to bitmap->fill() among other similar changes. Bitmap fields now only available via accessors. Replaced sect_rect with &= and union_rect with |= operators for rectangle classes. Some general cleanup as a result of these changes. [Aaron Giles]
Diffstat (limited to 'src/emu/machine/s3c24xx.c')
-rw-r--r--src/emu/machine/s3c24xx.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c
index 6c4786cedf7..678504adab9 100644
--- a/src/emu/machine/s3c24xx.c
+++ b/src/emu/machine/s3c24xx.c
@@ -453,7 +453,7 @@ static void s3c24xx_lcd_render_tpal( device_t *device)
UINT32 color = s3c24xx_get_color_tpal( device);
for (int y = s3c24xx->lcd.vpos_min; y <= s3c24xx->lcd.vpos_max; y++)
{
- UINT32 *scanline = BITMAP_ADDR32( bitmap, y, s3c24xx->lcd.hpos_min);
+ UINT32 *scanline = &bitmap->pix32(y, s3c24xx->lcd.hpos_min);
for (int x = s3c24xx->lcd.hpos_min; x <= s3c24xx->lcd.hpos_max; x++)
{
*scanline++ = color;
@@ -465,7 +465,7 @@ static void s3c24xx_lcd_render_stn_01( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -487,7 +487,7 @@ static void s3c24xx_lcd_render_stn_01( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -497,7 +497,7 @@ static void s3c24xx_lcd_render_stn_02( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -511,7 +511,7 @@ static void s3c24xx_lcd_render_stn_02( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -521,7 +521,7 @@ static void s3c24xx_lcd_render_stn_04( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -535,7 +535,7 @@ static void s3c24xx_lcd_render_stn_04( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -545,7 +545,7 @@ static void s3c24xx_lcd_render_stn_08( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -559,7 +559,7 @@ static void s3c24xx_lcd_render_stn_08( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -569,7 +569,7 @@ static void s3c24xx_lcd_render_stn_12_p( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 16; i++)
{
*scanline++ = s3c24xx_get_color_stn_12( device, s3c24xx_lcd_dma_read_bits( device, 12));
@@ -579,7 +579,7 @@ static void s3c24xx_lcd_render_stn_12_p( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -588,7 +588,7 @@ static void s3c24xx_lcd_render_stn_12_u( device_t *device) // not tested
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -602,7 +602,7 @@ static void s3c24xx_lcd_render_stn_12_u( device_t *device) // not tested
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -612,7 +612,7 @@ static void s3c24xx_lcd_render_tft_01( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -626,7 +626,7 @@ static void s3c24xx_lcd_render_tft_01( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -636,7 +636,7 @@ static void s3c24xx_lcd_render_tft_02( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -650,7 +650,7 @@ static void s3c24xx_lcd_render_tft_02( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -660,7 +660,7 @@ static void s3c24xx_lcd_render_tft_04( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -674,7 +674,7 @@ static void s3c24xx_lcd_render_tft_04( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -684,7 +684,7 @@ static void s3c24xx_lcd_render_tft_08( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -698,7 +698,7 @@ static void s3c24xx_lcd_render_tft_08( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -708,7 +708,7 @@ static void s3c24xx_lcd_render_tft_16( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
bitmap_t *bitmap = s3c24xx->lcd.bitmap[0];
- UINT32 *scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ UINT32 *scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
for (int i = 0; i < 4; i++)
{
UINT32 data = s3c24xx_lcd_dma_read( device);
@@ -722,7 +722,7 @@ static void s3c24xx_lcd_render_tft_16( device_t *device)
s3c24xx->lcd.vpos++;
if (s3c24xx->lcd.vpos > s3c24xx->lcd.vpos_max) s3c24xx->lcd.vpos = s3c24xx->lcd.vpos_min;
s3c24xx->lcd.hpos = s3c24xx->lcd.hpos_min;
- scanline = BITMAP_ADDR32( bitmap, s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
+ scanline = &bitmap->pix32(s3c24xx->lcd.vpos, s3c24xx->lcd.hpos);
}
}
}
@@ -783,12 +783,12 @@ static void s3c24xx_video_start( device_t *device, running_machine &machine)
static void bitmap_blend( bitmap_t *bitmap_dst, bitmap_t *bitmap_src_1, bitmap_t *bitmap_src_2)
{
- for (int y = 0; y < bitmap_dst->height; y++)
+ for (int y = 0; y < bitmap_dst->height(); y++)
{
- UINT32 *line0 = BITMAP_ADDR32( bitmap_src_1, y, 0);
- UINT32 *line1 = BITMAP_ADDR32( bitmap_src_2, y, 0);
- UINT32 *line2 = BITMAP_ADDR32( bitmap_dst, y, 0);
- for (int x = 0; x < bitmap_dst->width; x++)
+ UINT32 *line0 = &bitmap_src_1->pix32(y);
+ UINT32 *line1 = &bitmap_src_2->pix32(y);
+ UINT32 *line2 = &bitmap_dst->pix32(y);
+ for (int x = 0; x < bitmap_dst->width(); x++)
{
UINT32 color0 = line0[x];
UINT32 color1 = line1[x];