Update submodules

[picodrive.git] / pico / videoport.c

diff --git a/pico/videoport.c b/pico/videoport.c
index 1e60686..61f7f18 100644 (file)
--- a/pico/videoport.c
+++ b/pico/videoport.c
@@ -8,7 +8,6 @@
  */\r
 \r
 #include "pico_int.h"\r
-#include "cd/gfx_cd.h"\r
 \r
 int line_base_cycles;\r
 extern const unsigned char  hcounts_32[];\r
@@ -23,7 +22,7 @@ typedef unsigned int   u32;
 \r
 int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp) = NULL;\r
 \r
-static __inline void AutoIncrement(void)\r
+static INLINE void AutoIncrement(void)\r
 {\r
   Pico.video.addr=(unsigned short)(Pico.video.addr+Pico.video.reg[0xf]);\r
 }\r
@@ -157,7 +156,7 @@ static void DmaSlow(int len)
       if (inc == 2 && !(a&1) && a+len*2 < 0x10000)\r
       {\r
         // most used DMA mode\r
-        memcpy16(r + (a>>1), pd, len);\r
+        pmemcpy16(r + (a>>1), pd, len);\r
         a += len*2;\r
       }\r
       else\r