Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 06:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better MAC address handling (#312)

Browse source
This commit is contained in:
wheremyfoodat 2023-10-17 23:27:37 +03:00 • committed by GitHub
parent 5043f98e00
commit 6626c2ae9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/memory.hpp
View file

@ -159,7 +159,9 @@ private:
Regions region = Regions::USA;
const EmulatorConfig& config;
public:
static constexpr std::array<u8, 6> MACAddress = {0x40, 0xF4, 0x07, 0xFF, 0xFF, 0xEE};
public:
u16 kernelVersion = 0;
u32 usedUserMemory = u32(0_MB); // How much of the APPLICATION FCRAM range is used (allocated to the appcore)
u32 usedSystemMemory = u32(0_MB); // Similar for the SYSTEM range (reserved for the syscore)

2
include/panda_qt/main_window.hpp
View file

@ -7,8 +7,8 @@
#include <QtWidgets>
#include <atomic>
#include <filesystem>
#include <thread>
#include <mutex>
#include <thread>
#include "emulator.hpp"
#include "panda_qt/screen.hpp"

14
src/core/memory.cpp
View file

@ -122,6 +122,13 @@ u8 Memory::read8(u32 vaddr) {
case ConfigMem::FirmVersionMajor: return firm.major;
case ConfigMem::WifiLevel: return 0; // No wifi :(
case ConfigMem::WifiMac:
case ConfigMem::WifiMac + 1:
case ConfigMem::WifiMac + 2:
case ConfigMem::WifiMac + 3:
case ConfigMem::WifiMac + 4:
case ConfigMem::WifiMac + 5: return MACAddress[vaddr - ConfigMem::WifiMac];
default: Helpers::panic("Unimplemented 8-bit read, addr: %08X", vaddr);
}
}
@ -136,7 +143,7 @@ u16 Memory::read16(u32 vaddr) {
return *(u16*)(pointer + offset);
} else {
switch (vaddr) {
case ConfigMem::WifiMac + 4: return 0xEEFF; // Wifi MAC: Last 2 bytes of MAC Address
case ConfigMem::WifiMac + 4: return (MACAddress[5] << 8) | MACAddress[4]; // Wifi MAC: Last 2 bytes of MAC Address
default: Helpers::panic("Unimplemented 16-bit read, addr: %08X", vaddr);
}
}
@ -166,7 +173,10 @@ u32 Memory::read32(u32 vaddr) {
case ConfigMem::AppMemAlloc: return appResourceLimits.maxCommit;
case ConfigMem::SyscoreVer: return 2;
case 0x1FF81000: return 0; // TODO: Figure out what this config mem address does
case ConfigMem::WifiMac: return 0xFF07F440; // Wifi MAC: First 4 bytes of MAC Address
// Wifi MAC: First 4 bytes of MAC Address
case ConfigMem::WifiMac:
return (u32(MACAddress[3]) << 24) | (u32(MACAddress[2]) << 16) | (u32(MACAddress[1]) << 8) |
MACAddress[0];
// 3D slider. Float in range 0.0 = off, 1.0 = max.
case ConfigMem::SliderState3D: return Helpers::bit_cast<u32, float>(0.0f);