some big endian fixes

[pcsx_rearmed.git] / libpcsxcore / cdrom.c

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index a3ddb44..cdb7a1e 100644 (file)
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -35,7 +35,7 @@
 #if 0
 #define CDR_LOG_I SysPrintf
 #else
-#define CDR_LOG_I(...)
+#define CDR_LOG_I log_unhandled
 #endif
 #if 0
 #define CDR_LOG_IO SysPrintf
@@ -567,6 +567,8 @@ static int cdrSeekTime(unsigned char *target)
 }
 
 static void cdrReadInterrupt(void);
+static void cdrPrepCdda(s16 *buf, int samples);
+static void cdrAttenuate(s16 *buf, int samples, int stereo);
 
 void cdrPlaySeekReadInterrupt(void)
 {
@@ -613,6 +615,7 @@ void cdrPlaySeekReadInterrupt(void)
                cdrPlayInterrupt_Autopause();
 
        if (!cdr.Muted && !Config.Cdda) {
+               cdrPrepCdda(read_buf, CD_FRAMESIZE_RAW / 4);
                cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1);
                SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, cdr.FirstSector);
                cdr.FirstSector = 0;
@@ -1117,7 +1120,18 @@ void cdrInterrupt(void) {
  } while (0)
 #endif
 
-void cdrAttenuate(s16 *buf, int samples, int stereo)
+static void cdrPrepCdda(s16 *buf, int samples)
+{
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+       int i;
+       for (i = 0; i < samples; i++) {
+               buf[i * 2 + 0] = SWAP16(buf[i * 2 + 0]);
+               buf[i * 2 + 1] = SWAP16(buf[i * 2 + 1]);
+       }
+#endif
+}
+
+static void cdrAttenuate(s16 *buf, int samples, int stereo)
 {
        int i, l, r;
        int ll = cdr.AttenuatorLeftToLeft;
@@ -1495,6 +1509,8 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
                                cdr.FifoOffset += size;
                                psxCpu->Clear(madr, size / 4);
                        }
+                       if (size < cdsize)
+                               CDR_LOG_I("cdrom: dma3 %d/%d\n", size, cdsize);
 
                        CDRDMA_INT((cdsize/4) * 24);
 
@@ -1510,7 +1526,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
                        return;
 
                default:
-                       CDR_LOG("psxDma3() Log: Unknown cddma %x\n", chcr);
+                       CDR_LOG_I("psxDma3() Log: Unknown cddma %x\n", chcr);
                        break;
        }