X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmemory.c;h=95c78f9265d7284310f965dc88946e61b633fa9a;hb=bf092a3631694f525c3d1179b21ab8941e87e7d7;hp=5b3ebf5ef326c3c5d88b922ea51b556cc1f9a671;hpb=0ace9b9aac5de8f1ee5bf181132f98a1f81f4a1d;p=picodrive.git

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 5b3ebf5..95c78f9 100644
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -1,5 +1,10 @@
-// Memory I/O handlers for Sega/Mega CD.
-// (c) Copyright 2007-2009, Grazvydas "notaz" Ignotas
+/*
+ * Memory I/O handlers for Sega/Mega CD.
+ * (C) notaz, 2007-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "../pico_int.h"
 #include "../memory.h"
@@ -7,10 +12,10 @@
 #include "gfx_cd.h"
 #include "pcm.h"
 
-unsigned long s68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
+uptr s68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
+uptr s68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
+uptr s68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
+uptr s68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
 
 MAKE_68K_READ8(s68k_read8, s68k_read8_map)
 MAKE_68K_READ16(s68k_read16, s68k_read16_map)
@@ -961,14 +966,14 @@ static void remap_word_ram(int r3)
   if (!(r3 & 4))
   {
     for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x240000; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x200000;
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram2M - 0x200000;
   }
   else
   {
     for (i = M68K_FETCHBANK1*2/16; (i<<(24-FAMEC_FETCHBITS)) < 0x220000; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[r3 & 1] - 0x200000;
     for (i = M68K_FETCHBANK1*0x0c/0x100; (i<<(24-FAMEC_FETCHBITS)) < 0x0e0000; i++)
-      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;
+      PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram1M[(r3&1)^1] - 0x0c0000;
   }
 #endif
 }
@@ -1068,23 +1073,23 @@ PICO_INTERNAL void PicoMemSetupCD(void)
     // M68k
     // by default, point everything to fitst 64k of ROM (BIOS)
     for (i = 0; i < M68K_FETCHBANK1; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
     // now real ROM (BIOS)
     for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom;
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
     // .. and RAM
     for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
     // S68k
     // PRG RAM is default
     for (i = 0; i < M68K_FETCHBANK1; i++)
-      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));
+      PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->prg_ram - (i<<(24-FAMEC_FETCHBITS));
     // real PRG RAM
     for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0x80000; i++)
-      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->prg_ram;
+      PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->prg_ram;
     // WORD RAM 2M area
     for (i = M68K_FETCHBANK1*0x08/0x100; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < 0xc0000; i++)
-      PicoCpuFS68k.Fetch[i] = (unsigned int)Pico_mcd->word_ram2M - 0x80000;
+      PicoCpuFS68k.Fetch[i] = (unsigned long)Pico_mcd->word_ram2M - 0x80000;
     // remap_word_ram() will setup word ram for both
   }
 #endif