X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=a4fe3c88bf740add99aa09a8df6de847ca64d839;hb=83c093a48ab58670ea82d0ec81658daa9f9b950a;hp=997b938aedcb2a7a2ee58ab6354011ca716524d6;hpb=7336a99a49268970e0df89d15210b98dd7798f1e;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 997b938..a4fe3c8 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -1,7 +1,7 @@
 // This is part of Pico Library
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -15,8 +15,12 @@ extern const unsigned char  hcounts_40[];
 extern const unsigned short vcounts[];
 extern int rendstatus;
 
+#ifndef UTYPES_DEFINED
 typedef unsigned char  u8;
 typedef unsigned short u16;
+typedef unsigned int   u32;
+#define UTYPES_DEFINED
+#endif
 
 
 static __inline void AutoIncrement()
@@ -89,7 +93,7 @@ static void DmaSlow(int len)
 
   if(Pico.m.scanline != -1) {
     Pico.m.dma_bytes += len;
-    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt+=CheckDMA();
+    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA());
     else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
   } else {
     // be approximate in non-accurate mode
@@ -308,7 +312,7 @@ static void CommandChange()
   if (cmd&0x80) CommandDma();
 }
 
-void PicoVideoWrite(unsigned int a,unsigned short d)
+PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
 {
   struct PicoVideo *pvid=&Pico.video;
 
@@ -390,7 +394,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
   }
 }
 
-unsigned int PicoVideoRead(unsigned int a)
+PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)
 {
   unsigned int d=0;