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

gamepad works now finally. Ready for merge in dev

Browse Source
This commit is contained in:
SimoZ64
2025-06-27 12:18:44 +02:00
parent 7ca337ca48
commit 1be357e607
6 changed files with 73 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/MemoryRegions.hpp
View File

@@ -37,8 +37,8 @@
#define CART_REGION_END_2_1 0x05FFFFFF
#define CART_REGION_END_2_2 0x0FFFFFFF
#define RDRAM_REGION RDRAM_REGION_START... RDRAM_REGION_END
#define RSP_MEM_REGION DMEM_REGION_START... 0x0403FFFF
#define RDRAM_REGION RDRAM_REGION_START ... RDRAM_REGION_END
#define RSP_MEM_REGION DMEM_REGION_START ... 0x0403FFFF
#define MMIO_REGION 0x04040000 ... 0x041FFFFF : case 0x04300000 ... 0x048FFFFF
#define SP_REGION 0x04040000 ... 0x040FFFFF
#define DP_CMD_REGION 0x04100000 ... 0x041FFFFF
@@ -51,9 +51,9 @@
#define PI_REGION 0x04600000 ... 0x046FFFFF
#define RI_REGION 0x04700000 ... 0x047FFFFF
#define SI_REGION 0x04800000 ... 0x048FFFFF
#define REGION_CART CART_REGION_START_2_1... CART_REGION_END_1_2
#define PIF_ROM_REGION PIF_ROM_REGION_START... PIF_ROM_REGION_END
#define PIF_RAM_REGION PIF_RAM_REGION_START... PIF_RAM_REGION_END
#define REGION_CART CART_REGION_START_2_1 ... CART_REGION_END_1_2
#define PIF_ROM_REGION PIF_ROM_REGION_START ... PIF_ROM_REGION_END
#define PIF_RAM_REGION PIF_RAM_REGION_START ... PIF_RAM_REGION_END
#define START_VREGION_KUSEG 0x00000000
#define START_VREGION_KSEG0 0x80000000
@@ -67,11 +67,11 @@
#define END_VREGION_KSSEG 0xDFFFFFFF
#define END_VREGION_KSEG3 0xFFFFFFFF
#define VREGION_KUSEG START_VREGION_KUSEG... END_VREGION_KUSEG
#define VREGION_KSEG0 START_VREGION_KSEG0... END_VREGION_KSEG0
#define VREGION_KSEG1 START_VREGION_KSEG1... END_VREGION_KSEG1
#define VREGION_KSSEG START_VREGION_KSSEG... END_VREGION_KSSEG
#define VREGION_KSEG3 START_VREGION_KSEG3... END_VREGION_KSEG3
#define VREGION_KUSEG START_VREGION_KUSEG ... END_VREGION_KUSEG
#define VREGION_KSEG0 START_VREGION_KSEG0 ... END_VREGION_KSEG0
#define VREGION_KSEG1 START_VREGION_KSEG1 ... END_VREGION_KSEG1
#define VREGION_KSSEG START_VREGION_KSSEG ... END_VREGION_KSSEG
#define VREGION_KSEG3 START_VREGION_KSEG3 ... END_VREGION_KSEG3
#define DIRECT_MAP_MASK 0x1FFFFFFF
@@ -99,17 +99,17 @@
#define EREGION_PI_SRAM 0x0FFFFFFF
#define EREGION_PI_ROM 0xFFFFFFFF
#define REGION_PI_UNKNOWN SREGION_PI_UNKNOWN... EREGION_PI_UNKNOWN
#define REGION_PI_64DD_REG SREGION_PI_64DD_REG... EREGION_PI_64DD_REG
#define REGION_PI_64DD_ROM SREGION_PI_64DD_ROM... EREGION_PI_64DD_ROM
#define REGION_PI_SRAM SREGION_PI_SRAM... EREGION_PI_SRAM
#define REGION_PI_ROM SREGION_PI_ROM... EREGION_PI_ROM
#define REGION_PI_UNKNOWN SREGION_PI_UNKNOWN ... EREGION_PI_UNKNOWN
#define REGION_PI_64DD_REG SREGION_PI_64DD_REG ... EREGION_PI_64DD_REG
#define REGION_PI_64DD_ROM SREGION_PI_64DD_ROM ... EREGION_PI_64DD_ROM
#define REGION_PI_SRAM SREGION_PI_SRAM ... EREGION_PI_SRAM
#define REGION_PI_ROM SREGION_PI_ROM ... EREGION_PI_ROM
#define CART_ISVIEWER_FLUSH 0x13FF0014
#define SREGION_CART_ISVIEWER_BUFFER 0x13FF0020
#define EREGION_CART_ISVIEWER_BUFFER 0x13FFFFFF
#define CART_ISVIEWER_SIZE (EREGION_CART_ISVIEWER_BUFFER - SREGION_CART_ISVIEWER_BUFFER)
#define REGION_CART_ISVIEWER_BUFFER SREGION_CART_ISVIEWER_BUFFER... EREGION_CART_ISVIEWER_BUFFER
#define REGION_CART_ISVIEWER_BUFFER SREGION_CART_ISVIEWER_BUFFER ... EREGION_CART_ISVIEWER_BUFFER
constexpr u64 operator""_kb(unsigned long long int x) { return 1024ULL * x; }

7
src/backend/core/mmio/Audio.cpp
View File

@@ -8,13 +8,6 @@ namespace n64 {
#define SYSTEM_SAMPLE_SIZE 4
#define BYTES_PER_HALF_SECOND (((float)AUDIO_SAMPLE_RATE / 2) * SYSTEM_SAMPLE_SIZE)
AudioDevice::~AudioDevice() {
LockMutex();
SDL_DestroyAudioStream(GetStream());
UnlockMutex();
SDL_DestroyMutex(audioStreamMutex);
}
AudioDevice::AudioDevice() {
audioStreamMutex = SDL_CreateMutex();
if (!audioStreamMutex) {

1
src/backend/core/mmio/Audio.hpp
View File

@@ -5,7 +5,6 @@
namespace n64 {
struct AudioDevice {
AudioDevice();
~AudioDevice();
void Reset() { running = false; }