ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MERGEZORZ

This commit is contained in:
Arisotura 2024-05-20 00:46:59 +02:00
parent c3226f435c 95adc87f6d
commit 8bd50bb8b3
23 changed files with 583 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-macos.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v3
- name: Install dependencies for package building
run: |
brew install autoconf automake autoconf-archive libtool && pip3 install setuptools
brew install autoconf automake autoconf-archive libtool python-setuptools
- name: Set up CMake
uses: lukka/get-cmake@latest
- name: Set up vcpkg

12
src/Args.h
View File

@ -69,6 +69,10 @@ struct JITArgs
bool FastMemory = true;
};
using ARM9BIOSImage = std::array<u8, ARM9BIOSSize>;
using ARM7BIOSImage = std::array<u8, ARM7BIOSSize>;
using DSiBIOSImage = std::array<u8, DSiBIOSSize>;
struct GDBArgs
{
u16 PortARM7 = 0;
@ -95,11 +99,11 @@ struct NDSArgs
/// NDS ARM9 BIOS to install.
/// Defaults to FreeBIOS, which is not compatible with DSi mode.
std::array<u8, ARM9BIOSSize> ARM9BIOS = bios_arm9_bin;
std::unique_ptr<ARM9BIOSImage> ARM9BIOS = std::make_unique<ARM9BIOSImage>(bios_arm9_bin);
/// NDS ARM7 BIOS to install.
/// Defaults to FreeBIOS, which is not compatible with DSi mode.
std::array<u8, ARM7BIOSSize> ARM7BIOS = bios_arm7_bin;
std::unique_ptr<ARM7BIOSImage> ARM7BIOS = std::make_unique<ARM7BIOSImage>(bios_arm7_bin);
/// Firmware image to install.
/// Defaults to generated NDS firmware.
@ -131,8 +135,8 @@ struct NDSArgs
/// Contains no virtual methods, so there's no vtable.
struct DSiArgs final : public NDSArgs
{
std::array<u8, DSiBIOSSize> ARM9iBIOS = BrokenBIOS<DSiBIOSSize>;
std::array<u8, DSiBIOSSize> ARM7iBIOS = BrokenBIOS<DSiBIOSSize>;
std::unique_ptr<DSiBIOSImage> ARM9iBIOS = std::make_unique<DSiBIOSImage>(BrokenBIOS<DSiBIOSSize>);
std::unique_ptr<DSiBIOSImage> ARM7iBIOS = std::make_unique<DSiBIOSImage>(BrokenBIOS<DSiBIOSSize>);
/// NAND image to install.
/// Required, there is no default value.

4
src/DSi.cpp
View File

@ -102,8 +102,8 @@ DSi::DSi(DSiArgs&& args) noexcept :
DSi_NDMA(1, 2, *this),
DSi_NDMA(1, 3, *this),
},
ARM7iBIOS(args.ARM7iBIOS),
ARM9iBIOS(args.ARM9iBIOS),
ARM7iBIOS(*args.ARM7iBIOS),
ARM9iBIOS(*args.ARM9iBIOS),
DSP(*this),
SDMMC(*this, std::move(args.NANDImage), std::move(args.DSiSDCard)),
SDIO(*this),

3
src/FATStorage.cpp
View File

@ -110,6 +110,7 @@ bool FATStorage::InjectFile(const std::string& path, u8* data, u32 len)
res = f_mount(&fs, "0:", 1);
if (res != FR_OK)
{
f_unmount("0:");
ff_disk_close();
return false;
}
@ -146,6 +147,7 @@ u32 FATStorage::ReadFile(const std::string& path, u32 start, u32 len, u8* data)
res = f_mount(&fs, "0:", 1);
if (res != FR_OK)
{
f_unmount("0:");
ff_disk_close();
return false;
}
@ -1144,6 +1146,7 @@ bool FATStorage::Save()
res = f_mount(&fs, "0:", 1);
if (res != FR_OK)
{
f_unmount("0:");
ff_disk_close();
return false;
}

10
src/NDS.cpp
View File

@ -80,8 +80,8 @@ NDS::NDS() noexcept :
NDSArgs {
nullptr,
nullptr,
bios_arm9_bin,
bios_arm7_bin,
std::make_unique<ARM9BIOSImage>(bios_arm9_bin),
std::make_unique<ARM7BIOSImage>(bios_arm7_bin),
Firmware(0),
}
)
@ -90,8 +90,8 @@ NDS::NDS() noexcept :
NDS::NDS(NDSArgs&& args, int type) noexcept :
ConsoleType(type),
ARM7BIOS(args.ARM7BIOS),
ARM9BIOS(args.ARM9BIOS),
ARM7BIOS(*args.ARM7BIOS),
ARM9BIOS(*args.ARM9BIOS),
ARM7BIOSNative(CRC32(ARM7BIOS.data(), ARM7BIOS.size()) == ARM7BIOSCRC32),
ARM9BIOSNative(CRC32(ARM9BIOS.data(), ARM9BIOS.size()) == ARM9BIOSCRC32),
JIT(*this, args.JIT),
@ -1845,7 +1845,7 @@ void NDS::debug(u32 param)
//for (int i = 0; i < 9; i++)
// printf("VRAM %c: %02X\n", 'A'+i, GPU->VRAMCNT[i]);
Platform::FileHandle* shit = Platform::OpenFile("debug/DSfirmware.bin", FileMode::Write);
Platform::FileHandle* shit = Platform::OpenFile("debug/pokeplat.bin", FileMode::Write);
Platform::FileWrite(ARM9.ITCM, 0x8000, 1, shit);
for (u32 i = 0x02000000; i < 0x02400000; i+=4)
{

50
src/SPU.cpp
View File

@ -140,6 +140,41 @@ constexpr array2d<s16, 0x100, 4> InterpCubic = []() constexpr {
return interp;
}();
const std::array<s16, 0x200> InterpSNESGauss = {
0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,
0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x002, 0x002, 0x002, 0x002, 0x002,
0x002, 0x002, 0x003, 0x003, 0x003, 0x003, 0x003, 0x004, 0x004, 0x004, 0x004, 0x004, 0x005, 0x005, 0x005, 0x005,
0x006, 0x006, 0x006, 0x006, 0x007, 0x007, 0x007, 0x008, 0x008, 0x008, 0x009, 0x009, 0x009, 0x00A, 0x00A, 0x00A,
0x00B, 0x00B, 0x00B, 0x00C, 0x00C, 0x00D, 0x00D, 0x00E, 0x00E, 0x00F, 0x00F, 0x00F, 0x010, 0x010, 0x011, 0x011,
0x012, 0x013, 0x013, 0x014, 0x014, 0x015, 0x015, 0x016, 0x017, 0x017, 0x018, 0x018, 0x019, 0x01A, 0x01B, 0x01B,
0x01C, 0x01D, 0x01D, 0x01E, 0x01F, 0x020, 0x020, 0x021, 0x022, 0x023, 0x024, 0x024, 0x025, 0x026, 0x027, 0x028,
0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x02E, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x034, 0x035, 0x036, 0x037, 0x038,
0x03A, 0x03B, 0x03C, 0x03D, 0x03E, 0x040, 0x041, 0x042, 0x043, 0x045, 0x046, 0x047, 0x049, 0x04A, 0x04C, 0x04D,
0x04E, 0x050, 0x051, 0x053, 0x054, 0x056, 0x057, 0x059, 0x05A, 0x05C, 0x05E, 0x05F, 0x061, 0x063, 0x064, 0x066,
0x068, 0x06A, 0x06B, 0x06D, 0x06F, 0x071, 0x073, 0x075, 0x076, 0x078, 0x07A, 0x07C, 0x07E, 0x080, 0x082, 0x084,
0x086, 0x089, 0x08B, 0x08D, 0x08F, 0x091, 0x093, 0x096, 0x098, 0x09A, 0x09C, 0x09F, 0x0A1, 0x0A3, 0x0A6, 0x0A8,
0x0AB, 0x0AD, 0x0AF, 0x0B2, 0x0B4, 0x0B7, 0x0BA, 0x0BC, 0x0BF, 0x0C1, 0x0C4, 0x0C7, 0x0C9, 0x0CC, 0x0CF, 0x0D2,
0x0D4, 0x0D7, 0x0DA, 0x0DD, 0x0E0, 0x0E3, 0x0E6, 0x0E9, 0x0EC, 0x0EF, 0x0F2, 0x0F5, 0x0F8, 0x0FB, 0x0FE, 0x101,
0x104, 0x107, 0x10B, 0x10E, 0x111, 0x114, 0x118, 0x11B, 0x11E, 0x122, 0x125, 0x129, 0x12C, 0x130, 0x133, 0x137,
0x13A, 0x13E, 0x141, 0x145, 0x148, 0x14C, 0x150, 0x153, 0x157, 0x15B, 0x15F, 0x162, 0x166, 0x16A, 0x16E, 0x172,
0x176, 0x17A, 0x17D, 0x181, 0x185, 0x189, 0x18D, 0x191, 0x195, 0x19A, 0x19E, 0x1A2, 0x1A6, 0x1AA, 0x1AE, 0x1B2,
0x1B7, 0x1BB, 0x1BF, 0x1C3, 0x1C8, 0x1CC, 0x1D0, 0x1D5, 0x1D9, 0x1DD, 0x1E2, 0x1E6, 0x1EB, 0x1EF, 0x1F3, 0x1F8,
0x1FC, 0x201, 0x205, 0x20A, 0x20F, 0x213, 0x218, 0x21C, 0x221, 0x226, 0x22A, 0x22F, 0x233, 0x238, 0x23D, 0x241,
0x246, 0x24B, 0x250, 0x254, 0x259, 0x25E, 0x263, 0x267, 0x26C, 0x271, 0x276, 0x27B, 0x280, 0x284, 0x289, 0x28E,
0x293, 0x298, 0x29D, 0x2A2, 0x2A6, 0x2AB, 0x2B0, 0x2B5, 0x2BA, 0x2BF, 0x2C4, 0x2C9, 0x2CE, 0x2D3, 0x2D8, 0x2DC,
0x2E1, 0x2E6, 0x2EB, 0x2F0, 0x2F5, 0x2FA, 0x2FF, 0x304, 0x309, 0x30E, 0x313, 0x318, 0x31D, 0x322, 0x326, 0x32B,
0x330, 0x335, 0x33A, 0x33F, 0x344, 0x349, 0x34E, 0x353, 0x357, 0x35C, 0x361, 0x366, 0x36B, 0x370, 0x374, 0x379,
0x37E, 0x383, 0x388, 0x38C, 0x391, 0x396, 0x39B, 0x39F, 0x3A4, 0x3A9, 0x3AD, 0x3B2, 0x3B7, 0x3BB, 0x3C0, 0x3C5,
0x3C9, 0x3CE, 0x3D2, 0x3D7, 0x3DC, 0x3E0, 0x3E5, 0x3E9, 0x3ED, 0x3F2, 0x3F6, 0x3FB, 0x3FF, 0x403, 0x408, 0x40C,
0x410, 0x415, 0x419, 0x41D, 0x421, 0x425, 0x42A, 0x42E, 0x432, 0x436, 0x43A, 0x43E, 0x442, 0x446, 0x44A, 0x44E,
0x452, 0x455, 0x459, 0x45D, 0x461, 0x465, 0x468, 0x46C, 0x470, 0x473, 0x477, 0x47A, 0x47E, 0x481, 0x485, 0x488,
0x48C, 0x48F, 0x492, 0x496, 0x499, 0x49C, 0x49F, 0x4A2, 0x4A6, 0x4A9, 0x4AC, 0x4AF, 0x4B2, 0x4B5, 0x4B7, 0x4BA,
0x4BD, 0x4C0, 0x4C3, 0x4C5, 0x4C8, 0x4CB, 0x4CD, 0x4D0, 0x4D2, 0x4D5, 0x4D7, 0x4D9, 0x4DC, 0x4DE, 0x4E0, 0x4E3,
0x4E5, 0x4E7, 0x4E9, 0x4EB, 0x4ED, 0x4EF, 0x4F1, 0x4F3, 0x4F5, 0x4F6, 0x4F8, 0x4FA, 0x4FB, 0x4FD, 0x4FF, 0x500,
0x502, 0x503, 0x504, 0x506, 0x507, 0x508, 0x50A, 0x50B, 0x50C, 0x50D, 0x50E, 0x50F, 0x510, 0x511, 0x511, 0x512,
0x513, 0x514, 0x514, 0x515, 0x516, 0x516, 0x517, 0x517, 0x517, 0x518, 0x518, 0x518, 0x518, 0x518, 0x519, 0x519
};
SPU::SPU(melonDS::NDS& nds, AudioBitDepth bitdepth, AudioInterpolation interpolation) :
NDS(nds),
Channels {
@ -621,6 +656,19 @@ s32 SPUChannel::Run()
(PrevSample[0] * InterpCubic[samplepos][2]) +
(val * InterpCubic[samplepos][3])) >> 14;
break;
case AudioInterpolation::SNESGaussian: {
// Avoid clipping (from fullsnes)
#define CLAMP(s) (std::clamp((s) >> 1, -0x3FFA, 0x3FF8))
s32 out = (InterpSNESGauss[0x0FF - samplepos] * CLAMP(PrevSample[2]) >> 10);
out = out + ((InterpSNESGauss[0x1FF - samplepos] * CLAMP(PrevSample[1])) >> 10);
out = out + ((InterpSNESGauss[0x100 + samplepos] * CLAMP(PrevSample[0])) >> 10);
out = out + ((InterpSNESGauss[0x000 + samplepos] * CLAMP(val)) >> 10);
val = std::clamp(out, -0x8000, 0x7FFF);
#undef CLAMP
break;
}
default:
break;
}
@ -1257,4 +1305,4 @@ void SPU::Write32(u32 addr, u32 val)
}
}
}
}

1
src/SPU.h
View File

@ -40,6 +40,7 @@ enum class AudioInterpolation
Linear,
Cosine,
Cubic,
SNESGaussian
};
class SPUChannel

460
src/Wifi.cpp
View File

@ -159,11 +159,45 @@ void Wifi::Reset()
#undef BBREG_FIXED
const Firmware& fw = NDS.SPI.GetFirmware();
const auto& fwheader = fw.GetHeader();
RFVersion = fw.GetHeader().RFChipType;
RFVersion = fwheader.RFChipType;
memset(RFRegs, 0, 4*0x40);
Firmware::FirmwareConsoleType console = fw.GetHeader().ConsoleType;
// load channel index/data from the firmware
// the current channel will be determined by RF settings
// so we compare the two 'most important' RF registers to these values to figure out which channel is selected
if (RFVersion == 3)
{
RFChannelIndex[0] = fwheader.Type3Config.RFIndex1;
RFChannelIndex[1] = fwheader.Type3Config.RFIndex2;
for (int i = 0; i < 14; i++)
{
RFChannelData[i][0] = fwheader.Type3Config.RFData1[i];
RFChannelData[i][1] = fwheader.Type3Config.RFData2[i];
}
}
else
{
RFChannelIndex[0] = fwheader.Type2Config.InitialRF56Values[2] >> 2;
RFChannelIndex[1] = fwheader.Type2Config.InitialRF56Values[5] >> 2;
for (int i = 0; i < 14; i++)
{
RFChannelData[i][0] = fwheader.Type2Config.InitialRF56Values[i*6 + 0] |
(fwheader.Type2Config.InitialRF56Values[i*6 + 1] << 8) |
((fwheader.Type2Config.InitialRF56Values[i*6 + 2] & 0x03) << 16);
RFChannelData[i][1] = fwheader.Type2Config.InitialRF56Values[i*6 + 3] |
(fwheader.Type2Config.InitialRF56Values[i*6 + 4] << 8) |
((fwheader.Type2Config.InitialRF56Values[i*6 + 5] & 0x03) << 16);
}
}
CurChannel = 0;
Firmware::FirmwareConsoleType console = fwheader.ConsoleType;
if (console == Firmware::FirmwareConsoleType::DS)
IOPORT(0x000) = 0x1440;
else if (console == Firmware::FirmwareConsoleType::DSLite)
@ -182,6 +216,8 @@ void Wifi::Reset()
// TODO: find out what the initial values are
IOPORT(W_PowerUS) = 0x0001;
//IOPORT(W_BeaconInterval) = 100;
USTimestamp = 0;
USCounter = 0;
@ -209,7 +245,6 @@ void Wifi::Reset()
CmdCounter = 0;
USUntilPowerOn = 0;
ForcePowerOn = false;
IsMP = false;
IsMPClient = false;
@ -244,6 +279,8 @@ void Wifi::DoSavestate(Savestate* file)
file->Var8(&RFVersion);
file->VarArray(RFRegs, 4*0x40);
file->Var32((u32*)&CurChannel);
file->Var64(&USCounter);
file->Var64(&USCompare);
file->Bool32(&BlockBeaconIRQ14);
@ -285,7 +322,6 @@ void Wifi::DoSavestate(Savestate* file)
file->Var16(&MPLastSeqno);
file->Var32((u32*)&USUntilPowerOn);
file->Bool32(&ForcePowerOn);
file->Bool32(&IsMP);
file->Bool32(&IsMPClient);
@ -351,33 +387,38 @@ void Wifi::SetPowerCnt(u32 val)
}
void Wifi::SetIRQ(u32 irq)
void Wifi::CheckIRQ(u16 oldflags)
{
u32 oldflags = IOPORT(W_IF) & IOPORT(W_IE);
IOPORT(W_IF) |= (1<<irq);
u32 newflags = IOPORT(W_IF) & IOPORT(W_IE);
u16 newflags = IOPORT(W_IF) & IOPORT(W_IE);
if ((oldflags == 0) && (newflags != 0))
NDS.SetIRQ(1, IRQ_Wifi);
}
void Wifi::SetIRQ(u32 irq)
{
u16 oldflags = IOPORT(W_IF) & IOPORT(W_IE);
IOPORT(W_IF) |= (1<<irq);
CheckIRQ(oldflags);
}
void Wifi::SetIRQ13()
{
SetIRQ(13);
if (!(IOPORT(W_PowerTX) & 0x0002))
if ((IOPORT(W_ModeWEP) & 0x7) != 3)
{
IOPORT(0x034) = 0x0002;
//PowerDown();
// FIXME!!
IOPORT(W_RFPins) = 0x0046;
IOPORT(W_RFStatus) = 9;
if (!(IOPORT(W_PowerTX) & (1<<1)))
{
UpdatePowerStatus(-1);
}
}
}
void Wifi::SetIRQ14(int source) // 0=USCOMPARE 1=BEACONCOUNT 2=forced
{
// CHECKME: is this also done for USCOMPARE IRQ?
if (source != 2)
IOPORT(W_BeaconCount1) = IOPORT(W_BeaconInterval);
@ -409,10 +450,10 @@ void Wifi::SetIRQ15()
{
SetIRQ(15);
if (IOPORT(W_PowerTX) & 0x0001)
// unlike auto sleep, auto wakeup works under all power management modes
if (IOPORT(W_PowerTX) & (1<<0))
{
IOPORT(W_RFPins) |= 0x0080;
IOPORT(W_RFStatus) = 1;
UpdatePowerStatus(1);
}
}
@ -426,16 +467,110 @@ void Wifi::SetStatus(u32 status)
}
void Wifi::PowerDown()
void Wifi::UpdatePowerStatus(int power) // 1=on 0=no change -1=off
{
IOPORT(W_TXReqRead) &= ~0x000F;
IOPORT(W_PowerState) |= 0x0200;
// TRANSCEIVER POWER MANAGEMENT
//
// * W_PowerForce overrides all else
// * W_ModeReset bit0 forcibly turns off the transceiver when cleared
// * power is normally turned on or off either by IRQ15/IRQ13 or by W_PowerState
// depending on the power management mode selected in W_ModeWEP
// * W_PowerDownCtrl controls how deep a regular power-down is
// if the RF hardware is powered down while still sending or receiving,
// the current frame is completed before going idle
if (!ComStatus)
int curflags = 0;
if (IOPORT(W_TRXPower) == 1) curflags |= 1;
if (!(IOPORT(W_PowerState) & (1<<9))) curflags |= 2;
int reqflags = curflags;
if (IOPORT(W_PowerForce) & (1<<15))
{
SetStatus(9);
reqflags = (IOPORT(W_PowerForce) & (1<<0)) ? 0 : 3;
}
else if (!(IOPORT(W_ModeReset) & (1<<0)))
{
reqflags = 0;
}
else
{
if (power == 0)
{
if ((IOPORT(W_PowerState) & 0x0202) == 0x0202)
power = 1;
else if ((IOPORT(W_PowerState) & 0x0201) == 0x0001)
power = -1;
}
// W_PowerDownCtrl:
// * bit 0 inhibits a regular power-down
// * bit 1 forces a wakeup, atleast partial
if ((power == -1) && (IOPORT(W_PowerDownCtrl) & (1<<0)))
power = 0;
/*if (power == 1)
reqflags = 3;
else if (power == -1)
reqflags = IOPORT(W_PowerDownCtrl);
else if (IOPORT(W_PowerDownCtrl) & (1<<1))
reqflags = (curflags == 3) ? 3 : IOPORT(W_PowerDownCtrl);*/
// TODO: support partial power statuses (W_PowerDownCtrl=1 or 2)
if (power == 1)
reqflags = 3;
else if (power == -1)
reqflags = IOPORT(W_PowerDownCtrl) ? 3 : 0;
else if (IOPORT(W_PowerDownCtrl) & (1<<1))
reqflags = 3;
}
if (reqflags == curflags)
return;
if (reqflags & 1)
{
if (!(curflags & 1))
{
IOPORT(W_TRXPower) = 1;
SetStatus(1);
}
}
else
{
// signal the transceiver is going to turn off (checkme)
IOPORT(W_TRXPower) = 2;
if (!ComStatus)
{
IOPORT(W_TRXPower) = 0;
SetStatus(9);
}
}
if (reqflags & 2)
{
// power on
IOPORT(W_PowerState) |= (1<<8);
if ((!(curflags & 2)) && (USUntilPowerOn == 0))
{
Log(LogLevel::Debug, "wifi: TRX power ON\n");
USUntilPowerOn = -2048;
SetIRQ(11);
}
}
else
{
// power off
if (curflags & 2)
Log(LogLevel::Debug, "wifi: TRX power OFF\n");
IOPORT(W_PowerState) &= ~(1<<0);
IOPORT(W_PowerState) &= ~(1<<8);
IOPORT(W_PowerState) |= (1<<9);
USUntilPowerOn = 0;
}
}
@ -521,6 +656,9 @@ void Wifi::TXSendFrame(const TXSlot* slot, int num)
if (noseqno == 2)
*(u16*)&TXBuffer[0xC] |= (1<<11);
if (CurChannel == 0) return;
TXBuffer[9] = CurChannel;
switch (num)
{
case 0:
@ -600,6 +738,9 @@ void Wifi::StartTX_Cmd()
slot->CurPhase = 13;
slot->CurPhaseTime = CmdCounter - 100;
}
// starting a CMD transfer wakes up the transceiver automatically
UpdatePowerStatus(1);
}
void Wifi::StartTX_Beacon()
@ -678,6 +819,9 @@ void Wifi::SendMPDefaultReply()
// TODO
reply[0x8] = 0x14;
if (CurChannel == 0) return;
reply[0x9] = CurChannel;
*(u16*)&reply[0xC + 0x00] = 0x0158;
*(u16*)&reply[0xC + 0x02] = 0x00F0;//0; // TODO??
*(u16*)&reply[0xC + 0x04] = IOPORT(W_BSSID0);
@ -767,6 +911,9 @@ void Wifi::SendMPAck(u16 cmdcount, u16 clientfail)
if (TXSlots[1].Rate == 2) ack[0x8] = 0x14;
else ack[0x8] = 0xA;
if (CurChannel == 0) return;
ack[0x9] = CurChannel;
*(u16*)&ack[0xC + 0x00] = 0x0218;
*(u16*)&ack[0xC + 0x02] = 0;
*(u16*)&ack[0xC + 0x04] = 0x0903;
@ -1110,8 +1257,11 @@ void Wifi::FinishRX()
if (!ComStatus)
{
if (IOPORT(W_PowerState) & 0x0300)
if (IOPORT(W_PowerState) & (1<<9))
{
IOPORT(W_TRXPower) = 0;
SetStatus(9);
}
else
SetStatus(1);
}
@ -1380,7 +1530,7 @@ void Wifi::FinishRX()
void Wifi::MPClientReplyRX(int client)
{
if (IOPORT(W_PowerState) & 0x0300)
if (IOPORT(W_PowerState) & (1<<9))
return;
if (!(IOPORT(W_RXCnt) & 0x8000))
@ -1421,7 +1571,7 @@ void Wifi::MPClientReplyRX(int client)
bool Wifi::CheckRX(int type) // 0=regular 1=MP replies 2=MP host frames
{
if (IOPORT(W_PowerState) & 0x0300)
if (IOPORT(W_PowerState) & (1<<9))
return false;
if (!(IOPORT(W_RXCnt) & 0x8000))
@ -1433,7 +1583,7 @@ bool Wifi::CheckRX(int type) // 0=regular 1=MP replies 2=MP host frames
int rxlen;
int framelen;
u16 framectl;
u8 txrate;
u8 txrate, chan;
u64 timestamp;
for (;;)
@ -1468,6 +1618,24 @@ bool Wifi::CheckRX(int type) // 0=regular 1=MP replies 2=MP host frames
continue;
}
chan = RXBuffer[9];
if (chan != CurChannel || CurChannel == 0)
{
Log(LogLevel::Debug, "received frame but bad channel %d (expected %d)\n", chan, CurChannel);
continue;
}
// hack: ignore MP frames if not engaged in a MP comm
if (type == 0 && (!IsMP))
{
if (MACEqual(&RXBuffer[12 + 16], MPReplyMAC) ||
MACEqual(&RXBuffer[12 + 4], MPCmdMAC) ||
MACEqual(&RXBuffer[12 + 4], MPReplyMAC))
{
continue;
}
}
framectl = *(u16*)&RXBuffer[12+0];
txrate = RXBuffer[8];
@ -1528,7 +1696,6 @@ bool Wifi::CheckRX(int type) // 0=regular 1=MP replies 2=MP host frames
// we also need to determine how far we can run after having received this frame
RXTimestamp = timestamp;
//if (RXTimestamp < USTimestamp) printf("CRAP!! %04X %016llX %016llX\n", framectl, RXTimestamp, USTimestamp);
if (RXTimestamp < USTimestamp) RXTimestamp = USTimestamp;
NextSync = RXTimestamp + (framelen * (txrate==0x14 ? 4:8));
@ -1570,11 +1737,13 @@ void Wifi::MSTimer()
}
}
IOPORT(W_BeaconCount1)--;
if (IOPORT(W_BeaconCount1) == 0)
if (IOPORT(W_BeaconCount1) != 0)
{
SetIRQ14(1);
IOPORT(W_BeaconCount1)--;
if (IOPORT(W_BeaconCount1) == 0) SetIRQ14(1);
}
if (IOPORT(W_BeaconCount1) == 0)
IOPORT(W_BeaconCount1) = IOPORT(W_BeaconInterval);
if (IOPORT(W_BeaconCount2) != 0)
{
@ -1605,19 +1774,19 @@ void Wifi::USTimer(u32 param)
if (!(USTimestamp & 0x3FF & kTimeCheckMask))
WifiAP->MSTimer();
bool switchOffPowerSaving = false;
if (USUntilPowerOn < 0)
{
USUntilPowerOn += kTimerInterval;
switchOffPowerSaving = (USUntilPowerOn >= 0) && (IOPORT(W_PowerUnk) & 0x0001 || ForcePowerOn);
}
if ((USUntilPowerOn >= 0) && (IOPORT(W_PowerState) & 0x0002 || switchOffPowerSaving))
{
IOPORT(W_PowerState) = 0;
IOPORT(W_RFPins) = 1;
IOPORT(W_RFPins) = 0x0084;
SetIRQ(11);
if (USUntilPowerOn >= 0)
{
USUntilPowerOn = 0;
IOPORT(W_PowerState) = 0;
SetStatus(1);
UpdatePowerStatus(0);
}
}
if (IOPORT(W_USCountCnt))
@ -1660,7 +1829,7 @@ void Wifi::USTimer(u32 param)
u16 txbusy = IOPORT(W_TXBusy);
if (txbusy)
{
if (IOPORT(W_PowerState) & 0x0300)
if (IOPORT(W_PowerState) & (1<<9))
{
ComStatus = 0;
TXCurSlot = -1;
@ -1695,9 +1864,10 @@ void Wifi::USTimer(u32 param)
bool finished = ProcessTX(&TXSlots[TXCurSlot], TXCurSlot);
if (finished)
{
if (IOPORT(W_PowerState) & 0x0300)
if (IOPORT(W_PowerState) & (1<<9))
{
IOPORT(W_TXBusy) = 0;
IOPORT(W_TRXPower) = 0;
SetStatus(9);
}
@ -1754,8 +1924,9 @@ void Wifi::USTimer(u32 param)
RXCounter = 0;
}
// TODO: proper error management
if ((!ComStatus) && (IOPORT(W_PowerState) & 0x0300))
if ((!ComStatus) && (IOPORT(W_PowerState) & (1<<9)))
{
IOPORT(W_TRXPower) = 0;
SetStatus(9);
}
}
@ -1766,6 +1937,28 @@ void Wifi::USTimer(u32 param)
}
void Wifi::ChangeChannel()
{
u32 val1 = RFRegs[RFChannelIndex[0]];
u32 val2 = RFRegs[RFChannelIndex[1]];
CurChannel = 0;
for (int i = 0; i < 14; i++)
{
if (val1 == RFChannelData[i][0] && val2 == RFChannelData[i][1])
{
CurChannel = i+1;
break;
}
}
if (CurChannel > 0)
Log(LogLevel::Debug, "wifi: switching to channel %d\n", CurChannel);
else
Log(LogLevel::Debug, "wifi: invalid channel values %05X:%05X\n", val1, val2);
}
void Wifi::RFTransfer_Type2()
{
u32 id = (IOPORT(W_RFData2) >> 2) & 0x1F;
@ -1780,6 +1973,9 @@ void Wifi::RFTransfer_Type2()
{
u32 data = IOPORT(W_RFData1) | ((IOPORT(W_RFData2) & 0x0003) << 16);
RFRegs[id] = data;
if (id == RFChannelIndex[0] || id == RFChannelIndex[1])
ChangeChannel();
}
}
@ -1796,6 +1992,9 @@ void Wifi::RFTransfer_Type3()
{
u32 data = IOPORT(W_RFData1) & 0xFF;
RFRegs[id] = data;
if (id == RFChannelIndex[0] || id == RFChannelIndex[1])
ChangeChannel();
}
}
@ -1819,6 +2018,7 @@ u16 Wifi::Read(u32 addr)
switch (addr)
{
case W_Random: // random generator. not accurate
// TODO: rotate the sequence based on the ARM7 cycle counter (if this is important)
Random = (Random & 0x1) ^ (((Random & 0x3FF) << 1) | (Random >> 10));
return Random;
@ -1899,7 +2099,6 @@ u16 Wifi::Read(u32 addr)
}
}
//printf("WIFI: read %08X\n", addr);
return IOPORT(addr&0xFFF);
}
@ -1923,28 +2122,20 @@ void Wifi::Write(u32 addr, u16 val)
case W_ModeReset:
{
u16 oldval = IOPORT(W_ModeReset);
IOPORT(W_ModeReset) = val & 0x0001;
if (!(oldval & 0x0001) && (val & 0x0001))
{
if (!(USUntilPowerOn < 0 && ForcePowerOn))
{
//printf("mode reset power on %08x\n", NDS::ARM7->R[15]);
IOPORT(0x034) = 0x0002;
IOPORT(0x27C) = 0x0005;
// TODO: 02A2??
IOPORT(0x27C) = 0x0005;
// TODO: 02A2??
if (IOPORT(W_PowerUnk) & 0x0002)
{
USUntilPowerOn = -2048;
IOPORT(W_PowerState) |= 0x100;
}
}
UpdatePowerStatus(0);
}
else if ((oldval & 0x0001) && !(val & 0x0001))
{
//printf("mode reset shutdown %08x\n", NDS::ARM7->R[15]);
IOPORT(0x27C) = 0x000A;
PowerDown();
UpdatePowerStatus(0);
}
if (val & 0x2000)
@ -1986,23 +2177,43 @@ void Wifi::Write(u32 addr, u16 val)
IOPORT(0x230) = 0x0047;
}
}
break;
return;
case W_ModeWEP:
val &= 0x007F;
//printf("writing mode web %x\n", val);
if ((val & 0x7) == 1)
IOPORT(W_PowerUnk) |= 0x0002;
if ((val & 0x7) == 2)
IOPORT(W_PowerUnk) = 0x0003;
break;
IOPORT(W_ModeWEP) = val;
if (IOPORT(W_PowerTX) & (1<<1))
{
if ((val & 0x7) == 1)
IOPORT(W_PowerDownCtrl) |= (1<<1);
else if ((val & 0x7) == 2)
IOPORT(W_PowerDownCtrl) = 3;
if ((val & 0x7) != 3)
IOPORT(W_PowerState) &= 0x0300;
UpdatePowerStatus(0);
}
return;
case W_IE:
{
u16 oldflags = IOPORT(W_IF) & IOPORT(W_IE);
IOPORT(W_IE) = val;
CheckIRQ(oldflags);
}
return;
case W_IF:
IOPORT(W_IF) &= ~val;
return;
case W_IFSet:
IOPORT(W_IF) |= (val & 0xFBFF);
Log(LogLevel::Debug, "wifi: force-setting IF %04X\n", val);
{
u16 oldflags = IOPORT(W_IF) & IOPORT(W_IE);
IOPORT(W_IF) |= (val & 0xFBFF);
CheckIRQ(oldflags);
Log(LogLevel::Debug, "wifi: force-setting IF %04X\n", val);
}
return;
case W_AIDLow:
@ -2012,67 +2223,63 @@ void Wifi::Write(u32 addr, u16 val)
IOPORT(W_AIDFull) = val & 0x07FF;
return;
case W_PowerState:
//printf("writing power state %x %08x\n", val, NDS::ARM7->R[15]);
IOPORT(W_PowerState) |= val & 0x0002;
if (IOPORT(W_ModeReset) & 0x0001 && IOPORT(W_PowerState) & 0x0002)
{
/*if (IOPORT(W_PowerState) & 0x100)
{
AlwaysPowerOn = true;
USUntilPowerOn = -1;
}
else */
if (IOPORT(W_PowerForce) == 1)
{
//printf("power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = false;
}
}
return;
case W_PowerForce:
//if ((val&0x8001)==0x8000) printf("WIFI: forcing power %04X\n", val);
val &= 0x8001;
//printf("writing power force %x %08x\n", val, NDS::ARM7->R[15]);
if (val == 0x8001)
{
//printf("force power off\n");
IOPORT(0x034) = 0x0002;
IOPORT(W_PowerState) = 0x0200;
IOPORT(W_TXReqRead) = 0;
PowerDown();
}
if (val == 1 && IOPORT(W_PowerState) & 0x0002)
{
//printf("power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = false;
}
if (val == 0x8000)
{
//printf("force power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = true;
}
break;
case W_PowerUS:
IOPORT(W_PowerUS) = val & 0x0003;
UpdatePowerOn();
return;
case W_PowerUnk:
val &= 0x0003;
//printf("writing power unk %x\n", val);
if ((IOPORT(W_ModeWEP) & 0x7) == 1)
val |= 2;
else if ((IOPORT(W_ModeWEP) & 0x7) == 2)
val = 3;
break;
case W_PowerTX:
IOPORT(W_PowerTX) = val & 0x0003;
if (val & (1<<1))
{
if ((IOPORT(W_ModeWEP) & 0x7) == 1)
IOPORT(W_PowerDownCtrl) |= (1<<1);
else if ((IOPORT(W_ModeWEP) & 0x7) == 2)
IOPORT(W_PowerDownCtrl) = 3;
UpdatePowerStatus(0);
}
return;
case W_PowerState:
if ((IOPORT(W_ModeWEP) & 0x7) != 3)
return;
val = (IOPORT(W_PowerState) & 0x0300) | (val & 0x0003);
if ((val & 0x0300) == 0x0200)
val &= ~(1<<0);
else
val &= ~(1<<1);
if (!(val & (1<<9)))
val &= ~(1<<8);
IOPORT(W_PowerState) = val;
UpdatePowerStatus(0);
return;
case W_PowerForce:
val &= 0x8001;
IOPORT(W_PowerForce) = val;
UpdatePowerStatus(0);
return;
case W_PowerDownCtrl:
IOPORT(W_PowerDownCtrl) = val & 0x0003;
if (IOPORT(W_PowerTX) & (1<<1))
{
if ((IOPORT(W_ModeWEP) & 0x7) == 1)
IOPORT(W_PowerDownCtrl) |= (1<<1);
else if ((IOPORT(W_ModeWEP) & 0x7) == 2)
IOPORT(W_PowerDownCtrl) = 3;
}
if (val != 0 && val != 3)
Log(LogLevel::Warn, "wifi: unusual W_PowerDownCtrl value %04X\n", val);
UpdatePowerStatus(0);
return;
case W_USCountCnt: val &= 0x0001; break;
case W_USCompareCnt:
@ -2231,6 +2438,7 @@ void Wifi::Write(u32 addr, u16 val)
// read-only ports
case 0x000:
case 0x034:
case 0x044:
case 0x054:
case 0x098:

14
src/Wifi.h
View File

@ -52,11 +52,12 @@ public:
W_RXCnt = 0x030,
W_WEPCnt = 0x032,
W_TRXPower = 0x034,
W_PowerUS = 0x036,
W_PowerTX = 0x038,
W_PowerState = 0x03C,
W_PowerForce = 0x040,
W_PowerUnk = 0x48,
W_PowerDownCtrl = 0x48,
W_Random = 0x044,
@ -206,6 +207,10 @@ private:
u8 RFVersion;
u32 RFRegs[0x40];
u32 RFChannelIndex[2];
u32 RFChannelData[14][2];
int CurChannel;
struct TXSlot
{
bool Valid;
@ -240,7 +245,6 @@ private:
bool LANInited;
int USUntilPowerOn;
bool ForcePowerOn;
// MULTIPLAYER SYNC APPARATUS
bool IsMP;
@ -253,13 +257,15 @@ private:
void ScheduleTimer(bool first);
void UpdatePowerOn();
void CheckIRQ(u16 oldflags);
void SetIRQ(u32 irq);
void SetIRQ13();
void SetIRQ14(int source);
void SetIRQ15();
void SetStatus(u32 status);
void PowerDown();
void UpdatePowerStatus(int power);
int PreambleLen(int rate) const;
u32 NumClients(u16 bitmask) const;
@ -284,6 +290,8 @@ private:
void MSTimer();
void ChangeChannel();
void RFTransfer_Type2();
void RFTransfer_Type3();
};

10
src/WifiAP.cpp
View File

@ -35,6 +35,7 @@ using Platform::LogLevel;
const char* WifiAP::APName = "melonAP";
const u8 WifiAP::APMac[6] = {0x00, 0xF0, 0x77, 0x77, 0x77, 0x77};
const u8 WifiAP::APChannel = 6;
#define PWRITE_8(p, v) *p++ = v;
#define PWRITE_16(p, v) *(u16*)p = v; p += 2;
@ -55,7 +56,7 @@ const u8 WifiAP::APMac[6] = {0x00, 0xF0, 0x77, 0x77, 0x77, 0x77};
PWRITE_16(p, 0); \
PWRITE_16(p, 0); \
PWRITE_8(p, rate); \
PWRITE_8(p, 0); \
PWRITE_8(p, APChannel); \
PWRITE_16(p, len);
//#define PALIGN_4(p, base) p += ((4 - ((ptrdiff_t)(p-base) & 0x3)) & 0x3);
@ -174,7 +175,7 @@ int WifiAP::HandleManagementFrame(const u8* data, int len)
PWRITE_16(p, 128); // beacon interval
PWRITE_16(p, 0x0021); // capability
PWRITE_8(p, 0x01); PWRITE_8(p, 0x02); PWRITE_8(p, 0x82); PWRITE_8(p, 0x84); // rates
PWRITE_8(p, 0x03); PWRITE_8(p, 0x01); PWRITE_8(p, 0x06); // current channel
PWRITE_8(p, 0x03); PWRITE_8(p, 0x01); PWRITE_8(p, APChannel); // current channel
PWRITE_8(p, 0x00); PWRITE_8(p, strlen(APName));
memcpy(p, APName, strlen(APName)); p += strlen(APName);
@ -260,6 +261,9 @@ int WifiAP::HandleManagementFrame(const u8* data, int len)
int WifiAP::SendPacket(const u8* data, int len)
{
if (data[9] != APChannel)
return 0;
data += 12;
u16 framectl = *(u16*)&data[0];
@ -327,7 +331,7 @@ int WifiAP::RecvPacket(u8* data)
PWRITE_16(p, 128); // beacon interval
PWRITE_16(p, 0x0021); // capability
PWRITE_8(p, 0x01); PWRITE_8(p, 0x02); PWRITE_8(p, 0x82); PWRITE_8(p, 0x84); // rates
PWRITE_8(p, 0x03); PWRITE_8(p, 0x01); PWRITE_8(p, 0x06); // current channel
PWRITE_8(p, 0x03); PWRITE_8(p, 0x01); PWRITE_8(p, APChannel); // current channel
PWRITE_8(p, 0x05); PWRITE_8(p, 0x04); PWRITE_8(p, 0); PWRITE_8(p, 0); PWRITE_8(p, 0); PWRITE_8(p, 0); // TIM
PWRITE_8(p, 0x00); PWRITE_8(p, strlen(APName));
memcpy(p, APName, strlen(APName)); p += strlen(APName);

1
src/WifiAP.h
View File

@ -34,6 +34,7 @@ public:
static const char* APName;
static const u8 APMac[6];
static const u8 APChannel;
void MSTimer();

4
src/frontend/duckstation/gl/context.cpp
View File

@ -3,11 +3,7 @@
#include "loader.h"
#include <cstdlib>
#include <cstring>
#ifdef __APPLE__
#include <stdlib.h>
#else
#include <malloc.h>
#endif
Log_SetChannel(GL::Context);
#if defined(_WIN32)

3
src/frontend/qt_sdl/AudioSettingsDialog.cpp
View File

@ -55,6 +55,7 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent) : QDialog(parent), ui(
ui->cbInterpolation->addItem("Linear");
ui->cbInterpolation->addItem("Cosine");
ui->cbInterpolation->addItem("Cubic");
ui->cbInterpolation->addItem("Gaussian (SNES)");
ui->cbInterpolation->setCurrentIndex(Config::AudioInterp);
ui->cbBitDepth->addItem("Automatic");
@ -177,7 +178,7 @@ void AudioSettingsDialog::on_cbBitDepth_currentIndexChanged(int idx)
void AudioSettingsDialog::on_cbInterpolation_currentIndexChanged(int idx)
{
// prevent a spurious change
if (ui->cbInterpolation->count() < 4) return;
if (ui->cbInterpolation->count() < 5) return;
Config::AudioInterp = ui->cbInterpolation->currentIndex();

172
src/frontend/qt_sdl/EmuInstance.cpp
View File

@ -569,65 +569,65 @@ void EmuInstance::loadCheats()
nds->AREngine.SetCodeFile(cheatsOn ? cheatFile : nullptr);
}
std::optional<std::array<u8, ARM9BIOSSize>> EmuInstance::loadARM9BIOS() noexcept
std::unique_ptr<ARM9BIOSImage> EmuInstance::loadARM9BIOS() noexcept
{
if (!globalCfg.GetBool("Emu.ExternalBIOSEnable"))
{
return globalCfg.GetInt("Emu.ConsoleType") == 0 ? std::make_optional(bios_arm9_bin) : std::nullopt;
return globalCfg.GetInt("Emu.ConsoleType") == 0 ? std::make_unique<ARM9BIOSImage>(bios_arm9_bin) : nullptr;
}
string path = globalCfg.GetString("DS.BIOS9Path");
if (FileHandle* f = OpenLocalFile(path, Read))
{
std::array<u8, ARM9BIOSSize> bios {};
std::unique_ptr<ARM9BIOSImage> bios = std::make_unique<ARM9BIOSImage>();
FileRewind(f);
FileRead(bios.data(), sizeof(bios), 1, f);
FileRead(bios->data(), bios->size(), 1, f);
CloseFile(f);
Log(Info, "ARM9 BIOS loaded from %s\n", path.c_str());
return bios;
}
Log(Warn, "ARM9 BIOS not found\n");
return std::nullopt;
return nullptr;
}
std::optional<std::array<u8, ARM7BIOSSize>> EmuInstance::loadARM7BIOS() noexcept
std::unique_ptr<ARM7BIOSImage> EmuInstance::loadARM7BIOS() noexcept
{
if (!globalCfg.GetBool("Emu.ExternalBIOSEnable"))
{
return globalCfg.GetInt("Emu.ConsoleType") == 0 ? std::make_optional(bios_arm7_bin) : std::nullopt;
return globalCfg.GetInt("Emu.ConsoleType") == 0 ? std::make_unique<ARM7BIOSImage>(bios_arm7_bin) : nullptr;
}
string path = globalCfg.GetString("DS.BIOS7Path");
if (FileHandle* f = OpenLocalFile(path, Read))
{
std::array<u8, ARM7BIOSSize> bios {};
FileRead(bios.data(), sizeof(bios), 1, f);
std::unique_ptr<ARM7BIOSImage> bios = std::make_unique<ARM7BIOSImage>();
FileRead(bios->data(), bios->size(), 1, f);
CloseFile(f);
Log(Info, "ARM7 BIOS loaded from %s\n", path.c_str());
return bios;
}
Log(Warn, "ARM7 BIOS not found\n");
return std::nullopt;
return nullptr;
}
std::optional<std::array<u8, DSiBIOSSize>> EmuInstance::loadDSiARM9BIOS() noexcept
std::unique_ptr<DSiBIOSImage> EmuInstance::loadDSiARM9BIOS() noexcept
{
string path = globalCfg.GetString("DSi.BIOS9Path");
if (FileHandle* f = OpenLocalFile(path, Read))
{
std::array<u8, DSiBIOSSize> bios {};
FileRead(bios.data(), sizeof(bios), 1, f);
std::unique_ptr<DSiBIOSImage> bios = std::make_unique<DSiBIOSImage>();
FileRead(bios->data(), bios->size(), 1, f);
CloseFile(f);
if (!globalCfg.GetBool("DSi.FullBIOSBoot"))
{
// herp
*(u32*)&bios[0] = 0xEAFFFFFE; // overwrites the reset vector
*(u32*)bios->data() = 0xEAFFFFFE; // overwrites the reset vector
// TODO!!!!
// hax the upper 32K out of the goddamn DSi
@ -638,23 +638,23 @@ std::optional<std::array<u8, DSiBIOSSize>> EmuInstance::loadDSiARM9BIOS() noexce
}
Log(Warn, "ARM9i BIOS not found\n");
return std::nullopt;
return nullptr;
}
std::optional<std::array<u8, DSiBIOSSize>> EmuInstance::loadDSiARM7BIOS() noexcept
std::unique_ptr<DSiBIOSImage> EmuInstance::loadDSiARM7BIOS() noexcept
{
string path = globalCfg.GetString("DSi.BIOS7Path");
if (FileHandle* f = OpenLocalFile(path, Read))
{
std::array<u8, DSiBIOSSize> bios {};
FileRead(bios.data(), sizeof(bios), 1, f);
std::unique_ptr<DSiBIOSImage> bios = std::make_unique<DSiBIOSImage>();
FileRead(bios->data(), bios->size(), 1, f);
CloseFile(f);
if (!globalCfg.GetBool("DSi.FullBIOSBoot"))
{
// herp
*(u32*)&bios[0] = 0xEAFFFFFE; // overwrites the reset vector
*(u32*)bios->data() = 0xEAFFFFFE; // overwrites the reset vector
// TODO!!!!
// hax the upper 32K out of the goddamn DSi
@ -665,7 +665,7 @@ std::optional<std::array<u8, DSiBIOSSize>> EmuInstance::loadDSiARM7BIOS() noexce
}
Log(Warn, "ARM7i BIOS not found\n");
return std::nullopt;
return nullptr;
}
Firmware EmuInstance::generateFirmware(int type) noexcept
@ -707,7 +707,7 @@ Firmware EmuInstance::generateFirmware(int type) noexcept
}
}
customizeFirmware(firmware);
customizeFirmware(firmware, true);
// If we don't have Wi-fi settings to load,
// then the defaults will have already been populated by the constructor.
@ -751,10 +751,7 @@ std::optional<Firmware> EmuInstance::loadFirmware(int type) noexcept
return std::nullopt;
}
if (Config::FirmwareOverrideSettings)
{
customizeFirmware(firmware);
}
customizeFirmware(firmware, Config::FirmwareOverrideSettings);
return firmware;
}
@ -986,8 +983,8 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
NDSArgs ndsargs {
std::move(nextndscart),
std::move(nextgbacart),
*arm9bios,
*arm7bios,
std::move(arm9bios),
std::move(arm7bios),
std::move(*firmware),
jitargs,
static_cast<AudioBitDepth>(Config::AudioBitDepth),
@ -1016,8 +1013,8 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
DSiArgs args {
std::move(ndsargs),
*arm9ibios,
*arm7ibios,
std::move(arm9ibios),
std::move(arm7ibios),
std::move(*nand),
std::move(sdcard),
globalCfg.GetBool("DSi.FullBIOSBoot"),
@ -1042,8 +1039,8 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
}
else
{
nds->SetARM7BIOS(ndsargs.ARM7BIOS);
nds->SetARM9BIOS(ndsargs.ARM9BIOS);
nds->SetARM7BIOS(*ndsargs.ARM7BIOS);
nds->SetARM9BIOS(*ndsargs.ARM9BIOS);
nds->SetFirmware(std::move(ndsargs.Firmware));
nds->SetNDSCart(std::move(ndsargs.NDSROM));
nds->SetJITArgs(ndsargs.JIT);
@ -1057,8 +1054,8 @@ bool EmuInstance::updateConsole(UpdateConsoleNDSArgs&& _ndsargs, UpdateConsoleGB
DSiArgs& args = dsiargs.value();
dsi->SetFullBIOSBoot(args.FullBIOSBoot);
dsi->ARM7iBIOS = args.ARM7iBIOS;
dsi->ARM9iBIOS = args.ARM9iBIOS;
dsi->ARM7iBIOS = *args.ARM7iBIOS;
dsi->ARM9iBIOS = *args.ARM9iBIOS;
dsi->SetNAND(std::move(args.NANDImage));
dsi->SetSDCard(std::move(args.DSiSDCard));
// We're moving the optional, not the card
@ -1129,6 +1126,8 @@ void EmuInstance::reset()
nds->SetupDirectBoot(baseROMName);
}
}
nds->Start();
}
@ -1331,54 +1330,59 @@ bool EmuInstance::parseMacAddress(void* data)
return false;
}
void EmuInstance::customizeFirmware(Firmware& firmware) noexcept
void EmuInstance::customizeFirmware(Firmware& firmware, bool overridesettings) noexcept
{
auto& currentData = firmware.GetEffectiveUserData();
// setting up username
std::string orig_username = Config::FirmwareUsername;
if (!orig_username.empty())
{ // If the frontend defines a username, take it. If not, leave the existing one.
std::u16string username = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(orig_username);
size_t usernameLength = std::min(username.length(), (size_t) 10);
currentData.NameLength = usernameLength;
memcpy(currentData.Nickname, username.data(), usernameLength * sizeof(char16_t));
}
auto language = static_cast<Firmware::Language>(Config::FirmwareLanguage);
if (language != Firmware::Language::Reserved)
{ // If the frontend specifies a language (rather than using the existing value)...
currentData.Settings &= ~Firmware::Language::Reserved; // ..clear the existing language...
currentData.Settings |= language; // ...and set the new one.
}
// setting up color
u8 favoritecolor = Config::FirmwareFavouriteColour;
if (favoritecolor != 0xFF)
if (overridesettings)
{
currentData.FavoriteColor = favoritecolor;
}
auto &currentData = firmware.GetEffectiveUserData();
u8 birthmonth = Config::FirmwareBirthdayMonth;
if (birthmonth != 0)
{ // If the frontend specifies a birth month (rather than using the existing value)...
currentData.BirthdayMonth = birthmonth;
}
// setting up username
std::string orig_username = Config::FirmwareUsername;
if (!orig_username.empty())
{ // If the frontend defines a username, take it. If not, leave the existing one.
std::u16string username = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(
orig_username);
size_t usernameLength = std::min(username.length(), (size_t) 10);
currentData.NameLength = usernameLength;
memcpy(currentData.Nickname, username.data(), usernameLength * sizeof(char16_t));
}
u8 birthday = Config::FirmwareBirthdayDay;
if (birthday != 0)
{ // If the frontend specifies a birthday (rather than using the existing value)...
currentData.BirthdayDay = birthday;
}
auto language = static_cast<Firmware::Language>(Config::FirmwareLanguage);
if (language != Firmware::Language::Reserved)
{ // If the frontend specifies a language (rather than using the existing value)...
currentData.Settings &= ~Firmware::Language::Reserved; // ..clear the existing language...
currentData.Settings |= language; // ...and set the new one.
}
// setup message
std::string orig_message = Config::FirmwareMessage;
if (!orig_message.empty())
{
std::u16string message = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(orig_message);
size_t messageLength = std::min(message.length(), (size_t) 26);
currentData.MessageLength = messageLength;
memcpy(currentData.Message, message.data(), messageLength * sizeof(char16_t));
// setting up color
u8 favoritecolor = Config::FirmwareFavouriteColour;
if (favoritecolor != 0xFF)
{
currentData.FavoriteColor = favoritecolor;
}
u8 birthmonth = Config::FirmwareBirthdayMonth;
if (birthmonth != 0)
{ // If the frontend specifies a birth month (rather than using the existing value)...
currentData.BirthdayMonth = birthmonth;
}
u8 birthday = Config::FirmwareBirthdayDay;
if (birthday != 0)
{ // If the frontend specifies a birthday (rather than using the existing value)...
currentData.BirthdayDay = birthday;
}
// setup message
std::string orig_message = Config::FirmwareMessage;
if (!orig_message.empty())
{
std::u16string message = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(
orig_message);
size_t messageLength = std::min(message.length(), (size_t) 26);
currentData.MessageLength = messageLength;
memcpy(currentData.Message, message.data(), messageLength * sizeof(char16_t));
}
}
MacAddress mac;
@ -1387,14 +1391,16 @@ void EmuInstance::customizeFirmware(Firmware& firmware) noexcept
memcpy(&mac, header.MacAddr.data(), sizeof(MacAddress));
MacAddress configuredMac;
rep = parseMacAddress(&configuredMac);
rep &= (configuredMac != MacAddress());
if (rep)
if (overridesettings)
{
mac = configuredMac;
MacAddress configuredMac;
rep = parseMacAddress(&configuredMac);
rep &= (configuredMac != MacAddress());
if (rep)
{
mac = configuredMac;
}
}
int inst = Platform::InstanceID();

10
src/frontend/qt_sdl/EmuInstance.h
View File

@ -77,10 +77,10 @@ private:
void undoStateLoad();
void unloadCheats();
void loadCheats();
std::optional<std::array<melonDS::u8, melonDS::ARM9BIOSSize>> loadARM9BIOS() noexcept;
std::optional<std::array<melonDS::u8, melonDS::ARM7BIOSSize>> loadARM7BIOS() noexcept;
std::optional<std::array<melonDS::u8, melonDS::DSiBIOSSize>> loadDSiARM9BIOS() noexcept;
std::optional<std::array<melonDS::u8, melonDS::DSiBIOSSize>> loadDSiARM7BIOS() noexcept;
std::unique_ptr<melonDS::ARM9BIOSImage> loadARM9BIOS() noexcept;
std::unique_ptr<melonDS::ARM7BIOSImage> loadARM7BIOS() noexcept;
std::unique_ptr<melonDS::DSiBIOSImage> loadDSiARM9BIOS() noexcept;
std::unique_ptr<melonDS::DSiBIOSImage> loadDSiARM7BIOS() noexcept;
melonDS::Firmware generateFirmware(int type) noexcept;
std::optional<melonDS::Firmware> loadFirmware(int type) noexcept;
std::optional<melonDS::DSi_NAND::NANDImage> loadNAND(const std::array<melonDS::u8, melonDS::DSiBIOSSize>& arm7ibios) noexcept;
@ -94,7 +94,7 @@ private:
void clearBackupState();
std::pair<std::unique_ptr<melonDS::Firmware>, std::string> generateDefaultFirmware();
bool parseMacAddress(void* data);
void customizeFirmware(melonDS::Firmware& firmware) noexcept;
void customizeFirmware(melonDS::Firmware& firmware, bool overridesettings) noexcept;
bool loadROMData(const QStringList& filepath, std::unique_ptr<melonDS::u8[]>& filedata, melonDS::u32& filelen, std::string& basepath, std::string& romname) noexcept;
QString getSavErrorString(std::string& filepath, bool gba);
bool loadROM(QStringList filepath, bool reset);

23
src/frontend/qt_sdl/Input.cpp
View File

@ -128,6 +128,11 @@ void KeyRelease(QKeyEvent* event)
KeyHotkeyMask &= ~(1<<i);
}
void KeyReleaseAll()
{
KeyInputMask = 0xFFF;
KeyHotkeyMask = 0;
}
bool JoystickButtonDown(int val)
{
@ -204,16 +209,22 @@ void Process()
}
JoyInputMask = 0xFFF;
for (int i = 0; i < 12; i++)
if (JoystickButtonDown(Config::JoyMapping[i]))
JoyInputMask &= ~(1<<i);
if (Joystick)
{
for (int i = 0; i < 12; i++)
if (JoystickButtonDown(Config::JoyMapping[i]))
JoyInputMask &= ~(1 << i);
}
InputMask = KeyInputMask & JoyInputMask;
JoyHotkeyMask = 0;
for (int i = 0; i < HK_MAX; i++)
if (JoystickButtonDown(Config::HKJoyMapping[i]))
JoyHotkeyMask |= (1<<i);
if (Joystick)
{
for (int i = 0; i < HK_MAX; i++)
if (JoystickButtonDown(Config::HKJoyMapping[i]))
JoyHotkeyMask |= (1 << i);
}
HotkeyMask = KeyHotkeyMask | JoyHotkeyMask;
HotkeyPress = HotkeyMask & ~LastHotkeyMask;

1
src/frontend/qt_sdl/Input.h
View File

@ -41,6 +41,7 @@ void CloseJoystick();
void KeyPress(QKeyEvent* event);
void KeyRelease(QKeyEvent* event);
void KeyReleaseAll();
void Process();

34
src/frontend/qt_sdl/Platform.cpp
View File

@ -219,9 +219,30 @@ std::string InstanceFileSuffix()
return suffix;
}
static QIODevice::OpenMode GetQMode(FileMode mode)
{
QIODevice::OpenMode qmode = QIODevice::OpenModeFlag::NotOpen;
if (mode & FileMode::Read)
qmode |= QIODevice::OpenModeFlag::ReadOnly;
if (mode & FileMode::Write)
qmode |= QIODevice::OpenModeFlag::WriteOnly;
if (mode & FileMode::Append)
qmode |= QIODevice::OpenModeFlag::Append;
if ((mode & FileMode::Write) && !(mode & FileMode::Preserve))
qmode |= QIODevice::OpenModeFlag::Truncate;
if (mode & FileMode::NoCreate)
qmode |= QIODevice::OpenModeFlag::ExistingOnly;
if (mode & FileMode::Text)
qmode |= QIODevice::OpenModeFlag::Text;
return qmode;
}
constexpr char AccessMode(FileMode mode, bool file_exists)
{
if (mode & FileMode::Append)
return 'a';
@ -269,10 +290,15 @@ FileHandle* OpenFile(const std::string& path, FileMode mode)
return nullptr;
}
bool file_exists = QFile::exists(QString::fromStdString(path));
std::string modeString = GetModeString(mode, file_exists);
QString qpath{QString::fromStdString(path)};
std::string modeString = GetModeString(mode, QFile::exists(qpath));
QIODevice::OpenMode qmode = GetQMode(mode);
QFile qfile{qpath};
qfile.open(qmode);
FILE* file = fdopen(dup(qfile.handle()), modeString.c_str());
qfile.close();
FILE* file = fopen(path.c_str(), modeString.c_str());
if (file)
{
Log(LogLevel::Debug, "Opened \"%s\" with FileMode 0x%x (effective mode \"%s\")\n", path.c_str(), mode, modeString.c_str());

2
src/frontend/qt_sdl/Screen.cpp
View File

@ -225,7 +225,7 @@ void ScreenPanel::mouseMoveEvent(QMouseEvent* event)
showCursor();
if (!(event->buttons() & Qt::LeftButton)) return;
//if (!(event->buttons() & Qt::LeftButton)) return;
if (!touching) return;
int x = event->pos().x();

3
src/frontend/qt_sdl/Window.cpp
View File

@ -841,7 +841,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
if (event->isAutoRepeat()) return;
// TODO!! REMOVE ME IN RELEASE BUILDS!!
//if (event->key() == Qt::Key_F11) NDS::debug(0);
//if (event->key() == Qt::Key_F11) emuThread->NDS->debug(0);
Input::KeyPress(event);
}
@ -952,6 +952,7 @@ void MainWindow::onAppStateChanged(Qt::ApplicationState state)
{
if (state == Qt::ApplicationInactive)
{
Input::KeyReleaseAll();
if (Config::PauseLostFocus && emuThread->emuIsRunning())
emuThread->emuPause();
}

2
src/frontend/qt_sdl/main.cpp
View File

@ -347,7 +347,7 @@ int main(int argc, char** argv)
#endif
SANITIZE(Config::ScreenVSyncInterval, 1, 20);
SANITIZE(Config::GL_ScaleFactor, 1, 16);
SANITIZE(Config::AudioInterp, 0, 3);
SANITIZE(Config::AudioInterp, 0, 4);
SANITIZE(Config::AudioVolume, 0, 256);
SANITIZE(Config::MicInputType, 0, (int)micInputType_MAX);
SANITIZE(Config::ScreenRotation, 0, (int)Frontend::screenRot_MAX);

11
src/teakra/src/CMakeLists.txt
View File

@ -32,11 +32,16 @@ add_library(teakra
register.h
shared_memory.h
teakra.cpp
test.h
test_generator.cpp
test_generator.h
)
if (TEAKRA_BUILD_UNIT_TESTS)
target_sources(teakra PUBLIC
test.h
test_generator.cpp
test_generator.h
)
endif()
create_target_directory_groups(teakra)
target_link_libraries(teakra PRIVATE Threads::Threads)

6
vcpkg.json
View File

@ -1,7 +1,11 @@
{
"dependencies": [
"sdl2",
"libarchive",
{
"name": "libarchive",
"default-features": false,
"features": ["bzip2", "crypto", "lz4", "zstd"]
},
"libslirp",
"zstd",
{