notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix broken error path
[picodrive.git]
/
pico
/
mode4.c
diff --git
a/pico/mode4.c
b/pico/mode4.c
index
c945f6f
..
4abace6
100644
(file)
--- a/
pico/mode4.c
+++ b/
pico/mode4.c
@@
-28,7
+28,7
@@
static int screen_offset;
static int TileNormM4(int sx, int addr, int pal)
{
static int TileNormM4(int sx, int addr, int pal)
{
- unsigned char *pd = HighCol + sx;
+ unsigned char *pd =
Pico.est.
HighCol + sx;
unsigned int pack, t;
pack = *(unsigned int *)(Pico.vram + addr); /* Get 4 bitplanes / 8 pixels */
unsigned int pack, t;
pack = *(unsigned int *)(Pico.vram + addr); /* Get 4 bitplanes / 8 pixels */
@@
-50,7
+50,7
@@
static int TileNormM4(int sx, int addr, int pal)
static int TileFlipM4(int sx,int addr,int pal)
{
static int TileFlipM4(int sx,int addr,int pal)
{
- unsigned char *pd = HighCol + sx;
+ unsigned char *pd =
Pico.est.
HighCol + sx;
unsigned int pack, t;
pack = *(unsigned int *)(Pico.vram + addr); /* Get 4 bitplanes / 8 pixels */
unsigned int pack, t;
pack = *(unsigned int *)(Pico.vram + addr); /* Get 4 bitplanes / 8 pixels */
@@
-192,7
+192,7
@@
static void DrawDisplayM4(int scanline)
if (pv->reg[0] & 0x20)
// first column masked
if (pv->reg[0] & 0x20)
// first column masked
- ((int *)
HighCol)[2] = ((int *)
HighCol)[3] = 0xe0e0e0e0;
+ ((int *)
Pico.est.HighCol)[2] = ((int *)Pico.est.
HighCol)[3] = 0xe0e0e0e0;
}
void PicoFrameStartMode4(void)
}
void PicoFrameStartMode4(void)
@@
-219,7
+219,7
@@
void PicoFrameStartMode4(void)
rendlines = lines;
}
rendlines = lines;
}
- DrawLineDest = (char *)DrawLineDestBase + screen_offset * DrawLineDestIncrement;
+
Pico.est.
DrawLineDest = (char *)DrawLineDestBase + screen_offset * DrawLineDestIncrement;
}
void PicoLineMode4(int line)
}
void PicoLineMode4(int line)
@@
-233,7
+233,7
@@
void PicoLineMode4(int line)
skip_next_line = PicoScanBegin(line + screen_offset);
// Draw screen:
skip_next_line = PicoScanBegin(line + screen_offset);
// Draw screen:
- BackFill(Pico.video.reg[7] & 0x0f, 0);
+ BackFill(Pico.video.reg[7] & 0x0f, 0
, &Pico.est
);
if (Pico.video.reg[1] & 0x40)
DrawDisplayM4(line);
if (Pico.video.reg[1] & 0x40)
DrawDisplayM4(line);
@@
-243,13
+243,13
@@
void PicoLineMode4(int line)
if (PicoScanEnd != NULL)
skip_next_line = PicoScanEnd(line + screen_offset);
if (PicoScanEnd != NULL)
skip_next_line = PicoScanEnd(line + screen_offset);
-
DrawLineDest = (char *)
DrawLineDest + DrawLineDestIncrement;
+
Pico.est.DrawLineDest = (char *)Pico.est.
DrawLineDest + DrawLineDestIncrement;
}
void PicoDoHighPal555M4(void)
{
unsigned int *spal=(void *)Pico.cram;
}
void PicoDoHighPal555M4(void)
{
unsigned int *spal=(void *)Pico.cram;
- unsigned int *dpal=(void *)HighPal;
+ unsigned int *dpal=(void *)
Pico.est.
HighPal;
unsigned int t;
int i;
unsigned int t;
int i;
@@
-267,7
+267,7
@@
void PicoDoHighPal555M4(void)
t |= (t >> 4) & 0x08610861;
*dpal = t;
}
t |= (t >> 4) & 0x08610861;
*dpal = t;
}
- HighPal[0xe0] = 0;
+
Pico.est.
HighPal[0xe0] = 0;
}
static void FinalizeLineRGB555M4(int line)
}
static void FinalizeLineRGB555M4(int line)
@@
-282,12
+282,12
@@
static void FinalizeLineRGB555M4(int line)
static void FinalizeLine8bitM4(int line)
{
static void FinalizeLine8bitM4(int line)
{
- unsigned char *pd = DrawLineDest;
+ unsigned char *pd =
Pico.est.
DrawLineDest;
if (!(PicoOpt & POPT_DIS_32C_BORDER))
pd += 32;
if (!(PicoOpt & POPT_DIS_32C_BORDER))
pd += 32;
- memcpy32((int *)pd, (int *)(HighCol+8), 256/4);
+ memcpy32((int *)pd, (int *)(
Pico.est.
HighCol+8), 256/4);
}
void PicoDrawSetOutputMode4(pdso_t which)
}
void PicoDrawSetOutputMode4(pdso_t which)