Add MoveImage(), use draw queue for psxgpu VRAM APIs

1 files changed, 29 insertions, 29 deletions

diff --git a/libpsn00b/psxspu/common.c b/libpsn00b/psxspu/common.c
index d6508c7..380bd3d 100644
--- a/libpsn00b/psxspu/common.c
+++ b/libpsn00b/psxspu/common.c
@@ -34,6 +34,33 @@ static void _wait_status(uint16_t mask, uint16_t value) {
 	_LOG("psxspu: status register timeout (0x%04x)\n", SPU_STAT);
 }
 
+static void _dma_transfer(uint32_t *data, size_t length, int write) {
+	if (length % 4)
+		_LOG("psxspu: can't transfer a number of bytes that isn't multiple of 4\n");
+
+	length /= 4;
+	if ((length >= DMA_CHUNK_LENGTH) && (length % DMA_CHUNK_LENGTH)) {
+		_LOG("psxspu: transfer data length (%d) is not a multiple of %d, rounding\n", length, DMA_CHUNK_LENGTH);
+		length += DMA_CHUNK_LENGTH - 1;
+	}
+
+	SPU_CTRL &= 0xffcf; // Disable DMA request
+	_wait_status(0x0030, 0x0000);
+
+	// Enable DMA request for writing (2) or reading (3)
+	SPU_ADDR  = _transfer_addr;
+	SPU_CTRL |= write ? 0x0020 : 0x0030;
+	_wait_status(0x0400, 0x0000);
+
+	DMA_MADR(4) = (uint32_t) data;
+	if (length < DMA_CHUNK_LENGTH)
+		DMA_BCR(4) = 0x00010000 | length;
+	else
+		DMA_BCR(4) = DMA_CHUNK_LENGTH | ((length / DMA_CHUNK_LENGTH) << 16);
+
+	DMA_CHCR(4) = 0x01000200 | write;
+}
+
 /* Public API */
 
 void SpuInit(void) {
@@ -87,35 +114,8 @@ void SpuInit(void) {
 	SPU_CD_VOL_R		= 0x7fff;
 }
 
-static void _load_store_data(uint32_t *data, size_t length, int mode) {
-	if (length % 4)
-		_LOG("psxspu: can't transfer a number of bytes that isn't multiple of 4\n");
-
-	length /= 4;
-	if ((length >= DMA_CHUNK_LENGTH) && (length % DMA_CHUNK_LENGTH)) {
-		_LOG("psxspu: transfer data length (%d) is not a multiple of %d, rounding\n", length, DMA_CHUNK_LENGTH);
-		length += DMA_CHUNK_LENGTH - 1;
-	}
-
-	SPU_CTRL &= 0xffcf; // Disable DMA request
-	_wait_status(0x0030, 0x0000);
-
-	// Enable DMA request for writing (2) or reading (3)
-	SPU_ADDR  = _transfer_addr;
-	SPU_CTRL |= mode << 4;
-	_wait_status(0x0400, 0x0000);
-
-	DMA_MADR(4) = (uint32_t) data;
-	if (length < DMA_CHUNK_LENGTH)
-		DMA_BCR(4) = 0x00010000 | length;
-	else
-		DMA_BCR(4) = DMA_CHUNK_LENGTH | ((length / DMA_CHUNK_LENGTH) << 16);
-
-	DMA_CHCR(4) = 0x01000200 | ((mode & 1) ^ 1);
-}
-
 void SpuRead(uint32_t *data, size_t size) {
-	_load_store_data(data, size, 3);
+	_dma_transfer(data, size, 0);
 }
 
 void SpuWrite(const uint32_t *data, size_t size) {
@@ -138,7 +138,7 @@ void SpuWrite(const uint32_t *data, size_t size) {
 		return;
 	}
 
-	_load_store_data((uint32_t *) data, size, 2);
+	_dma_transfer((uint32_t *) data, size, 1);
 }
 
 SPU_TransferMode SpuSetTransferMode(SPU_TransferMode mode) {