X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=a4fe3c88bf740add99aa09a8df6de847ca64d839;hb=f58f05d28a40e783a6159186d01dbfe67cdc0728;hp=e3643df8879b88f330d4df68bee7e1ec3f0093e9;hpb=cea6590346640236914eeff840401c55db8a77ce;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index e3643df..a4fe3c8 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -1,21 +1,26 @@
 // 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.
 
 
 #include "PicoInt.h"
+#include "cd/gfx_cd.h"
 
 extern const unsigned char  hcounts_32[];
 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()
@@ -88,7 +93,8 @@ static void DmaSlow(int len)
 
   if(Pico.m.scanline != -1) {
     Pico.m.dma_bytes += len;
-    SekSetCyclesLeft(SekCyclesLeft - CheckDMA());
+    if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCyclesBurn(CheckDMA());
+    else SekSetCyclesLeftNoMCD(SekCyclesLeftNoMCD - CheckDMA());
   } else {
     // be approximate in non-accurate mode
     SekSetCyclesLeft(SekCyclesLeft - (len*(((488<<8)/167))>>8));
@@ -98,25 +104,31 @@ static void DmaSlow(int len)
     pd=(u16 *)(Pico.ram+(source&0xfffe));
     pdend=(u16 *)(Pico.ram+0x10000);
   } else if(PicoMCD & 1) {
-    dprintf("DmaSlow CD");
+    dprintf("DmaSlow CD, r3=%02x", Pico_mcd->s68k_regs[3]);
     if(source<0x20000) { // Bios area
       pd=(u16 *)(Pico_mcd->bios+(source&~1));
       pdend=(u16 *)(Pico_mcd->bios+0x20000);
-    } else if ((source&0xfc0000)==0x200000 && (!(Pico_mcd->s68k_regs[3]&4))) { // Word Ram
+    } else if ((source&0xfc0000)==0x200000) { // Word Ram
+      source -= 2;
       if (!(Pico_mcd->s68k_regs[3]&4)) { // 2M mode
-        source -= 2;
-        pd=(u16 *)(Pico_mcd->word_ram+(source&0x3fffe));
-        pdend=(u16 *)(Pico_mcd->word_ram+0x40000);
+        pd=(u16 *)(Pico_mcd->word_ram2M+(source&0x3fffe));
+        pdend=(u16 *)(Pico_mcd->word_ram2M+0x40000);
       } else {
-        dprintf("DmaSlow: unsupported src");
-	return;
+        if (source < 0x220000) { // 1M mode
+          int bank = Pico_mcd->s68k_regs[3]&1;
+          pd=(u16 *)(Pico_mcd->word_ram1M[bank]+(source&0x1fffe));
+          pdend=(u16 *)(Pico_mcd->word_ram1M[bank]+0x20000);
+	} else {
+          DmaSlowCell(source, a, len, inc);
+          return;
+	}
       }
     } else if ((source&0xfe0000)==0x020000) { // Prg Ram
       u8 *prg_ram = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
       pd=(u16 *)(prg_ram+(source&0x1fffe));
       pdend=(u16 *)(prg_ram+0x20000);
     } else {
-      dprintf("DmaSlow: unsupported src");
+      dprintf("DmaSlow FIXME: unsupported src");
       return;
     }
   } else {
@@ -142,8 +154,8 @@ static void DmaSlow(int len)
       if (inc == 2 && !(a&1) && a+len*2 < 0x10000)
       {
         // most used DMA mode
-	memcpy16(r + (a>>1), pd, len);
-	a += len*2;
+        memcpy16(r + (a>>1), pd, len);
+        a += len*2;
       }
       else
       {
@@ -166,7 +178,7 @@ static void DmaSlow(int len)
       r = Pico.cram;
       for(a2=a&0x7f; len; len--)
       {
-        r[a2>>1] = (u16)*pd++;; // bit 0 is ignored
+        r[a2>>1] = (u16)*pd++; // bit 0 is ignored
         // AutoIncrement
         a2+=inc;
         // didn't src overlap?
@@ -300,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;
 
@@ -382,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;