cdrom: change pause timing again

[pcsx_rearmed.git] / libpcsxcore / gpu.h

diff --git a/libpcsxcore/gpu.h b/libpcsxcore/gpu.h
index d02dca4..ec5019c 100644 (file)
--- a/libpcsxcore/gpu.h
+++ b/libpcsxcore/gpu.h
@@ -1,3 +1,19 @@
+/*  Pcsx - Pc Psx Emulator
+ *  Copyright (C) 1999-2016  Pcsx 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, see <http://www.gnu.org/licenses>.
+ */
 
 /*
  * q: Why bother with GPU stuff in a plugin-based emu core?
@@ -5,16 +21,34 @@
  *    that GPU plugin doesn't.
  */
 
-#define PSXGPU_LCF   (1<<31)
-#define PSXGPU_nBUSY (1<<26)
-#define PSXGPU_ILACE (1<<22)
+#ifndef __GPU_H__
+#define __GPU_H__
+
+#define PSXGPU_LCF     (1u<<31)
+#define PSXGPU_nBUSY   (1u<<26)
+#define PSXGPU_ILACE   (1u<<22)
+#define PSXGPU_DHEIGHT (1u<<19)
+#define PSXGPU_FIELD   (1u<<13)
+
+// both must be set for interlace to work
+#define PSXGPU_ILACE_BITS (PSXGPU_ILACE | PSXGPU_DHEIGHT)
 
 #define HW_GPU_STATUS psxHu32ref(0x1814)
 
 // TODO: handle com too
-#define PSXGPU_TIMING_BITS (PSXGPU_LCF | PSXGPU_nBUSY)
+#define PSXGPU_TIMING_BITS (PSXGPU_LCF | PSXGPU_nBUSY | PSXGPU_FIELD)
 
 #define gpuSyncPluginSR() { \
-       HW_GPU_STATUS &= PSXGPU_TIMING_BITS; \
-       HW_GPU_STATUS |= GPU_readStatus() & ~PSXGPU_TIMING_BITS; \
+       HW_GPU_STATUS &= SWAP32(PSXGPU_TIMING_BITS); \
+       HW_GPU_STATUS |= SWAP32(GPU_readStatus() & ~PSXGPU_TIMING_BITS); \
 }
+
+enum psx_gpu_state {
+  PGS_VRAM_TRANSFER_START,
+  PGS_VRAM_TRANSFER_END,
+  PGS_PRIMITIVE_START, // for non-dma only
+};
+
+void gpu_state_change(int what);
+
+#endif /* __GPU_H__ */