Emulation/psxact
1
0
Fork 0
mirror of https://github.com/whaison/psxact.git synced 2024-06-01 02:37:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renaming method for consistency.

Browse source
This commit is contained in:
Adam Becker 2016-11-12 15:09:51 -07:00
parent aa7e87792a
commit b610f2d1f9
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bus.cpp
View file

@ -70,11 +70,11 @@ uint32_t bus::read(int size, uint32_t address) {
}
if (utility::between<0x1f801810, 0x1f801817>(address)) {
return gpu::read(size, address);
return gpu::mmio_read(size, address);
}
if (utility::between<0x1f801c00, 0x1f801fff>(address)) {
return spu::read(size, address);
return spu::mmio_read(size, address);
}
printf("unhandled mmio read: $%08x\n", address);
@ -139,11 +139,11 @@ void bus::write(int size, uint32_t address, uint32_t data) {
}
if (utility::between<0x1f801810, 0x1f801817>(address)) {
return gpu::write(size, address, data);
return gpu::mmio_write(size, address, data);
}
if (utility::between<0x1f801c00, 0x1f801fff>(address)) {
return spu::write(size, address, data);
return spu::mmio_write(size, address, data);
}
switch (address) {

4
src/gpu/gpu_core.cpp
View file

@ -397,7 +397,7 @@ static inline void write_gp1(uint32_t data) {
}
}
uint32_t gpu::read(int size, uint32_t address) {
uint32_t gpu::mmio_read(int size, uint32_t address) {
assert(size == WORD);
switch (address - 0x1f801810) {
@ -409,7 +409,7 @@ uint32_t gpu::read(int size, uint32_t address) {
}
}
void gpu::write(int size, uint32_t address, uint32_t data) {
void gpu::mmio_write(int size, uint32_t address, uint32_t data) {
assert(size == WORD);
switch (address - 0x1f801810) {

4
src/gpu/gpu_core.hpp
View file

@ -53,9 +53,9 @@ namespace gpu {
uint32_t gp0_texture_download_size;
};
uint32_t read(int size, uint32_t address);
uint32_t mmio_read(int size, uint32_t address);
void write(int size, uint32_t address, uint32_t data);
void mmio_write(int size, uint32_t address, uint32_t data);
uint16_t read_vram(int x, int y);

4
src/spu/spu_core.cpp
View file

@ -1,8 +1,8 @@
#include "spu_core.hpp"
uint32_t spu::read(int size, uint32_t address) {
uint32_t spu::mmio_read(int size, uint32_t address) {
return 0;
}
void spu::write(int size, uint32_t address, uint32_t) {
void spu::mmio_write(int size, uint32_t address, uint32_t) {
}

4
src/spu/spu_core.hpp
View file

@ -4,9 +4,9 @@
#include <stdint.h>
namespace spu {
uint32_t read(int size, uint32_t address);
uint32_t mmio_read(int size, uint32_t address);
void write(int size, uint32_t address, uint32_t data);
void mmio_write(int size, uint32_t address, uint32_t data);
}
#endif