armsx/ARMSX1
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX1.git synced 2026-08-24 16:53:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up some files

Browse Source
This commit is contained in:
Lycoder
2023-05-30 23:00:30 -03:00
parent e475681413
commit c73cd1c318
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
psx/bus.c
+2 -2
View File
@@ -219,5 +219,5 @@ void psx_bus_init_spu(psx_bus_t* bus, psx_spu_t* spu) {
bus->spu = spu;
}
#undef HANDLE_READ
#undef HANDLE_READ
#undef HANDLE_WRITE
psx/bus.h
-2
View File
@@ -7,8 +7,6 @@ struct psx_bus_t;
typedef struct psx_bus_t psx_bus_t;
#define PSX_GPUSTAT 0x1f801814
psx_bus_t* psx_bus_create();
void psx_bus_init(psx_bus_t*);
uint32_t psx_bus_read32(psx_bus_t*, uint32_t);
psx/dev/dma.c
+4 -3
View File
@@ -36,7 +36,7 @@ uint32_t psx_dma_read32(psx_dma_t* dma, uint32_t offset) {
int channel = (offset >> 4) & 0x7;
int reg = (offset >> 2) & 0x3;
log_error("DMA channel %u register %u read %08x", channel, reg, (CR(channel, reg)));
log_error("DMA channel %u register %u (%08x) read %08x", channel, reg, PSX_DMAR_BEGIN + offset, (CR(channel, reg)));
return CR(channel, reg);
} else {
@@ -86,7 +86,7 @@ void psx_dma_write32(psx_dma_t* dma, uint32_t offset, uint32_t value) {
CR(channel, reg) = value;
log_error("DMA channel %u register %u write %08x", channel, reg, value);
log_error("DMA channel %u register %u write (%08x) %08x", channel, reg, PSX_DMAR_BEGIN + offset, value);
if (reg == 2) {
g_psx_dma_do_table[channel](dma);
@@ -228,7 +228,8 @@ void psx_dma_do_otc(psx_dma_t* dma) {
}
// Clear BCR and CHCR trigger and busy bits
dma->otc.chcr &= ~(CHCR_BUSY_MASK | CHCR_TRIG_MASK);
dma->otc.chcr = 0;
//dma->otc.chcr &= ~(CHCR_BUSY_MASK | CHCR_TRIG_MASK);
dma->otc.bcr = 0;
}