X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fpico.c;h=8c0bf25418031a84312ac6fa699172d81b9057c6;hb=fc1874de8af2fb53449bcfa931e025071f188b3e;hp=f76a7f934d002ff90e3864ca0ef13c908d64c682;hpb=d687ef50419fe4f286df866333a5425204e5b98e;p=picodrive.git

diff --git a/pico/cd/pico.c b/pico/cd/pico.c
index f76a7f9..8c0bf25 100644
--- a/pico/cd/pico.c
+++ b/pico/cd/pico.c
@@ -30,6 +30,7 @@ PICO_INTERNAL void PicoPowerMCD(void)
   memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
   memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
   memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
+  PicoMemRemapCD(1);
 }
 
 PICO_INTERNAL int PicoResetMCD(void)
@@ -45,13 +46,12 @@ PICO_INTERNAL int PicoResetMCD(void)
   Reset_CD();
   LC89510_Reset();
   gfx_cd_reset();
-  PicoMemResetCD(1);
 #ifdef _ASM_CD_MEMORY_C
   //PicoMemResetCDdecode(1); // don't have to call this in 2M mode
 #endif
 
   // use SRam.data for RAM cart
-  if (PicoOpt&POPT_EN_MCD_RAMCART) {
+  if (PicoOpt & POPT_EN_MCD_RAMCART) {
     if (SRam.data == NULL)
       SRam.data = calloc(1, 0x12000);
   }
@@ -208,20 +208,6 @@ static __inline void update_chips(void)
 	// update gfx chip
 	if (Pico_mcd->rot_comp.Reg_58 & 0x8000)
 		gfx_cd_update();
-
-	// delayed setting of DMNA bit (needed for Silpheed)
-	if (Pico_mcd->m.state_flags & 2) {
-		Pico_mcd->m.state_flags &= ~2;
-		if (!(Pico_mcd->s68k_regs[3] & 4)) {
-			Pico_mcd->s68k_regs[3] |=  2;
-			Pico_mcd->s68k_regs[3] &= ~1;
-#ifdef USE_POLL_DETECT
-			if ((s68k_poll_adclk&0xfe) == 2) {
-				SekSetStopS68k(0); s68k_poll_adclk = 0;
-			}
-#endif
-		}
-	}
 }