scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change callbacks from using this to & for lambda

Browse Source
This commit is contained in:
scawful
2024-04-23 14:01:07 -04:00
parent 528d8fd9a6
commit de49d59070
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/emu/snes.h
View File

@@ -67,8 +67,8 @@ class SNES {
void SetPixels(uint8_t* pixel_data);
bool running() const { return running_; }
auto cpu() -> Cpu& { return cpu_; }
auto ppu() -> video::Ppu& { return ppu_; }
auto cpu() -> Cpu* { return &cpu_; }
auto ppu() -> video::Ppu* { return &ppu_; }
auto Memory() -> memory::MemoryImpl* { return &memory_; }
private:
@@ -80,9 +80,9 @@ class SNES {
audio::AudioRamImpl audio_ram_;
memory::CpuCallbacks cpu_callbacks_ = {
[this](uint32_t adr) { return CpuRead(adr); },
[this](uint32_t adr, uint8_t val) { CpuWrite(adr, val); },
[this](bool waiting) { CpuIdle(waiting); },
[&](uint32_t adr) { return CpuRead(adr); },
[&](uint32_t adr, uint8_t val) { CpuWrite(adr, val); },
[&](bool waiting) { CpuIdle(waiting); },
};
Cpu cpu_{memory_, clock_, cpu_callbacks_};
video::Ppu ppu_{memory_, clock_};
@@ -118,8 +118,8 @@ class SNES {
// Multiplication / Division
uint8_t multiply_a_;
uint16_t multiply_result_;
uint8_t divide_a_;
uint8_t divide_result_;
uint16_t divide_a_;
uint16_t divide_result_;
// Joypad State
Input input1;