[VM][MSM5205] Add new API: pause_w().

[VM][PCENGINE][ADPCM] Mostly fixed around playing.(Excepts Gradius II?).

diff --git a/source/src/vm/common_vm/CMakeLists.txt b/source/src/vm/common_vm/CMakeLists.txt
index 244b7c0..89a3a1e 100644 (file)
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
 message("* vm/common_vm")
 
-SET(THIS_LIB_VERSION 2.6.0)
+SET(THIS_LIB_VERSION 2.6.1)
 
 #include(cotire)
 set(s_vm_common_vm_srcs

diff --git a/source/src/vm/msm5205.cpp b/source/src/vm/msm5205.cpp
index 2c6b87a..01e1593 100644 (file)
--- a/source/src/vm/msm5205.cpp
+++ b/source/src/vm/msm5205.cpp
@@ -82,7 +82,7 @@ void MSM5205::reset()
        m_reset   = false;
        m_signal  = 0;
        m_step    = 0;
-
+       m_ignore = false;
        /* initialize clock */
        change_clock_w(m_mod_clock);
 
@@ -156,16 +156,17 @@ void MSM5205::event_callback(int event_id, int err)
                        if(m_vclk) return; // If MSM6585 Invert level.
                        /* update signal */
                        /* !! MSM5205 has internal 12bit decoding, signal width is 0 to 8191 !! */
-                       val = m_data;
-                       new_signal = m_signal + m_diff_lookup[m_step * 16 + (val & 15)];
-
-                       if (new_signal > 2047) new_signal = 2047;
-                       else if (new_signal < -2048) new_signal = -2048;
-
-                       m_step += index_shift[val & 7];
-
-                       if (m_step > 48) m_step = 48;
-                       else if (m_step < 0) m_step = 0;
+                       if(!(m_ignore)) {
+                               val = m_data;
+                               new_signal = m_signal + m_diff_lookup[m_step * 16 + (val & 15)];
+                               if (new_signal > 2047) new_signal = 2047;
+                               else if (new_signal < -2048) new_signal = -2048;
+                               
+                               m_step += index_shift[val & 7];
+                               
+                               if (m_step > 48) m_step = 48;
+                               else if (m_step < 0) m_step = 0;
+                       }
                }
 
                /* update when signal changed */
@@ -274,6 +275,14 @@ void MSM5205::playmode_w(int select)
        }
 }
 
+/*
+ *    PAUSE playing (hack for PCE).
+ */
+
+void MSM5205::pause_w(int data)
+{
+       m_ignore = (data != 0) ? true : false;
+}
 
 void MSM5205::set_volume(int volume)
 {
@@ -329,7 +338,7 @@ void MSM5205::set_volume(int ch, int decibel_l, int decibel_r)
        volume_r = decibel_to_volume(decibel_r + 6.0);
 }
 
-#define STATE_VERSION  2
+#define STATE_VERSION  3
 
 bool MSM5205::process_state(FILEIO* state_fio, bool loading)
 {
@@ -349,6 +358,7 @@ bool MSM5205::process_state(FILEIO* state_fio, bool loading)
        state_fio->StateValue(m_signal);
        state_fio->StateValue(m_step);
        state_fio->StateValue(m_select);
+       state_fio->StateValue(m_ignore);
        state_fio->StateValue(volume_m);
        return true;
 }

diff --git a/source/src/vm/msm5205.h b/source/src/vm/msm5205.h
index 6fa11e3..e03b603 100644 (file)
--- a/source/src/vm/msm5205.h
+++ b/source/src/vm/msm5205.h
@@ -51,6 +51,7 @@ private:
        int32_t m_bitwidth;           /* bit width selector -3B/4B    */
        int32_t m_signal;             /* current ADPCM signal         */
        int32_t m_step;               /* current ADPCM step           */
+       bool m_ignore;                            /* Stop to update data.This may be hack. */   
        int m_diff_lookup[49*16];
        int m_select;
        outputs_t m_vclk_cb;
@@ -91,6 +92,7 @@ public:
        void reset_w(int reset);
        void data_w(int data);
        void vclk_w(int vclk);
+       void pause_w(int stop);
        void playmode_w(int select);
        void set_volume(int volume);
        void change_clock_w(int32_t clock);

diff --git a/source/src/vm/pcengine/adpcm.cpp b/source/src/vm/pcengine/adpcm.cpp
index 477d44b..739dd64 100644 (file)
--- a/source/src/vm/pcengine/adpcm.cpp
+++ b/source/src/vm/pcengine/adpcm.cpp
@@ -60,14 +60,14 @@ uint32_t ADPCM::read_signal(int ch)
        case SIG_ADPCM_DATA:
                if(read_buf > 0) {
                        // Don't need to modify FLAGS 20190212 K.O
-//                     reg_0c |= ADPCM_REMAIN_READ_BUF;
+                       //reg_0c |= ADPCM_REMAIN_READ_BUF;
                        read_buf--;
 //                     if(read_buf == 0) {
 //                             reg_0c &= ~ADPCM_REMAIN_READ_BUF;
 //                     }
                        return 0x00;
                } else {
-//                     reg_0c &= ~ADPCM_REMAIN_READ_BUF;
+                       reg_0c &= ~ADPCM_REMAIN_READ_BUF;
                        uint8_t _d = ram[read_ptr & 0xffff];
                        read_ptr = (read_ptr + 1) & 0xffff;
                        return _d;
@@ -245,16 +245,9 @@ void ADPCM::write_signal(int ch, uint32_t data, uint32_t mask)
                do_dma(data);
                break;
        case SIG_ADPCM_DO_DMA_TRANSFER:
-               //if((play_in_progress) && ((write_ptr & 0xffff) >= (msm_ptr & 0xffff))) {
-               //      // now streaming, wait dma not to overwrite buffer before it is played
-               //      reg_0b = 0x00;// From Ootake v2.38.
-               //      dma_connected = false;
-                       //set_dma_status(false);  // DON'T MODIFY PCE's DMA STATUS (HACK by K.O 20190212)
-               //} else {
                //set_dma_status(true);
-                       dma_connected = true;
-                       do_dma(d_pce->read_signal(SIG_PCE_CDROM_RAW_DATA));
-               //}
+               dma_connected = true;
+               do_dma(d_pce->read_signal(SIG_PCE_CDROM_RAW_DATA));
                break;
        case SIG_ADPCM_FORCE_DMA_TRANSFER:
                if(flag) {
@@ -298,7 +291,7 @@ void ADPCM::write_signal(int ch, uint32_t data, uint32_t mask)
                        //      reg_0c &= ~ADPCM_REMAIN_WRITE_BUF;
                        //}
                } else {
-                       //reg_0c &= ~ADPCM_REMAIN_WRITE_BUF;
+                       reg_0c &= ~ADPCM_REMAIN_WRITE_BUF;
                        ram[write_ptr & 0xffff] = data;
                        write_ptr++;
                }
@@ -357,8 +350,8 @@ void ADPCM::do_cmd(uint8_t cmd)
                write_ptr = (uint32_t)(addr_reg.w) & 0xffff;
                write_buf = ((cmd & 0x01) == 0) ? 1 : 0;
                write_ptr = (write_ptr - write_buf) & 0xffff;
-               //written_size = written_size & 0xffff; // OK?
-               written_size = 0; // OK?
+               written_size = written_size & 0xffff; // OK?
+               //written_size = 0; // OK?
        }
        if((cmd & 0x10) != 0) {
                // It's ugly... (;_;)
@@ -432,12 +425,18 @@ void ADPCM::do_cmd(uint8_t cmd)
        } else {
                //set_cdrom_irq_line(PCE_CD_IRQ_SAMPLE_HALF_PLAY, CLEAR_LINE);
                //      set_cdrom_irq_line(PCE_CD_IRQ_SAMPLE_FULL_PLAY, ASSERT_LINE);
-               //d_pce->write_signal(SIG_PCE_ADPCM_HALF, 0x00000000, 0xffffffff);
-               //d_pce->write_signal(SIG_PCE_ADPCM_FULL, 0x00000000, 0xffffffff);
+               if(play_in_progress) {
+                       d_pce->write_signal(SIG_PCE_ADPCM_HALF, 0x00000000, 0xffffffff);
+                       d_pce->write_signal(SIG_PCE_ADPCM_FULL, 0xffffffff, 0xffffffff);
+                       if((msm_last_cmd & 0x40) != 0) {
+                               do_stop(true); // true?
+                               d_msm->reset_w(1);
+                               return;
+                       }
+               }
                adpcm_stream = false;
                adpcm_repeat = false;
-               do_stop(true); // false?
-               out_debug_log(_T("ADPCM STATUS UPDATE PLAY=%s\n"), (play_in_progress) ? _T("YES") : _T("NO"));
+               out_debug_log(_T("ADPCM STATUS UPDATE / STOP\n"));
        }
        msm_last_cmd = cmd;
 }
@@ -454,23 +453,22 @@ void ADPCM::do_vclk(bool flag)
 {
        bool need_wait =false;
        if((flag)) {
-               if(((dma_enabled ) && (dma_connected)) &&
-                  ((written_size < 0x10) && (msm_length > 0)
-                       /*&& ((write_ptr & 0xffff) <= (msm_ptr & 0xffff))*/)) { // OK?
-                       // ToDo: exception
-                       need_wait = true;
-                       if(msm_nibble != 0) {
-                               d_msm->reset_w(1);
-                               msm_nibble = 0;
-                               return;
-                       } else {
+               // 20190216 K.O: Must wait when dma enabled and PCM data will empty, when DMA transferring.
+               if((play_in_progress) && !(adpcm_paused)) {
+                       if(((dma_enabled ) && (dma_connected)) &&
+                          ((written_size < 0x10) /*&& (msm_length > 0)*/
+                               /*&& ((write_ptr & 0xffff) <= (msm_ptr & 0xffff))*/)) { // OK?
+                               // ToDo: exception
+                               d_msm->pause_w(1);
+                               //d_msm->reset_w(1);
                                return;
                        }
                }
                {
                        if((play_in_progress) && !(adpcm_paused)) {
+                               d_msm->pause_w(0);
+                               //d_msm->reset_w(0);
                                //if(dma_enabled) {
-                               d_msm->reset_w(0);
                                msm_data = (msm_nibble != 0) ? (ram[msm_ptr & 0xffff] & 0x0f) : ((ram[msm_ptr & 0xffff] & 0xf0) >> 4);
                                d_msm->data_w(msm_data);
                                msm_nibble ^= 1;
@@ -520,30 +518,21 @@ void ADPCM::do_vclk(bool flag)
                                                        d_pce->write_signal(SIG_PCE_ADPCM_FULL, 0x00000000, 0xffffffff);
                                                }
                                        }
-#if 1
-                       __skip1:
-                                       if(dma_enabled && dma_connected) { // Underflow
-                                               //if(/*(msm_length > 0) &&*/
-                                               //  (written_size <= 10))
-                                               { 
+
+                                       // 20190216 K.O: DO NOT DMA WITHIN VCLK.MUST DO ONLY BY DRQ.
+#if 0
+                                       if(written_size <= 0x10) {
+                                               if((dma_connected) && (dma_enabled)) {
                                                        if(d_pce->read_signal(SIG_PCE_CDROM_DATA_IN) != 0) {
-                                                               //do_pause(false); // Unpause if paused && data in.
                                                                do_dma(d_pce->read_signal(SIG_PCE_CDROM_RAW_DATA));
                                                        }
                                                }
-                                       } else {
                                        }
 #endif
+//                     __skip1:
                                } else { // nibble = 1
                                }
                        } else {
-//                             if((dma_enabled) && (play_in_progress) && (dma_connected)) {
-//                                     reg_0c |= ADPCM_REMAIN_WRITE_BUF;
-//                                     if(d_pce->read_signal(SIG_PCE_CDROM_DATA_IN) != 0) {
-//                                             //do_pause(false); // Unpause if paused && data in.
-//                                             do_dma(d_pce->read_signal(SIG_PCE_CDROM_RAW_DATA));
-//                                     }
-//                             }
                        }
                }
        }

diff --git a/source/src/vm/scsi_cdrom.cpp b/source/src/vm/scsi_cdrom.cpp
index c04c077..b1d3d4c 100644 (file)
--- a/source/src/vm/scsi_cdrom.cpp
+++ b/source/src/vm/scsi_cdrom.cpp
@@ -1130,11 +1130,11 @@ bool SCSI_CDROM::open_cue_file(const _TCHAR* file_path)
                                if(toc_table[i].index1 != 0) {
                                        toc_table[i].index0 = toc_table[i].index0 + max_logical_block;
                                        toc_table[i].index1 = toc_table[i].index1 + max_logical_block;
-                                       //if(toc_table[i].index0 != max_logical_block) {
+                                       if(toc_table[i].index0 != max_logical_block) {
                                                if(toc_table[i].pregap == 0) {
                                                        toc_table[i].pregap = toc_table[i].index1 - toc_table[i].index0;
                                                }
-                                       //}
+                                       }
                                } else {
                                        toc_table[i].index1 = toc_table[i].index1 + max_logical_block;
                                        if(toc_table[i].index0 == 0) {