iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reduntant includes

Browse Source
This commit is contained in:
SimoneN64
2023-06-09 16:06:16 +02:00
parent 7e9cfa1f53
commit f62df87381
12 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/core/mmio/PIF.cpp
View File

@@ -154,9 +154,7 @@ void PIF::ProcessCommands(Mem &mem) {
u8* cmd = &ram[i++];
u8 cmdlen = cmd[CMD_LEN] & 0x3F;
if (cmdlen == 0) {
channel++;
} else if (cmdlen == 0x3D) {
if (cmdlen == 0 || cmdlen == 0x3D) {
channel++;
} else if (cmdlen == 0x3E) {
break;
@@ -171,11 +169,7 @@ void PIF::ProcessCommands(Mem &mem) {
u8* res = &ram[i + cmdlen];
switch (cmd[CMD_IDX]) {
case 0xff:
ControllerID(res);
channel++;
break;
case 0:
case 0: case 0xff:
ControllerID(res);
channel++;
break;
@@ -249,7 +243,7 @@ void PIF::ProcessCommands(Mem &mem) {
}
}
void PIF::MempakRead(u8* cmd, u8* res) const {
void PIF::MempakRead(const u8* cmd, u8* res) const {
u16 offset = cmd[3] << 8;
offset |= cmd[4];
@@ -305,7 +299,7 @@ void PIF::MempakWrite(u8* cmd, u8* res) const {
res[0] = data_crc(&cmd[5]);
}
void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
void PIF::EepromRead(const u8* cmd, u8* res, const Mem& mem) const {
assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
if (channel == 4) {
u8 offset = cmd[3];
@@ -321,7 +315,7 @@ void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
}
}
void PIF::EepromWrite(u8* cmd, u8* res, const Mem& mem) const {
void PIF::EepromWrite(const u8* cmd, u8* res, const Mem& mem) const {
assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
if (channel == 4) {
u8 offset = cmd[3];

6
src/backend/core/mmio/PIF.hpp
View File

@@ -102,10 +102,10 @@ struct PIF {
void UpdateController();
bool ReadButtons(u8*) const;
void ControllerID(u8*) const;
void MempakRead(u8*, u8*) const;
void MempakRead(const u8*, u8*) const;
void MempakWrite(u8*, u8*) const;
void EepromRead(u8*, u8*, const Mem&) const;
void EepromWrite(u8*, u8*, const Mem&) const;
void EepromRead(const u8*, u8*, const Mem&) const;
void EepromWrite(const u8*, u8*, const Mem&) const;
bool gamepadConnected = false;
SDL_GameController* gamepad{};

1
src/backend/core/registers/Registers.hpp
View File

@@ -1,5 +1,4 @@
#pragma once
#include <backend/core/registers/Cop0.hpp>
#include <backend/core/registers/Cop1.hpp>
namespace n64 {