amalgamation

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index e3643df..a4fe3c8 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -1,21 +1,26 @@
 // This is part of Pico Library\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 \r
 #include "PicoInt.h"\r
+#include "cd/gfx_cd.h"\r
 \r
 extern const unsigned char  hcounts_32[];\r
 extern const unsigned char  hcounts_40[];\r
 extern const unsigned short vcounts[];\r
 extern int rendstatus;\r
 \r
+#ifndef UTYPES_DEFINED\r
 typedef unsigned char  u8;\r
 typedef unsigned short u16;\r
+typedef unsigned int   u32;\r
+#define UTYPES_DEFINED\r
+#endif\r
 \r
 \r
 static __inline void AutoIncrement()\r
@@ -88,7 +93,8 @@ static void DmaSlow(int len)
 \r
   if(Pico.m.scanline != -1) {\r
     Pico.m.dma_bytes += len;\r
-    SekSetCyclesLeft(SekCyclesLeft - CheckDMA());\r
+    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA());\r
+    else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());\r
   } else {\r
     // be approximate in non-accurate mode\r
     SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8));\r
@@ -98,25 +104,31 @@ static void DmaSlow(int len)
     pd=(u16 *)(Pico.ram+(source&0xfffe));\r
     pdend=(u16 *)(Pico.ram+0x10000);\r
   } else if(PicoMCD & 1) {\r
-    dprintf("DmaSlow CD");\r
+    dprintf("DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]);\r
     if(source<0x20000) { // Bios area\r
       pd=(u16 *)(Pico_mcd->bios+(source&~1));\r
       pdend=(u16 *)(Pico_mcd->bios+0x20000);\r
-    } else if ((source&0xfc0000)==0x200000 && (!(Pico_mcd->s68k_regs[3]&4))) { // Word Ram\r
+    } else if ((source&0xfc0000)==0x200000) { // Word Ram\r
+      source -= 2;\r
       if (!(Pico_mcd->s68k_regs[3]&4)) { // 2M mode\r
-        source -= 2;\r
-        pd=(u16 *)(Pico_mcd->word_ram+(source&0x3fffe));\r
-        pdend=(u16 *)(Pico_mcd->word_ram+0x40000);\r
+        pd=(u16 *)(Pico_mcd->word_ram2M+(source&0x3fffe));\r
+        pdend=(u16 *)(Pico_mcd->word_ram2M+0x40000);\r
       } else {\r
-        dprintf("DmaSlow: unsupported src");\r
-       return;\r
+        if (source < 0x220000) { // 1M mode\r
+          int bank = Pico_mcd->s68k_regs[3]&1;\r
+          pd=(u16 *)(Pico_mcd->word_ram1M[bank]+(source&0x1fffe));\r
+          pdend=(u16 *)(Pico_mcd->word_ram1M[bank]+0x20000);\r
+       } else {\r
+          DmaSlowCell(source, a, len, inc);\r
+          return;\r
+       }\r
       }\r
     } else if ((source&0xfe0000)==0x020000) { // Prg Ram\r
       u8 *prg_ram = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];\r
       pd=(u16 *)(prg_ram+(source&0x1fffe));\r
       pdend=(u16 *)(prg_ram+0x20000);\r
     } else {\r
-      dprintf("DmaSlow: unsupported src");\r
+      dprintf("DmaSlow FIXME: unsupported src");\r
       return;\r
     }\r
   } else {\r
@@ -142,8 +154,8 @@ 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
-       a += len*2;\r
+        memcpy16(r + (a>>1), pd, len);\r
+        a += len*2;\r
       }\r
       else\r
       {\r
@@ -166,7 +178,7 @@ static void DmaSlow(int len)
       r = Pico.cram;\r
       for(a2=a&0x7f; len; len--)\r
       {\r
-        r[a2>>1] = (u16)*pd++;; // bit 0 is ignored\r
+        r[a2>>1] = (u16)*pd++; // bit 0 is ignored\r
         // AutoIncrement\r
         a2+=inc;\r
         // didn't src overlap?\r
@@ -300,7 +312,7 @@ static void CommandChange()
   if (cmd&0x80) CommandDma();\r
 }\r
 \r
-void PicoVideoWrite(unsigned int a,unsigned short d)\r
+PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)\r
 {\r
   struct PicoVideo *pvid=&Pico.video;\r
 \r
@@ -382,7 +394,7 @@ void PicoVideoWrite(unsigned int a,unsigned short d)
   }\r
 }\r
 \r
-unsigned int PicoVideoRead(unsigned int a)\r
+PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a)\r
 {\r
   unsigned int d=0;\r
 \r