X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FPico.c;h=02cad9b5fa9b7e992f5e099373ff8b7f4511d84d;hb=1cb1584b86a5679b8d32ccfc190f6e76c920810f;hp=0847f291db5b42f4b444e0a4a81edecb2bebfda9;hpb=b542be4686241c9e0722ff8e452980f9ac2b4d7c;p=picodrive.git diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c index 0847f29..02cad9b 100644 --- a/Pico/cd/Pico.c +++ b/Pico/cd/Pico.c @@ -48,16 +48,18 @@ PICO_INTERNAL void PicoExitMCD(void) //dump_ram(Pico.ram, "ram.bin"); } -PICO_INTERNAL int PicoResetMCD(int hard) +PICO_INTERNAL void PicoPowerMCD(void) +{ + int fmt_size = sizeof(formatted_bram); + memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); + memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M)); + 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); +} + +PICO_INTERNAL int PicoResetMCD(void) { - if (hard) { - int fmt_size = sizeof(formatted_bram); - memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram)); - memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M)); - 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); - } memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs)); memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm)); memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m)); @@ -75,10 +77,14 @@ PICO_INTERNAL int PicoResetMCD(int hard) #endif // use SRam.data for RAM cart - if (SRam.data) free(SRam.data); - SRam.data = NULL; - if (PicoOpt&0x8000) - SRam.data = calloc(1, 0x12000); + if (PicoOpt&0x8000) { + if (SRam.data == NULL) + SRam.data = calloc(1, 0x12000); + } + else if (SRam.data != NULL) { + free(SRam.data); + SRam.data = NULL; + } SRam.start = SRam.end = 0; // unused return 0;