rearrange globals

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index b5e3f86..355489e 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -109,7 +109,7 @@ static void DmaSlow(int len, unsigned int source)
     base = (u16 *)PicoMem.ram;\r
     mask = 0xffff;\r
   }\r
-  else if (PicoAHW & PAHW_MCD)\r
+  else if (PicoIn.AHW & PAHW_MCD)\r
   {\r
     u8 r3 = Pico_mcd->s68k_regs[3];\r
     elprintf(EL_VDPDMA, "DmaSlow CD, r3=%02x", r3);\r
@@ -346,8 +346,8 @@ static NOINLINE void CommandChange(void)
 \r
 static void DrawSync(int blank_on)\r
 {\r
-  if (Pico.m.scanline < 224 && !(PicoOpt & POPT_ALT_RENDERER) &&\r
-      !PicoSkipFrame && Pico.est.DrawScanline <= Pico.m.scanline) {\r
+  if (Pico.m.scanline < 224 && !(PicoIn.opt & POPT_ALT_RENDERER) &&\r
+      !PicoIn.skipFrame && Pico.est.DrawScanline <= Pico.m.scanline) {\r
     //elprintf(EL_ANOMALY, "sync");\r
     PicoDrawSync(Pico.m.scanline, blank_on);\r
   }\r
@@ -376,7 +376,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
       pvid->pending=0;\r
     }\r
 \r
-    if (!(pvid->status & SR_VB) && !(PicoOpt&POPT_DIS_VDP_FIFO))\r
+    if (!(pvid->status & SR_VB) && !(PicoIn.opt&POPT_DIS_VDP_FIFO))\r
     {\r
       int use = pvid->type == 1 ? 2 : 1;\r
       pvid->lwrite_cnt -= use;\r