X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2Fcd_sys.c;h=390c3094d3a279fbad106e174e3ddd3ba7f02438;hb=2270612aa7ee7d04549e95c2ab4d72f6aa67fa8d;hp=c0199e826c4e281b04db790b440389143ab42211;hpb=75736070161d40608ba3052b4c95b42943f9de3d;p=picodrive.git diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c index c0199e8..390c309 100644 --- a/Pico/cd/cd_sys.c +++ b/Pico/cd/cd_sys.c @@ -1,3 +1,12 @@ +/*********************************************************** + * * + * This source was taken from the Gens project * + * Written by Stéphane Dallongeville * + * Copyright (c) 2002 by Stéphane Dallongeville * + * Modified/adapted for PicoDrive by notaz, 2007 * + * * + ***********************************************************/ + #include #include "cd_sys.h" #include "cd_file.h" @@ -17,19 +26,7 @@ #define PLAYING 0x0100 // PLAYING audio track CDD status -/* -int CDDA_Enable; - -int CD_Audio_Buffer_L[8192]; -int CD_Audio_Buffer_R[8192]; -int CD_Audio_Buffer_Read_Pos = 0; -int CD_Audio_Buffer_Write_Pos = 2000; -int CD_Audio_Starting; -*/ - static int CD_Present = 0; -// int CD_Timer_Counter = 0; // TODO: check refs - #define CHECK_TRAY_OPEN \ @@ -65,20 +62,6 @@ if (!CD_Present) \ } -#if 0 -static void MSB2DWORD(unsigned int *d, unsigned char *b) -{ - unsigned int retVal; - - retVal = (unsigned int )b[0]; - retVal = (retVal<<8) + (unsigned int )b[1]; - retVal = (retVal<<8) + (unsigned int )b[2]; - retVal = (retVal<<8) + (unsigned int )b[3]; - - *d = retVal; -} -#endif - static int MSF_to_LBA(_msf *MSF) { return (MSF->M * 60 * 75) + (MSF->S * 75) + MSF->F - 150; @@ -152,17 +135,7 @@ void Check_CD_Command(void) { cdprintf("CHECK CD COMMAND"); - // Check CDD - - if (Pico_mcd->scd.CDD_Complete) - { - Pico_mcd->scd.CDD_Complete = 0; - - CDD_Export_Status(); - } - // Check CDC - if (Pico_mcd->scd.Status_CDC & 1) // CDC is reading data ... { cdprintf("Got a read command"); @@ -179,6 +152,14 @@ void Check_CD_Command(void) else Pico_mcd->scd.File_Add_Delay--; } + // Check CDD + if (Pico_mcd->scd.CDD_Complete) + { + Pico_mcd->scd.CDD_Complete = 0; + + CDD_Export_Status(); + } + if (Pico_mcd->scd.Status_CDD == FAST_FOW) { Pico_mcd->scd.Cur_LBA += 10; @@ -210,8 +191,10 @@ void Reset_CD(void) { Pico_mcd->scd.Cur_Track = 0; Pico_mcd->scd.Cur_LBA = -150; - Pico_mcd->scd.Status_CDD = READY; + Pico_mcd->scd.Status_CDC &= ~1; + Pico_mcd->scd.Status_CDD = CD_Present ? READY : NOCD; Pico_mcd->scd.CDD_Complete = 0; + Pico_mcd->scd.File_Add_Delay = 0; } @@ -223,12 +206,15 @@ int Insert_CD(char *iso_name, int is_bin) // memset(CD_Audio_Buffer_R, 0, 4096 * 4); CD_Present = 0; + Pico_mcd->scd.Status_CDD = NOCD; if (iso_name != NULL) { ret = Load_ISO(iso_name, is_bin); - if (ret == 0) + if (ret == 0) { CD_Present = 1; + Pico_mcd->scd.Status_CDD = READY; + } } return ret; @@ -671,31 +657,23 @@ int Fast_Rewind_CDD_c9(void) int Close_Tray_CDD_cC(void) { + CD_Present = 0; //Clear_Sound_Buffer(); Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read - { -#if 0 // TODO - char new_iso[1024]; - - memset(new_iso, 0, 1024); + printf("tray close\n"); - while (!Change_File_L(new_iso, Rom_Dir, "Load SegaCD image file", "SegaCD image file\0*.bin;*.iso;*.raw\0All files\0*.*\0\0", "")); - Reload_SegaCD(new_iso); + if (PicoMCDcloseTray != NULL) + CD_Present = PicoMCDcloseTray(); - CD_Present = 1; -#else - CD_Present = 0; -#endif - Pico_mcd->scd.Status_CDD = STOPPED; - Pico_mcd->cdd.Status = 0x0000; + Pico_mcd->scd.Status_CDD = CD_Present ? STOPPED : NOCD; + Pico_mcd->cdd.Status = 0x0000; - Pico_mcd->cdd.Minute = 0; - Pico_mcd->cdd.Seconde = 0; - Pico_mcd->cdd.Frame = 0; - Pico_mcd->cdd.Ext = 0; - } + Pico_mcd->cdd.Minute = 0; + Pico_mcd->cdd.Seconde = 0; + Pico_mcd->cdd.Frame = 0; + Pico_mcd->cdd.Ext = 0; Pico_mcd->scd.CDD_Complete = 1; @@ -709,9 +687,14 @@ int Open_Tray_CDD_cD(void) Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read + printf("tray open\n"); + Unload_ISO(); CD_Present = 0; + if (PicoMCDopenTray != NULL) + PicoMCDopenTray(); + Pico_mcd->scd.Status_CDD = TRAY_OPEN; Pico_mcd->cdd.Status = 0x0E00; @@ -760,193 +743,3 @@ int CDD_Def(void) } - - -/*************************** - * Others CD functions * - **************************/ - - -// do we need them? -#if 0 -void Write_CD_Audio(short *Buf, int rate, int channel, int lenght) -{ - unsigned int lenght_src, lenght_dst; - unsigned int pos_src, pas_src; - - if (rate == 0) return; - if (Sound_Rate == 0) return; - - if (CD_Audio_Starting) - { - CD_Audio_Starting = 0; - memset(CD_Audio_Buffer_L, 0, 4096 * 4); - memset(CD_Audio_Buffer_R, 0, 4096 * 4); - CD_Audio_Buffer_Write_Pos = (CD_Audio_Buffer_Read_Pos + 2000) & 0xFFF; - } - - lenght_src = rate / 75; // 75th of a second - lenght_dst = Sound_Rate / 75; // 75th of a second - - pas_src = (lenght_src << 16) / lenght_dst; - pos_src = 0; - -#ifdef DEBUG_CD - fprintf(debug_SCD_file, "\n********* Write Pos = %d ", CD_Audio_Buffer_Write_Pos); -#endif - - if (channel == 2) - { - __asm - { - mov edi, CD_Audio_Buffer_Write_Pos - mov ebx, Buf - xor esi, esi - mov ecx, lenght_dst - xor eax, eax - mov edx, pas_src - dec ecx - jmp short loop_stereo - -align 16 - -loop_stereo: - movsx eax, word ptr [ebx + esi * 4] - mov CD_Audio_Buffer_L[edi * 4], eax - movsx eax, word ptr [ebx + esi * 4 + 2] - mov CD_Audio_Buffer_R[edi * 4], eax - mov esi, dword ptr pos_src - inc edi - add esi, edx - and edi, 0xFFF - mov dword ptr pos_src, esi - shr esi, 16 - dec ecx - jns short loop_stereo - - mov CD_Audio_Buffer_Write_Pos, edi - } - } - else - { - __asm - { - mov edi, CD_Audio_Buffer_Write_Pos - mov ebx, Buf - xor esi, esi - mov ecx, lenght_dst - xor eax, eax - mov edx, pas_src - dec ecx - jmp short loop_mono - -align 16 - -loop_mono: - movsx eax, word ptr [ebx + esi * 2] - mov CD_Audio_Buffer_L[edi * 4], eax - mov CD_Audio_Buffer_R[edi * 4], eax - mov esi, dword ptr pos_src - inc edi - add esi, edx - and edi, 0xFFF - mov dword ptr pos_src, esi - shr esi, 16 - dec ecx - jns short loop_mono - - mov CD_Audio_Buffer_Write_Pos, edi - } - } - -#ifdef DEBUG_CD - fprintf(debug_SCD_file, "Write Pos 2 = %d\n\n", CD_Audio_Buffer_Write_Pos); -#endif -} - - -void Update_CD_Audio(int **buf, int lenght) -{ - int *Buf_L, *Buf_R; - int diff; - - Buf_L = buf[0]; - Buf_R = buf[1]; - - if (Pico_mcd->s68k_regs[0x36] & 0x01) return; - if (!(Pico_mcd->scd.Status_CDC & 1)) return; - if (CD_Audio_Starting) return; - -#ifdef DEBUG_CD - fprintf(debug_SCD_file, "\n********* Read Pos Normal = %d ", CD_Audio_Buffer_Read_Pos); -#endif - - if (CD_Audio_Buffer_Write_Pos < CD_Audio_Buffer_Read_Pos) - { - diff = CD_Audio_Buffer_Write_Pos + (4096) - CD_Audio_Buffer_Read_Pos; - } - else - { - diff = CD_Audio_Buffer_Write_Pos - CD_Audio_Buffer_Read_Pos; - } - - if (diff < 500) CD_Audio_Buffer_Read_Pos -= 2000; - else if (diff > 3500) CD_Audio_Buffer_Read_Pos += 2000; - -#ifdef DEBUG_CD - else fprintf(debug_SCD_file, " pas de modifs "); -#endif - - CD_Audio_Buffer_Read_Pos &= 0xFFF; - -#ifdef DEBUG_CD - fprintf(debug_SCD_file, "Read Pos = %d ", CD_Audio_Buffer_Read_Pos); -#endif - - if (CDDA_Enable) - { - __asm - { - mov ecx, lenght - mov esi, CD_Audio_Buffer_Read_Pos - mov edi, Buf_L - dec ecx - -loop_L: - mov eax, CD_Audio_Buffer_L[esi * 4] - add [edi], eax - inc esi - add edi, 4 - and esi, 0xFFF - dec ecx - jns short loop_L - - mov ecx, lenght - mov esi, CD_Audio_Buffer_Read_Pos - mov edi, Buf_R - dec ecx - -loop_R: - mov eax, CD_Audio_Buffer_R[esi * 4] - add [edi], eax - inc esi - add edi, 4 - and esi, 0xFFF - dec ecx - jns short loop_R - - mov CD_Audio_Buffer_Read_Pos, esi - } - } - else - { - CD_Audio_Buffer_Read_Pos += lenght; - CD_Audio_Buffer_Read_Pos &= 0xFFF; - } - -#ifdef DEBUG_CD - fprintf(debug_SCD_file, "Read Pos 2 = %d\n\n", CD_Audio_Buffer_Read_Pos); -#endif -} -#endif -