1.22.0-UNSTABLE - CDC

psx/octoshock/docs/upstreaminfo.txt

@@ -193,4 +193,9 @@
 [OK] psx/input/multitap : MDAP ? weird
 [ON] psx/mdec : MDAP? (ignored: variable saving)
 [NO] psx/psx : frontend memcard error handling, changes from strncasecmp to MDFN_strazicmp and etc; change to ReadSector API?
-[NO] psx/spu : ignored: variable saving
+[NO] psx/spu : ignored: variable saving
+
+1.21.3 -> 1.22.0-UNSTABLE
+(mednafen namespaces added all over)
+[NO] endian : nothing important
+[OK] psx/cdc : many changes (described well in changelog)

psx/octoshock/psx/cdc.h

@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* cdc.h:
+**  Copyright (C) 2011-2018 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_CDC_H
 #define __MDFN_PSX_CDC_H
 
@@ -169,10 +190,11 @@ class PS_CDC
   DS_STOPPED = 0,
   DS_SEEKING,
   DS_SEEKING_LOGICAL,
+	DS_SEEKING_LOGICAL2,
   DS_PLAY_SEEKING,
   DS_PLAYING,
   DS_READING,
-  DS_RESETTING
+  //DS_RESETTING
  };
  int DriveStatus;
  int StatusAfterSeek;
@@ -184,6 +206,8 @@ class PS_CDC
 
  int32 PSRCounter;
 
+ bool HoldLogicalPos;
+
  int32 CurSector;
  uint32 SectorsRead;	// Reset to 0 on Read*/Play command start; used in the rough simulation of PS1 SetLoc->Read->Pause->Read behavior.
 
@@ -201,6 +225,7 @@ class PS_CDC
 
  int32 SeekTarget;
  uint32 SeekRetryCounter;
+ int SeekFinished;
 
  pscpu_timestamp_t lastts;
 
@@ -225,6 +250,7 @@ class PS_CDC
  uint8 xa_cur_chan;
 
  uint8 ReportLastF;
+ int32 ReportStartupDelay;
 
  void HandlePlayRead(void);