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

merge local_wifi (#1516) 

* attempt at betterer wifi

* add preliminary sync mechanism
* fix gaps in wifi implementation

* move local-MP comm to its own module instead of cramping Platform.cpp

* remove some stupid cruft

* as you wish, Sorer

(starting work on shared-memory system)

* shared-memory IPC that actually works (albeit Windows-only for now)

* shut up logging from NULL writes on ARM7 (ffs Nintendo learn to code)

* get this somewhat good

* leave client sync mode when host deauths. makes download play actually work.

* start implementing MP-comm error handling

* * add MP-reply error counters
* feeble attempt at fixing slowdown/desync/etc problems

* somewhat better exchange/sync method

* * when entering power-saving mode, be sure to finish transferring the current frame first
* fix misc bug due to old cruft leftover

makes for a more stable connection

* remove a bunch of cruft

* set wifi time interval to 34 cycles instead of 33. games seem sensitive to the general timing of wifi vs the rest of the system, and this seems to make things run better, atleast until I rewrite this to use a proper scheduler.

* more graceful handling of disconnects

* deal with FIFO overflow more gracefully

* BAHAHAHAHAHAHAHAHHHH

THE SNEAKY BASTARDS

so, when the DS receives a beacon with the right BSSID

that beacon's timestamp is copied to USCOUNTER

* attempt at making the connection process smoother for weird games

* * begin adding POWCNT2, only applies to wifi for now
* begin work on wifi scheduler

* implement the shitty timers

* add the RF wakeup thing

* begin work on receiving frames. for now it can just receive melonAP beacons, but hey, it's a start.

* add enough TX functionality that online wifi is a possibility again.

* there are problems with this scheduler thing. committing it anyway

* kind of a rollback... we're gonna work out a compromise on this, I guess

* don't transmit shit if RXCNT.bit15 isn't set

* move RX-finish to its own function. more accurate filtering. implement RXFILTER.

* remove some cruft

* fix some of the shittiness when trying to connect more than two players

* fix some more shittiness

* fix more wifi shittiness (mainly don't try to receive shit while sending a frame)

* run wifi every 8µs. improves performance.

* fix IRQ14/IRQ15

* make this work under Linux

* Make it work on macOS, for now using a custom sem_timedwait
implementation.

If anyone knows anything about mach ports and have an idea for how to
make this work using mach IPC, please do let me know.

* 25ms seems like a good timeout

* begin work on proper multiplayer UI shito.

for now, determine a global instance ID, and derivate the system MAC from it. remove 'randomize MAC' option.

* finish removing RandomizeMAC

* lay groundwork for instance-unique config

* work some on the UI... make it not labelled Fart

* more UI work: make it explicit that some things are instance-unique

* separate firmware files for multiplayer instances

* make instances save to different save files, too

* more UI work, make things somewhat less shitty

* lay base for the multiplayer settings dialog

* actually hook up most of that dialog

* actually implement the fun audio settings

* ensure all the wifi shit is properly savestated and reset. properly update timings for the wifi region when wifi is disabled.

* add more fun labels

* * ignore WEP frames if WEP is off
* implement RX_LEN_CROP

* fake enough of WEP processing to make Inazuma Eleven work

* * do not copy more ROM banner data than actually needed
* avoid trying to read out of bounds if the banner offset is bad

* Fix oversight with the preferences action causing the build to fail on macOS

Co-authored-by: Nadia Holmquist Pedersen <nadia@nhp.sh>
This commit is contained in:
Arisotura 2022-09-22 20:32:27 +02:00 committed by GitHub
parent b5073e6014
commit b1e4bd5520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 3468 additions and 1068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/NDS.cpp
View File

@ -176,6 +176,7 @@ bool RunningGame;
void DivDone(u32 param); void DivDone(u32 param);
void SqrtDone(u32 param); void SqrtDone(u32 param);
void RunTimer(u32 tid, s32 cycles); void RunTimer(u32 tid, s32 cycles);
void UpdateWifiTimings();
void SetWifiWaitCnt(u16 val); void SetWifiWaitCnt(u16 val);
void SetGBASlotTimings(); void SetGBASlotTimings();
@ -892,9 +893,7 @@ bool DoSavestate(Savestate* file)
InitTimings(); InitTimings();
SetGBASlotTimings(); SetGBASlotTimings();
u16 tmp = WifiWaitCnt; UpdateWifiTimings();
WifiWaitCnt = 0xFFFF;
SetWifiWaitCnt(tmp); // force timing table update
} }
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
@ -918,6 +917,9 @@ bool DoSavestate(Savestate* file)
if (!file->Saving) if (!file->Saving)
{ {
GPU::SetPowerCnt(PowerControl9); GPU::SetPowerCnt(PowerControl9);
SPU::SetPowerCnt(PowerControl7 & 0x0001);
Wifi::SetPowerCnt(PowerControl7 & 0x0002);
} }
#ifdef JIT_ENABLED #ifdef JIT_ENABLED
@ -1198,6 +1200,25 @@ void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 para
Reschedule(evt->Timestamp); Reschedule(evt->Timestamp);
} }
void ScheduleEvent(u32 id, u64 timestamp, void (*func)(u32), u32 param)
{
if (SchedListMask & (1<<id))
{
printf("!! EVENT %d ALREADY SCHEDULED\n", id);
return;
}
SchedEvent* evt = &SchedList[id];
evt->Timestamp = timestamp;
evt->Func = func;
evt->Param = param;
SchedListMask |= (1<<id);
Reschedule(evt->Timestamp);
}
void CancelEvent(u32 id) void CancelEvent(u32 id)
{ {
SchedListMask &= ~(1<<id); SchedListMask &= ~(1<<id);
@ -1323,15 +1344,29 @@ void MapSharedWRAM(u8 val)
} }
void UpdateWifiTimings()
{
if (PowerControl7 & 0x0002)
{
const int ntimings[4] = {10, 8, 6, 18};
u16 val = WifiWaitCnt;
SetARM7RegionTimings(0x04800, 0x04808, Mem7_Wifi0, 16, ntimings[val & 0x3], (val & 0x4) ? 4 : 6);
SetARM7RegionTimings(0x04808, 0x04810, Mem7_Wifi1, 16, ntimings[(val>>3) & 0x3], (val & 0x20) ? 4 : 10);
}
else
{
SetARM7RegionTimings(0x04800, 0x04808, Mem7_Wifi0, 32, 1, 1);
SetARM7RegionTimings(0x04808, 0x04810, Mem7_Wifi1, 32, 1, 1);
}
}
void SetWifiWaitCnt(u16 val) void SetWifiWaitCnt(u16 val)
{ {
if (WifiWaitCnt == val) return; if (WifiWaitCnt == val) return;
WifiWaitCnt = val; WifiWaitCnt = val;
UpdateWifiTimings();
const int ntimings[4] = {10, 8, 6, 18};
SetARM7RegionTimings(0x04800, 0x04808, Mem7_Wifi0, 16, ntimings[val & 0x3], (val & 0x4) ? 4 : 6);
SetARM7RegionTimings(0x04808, 0x04810, Mem7_Wifi1, 16, ntimings[(val>>3) & 0x3], (val & 0x20) ? 4 : 10);
} }
void SetGBASlotTimings() void SetGBASlotTimings()
@ -1941,8 +1976,8 @@ void debug(u32 param)
//for (int i = 0; i < 9; i++) //for (int i = 0; i < 9; i++)
// printf("VRAM %c: %02X\n", 'A'+i, GPU::VRAMCNT[i]); // printf("VRAM %c: %02X\n", 'A'+i, GPU::VRAMCNT[i]);
/*FILE* FILE*
shit = fopen("debug/construct.bin", "wb"); shit = fopen("debug/inazuma.bin", "wb");
fwrite(ARM9->ITCM, 0x8000, 1, shit); fwrite(ARM9->ITCM, 0x8000, 1, shit);
for (u32 i = 0x02000000; i < 0x02400000; i+=4) for (u32 i = 0x02000000; i < 0x02400000; i+=4)
{ {
@ -1954,9 +1989,14 @@ void debug(u32 param)
u32 val = ARM7Read32(i); u32 val = ARM7Read32(i);
fwrite(&val, 4, 1, shit); fwrite(&val, 4, 1, shit);
} }
fclose(shit);*/ for (u32 i = 0x06000000; i < 0x06040000; i+=4)
{
u32 val = ARM7Read32(i);
fwrite(&val, 4, 1, shit);
}
fclose(shit);
FILE* /*FILE*
shit = fopen("debug/directboot9.bin", "wb"); shit = fopen("debug/directboot9.bin", "wb");
for (u32 i = 0x02000000; i < 0x04000000; i+=4) for (u32 i = 0x02000000; i < 0x04000000; i+=4)
{ {
@ -1970,7 +2010,7 @@ void debug(u32 param)
u32 val = DSi::ARM7Read32(i); u32 val = DSi::ARM7Read32(i);
fwrite(&val, 4, 1, shit); fwrite(&val, 4, 1, shit);
} }
fclose(shit); fclose(shit);*/
} }
@ -2396,6 +2436,7 @@ u8 ARM7Read8(u32 addr)
case 0x04800000: case 0x04800000:
if (addr < 0x04810000) if (addr < 0x04810000)
{ {
if (!(PowerControl7 & (1<<1))) return 0;
if (addr & 0x1) return Wifi::Read(addr-1) >> 8; if (addr & 0x1) return Wifi::Read(addr-1) >> 8;
return Wifi::Read(addr) & 0xFF; return Wifi::Read(addr) & 0xFF;
} }
@ -2460,6 +2501,7 @@ u16 ARM7Read16(u32 addr)
case 0x04800000: case 0x04800000:
if (addr < 0x04810000) if (addr < 0x04810000)
{ {
if (!(PowerControl7 & (1<<1))) return 0;
return Wifi::Read(addr); return Wifi::Read(addr);
} }
break; break;
@ -2523,6 +2565,7 @@ u32 ARM7Read32(u32 addr)
case 0x04800000: case 0x04800000:
if (addr < 0x04810000) if (addr < 0x04810000)
{ {
if (!(PowerControl7 & (1<<1))) return 0;
return Wifi::Read(addr) | (Wifi::Read(addr+2) << 16); return Wifi::Read(addr) | (Wifi::Read(addr+2) << 16);
} }
break; break;
@ -2614,7 +2657,8 @@ void ARM7Write8(u32 addr, u8 val)
return; return;
} }
if (ARM7->R[15] > 0x00002F30) // ARM7 BIOS bug //if (ARM7->R[15] > 0x00002F30) // ARM7 BIOS bug
if (addr >= 0x01000000)
printf("unknown arm7 write8 %08X %02X @ %08X\n", addr, val, ARM7->R[15]); printf("unknown arm7 write8 %08X %02X @ %08X\n", addr, val, ARM7->R[15]);
} }
@ -2662,6 +2706,7 @@ void ARM7Write16(u32 addr, u16 val)
case 0x04800000: case 0x04800000:
if (addr < 0x04810000) if (addr < 0x04810000)
{ {
if (!(PowerControl7 & (1<<1))) return;
Wifi::Write(addr, val); Wifi::Write(addr, val);
return; return;
} }
@ -2691,7 +2736,8 @@ void ARM7Write16(u32 addr, u16 val)
return; return;
} }
printf("unknown arm7 write16 %08X %04X @ %08X\n", addr, val, ARM7->R[15]); if (addr >= 0x01000000)
printf("unknown arm7 write16 %08X %04X @ %08X\n", addr, val, ARM7->R[15]);
} }
void ARM7Write32(u32 addr, u32 val) void ARM7Write32(u32 addr, u32 val)
@ -2738,6 +2784,7 @@ void ARM7Write32(u32 addr, u32 val)
case 0x04800000: case 0x04800000:
if (addr < 0x04810000) if (addr < 0x04810000)
{ {
if (!(PowerControl7 & (1<<1))) return;
Wifi::Write(addr, val & 0xFFFF); Wifi::Write(addr, val & 0xFFFF);
Wifi::Write(addr+2, val >> 16); Wifi::Write(addr+2, val >> 16);
return; return;
@ -2771,7 +2818,8 @@ void ARM7Write32(u32 addr, u32 val)
return; return;
} }
printf("unknown arm7 write32 %08X %08X @ %08X\n", addr, val, ARM7->R[15]); if (addr >= 0x01000000)
printf("unknown arm7 write32 %08X %08X @ %08X\n", addr, val, ARM7->R[15]);
} }
bool ARM7GetMemRegion(u32 addr, bool write, MemRegion* region) bool ARM7GetMemRegion(u32 addr, bool write, MemRegion* region)
@ -2931,7 +2979,8 @@ u8 ARM9IORead8(u32 addr)
return (u8)(emuID[idx]); return (u8)(emuID[idx]);
} }
printf("unknown ARM9 IO read8 %08X %08X\n", addr, ARM9->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM9 IO read8 %08X %08X\n", addr, ARM9->R[15]);
return 0; return 0;
} }
@ -3077,7 +3126,8 @@ u16 ARM9IORead16(u32 addr)
return GPU3D::Read16(addr); return GPU3D::Read16(addr);
} }
printf("unknown ARM9 IO read16 %08X %08X\n", addr, ARM9->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM9 IO read16 %08X %08X\n", addr, ARM9->R[15]);
return 0; return 0;
} }
@ -3220,7 +3270,8 @@ u32 ARM9IORead32(u32 addr)
return GPU3D::Read32(addr); return GPU3D::Read32(addr);
} }
printf("unknown ARM9 IO read32 %08X %08X\n", addr, ARM9->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM9 IO read32 %08X %08X\n", addr, ARM9->R[15]);
return 0; return 0;
} }
@ -3748,6 +3799,7 @@ u8 ARM7IORead8(u32 addr)
case 0x04000241: return WRAMCnt; case 0x04000241: return WRAMCnt;
case 0x04000300: return PostFlag7; case 0x04000300: return PostFlag7;
case 0x04000304: return PowerControl7;
} }
if (addr >= 0x04000400 && addr < 0x04000520) if (addr >= 0x04000400 && addr < 0x04000520)
@ -3755,7 +3807,8 @@ u8 ARM7IORead8(u32 addr)
return SPU::Read8(addr); return SPU::Read8(addr);
} }
printf("unknown ARM7 IO read8 %08X %08X\n", addr, ARM7->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM7 IO read8 %08X %08X\n", addr, ARM7->R[15]);
return 0; return 0;
} }
@ -3830,7 +3883,9 @@ u16 ARM7IORead16(u32 addr)
case 0x040001C2: return SPI::ReadData(); case 0x040001C2: return SPI::ReadData();
case 0x04000204: return ExMemCnt[1]; case 0x04000204: return ExMemCnt[1];
case 0x04000206: return WifiWaitCnt; case 0x04000206:
if (!(PowerControl7 & (1<<1))) return 0;
return WifiWaitCnt;
case 0x04000208: return IME[1]; case 0x04000208: return IME[1];
case 0x04000210: return IE[1] & 0xFFFF; case 0x04000210: return IE[1] & 0xFFFF;
@ -3846,7 +3901,8 @@ u16 ARM7IORead16(u32 addr)
return SPU::Read16(addr); return SPU::Read16(addr);
} }
printf("unknown ARM7 IO read16 %08X %08X\n", addr, ARM7->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM7 IO read16 %08X %08X\n", addr, ARM7->R[15]);
return 0; return 0;
} }
@ -3912,6 +3968,7 @@ u32 ARM7IORead32(u32 addr)
case 0x04000210: return IE[1]; case 0x04000210: return IE[1];
case 0x04000214: return IF[1]; case 0x04000214: return IF[1];
case 0x04000304: return PowerControl7;
case 0x04000308: return ARM7BIOSProt; case 0x04000308: return ARM7BIOSProt;
case 0x04100000: case 0x04100000:
@ -3945,7 +4002,8 @@ u32 ARM7IORead32(u32 addr)
return SPU::Read32(addr); return SPU::Read32(addr);
} }
printf("unknown ARM7 IO read32 %08X %08X\n", addr, ARM7->R[15]); if ((addr & 0xFFFFF000) != 0x04004000)
printf("unknown ARM7 IO read32 %08X %08X\n", addr, ARM7->R[15]);
return 0; return 0;
} }
@ -4140,6 +4198,7 @@ void ARM7IOWrite16(u32 addr, u16 val)
return; return;
} }
case 0x04000206: case 0x04000206:
if (!(PowerControl7 & (1<<1))) return;
SetWifiWaitCnt(val); SetWifiWaitCnt(val);
return; return;
@ -4155,7 +4214,15 @@ void ARM7IOWrite16(u32 addr, u16 val)
PostFlag7 = val & 0x01; PostFlag7 = val & 0x01;
return; return;
case 0x04000304: PowerControl7 = val; return; case 0x04000304:
{
u16 change = PowerControl7 ^ val;
PowerControl7 = val & 0x0003;
SPU::SetPowerCnt(val & 0x0001);
Wifi::SetPowerCnt(val & 0x0002);
if (change & 0x0002) UpdateWifiTimings();
}
return;
case 0x04000308: case 0x04000308:
if (ARM7BIOSProt == 0) if (ARM7BIOSProt == 0)
@ -4277,7 +4344,15 @@ void ARM7IOWrite32(u32 addr, u32 val)
case 0x04000210: IE[1] = val; UpdateIRQ(1); return; case 0x04000210: IE[1] = val; UpdateIRQ(1); return;
case 0x04000214: IF[1] &= ~val; UpdateIRQ(1); return; case 0x04000214: IF[1] &= ~val; UpdateIRQ(1); return;
case 0x04000304: PowerControl7 = val & 0xFFFF; return; case 0x04000304:
{
u16 change = PowerControl7 ^ val;
PowerControl7 = val & 0x0003;
SPU::SetPowerCnt(val & 0x0001);
Wifi::SetPowerCnt(val & 0x0002);
if (change & 0x0002) UpdateWifiTimings();
}
return;
case 0x04000308: case 0x04000308:
if (ARM7BIOSProt == 0) if (ARM7BIOSProt == 0)

1
src/NDS.h
View File

@ -263,6 +263,7 @@ void SetLidClosed(bool closed);
void MicInputFrame(s16* data, int samples); void MicInputFrame(s16* data, int samples);
void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 param); void ScheduleEvent(u32 id, bool periodic, s32 delay, void (*func)(u32), u32 param);
void ScheduleEvent(u32 id, u64 timestamp, void (*func)(u32), u32 param);
void CancelEvent(u32 id); void CancelEvent(u32 id);
void debug(u32 p); void debug(u32 p);

18
src/NDSCart.cpp
View File

@ -1584,6 +1584,9 @@ bool LoadROM(const u8* romdata, u32 romlen)
if (CartInserted) if (CartInserted)
EjectCart(); EjectCart();
memset(&Header, 0, sizeof(Header));
memset(&Banner, 0, sizeof(Banner));
CartROMSize = 0x200; CartROMSize = 0x200;
while (CartROMSize < romlen) while (CartROMSize < romlen)
CartROMSize <<= 1; CartROMSize <<= 1;
@ -1603,13 +1606,13 @@ bool LoadROM(const u8* romdata, u32 romlen)
memcpy(&Header, CartROM, sizeof(Header)); memcpy(&Header, CartROM, sizeof(Header));
if (!Header.BannerOffset) u8 unitcode = Header.UnitCode;
bool dsi = (unitcode & 0x02) != 0;
size_t bannersize = dsi ? 0x23C0 : 0xA40;
if (Header.BannerOffset >= 0x200 && Header.BannerOffset < (CartROMSize - bannersize))
{ {
memset(&Banner, 0, sizeof(Banner)); memcpy(&Banner, CartROM + Header.BannerOffset, bannersize);
}
else
{
memcpy(&Banner, CartROM + Header.BannerOffset, sizeof(Banner));
} }
printf("Game code: %.4s\n", Header.GameCode); printf("Game code: %.4s\n", Header.GameCode);
@ -1619,9 +1622,6 @@ bool LoadROM(const u8* romdata, u32 romlen)
(u32)Header.GameCode[1] << 8 | (u32)Header.GameCode[1] << 8 |
(u32)Header.GameCode[0]; (u32)Header.GameCode[0];
u8 unitcode = Header.UnitCode;
bool dsi = (unitcode & 0x02) != 0;
u32 arm9base = Header.ARM9ROMOffset; u32 arm9base = Header.ARM9ROMOffset;
bool homebrew = (arm9base < 0x4000) || (gamecode == 0x23232323); bool homebrew = (arm9base < 0x4000) || (gamecode == 0x23232323);

17
src/Platform.h
View File

@ -32,6 +32,10 @@ void DeInit();
void StopEmu(); void StopEmu();
// instance ID, for local multiplayer
int InstanceID();
std::string InstanceFileSuffix();
// configuration values // configuration values
enum ConfigEntry enum ConfigEntry
@ -77,7 +81,6 @@ enum ConfigEntry
Firm_Color, Firm_Color,
Firm_Message, Firm_Message,
Firm_MAC, Firm_MAC,
Firm_RandomizeMAC,
AudioBitrate, AudioBitrate,
}; };
@ -156,8 +159,16 @@ void WriteGBASave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen
// packet type: DS-style TX header (12 bytes) + original 802.11 frame // packet type: DS-style TX header (12 bytes) + original 802.11 frame
bool MP_Init(); bool MP_Init();
void MP_DeInit(); void MP_DeInit();
int MP_SendPacket(u8* data, int len); void MP_Begin();
int MP_RecvPacket(u8* data, bool block); void MP_End();
int MP_SendPacket(u8* data, int len, u64 timestamp);
int MP_RecvPacket(u8* data, u64* timestamp);
int MP_SendCmd(u8* data, int len, u64 timestamp);
int MP_SendReply(u8* data, int len, u64 timestamp, u16 aid);
int MP_SendAck(u8* data, int len, u64 timestamp);
int MP_RecvHostPacket(u8* data, u64* timestamp);
u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask);
// LAN comm interface // LAN comm interface
// packet type: Ethernet (802.3) // packet type: Ethernet (802.3)

55
src/SPI.cpp
View File

@ -215,7 +215,8 @@ void LoadDefaultFirmware()
// wifi access points // wifi access points
// TODO: WFC ID?? // TODO: WFC ID??
FILE* f = Platform::OpenLocalFile("wfcsettings.bin", "rb"); FILE* f = Platform::OpenLocalFile("wfcsettings.bin"+Platform::InstanceFileSuffix(), "rb");
if (!f) f = Platform::OpenLocalFile("wfcsettings.bin", "rb");
if (f) if (f)
{ {
u32 apdata = userdata - 0xA00; u32 apdata = userdata - 0xA00;
@ -259,7 +260,7 @@ void LoadDefaultFirmware()
} }
} }
void LoadFirmwareFromFile(FILE* f) void LoadFirmwareFromFile(FILE* f, bool makecopy)
{ {
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
@ -271,7 +272,9 @@ void LoadFirmwareFromFile(FILE* f)
fread(Firmware, 1, FirmwareLength, f); fread(Firmware, 1, FirmwareLength, f);
// take a backup // take a backup
std::string fwBackupPath = FirmwarePath + ".bak"; std::string fwBackupPath;
if (!makecopy) fwBackupPath = FirmwarePath + ".bak";
else fwBackupPath = FirmwarePath;
FILE* bf = Platform::OpenLocalFile(fwBackupPath, "rb"); FILE* bf = Platform::OpenLocalFile(fwBackupPath, "rb");
if (!bf) if (!bf)
{ {
@ -333,15 +336,24 @@ void Reset()
else else
FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath); FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath);
bool makecopy = false;
std::string origpath = FirmwarePath;
FirmwarePath += Platform::InstanceFileSuffix();
FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb"); FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb");
if (!f) if (!f)
{
f = Platform::OpenLocalFile(origpath, "rb");
makecopy = true;
}
if (!f)
{ {
printf("Firmware not found! Generating default firmware.\n"); printf("Firmware not found! Generating default firmware.\n");
FirmwarePath = ""; FirmwarePath = "";
} }
else else
{ {
LoadFirmwareFromFile(f); LoadFirmwareFromFile(f, makecopy);
fclose(f); fclose(f);
} }
} }
@ -385,28 +397,28 @@ void Reset()
*(u16*)&Firmware[userdata+0x72] = CRC16(&Firmware[userdata], 0x70, 0xFFFF); *(u16*)&Firmware[userdata+0x72] = CRC16(&Firmware[userdata], 0x70, 0xFFFF);
if (firmoverride) //if (firmoverride)
{ {
u8 mac[6]; u8 mac[6];
bool rep; bool rep = false;
if (Platform::GetConfigBool(Platform::Firm_RandomizeMAC)) memcpy(mac, &Firmware[0x36], 6);
{
mac[0] = 0x00; if (firmoverride)
mac[1] = 0x09;
mac[2] = 0xBF;
mac[3] = rand()&0xFF;
mac[4] = rand()&0xFF;
mac[5] = rand()&0xFF;
rep = true;
}
else
{
rep = Platform::GetConfigArray(Platform::Firm_MAC, mac); rep = Platform::GetConfigArray(Platform::Firm_MAC, mac);
int inst = Platform::InstanceID();
if (inst > 0)
{
rep = true;
mac[3] += inst;
mac[4] += inst*0x44;
mac[5] += inst*0x10;
} }
if (rep) if (rep)
{ {
mac[0] &= 0xFC; // ensure the MAC isn't a broadcast MAC
memcpy(&Firmware[0x36], mac, 6); memcpy(&Firmware[0x36], mac, 6);
*(u16*)&Firmware[0x2A] = CRC16(&Firmware[0x2C], *(u16*)&Firmware[0x2C], 0x0000); *(u16*)&Firmware[0x2A] = CRC16(&Firmware[0x2C], *(u16*)&Firmware[0x2C], 0x0000);
@ -593,7 +605,12 @@ void Write(u8 val, u32 hold)
} }
else else
{ {
FILE* f = Platform::OpenLocalFile("wfcsettings.bin", "wb"); char wfcfile[50] = {0};
int inst = Platform::InstanceID();
if (inst > 0) snprintf(wfcfile, 49, "wfcsettings.bin", Platform::InstanceID());
else strncpy(wfcfile, "wfcsettings.bin", 49);
FILE* f = Platform::OpenLocalFile(wfcfile, "wb");
if (f) if (f)
{ {
u32 cutoff = 0x7F400 & FirmwareMask; u32 cutoff = 0x7F400 & FirmwareMask;

6
src/SPU.cpp
View File

@ -184,6 +184,12 @@ void DoSavestate(Savestate* file)
} }
void SetPowerCnt(u32 val)
{
// TODO
}
void SetInterpolation(int type) void SetInterpolation(int type)
{ {
InterpType = type; InterpType = type;

2
src/SPU.h
View File

@ -31,6 +31,8 @@ void Stop();
void DoSavestate(Savestate* file); void DoSavestate(Savestate* file);
void SetPowerCnt(u32 val);
// 0=none 1=linear 2=cosine 3=cubic // 0=none 1=linear 2=cosine 3=cubic
void SetInterpolation(int type); void SetInterpolation(int type);

1434
src/Wifi.cpp
View File

File diff suppressed because it is too large Load Diff

34
src/Wifi.h
View File

@ -93,6 +93,7 @@ enum
W_CmdTotalTime = 0x0C0, W_CmdTotalTime = 0x0C0,
W_CmdReplyTime = 0x0C4, W_CmdReplyTime = 0x0C4,
W_RXFilter = 0x0D0, W_RXFilter = 0x0D0,
W_RXLenCrop = 0x0DA,
W_RXFilter2 = 0x0E0, W_RXFilter2 = 0x0E0,
W_USCountCnt = 0x0E8, W_USCountCnt = 0x0E8,
@ -136,12 +137,43 @@ enum
W_TXErrorCount = 0x1C0, W_TXErrorCount = 0x1C0,
W_RXCount = 0x1C4, W_RXCount = 0x1C4,
W_CMDStat0 = 0x1D0,
W_CMDStat1 = 0x1D2,
W_CMDStat2 = 0x1D4,
W_CMDStat3 = 0x1D6,
W_CMDStat4 = 0x1D8,
W_CMDStat5 = 0x1DA,
W_CMDStat6 = 0x1DC,
W_CMDStat7 = 0x1DE,
W_TXSeqNo = 0x210, W_TXSeqNo = 0x210,
W_RFStatus = 0x214, W_RFStatus = 0x214,
W_IFSet = 0x21C, W_IFSet = 0x21C,
W_RXTXAddr = 0x268, W_RXTXAddr = 0x268,
}; };
enum
{
Event_RXCheck = 0,
Event_IRQ15,
Event_MSTimer,
Event_RFWakeup,
Event_RX,
Event_TX,
Event_MPClientSync,
Event_RF,
Event_BB,
Event_MAX
};
struct SchedEvent
{
void (*Func)(u32 param);
u64 Timestamp;
u32 Param;
};
extern bool MPInited; extern bool MPInited;
@ -151,7 +183,7 @@ void DeInit();
void Reset(); void Reset();
void DoSavestate(Savestate* file); void DoSavestate(Savestate* file);
void StartTX_Beacon(); void SetPowerCnt(u32 val);
void USTimer(u32 param); void USTimer(u32 param);

14
src/WifiAP.cpp
View File

@ -91,7 +91,7 @@ void DeInit()
void Reset() void Reset()
{ {
// random starting point for the counter // random starting point for the counter
USCounter = 0x428888017ULL; USCounter = 0x428888000ULL;
SeqNo = 0x0120; SeqNo = 0x0120;
BeaconDue = false; BeaconDue = false;
@ -115,18 +115,6 @@ bool MACIsBroadcast(u8* a)
} }
void USTimer()
{
USCounter++;
u32 chk = (u32)USCounter;
if (!(chk & 0x1FFFF))
{
// send beacon every 128ms
BeaconDue = true;
}
}
void MSTimer() void MSTimer()
{ {
USCounter += 0x400; USCounter += 0x400;

1
src/WifiAP.h
View File

@ -33,7 +33,6 @@ bool Init();
void DeInit(); void DeInit();
void Reset(); void Reset();
void USTimer();
void MSTimer(); void MSTimer();
// packet format: 12-byte TX header + original 802.11 frame // packet format: 12-byte TX header + original 802.11 frame

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

@ -67,6 +67,20 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent) : QDialog(parent), ui(
bool iswav = (Config::MicInputType == 3); bool iswav = (Config::MicInputType == 3);
ui->txtMicWavPath->setEnabled(iswav); ui->txtMicWavPath->setEnabled(iswav);
ui->btnMicWavBrowse->setEnabled(iswav); ui->btnMicWavBrowse->setEnabled(iswav);
int inst = Platform::InstanceID();
if (inst > 0)
{
ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
ui->cbInterpolation->setEnabled(false);
ui->cbBitrate->setEnabled(false);
for (QAbstractButton* btn : grpMicMode->buttons())
btn->setEnabled(false);
ui->txtMicWavPath->setEnabled(false);
ui->btnMicWavBrowse->setEnabled(false);
}
else
ui->lblInstanceNum->hide();
} }
AudioSettingsDialog::~AudioSettingsDialog() AudioSettingsDialog::~AudioSettingsDialog()

11
src/frontend/qt_sdl/AudioSettingsDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>482</width> <width>482</width>
<height>256</height> <height>301</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -23,6 +23,13 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>
</property> </property>
<item>
<widget class="QLabel" name="lblInstanceNum">
<property name="text">
<string>Configuring settings for instance X</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
@ -76,7 +83,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="cbBitrate"> <widget class="QComboBox" name="cbBitrate">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bitrate of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bitrate of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/frontend/qt_sdl/CMakeLists.txt
View File

@ -17,6 +17,7 @@ set(SOURCES_QT_SDL
AudioSettingsDialog.cpp AudioSettingsDialog.cpp
FirmwareSettingsDialog.cpp FirmwareSettingsDialog.cpp
PathSettingsDialog.cpp PathSettingsDialog.cpp
MPSettingsDialog.cpp
WifiSettingsDialog.cpp WifiSettingsDialog.cpp
InterfaceSettingsDialog.cpp InterfaceSettingsDialog.cpp
ROMInfoDialog.cpp ROMInfoDialog.cpp
@ -25,6 +26,7 @@ set(SOURCES_QT_SDL
Input.cpp Input.cpp
LAN_PCap.cpp LAN_PCap.cpp
LAN_Socket.cpp LAN_Socket.cpp
LocalMP.cpp
OSD.cpp OSD.cpp
OSD_shaders.h OSD_shaders.h
font.h font.h
@ -112,6 +114,8 @@ if (PORTABLE)
endif() endif()
if (APPLE) if (APPLE)
target_sources(melonDS PRIVATE sem_timedwait.cpp)
# Copy icon into the bundle # Copy icon into the bundle
set(RESOURCE_FILES "${CMAKE_SOURCE_DIR}/res/melon.icns") set(RESOURCE_FILES "${CMAKE_SOURCE_DIR}/res/melon.icns")
target_sources(melonDS PUBLIC "${RESOURCE_FILES}") target_sources(melonDS PUBLIC "${RESOURCE_FILES}")

352
src/frontend/qt_sdl/Config.cpp
View File

@ -106,9 +106,10 @@ int FirmwareBirthdayDay;
int FirmwareFavouriteColour; int FirmwareFavouriteColour;
std::string FirmwareMessage; std::string FirmwareMessage;
std::string FirmwareMAC; std::string FirmwareMAC;
bool RandomizeMAC;
bool SocketBindAnyAddr; int MPAudioMode;
int MPRecvTimeout;
std::string LANDevice; std::string LANDevice;
bool DirectLAN; bool DirectLAN;
@ -141,200 +142,196 @@ bool DSiBatteryCharging;
const char* kConfigFile = "melonDS.ini"; const char* kConfigFile = "melonDS.ini";
const char* kUniqueConfigFile = "melonDS.%d.ini";
ConfigEntry ConfigFile[] = ConfigEntry ConfigFile[] =
{ {
{"Key_A", 0, &KeyMapping[0], -1}, {"Key_A", 0, &KeyMapping[0], -1, true},
{"Key_B", 0, &KeyMapping[1], -1}, {"Key_B", 0, &KeyMapping[1], -1, true},
{"Key_Select", 0, &KeyMapping[2], -1}, {"Key_Select", 0, &KeyMapping[2], -1, true},
{"Key_Start", 0, &KeyMapping[3], -1}, {"Key_Start", 0, &KeyMapping[3], -1, true},
{"Key_Right", 0, &KeyMapping[4], -1}, {"Key_Right", 0, &KeyMapping[4], -1, true},
{"Key_Left", 0, &KeyMapping[5], -1}, {"Key_Left", 0, &KeyMapping[5], -1, true},
{"Key_Up", 0, &KeyMapping[6], -1}, {"Key_Up", 0, &KeyMapping[6], -1, true},
{"Key_Down", 0, &KeyMapping[7], -1}, {"Key_Down", 0, &KeyMapping[7], -1, true},
{"Key_R", 0, &KeyMapping[8], -1}, {"Key_R", 0, &KeyMapping[8], -1, true},
{"Key_L", 0, &KeyMapping[9], -1}, {"Key_L", 0, &KeyMapping[9], -1, true},
{"Key_X", 0, &KeyMapping[10], -1}, {"Key_X", 0, &KeyMapping[10], -1, true},
{"Key_Y", 0, &KeyMapping[11], -1}, {"Key_Y", 0, &KeyMapping[11], -1, true},
{"Joy_A", 0, &JoyMapping[0], -1}, {"Joy_A", 0, &JoyMapping[0], -1, true},
{"Joy_B", 0, &JoyMapping[1], -1}, {"Joy_B", 0, &JoyMapping[1], -1, true},
{"Joy_Select", 0, &JoyMapping[2], -1}, {"Joy_Select", 0, &JoyMapping[2], -1, true},
{"Joy_Start", 0, &JoyMapping[3], -1}, {"Joy_Start", 0, &JoyMapping[3], -1, true},
{"Joy_Right", 0, &JoyMapping[4], -1}, {"Joy_Right", 0, &JoyMapping[4], -1, true},
{"Joy_Left", 0, &JoyMapping[5], -1}, {"Joy_Left", 0, &JoyMapping[5], -1, true},
{"Joy_Up", 0, &JoyMapping[6], -1}, {"Joy_Up", 0, &JoyMapping[6], -1, true},
{"Joy_Down", 0, &JoyMapping[7], -1}, {"Joy_Down", 0, &JoyMapping[7], -1, true},
{"Joy_R", 0, &JoyMapping[8], -1}, {"Joy_R", 0, &JoyMapping[8], -1, true},
{"Joy_L", 0, &JoyMapping[9], -1}, {"Joy_L", 0, &JoyMapping[9], -1, true},
{"Joy_X", 0, &JoyMapping[10], -1}, {"Joy_X", 0, &JoyMapping[10], -1, true},
{"Joy_Y", 0, &JoyMapping[11], -1}, {"Joy_Y", 0, &JoyMapping[11], -1, true},
{"HKKey_Lid", 0, &HKKeyMapping[HK_Lid], -1}, {"HKKey_Lid", 0, &HKKeyMapping[HK_Lid], -1, true},
{"HKKey_Mic", 0, &HKKeyMapping[HK_Mic], -1}, {"HKKey_Mic", 0, &HKKeyMapping[HK_Mic], -1, true},
{"HKKey_Pause", 0, &HKKeyMapping[HK_Pause], -1}, {"HKKey_Pause", 0, &HKKeyMapping[HK_Pause], -1, true},
{"HKKey_Reset", 0, &HKKeyMapping[HK_Reset], -1}, {"HKKey_Reset", 0, &HKKeyMapping[HK_Reset], -1, true},
{"HKKey_FastForward", 0, &HKKeyMapping[HK_FastForward], -1}, {"HKKey_FastForward", 0, &HKKeyMapping[HK_FastForward], -1, true},
{"HKKey_FastForwardToggle", 0, &HKKeyMapping[HK_FastForwardToggle], -1}, {"HKKey_FastForwardToggle", 0, &HKKeyMapping[HK_FastForwardToggle], -1, true},
{"HKKey_FullscreenToggle", 0, &HKKeyMapping[HK_FullscreenToggle], -1}, {"HKKey_FullscreenToggle", 0, &HKKeyMapping[HK_FullscreenToggle], -1, true},
{"HKKey_SwapScreens", 0, &HKKeyMapping[HK_SwapScreens], -1}, {"HKKey_SwapScreens", 0, &HKKeyMapping[HK_SwapScreens], -1, true},
{"HKKey_SolarSensorDecrease", 0, &HKKeyMapping[HK_SolarSensorDecrease], -1}, {"HKKey_SolarSensorDecrease", 0, &HKKeyMapping[HK_SolarSensorDecrease], -1, true},
{"HKKey_SolarSensorIncrease", 0, &HKKeyMapping[HK_SolarSensorIncrease], -1}, {"HKKey_SolarSensorIncrease", 0, &HKKeyMapping[HK_SolarSensorIncrease], -1, true},
{"HKKey_FrameStep", 0, &HKKeyMapping[HK_FrameStep], -1}, {"HKKey_FrameStep", 0, &HKKeyMapping[HK_FrameStep], -1, true},
{"HKJoy_Lid", 0, &HKJoyMapping[HK_Lid], -1}, {"HKJoy_Lid", 0, &HKJoyMapping[HK_Lid], -1, true},
{"HKJoy_Mic", 0, &HKJoyMapping[HK_Mic], -1}, {"HKJoy_Mic", 0, &HKJoyMapping[HK_Mic], -1, true},
{"HKJoy_Pause", 0, &HKJoyMapping[HK_Pause], -1}, {"HKJoy_Pause", 0, &HKJoyMapping[HK_Pause], -1, true},
{"HKJoy_Reset", 0, &HKJoyMapping[HK_Reset], -1}, {"HKJoy_Reset", 0, &HKJoyMapping[HK_Reset], -1, true},
{"HKJoy_FastForward", 0, &HKJoyMapping[HK_FastForward], -1}, {"HKJoy_FastForward", 0, &HKJoyMapping[HK_FastForward], -1, true},
{"HKJoy_FastForwardToggle", 0, &HKJoyMapping[HK_FastForwardToggle], -1}, {"HKJoy_FastForwardToggle", 0, &HKJoyMapping[HK_FastForwardToggle], -1, true},
{"HKJoy_FullscreenToggle", 0, &HKJoyMapping[HK_FullscreenToggle], -1}, {"HKJoy_FullscreenToggle", 0, &HKJoyMapping[HK_FullscreenToggle], -1, true},
{"HKJoy_SwapScreens", 0, &HKJoyMapping[HK_SwapScreens], -1}, {"HKJoy_SwapScreens", 0, &HKJoyMapping[HK_SwapScreens], -1, true},
{"HKJoy_SolarSensorDecrease", 0, &HKJoyMapping[HK_SolarSensorDecrease], -1}, {"HKJoy_SolarSensorDecrease", 0, &HKJoyMapping[HK_SolarSensorDecrease], -1, true},
{"HKJoy_SolarSensorIncrease", 0, &HKJoyMapping[HK_SolarSensorIncrease], -1}, {"HKJoy_SolarSensorIncrease", 0, &HKJoyMapping[HK_SolarSensorIncrease], -1, true},
{"HKJoy_FrameStep", 0, &HKJoyMapping[HK_FrameStep], -1}, {"HKJoy_FrameStep", 0, &HKJoyMapping[HK_FrameStep], -1, true},
{"JoystickID", 0, &JoystickID, 0}, {"JoystickID", 0, &JoystickID, 0, true},
{"WindowWidth", 0, &WindowWidth, 256}, {"WindowWidth", 0, &WindowWidth, 256, true},
{"WindowHeight", 0, &WindowHeight, 384}, {"WindowHeight", 0, &WindowHeight, 384, true},
{"WindowMax", 1, &WindowMaximized, false}, {"WindowMax", 1, &WindowMaximized, false, true},
{"ScreenRotation", 0, &ScreenRotation, 0}, {"ScreenRotation", 0, &ScreenRotation, 0, true},
{"ScreenGap", 0, &ScreenGap, 0}, {"ScreenGap", 0, &ScreenGap, 0, true},
{"ScreenLayout", 0, &ScreenLayout, 0}, {"ScreenLayout", 0, &ScreenLayout, 0, true},
{"ScreenSwap", 1, &ScreenSwap, false}, {"ScreenSwap", 1, &ScreenSwap, false, true},
{"ScreenSizing", 0, &ScreenSizing, 0}, {"ScreenSizing", 0, &ScreenSizing, 0, true},
{"IntegerScaling", 1, &IntegerScaling, false}, {"IntegerScaling", 1, &IntegerScaling, false, true},
{"ScreenAspectTop",0, &ScreenAspectTop,0}, {"ScreenAspectTop",0, &ScreenAspectTop,0, true},
{"ScreenAspectBot",0, &ScreenAspectBot,0}, {"ScreenAspectBot",0, &ScreenAspectBot,0, true},
{"ScreenFilter", 1, &ScreenFilter, true}, {"ScreenFilter", 1, &ScreenFilter, true, true},
{"ScreenUseGL", 1, &ScreenUseGL, false}, {"ScreenUseGL", 1, &ScreenUseGL, false, false},
{"ScreenVSync", 1, &ScreenVSync, false}, {"ScreenVSync", 1, &ScreenVSync, false, false},
{"ScreenVSyncInterval", 0, &ScreenVSyncInterval, 1}, {"ScreenVSyncInterval", 0, &ScreenVSyncInterval, 1, false},
{"3DRenderer", 0, &_3DRenderer, 0}, {"3DRenderer", 0, &_3DRenderer, 0, false},
{"Threaded3D", 1, &Threaded3D, true}, {"Threaded3D", 1, &Threaded3D, true, false},
{"GL_ScaleFactor", 0, &GL_ScaleFactor, 1}, {"GL_ScaleFactor", 0, &GL_ScaleFactor, 1, false},
{"GL_BetterPolygons", 1, &GL_BetterPolygons, false}, {"GL_BetterPolygons", 1, &GL_BetterPolygons, false, false},
{"LimitFPS", 1, &LimitFPS, true}, {"LimitFPS", 1, &LimitFPS, true, false},
{"AudioSync", 1, &AudioSync, false}, {"AudioSync", 1, &AudioSync, false},
{"ShowOSD", 1, &ShowOSD, true}, {"ShowOSD", 1, &ShowOSD, true, false},
{"ConsoleType", 0, &ConsoleType, 0}, {"ConsoleType", 0, &ConsoleType, 0, false},
{"DirectBoot", 1, &DirectBoot, true}, {"DirectBoot", 1, &DirectBoot, true, false},
#ifdef JIT_ENABLED #ifdef JIT_ENABLED
{"JIT_Enable", 1, &JIT_Enable, false}, {"JIT_Enable", 1, &JIT_Enable, false, false},
{"JIT_MaxBlockSize", 0, &JIT_MaxBlockSize, 32}, {"JIT_MaxBlockSize", 0, &JIT_MaxBlockSize, 32, false},
{"JIT_BranchOptimisations", 1, &JIT_BranchOptimisations, true}, {"JIT_BranchOptimisations", 1, &JIT_BranchOptimisations, true, false},
{"JIT_LiteralOptimisations", 1, &JIT_LiteralOptimisations, true}, {"JIT_LiteralOptimisations", 1, &JIT_LiteralOptimisations, true, false},
#ifdef __APPLE__ #ifdef __APPLE__
{"JIT_FastMemory", 1, &JIT_FastMemory, false}, {"JIT_FastMemory", 1, &JIT_FastMemory, false, false},
#else #else
{"JIT_FastMemory", 1, &JIT_FastMemory, true}, {"JIT_FastMemory", 1, &JIT_FastMemory, true, false},
#endif #endif
#endif #endif
{"ExternalBIOSEnable", 1, &ExternalBIOSEnable, false}, {"ExternalBIOSEnable", 1, &ExternalBIOSEnable, false, false},
{"BIOS9Path", 2, &BIOS9Path, (std::string)""}, {"BIOS9Path", 2, &BIOS9Path, (std::string)"", false},
{"BIOS7Path", 2, &BIOS7Path, (std::string)""}, {"BIOS7Path", 2, &BIOS7Path, (std::string)"", false},
{"FirmwarePath", 2, &FirmwarePath, (std::string)""}, {"FirmwarePath", 2, &FirmwarePath, (std::string)"", false},
{"DSiBIOS9Path", 2, &DSiBIOS9Path, (std::string)""}, {"DSiBIOS9Path", 2, &DSiBIOS9Path, (std::string)"", false},
{"DSiBIOS7Path", 2, &DSiBIOS7Path, (std::string)""}, {"DSiBIOS7Path", 2, &DSiBIOS7Path, (std::string)"", false},
{"DSiFirmwarePath", 2, &DSiFirmwarePath, (std::string)""}, {"DSiFirmwarePath", 2, &DSiFirmwarePath, (std::string)"", false},
{"DSiNANDPath", 2, &DSiNANDPath, (std::string)""}, {"DSiNANDPath", 2, &DSiNANDPath, (std::string)"", false},
{"DLDIEnable", 1, &DLDIEnable, false}, {"DLDIEnable", 1, &DLDIEnable, false, false},
{"DLDISDPath", 2, &DLDISDPath, (std::string)"dldi.bin"}, {"DLDISDPath", 2, &DLDISDPath, (std::string)"dldi.bin", false},
{"DLDISize", 0, &DLDISize, 0}, {"DLDISize", 0, &DLDISize, 0, false},
{"DLDIReadOnly", 1, &DLDIReadOnly, false}, {"DLDIReadOnly", 1, &DLDIReadOnly, false, false},
{"DLDIFolderSync", 1, &DLDIFolderSync, false}, {"DLDIFolderSync", 1, &DLDIFolderSync, false, false},
{"DLDIFolderPath", 2, &DLDIFolderPath, (std::string)""}, {"DLDIFolderPath", 2, &DLDIFolderPath, (std::string)"", false},
{"DSiSDEnable", 1, &DSiSDEnable, false}, {"DSiSDEnable", 1, &DSiSDEnable, false, false},
{"DSiSDPath", 2, &DSiSDPath, (std::string)"dsisd.bin"}, {"DSiSDPath", 2, &DSiSDPath, (std::string)"dsisd.bin", false},
{"DSiSDSize", 0, &DSiSDSize, 0}, {"DSiSDSize", 0, &DSiSDSize, 0, false},
{"DSiSDReadOnly", 1, &DSiSDReadOnly, false}, {"DSiSDReadOnly", 1, &DSiSDReadOnly, false, false},
{"DSiSDFolderSync", 1, &DSiSDFolderSync, false}, {"DSiSDFolderSync", 1, &DSiSDFolderSync, false, false},
{"DSiSDFolderPath", 2, &DSiSDFolderPath, (std::string)""}, {"DSiSDFolderPath", 2, &DSiSDFolderPath, (std::string)"", false},
{"FirmwareOverrideSettings", 1, &FirmwareOverrideSettings, false}, {"FirmwareOverrideSettings", 1, &FirmwareOverrideSettings, false, true},
{"FirmwareUsername", 2, &FirmwareUsername, (std::string)"melonDS"}, {"FirmwareUsername", 2, &FirmwareUsername, (std::string)"melonDS", true},
{"FirmwareLanguage", 0, &FirmwareLanguage, 1}, {"FirmwareLanguage", 0, &FirmwareLanguage, 1, true},
{"FirmwareBirthdayMonth", 0, &FirmwareBirthdayMonth, 1}, {"FirmwareBirthdayMonth", 0, &FirmwareBirthdayMonth, 1, true},
{"FirmwareBirthdayDay", 0, &FirmwareBirthdayDay, 1}, {"FirmwareBirthdayDay", 0, &FirmwareBirthdayDay, 1, true},
{"FirmwareFavouriteColour", 0, &FirmwareFavouriteColour, 0}, {"FirmwareFavouriteColour", 0, &FirmwareFavouriteColour, 0, true},
{"FirmwareMessage", 2, &FirmwareMessage, (std::string)""}, {"FirmwareMessage", 2, &FirmwareMessage, (std::string)"", true},
{"FirmwareMAC", 2, &FirmwareMAC, (std::string)""}, {"FirmwareMAC", 2, &FirmwareMAC, (std::string)"", true},
{"RandomizeMAC", 1, &RandomizeMAC, false},
{"SockBindAnyAddr", 1, &SocketBindAnyAddr, false}, {"MPAudioMode", 0, &MPAudioMode, 1, false},
{"LANDevice", 2, &LANDevice, (std::string)""}, {"MPRecvTimeout", 0, &MPRecvTimeout, 25, false},
{"DirectLAN", 1, &DirectLAN, false},
{"SavStaRelocSRAM", 1, &SavestateRelocSRAM, false}, {"LANDevice", 2, &LANDevice, (std::string)"", false},
{"DirectLAN", 1, &DirectLAN, false, false},
{"AudioInterp", 0, &AudioInterp, 0}, {"SavStaRelocSRAM", 1, &SavestateRelocSRAM, false, false},
{"AudioBitrate", 0, &AudioBitrate, 0},
{"AudioVolume", 0, &AudioVolume, 256},
{"MicInputType", 0, &MicInputType, 1},
{"MicWavPath", 2, &MicWavPath, (std::string)""},
{"LastROMFolder", 2, &LastROMFolder, (std::string)""}, {"AudioInterp", 0, &AudioInterp, 0, false},
{"AudioBitrate", 0, &AudioBitrate, 0, false},
{"AudioVolume", 0, &AudioVolume, 256, true},
{"MicInputType", 0, &MicInputType, 1, false},
{"MicWavPath", 2, &MicWavPath, (std::string)"", false},
{"RecentROM_0", 2, &RecentROMList[0], (std::string)""}, {"LastROMFolder", 2, &LastROMFolder, (std::string)"", true},
{"RecentROM_1", 2, &RecentROMList[1], (std::string)""},
{"RecentROM_2", 2, &RecentROMList[2], (std::string)""},
{"RecentROM_3", 2, &RecentROMList[3], (std::string)""},
{"RecentROM_4", 2, &RecentROMList[4], (std::string)""},
{"RecentROM_5", 2, &RecentROMList[5], (std::string)""},
{"RecentROM_6", 2, &RecentROMList[6], (std::string)""},
{"RecentROM_7", 2, &RecentROMList[7], (std::string)""},
{"RecentROM_8", 2, &RecentROMList[8], (std::string)""},
{"RecentROM_9", 2, &RecentROMList[9], (std::string)""},
{"SaveFilePath", 2, &SaveFilePath, (std::string)""}, {"RecentROM_0", 2, &RecentROMList[0], (std::string)"", true},
{"SavestatePath", 2, &SavestatePath, (std::string)""}, {"RecentROM_1", 2, &RecentROMList[1], (std::string)"", true},
{"CheatFilePath", 2, &CheatFilePath, (std::string)""}, {"RecentROM_2", 2, &RecentROMList[2], (std::string)"", true},
{"RecentROM_3", 2, &RecentROMList[3], (std::string)"", true},
{"RecentROM_4", 2, &RecentROMList[4], (std::string)"", true},
{"RecentROM_5", 2, &RecentROMList[5], (std::string)"", true},
{"RecentROM_6", 2, &RecentROMList[6], (std::string)"", true},
{"RecentROM_7", 2, &RecentROMList[7], (std::string)"", true},
{"RecentROM_8", 2, &RecentROMList[8], (std::string)"", true},
{"RecentROM_9", 2, &RecentROMList[9], (std::string)"", true},
{"EnableCheats", 1, &EnableCheats, false}, {"SaveFilePath", 2, &SaveFilePath, (std::string)"", true},
{"SavestatePath", 2, &SavestatePath, (std::string)"", true},
{"CheatFilePath", 2, &CheatFilePath, (std::string)"", true},
{"MouseHide", 1, &MouseHide, false}, {"EnableCheats", 1, &EnableCheats, false, true},
{"MouseHideSeconds", 0, &MouseHideSeconds, 5},
{"PauseLostFocus", 1, &PauseLostFocus, false},
{"DSBatteryLevelOkay", 1, &DSBatteryLevelOkay, true}, {"MouseHide", 1, &MouseHide, false, false},
{"DSiBatteryLevel", 0, &DSiBatteryLevel, 0xF}, {"MouseHideSeconds", 0, &MouseHideSeconds, 5, false},
{"DSiBatteryCharging", 1, &DSiBatteryCharging, true}, {"PauseLostFocus", 1, &PauseLostFocus, false, false},
{"", -1, nullptr, 0} {"DSBatteryLevelOkay", 1, &DSBatteryLevelOkay, true, true},
{"DSiBatteryLevel", 0, &DSiBatteryLevel, 0xF, true},
{"DSiBatteryCharging", 1, &DSiBatteryCharging, true, true},
{"", -1, nullptr, 0, false}
}; };
void Load() void LoadFile(int inst)
{ {
ConfigEntry* entry = &ConfigFile[0]; FILE* f;
for (;;) if (inst > 0)
{ {
if (!entry->Value) break; char name[100] = {0};
snprintf(name, 99, kUniqueConfigFile, inst+1);
switch (entry->Type) f = Platform::OpenLocalFile(name, "r");
{
case 0: *(int*)entry->Value = std::get<int>(entry->Default); break;
case 1: *(bool*)entry->Value = std::get<bool>(entry->Default); break;
case 2: *(std::string*)entry->Value = std::get<std::string>(entry->Default); break;
}
entry++;
} }
else
f = Platform::OpenLocalFile(kConfigFile, "r");
FILE* f = Platform::OpenLocalFile(kConfigFile, "r");
if (!f) return; if (!f) return;
char linebuf[1024]; char linebuf[1024];
@ -349,13 +346,13 @@ void Load()
entryname[31] = '\0'; entryname[31] = '\0';
if (ret < 2) continue; if (ret < 2) continue;
ConfigEntry* entry = &ConfigFile[0]; for (ConfigEntry* entry = &ConfigFile[0]; entry->Value; entry++)
for (;;)
{ {
if (!entry->Value) break;
if (!strncmp(entry->Name, entryname, 32)) if (!strncmp(entry->Name, entryname, 32))
{ {
if ((inst > 0) && (!entry->InstanceUnique))
break;
switch (entry->Type) switch (entry->Type)
{ {
case 0: *(int*)entry->Value = strtol(entryval, NULL, 10); break; case 0: *(int*)entry->Value = strtol(entryval, NULL, 10); break;
@ -365,23 +362,52 @@ void Load()
break; break;
} }
entry++;
} }
} }
fclose(f); fclose(f);
} }
void Load()
{
for (ConfigEntry* entry = &ConfigFile[0]; entry->Value; entry++)
{
switch (entry->Type)
{
case 0: *(int*)entry->Value = std::get<int>(entry->Default); break;
case 1: *(bool*)entry->Value = std::get<bool>(entry->Default); break;
case 2: *(std::string*)entry->Value = std::get<std::string>(entry->Default); break;
}
}
LoadFile(0);
int inst = Platform::InstanceID();
if (inst > 0)
LoadFile(inst);
}
void Save() void Save()
{ {
FILE* f = Platform::OpenLocalFile(kConfigFile, "w"); int inst = Platform::InstanceID();
FILE* f;
if (inst > 0)
{
char name[100] = {0};
snprintf(name, 99, kUniqueConfigFile, inst+1);
f = Platform::OpenLocalFile(name, "w");
}
else
f = Platform::OpenLocalFile(kConfigFile, "w");
if (!f) return; if (!f) return;
ConfigEntry* entry = &ConfigFile[0]; for (ConfigEntry* entry = &ConfigFile[0]; entry->Value; entry++)
for (;;)
{ {
if (!entry->Value) break; if ((inst > 0) && (!entry->InstanceUnique))
continue;
switch (entry->Type) switch (entry->Type)
{ {
@ -389,8 +415,6 @@ void Save()
case 1: fprintf(f, "%s=%d\r\n", entry->Name, *(bool*)entry->Value ? 1:0); break; case 1: fprintf(f, "%s=%d\r\n", entry->Name, *(bool*)entry->Value ? 1:0); break;
case 2: fprintf(f, "%s=%s\r\n", entry->Name, (*(std::string*)entry->Value).c_str()); break; case 2: fprintf(f, "%s=%s\r\n", entry->Name, (*(std::string*)entry->Value).c_str()); break;
} }
entry++;
} }
fclose(f); fclose(f);

6
src/frontend/qt_sdl/Config.h
View File

@ -58,6 +58,7 @@ struct ConfigEntry
int Type; // 0=int 1=bool 2=string int Type; // 0=int 1=bool 2=string
void* Value; // pointer to the value variable void* Value; // pointer to the value variable
std::variant<int, bool, std::string> Default; std::variant<int, bool, std::string> Default;
bool InstanceUnique; // whether the setting can exist individually for each instance in multiplayer
}; };
@ -141,9 +142,10 @@ extern int FirmwareBirthdayDay;
extern int FirmwareFavouriteColour; extern int FirmwareFavouriteColour;
extern std::string FirmwareMessage; extern std::string FirmwareMessage;
extern std::string FirmwareMAC; extern std::string FirmwareMAC;
extern bool RandomizeMAC;
extern bool SocketBindAnyAddr; extern int MPAudioMode;
extern int MPRecvTimeout;
extern std::string LANDevice; extern std::string LANDevice;
extern bool DirectLAN; extern bool DirectLAN;

20
src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
View File

@ -18,6 +18,7 @@
#include <QMessageBox> #include <QMessageBox>
#include "Platform.h"
#include "Config.h" #include "Config.h"
#include "FirmwareSettingsDialog.h" #include "FirmwareSettingsDialog.h"
@ -64,10 +65,14 @@ FirmwareSettingsDialog::FirmwareSettingsDialog(QWidget* parent) : QDialog(parent
ui->overrideFirmwareBox->setChecked(Config::FirmwareOverrideSettings); ui->overrideFirmwareBox->setChecked(Config::FirmwareOverrideSettings);
ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC)); ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC));
ui->cbRandomizeMAC->setChecked(Config::RandomizeMAC);
on_overrideFirmwareBox_toggled(); on_overrideFirmwareBox_toggled();
on_cbRandomizeMAC_toggled();
int inst = Platform::InstanceID();
if (inst > 0)
ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
else
ui->lblInstanceNum->hide();
} }
FirmwareSettingsDialog::~FirmwareSettingsDialog() FirmwareSettingsDialog::~FirmwareSettingsDialog()
@ -135,7 +140,6 @@ void FirmwareSettingsDialog::done(int r)
std::string newMessage = ui->messageEdit->text().toStdString(); std::string newMessage = ui->messageEdit->text().toStdString();
std::string newMAC = ui->txtMAC->text().toStdString(); std::string newMAC = ui->txtMAC->text().toStdString();
bool newRandomizeMAC = ui->cbRandomizeMAC->isChecked();
if ( newOverride != Config::FirmwareOverrideSettings if ( newOverride != Config::FirmwareOverrideSettings
|| newName != Config::FirmwareUsername || newName != Config::FirmwareUsername
@ -144,8 +148,7 @@ void FirmwareSettingsDialog::done(int r)
|| newBirthdayDay != Config::FirmwareBirthdayDay || newBirthdayDay != Config::FirmwareBirthdayDay
|| newBirthdayMonth != Config::FirmwareBirthdayMonth || newBirthdayMonth != Config::FirmwareBirthdayMonth
|| newMessage != Config::FirmwareMessage || newMessage != Config::FirmwareMessage
|| newMAC != Config::FirmwareMAC || newMAC != Config::FirmwareMAC)
|| newRandomizeMAC != Config::RandomizeMAC)
{ {
if (RunningSomething if (RunningSomething
&& QMessageBox::warning(this, "Reset necessary to apply changes", && QMessageBox::warning(this, "Reset necessary to apply changes",
@ -163,7 +166,6 @@ void FirmwareSettingsDialog::done(int r)
Config::FirmwareMessage = newMessage; Config::FirmwareMessage = newMessage;
Config::FirmwareMAC = newMAC; Config::FirmwareMAC = newMAC;
Config::RandomizeMAC = newRandomizeMAC;
Config::Save(); Config::Save();
@ -210,9 +212,3 @@ void FirmwareSettingsDialog::on_overrideFirmwareBox_toggled()
ui->grpUserSettings->setDisabled(disable); ui->grpUserSettings->setDisabled(disable);
ui->grpWifiSettings->setDisabled(disable); ui->grpWifiSettings->setDisabled(disable);
} }
void FirmwareSettingsDialog::on_cbRandomizeMAC_toggled()
{
bool disable = ui->cbRandomizeMAC->isChecked();
ui->txtMAC->setDisabled(disable);
}

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

@ -124,7 +124,6 @@ private slots:
void on_cbxBirthdayMonth_currentIndexChanged(int idx); void on_cbxBirthdayMonth_currentIndexChanged(int idx);
void on_overrideFirmwareBox_toggled(); void on_overrideFirmwareBox_toggled();
void on_cbRandomizeMAC_toggled();
private: private:
bool verifyMAC(); bool verifyMAC();

13
src/frontend/qt_sdl/FirmwareSettingsDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>511</width> <width>511</width>
<height>342</height> <height>357</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -23,6 +23,13 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>
</property> </property>
<item>
<widget class="QLabel" name="lblInstanceNum">
<property name="text">
<string>Configuring settings for instance X</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="grpGeneral"> <widget class="QGroupBox" name="grpGeneral">
<property name="title"> <property name="title">
@ -144,9 +151,9 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QCheckBox" name="cbRandomizeMAC"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Randomize</string> <string>(leave empty to use default MAC)</string>
</property> </property>
</widget> </widget>
</item> </item>

7
src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
View File

@ -24,6 +24,7 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include "types.h" #include "types.h"
#include "Platform.h"
#include "Config.h" #include "Config.h"
#include "MapButton.h" #include "MapButton.h"
@ -123,6 +124,12 @@ InputConfigDialog::InputConfigDialog(QWidget* parent) : QDialog(parent), ui(new
} }
setupKeypadPage(); setupKeypadPage();
int inst = Platform::InstanceID();
if (inst > 0)
ui->lblInstanceNum->setText(QString("Configuring mappings for instance %1").arg(inst+1));
else
ui->lblInstanceNum->hide();
} }
InputConfigDialog::~InputConfigDialog() InputConfigDialog::~InputConfigDialog()

145
src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>770</width> <width>770</width>
<height>719</height> <height>678</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -20,7 +20,7 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>
</property> </property>
<item row="7" column="1"> <item row="8" column="1">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -30,49 +30,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Joystick:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbxJoystick">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects which joystick will be used for joystick input, if any is present.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -167,7 +125,7 @@
<widget class="QPushButton" name="btnKeyR"> <widget class="QPushButton" name="btnKeyR">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -258,7 +216,7 @@
<widget class="QPushButton" name="btnKeyL"> <widget class="QPushButton" name="btnKeyL">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -384,7 +342,7 @@
<widget class="QPushButton" name="btnKeyX"> <widget class="QPushButton" name="btnKeyX">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -464,7 +422,7 @@
<widget class="QPushButton" name="btnKeyY"> <widget class="QPushButton" name="btnKeyY">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -523,7 +481,7 @@
<widget class="QPushButton" name="btnKeyA"> <widget class="QPushButton" name="btnKeyA">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -615,7 +573,7 @@
<widget class="QPushButton" name="btnKeyB"> <widget class="QPushButton" name="btnKeyB">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -698,7 +656,7 @@
<widget class="QPushButton" name="btnKeySelect"> <widget class="QPushButton" name="btnKeySelect">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -757,7 +715,7 @@
<widget class="QPushButton" name="btnKeyStart"> <widget class="QPushButton" name="btnKeyStart">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -882,7 +840,7 @@
<widget class="QPushButton" name="btnKeyUp"> <widget class="QPushButton" name="btnKeyUp">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -962,7 +920,7 @@
<widget class="QPushButton" name="btnKeyLeft"> <widget class="QPushButton" name="btnKeyLeft">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1021,7 +979,7 @@
<widget class="QPushButton" name="btnKeyRight"> <widget class="QPushButton" name="btnKeyRight">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1113,7 +1071,7 @@
<widget class="QPushButton" name="btnKeyDown"> <widget class="QPushButton" name="btnKeyDown">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1289,7 +1247,7 @@
<widget class="QPushButton" name="btnJoyL"> <widget class="QPushButton" name="btnJoyL">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1441,7 +1399,7 @@
<widget class="QPushButton" name="btnJoyUp"> <widget class="QPushButton" name="btnJoyUp">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1521,7 +1479,7 @@
<widget class="QPushButton" name="btnJoyLeft"> <widget class="QPushButton" name="btnJoyLeft">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1580,7 +1538,7 @@
<widget class="QPushButton" name="btnJoyRight"> <widget class="QPushButton" name="btnJoyRight">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1672,7 +1630,7 @@
<widget class="QPushButton" name="btnJoyDown"> <widget class="QPushButton" name="btnJoyDown">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1814,7 +1772,7 @@
<widget class="QPushButton" name="btnJoyX"> <widget class="QPushButton" name="btnJoyX">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1894,7 +1852,7 @@
<widget class="QPushButton" name="btnJoyY"> <widget class="QPushButton" name="btnJoyY">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -1953,7 +1911,7 @@
<widget class="QPushButton" name="btnJoyA"> <widget class="QPushButton" name="btnJoyA">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -2045,7 +2003,7 @@
<widget class="QPushButton" name="btnJoyB"> <widget class="QPushButton" name="btnJoyB">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -2128,7 +2086,7 @@
<widget class="QPushButton" name="btnJoySelect"> <widget class="QPushButton" name="btnJoySelect">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -2187,7 +2145,7 @@
<widget class="QPushButton" name="btnJoyStart"> <widget class="QPushButton" name="btnJoyStart">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -2251,7 +2209,7 @@
<widget class="QPushButton" name="btnJoyR"> <widget class="QPushButton" name="btnJoyR">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>76</width> <width>70</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -2321,6 +2279,55 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Joystick:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbxJoystick">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects which joystick will be used for joystick input, if any is present.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblInstanceNum">
<property name="text">
<string>Configuring mappings for instance X</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

12
src/frontend/qt_sdl/LAN_PCap.cpp
View File

@ -114,6 +114,12 @@ bool TryLoadPCap(void* lib)
bool Init(bool open_adapter) bool Init(bool open_adapter)
{ {
PCapAdapter = NULL;
PacketLen = 0;
RXNum = 0;
NumAdapters = 0;
// TODO: how to deal with cases where an adapter is unplugged or changes config?? // TODO: how to deal with cases where an adapter is unplugged or changes config??
if (!PCapLib) if (!PCapLib)
{ {
@ -142,12 +148,6 @@ bool Init(bool open_adapter)
} }
} }
PCapAdapter = NULL;
PacketLen = 0;
RXNum = 0;
NumAdapters = 0;
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE];
int ret; int ret;

634
src/frontend/qt_sdl/LocalMP.cpp Normal file
View File

@ -0,0 +1,634 @@
/*
Copyright 2016-2022 melonDS team
This file is part of melonDS.
melonDS is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef __WIN32__
#include <windows.h>
#else
#include <fcntl.h>
#include <semaphore.h>
#include <time.h>
#ifdef __APPLE__
#include "sem_timedwait.h"
#endif
#endif
#include <string>
#include <QSharedMemory>
#include "Config.h"
#include "LocalMP.h"
namespace LocalMP
{
u32 MPUniqueID;
u8 PacketBuffer[2048];
struct MPQueueHeader
{
u16 NumInstances;
u16 InstanceBitmask; // bitmask of all instances present
u16 ConnectedBitmask; // bitmask of which instances are ready to send/receive packets
u32 PacketWriteOffset;
u32 ReplyWriteOffset;
u16 MPHostInstanceID; // instance ID from which the last CMD frame was sent
u16 MPReplyBitmask; // bitmask of which clients replied in time
};
struct MPPacketHeader
{
u32 Magic;
u32 SenderID;
u32 Type; // 0=regular 1=CMD 2=reply 3=ack
u32 Length;
u64 Timestamp;
};
struct MPSync
{
u32 Magic;
u32 SenderID;
u16 ClientMask;
u16 Type;
u64 Timestamp;
};
QSharedMemory* MPQueue;
int InstanceID;
u32 PacketReadOffset;
u32 ReplyReadOffset;
const u32 kQueueSize = 0x20000;
const u32 kMaxFrameSize = 0x800;
const u32 kPacketStart = sizeof(MPQueueHeader);
const u32 kReplyStart = kQueueSize / 2;
const u32 kPacketEnd = kReplyStart;
const u32 kReplyEnd = kQueueSize;
int RecvTimeout;
int LastHostID;
// we need to come up with our own abstraction layer for named semaphores
// because QSystemSemaphore doesn't support waiting with a timeout
// and, as such, is unsuitable to our needs
#ifdef __WIN32__
bool SemInited[32];
HANDLE SemPool[32];
void SemPoolInit()
{
for (int i = 0; i < 32; i++)
{
SemPool[i] = INVALID_HANDLE_VALUE;
SemInited[i] = false;
}
}
void SemDeinit(int num);
void SemPoolDeinit()
{
for (int i = 0; i < 32; i++)
SemDeinit(i);
}
bool SemInit(int num)
{
if (SemInited[num])
return true;
char semname[64];
sprintf(semname, "Local\\melonNIFI_Sem%02d", num);
HANDLE sem = CreateSemaphore(nullptr, 0, 64, semname);
SemPool[num] = sem;
SemInited[num] = true;
return sem != INVALID_HANDLE_VALUE;
}
void SemDeinit(int num)
{
if (SemPool[num] != INVALID_HANDLE_VALUE)
{
CloseHandle(SemPool[num]);
SemPool[num] = INVALID_HANDLE_VALUE;
}
SemInited[num] = false;
}
bool SemPost(int num)
{
SemInit(num);
return ReleaseSemaphore(SemPool[num], 1, nullptr) != 0;
}
bool SemWait(int num, int timeout)
{
return WaitForSingleObject(SemPool[num], timeout) == WAIT_OBJECT_0;
}
void SemReset(int num)
{
while (WaitForSingleObject(SemPool[num], 0) == WAIT_OBJECT_0);
}
#else
bool SemInited[32];
sem_t* SemPool[32];
void SemPoolInit()
{
for (int i = 0; i < 32; i++)
{
SemPool[i] = SEM_FAILED;
SemInited[i] = false;
}
}
void SemDeinit(int num);
void SemPoolDeinit()
{
for (int i = 0; i < 32; i++)
SemDeinit(i);
}
bool SemInit(int num)
{
if (SemInited[num])
return true;
char semname[64];
sprintf(semname, "/melonNIFI_Sem%02d", num);
sem_t* sem = sem_open(semname, O_CREAT, 0644, 0);
SemPool[num] = sem;
SemInited[num] = true;
return sem != SEM_FAILED;
}
void SemDeinit(int num)
{
if (SemPool[num] != SEM_FAILED)
{
sem_close(SemPool[num]);
SemPool[num] = SEM_FAILED;
}
SemInited[num] = false;
}
bool SemPost(int num)
{
SemInit(num);
return sem_post(SemPool[num]) == 0;
}
bool SemWait(int num, int timeout)
{
if (!timeout)
return sem_trywait(SemPool[num]) == 0;
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
ts.tv_nsec += timeout * 1000000;
long sec = ts.tv_nsec / 1000000000;
ts.tv_nsec -= sec * 1000000000;
ts.tv_sec += sec;
return sem_timedwait(SemPool[num], &ts) == 0;
}
void SemReset(int num)
{
while (sem_trywait(SemPool[num]) == 0);
}
#endif
bool Init()
{
MPQueue = new QSharedMemory("melonNIFI");
if (!MPQueue->attach())
{
printf("MP sharedmem doesn't exist. creating\n");
if (!MPQueue->create(kQueueSize))
{
printf("MP sharedmem create failed :(\n");
return false;
}
MPQueue->lock();
memset(MPQueue->data(), 0, MPQueue->size());
MPQueueHeader* header = (MPQueueHeader*)MPQueue->data();
header->PacketWriteOffset = kPacketStart;
header->ReplyWriteOffset = kReplyStart;
MPQueue->unlock();
}
MPQueue->lock();
MPQueueHeader* header = (MPQueueHeader*)MPQueue->data();
u16 mask = header->InstanceBitmask;
for (int i = 0; i < 16; i++)
{
if (!(mask & (1<<i)))
{
InstanceID = i;
header->InstanceBitmask |= (1<<i);
//header->ConnectedBitmask |= (1 << i);
break;
}
}
header->NumInstances++;
PacketReadOffset = header->PacketWriteOffset;
ReplyReadOffset = header->ReplyWriteOffset;
MPQueue->unlock();
// prepare semaphores
// semaphores 0-15: regular frames; semaphore I is posted when instance I needs to process a new frame
// semaphores 16-31: MP replies; semaphore I is posted when instance I needs to process a new MP reply
SemPoolInit();
SemInit(InstanceID);
SemInit(16+InstanceID);
LastHostID = -1;
printf("MP comm init OK, instance ID %d\n", InstanceID);
RecvTimeout = 25;
return true;
}
void DeInit()
{
MPQueue->lock();
MPQueueHeader* header = (MPQueueHeader*)MPQueue->data();
header->ConnectedBitmask &= ~(1 << InstanceID);
header->InstanceBitmask &= ~(1 << InstanceID);
header->NumInstances--;
MPQueue->unlock();
SemPoolDeinit();
MPQueue->detach();
delete MPQueue;
}
void SetRecvTimeout(int timeout)
{
RecvTimeout = timeout;
}
void Begin()
{
MPQueue->lock();
MPQueueHeader* header = (MPQueueHeader*)MPQueue->data();
PacketReadOffset = header->PacketWriteOffset;
ReplyReadOffset = header->ReplyWriteOffset;
SemReset(InstanceID);
SemReset(16+InstanceID);
header->ConnectedBitmask |= (1 << InstanceID);
MPQueue->unlock();
}
void End()
{
MPQueue->lock();
MPQueueHeader* header = (MPQueueHeader*)MPQueue->data();
//SemReset(InstanceID);
//SemReset(16+InstanceID);
header->ConnectedBitmask &= ~(1 << InstanceID);
MPQueue->unlock();
}
void FIFORead(int fifo, void* buf, int len)
{
u8* data = (u8*)MPQueue->data();
u32 offset, start, end;
if (fifo == 0)
{
offset = PacketReadOffset;
start = kPacketStart;
end = kPacketEnd;
}
else
{
offset = ReplyReadOffset;
start = kReplyStart;
end = kReplyEnd;
}
if ((offset + len) >= end)
{
u32 part1 = end - offset;
memcpy(buf, &data[offset], part1);
memcpy(&((u8*)buf)[part1], &data[start], len - part1);
offset = start + len - part1;
}
else
{
memcpy(buf, &data[offset], len);
offset += len;
}
if (fifo == 0) PacketReadOffset = offset;
else ReplyReadOffset = offset;
}
void FIFOWrite(int fifo, void* buf, int len)
{
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
u32 offset, start, end;
if (fifo == 0)
{
offset = header->PacketWriteOffset;
start = kPacketStart;
end = kPacketEnd;
}
else
{
offset = header->ReplyWriteOffset;
start = kReplyStart;
end = kReplyEnd;
}
if ((offset + len) >= end)
{
u32 part1 = end - offset;
memcpy(&data[offset], buf, part1);
memcpy(&data[start], &((u8*)buf)[part1], len - part1);
offset = start + len - part1;
}
else
{
memcpy(&data[offset], buf, len);
offset += len;
}
if (fifo == 0) header->PacketWriteOffset = offset;
else header->ReplyWriteOffset = offset;
}
int SendPacketGeneric(u32 type, u8* packet, int len, u64 timestamp)
{
MPQueue->lock();
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
u16 mask = header->ConnectedBitmask;
// TODO: check if the FIFO is full!
MPPacketHeader pktheader;
pktheader.Magic = 0x4946494E;
pktheader.SenderID = InstanceID;
pktheader.Type = type;
pktheader.Length = len;
pktheader.Timestamp = timestamp;
type &= 0xFFFF;
int nfifo = (type == 2) ? 1 : 0;
FIFOWrite(nfifo, &pktheader, sizeof(pktheader));
if (len)
FIFOWrite(nfifo, packet, len);
if (type == 1)
{
// NOTE: this is not guarded against, say, multiple multiplay games happening on the same machine
// we would need to pass the packet's SenderID through the wifi module for that
header->MPHostInstanceID = InstanceID;
header->MPReplyBitmask = 0;
ReplyReadOffset = header->ReplyWriteOffset;
SemReset(16 + InstanceID);
}
else if (type == 2)
{
header->MPReplyBitmask |= (1 << InstanceID);
}
MPQueue->unlock();
if (type == 2)
{
SemPost(16 + header->MPHostInstanceID);
}
else
{
for (int i = 0; i < 16; i++)
{
if (mask & (1<<i))
SemPost(i);
}
}
return len;
}
int RecvPacketGeneric(u8* packet, bool block, u64* timestamp)
{
for (;;)
{
if (!SemWait(InstanceID, block ? RecvTimeout : 0))
{
return 0;
}
MPQueue->lock();
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
MPPacketHeader pktheader;
FIFORead(0, &pktheader, sizeof(pktheader));
if (pktheader.Magic != 0x4946494E)
{
printf("PACKET FIFO OVERFLOW\n");
PacketReadOffset = header->PacketWriteOffset;
SemReset(InstanceID);
MPQueue->unlock();
return 0;
}
if (pktheader.SenderID == InstanceID)
{
// skip this packet
PacketReadOffset += pktheader.Length;
if (PacketReadOffset >= kPacketEnd)
PacketReadOffset += kPacketStart - kPacketEnd;
MPQueue->unlock();
continue;
}
if (pktheader.Length)
{
FIFORead(0, packet, pktheader.Length);
if (pktheader.Type == 1)
LastHostID = pktheader.SenderID;
}
if (timestamp) *timestamp = pktheader.Timestamp;
MPQueue->unlock();
return pktheader.Length;
}
}
int SendPacket(u8* packet, int len, u64 timestamp)
{
return SendPacketGeneric(0, packet, len, timestamp);
}
int RecvPacket(u8* packet, u64* timestamp)
{
return RecvPacketGeneric(packet, false, timestamp);
}
int SendCmd(u8* packet, int len, u64 timestamp)
{
return SendPacketGeneric(1, packet, len, timestamp);
}
int SendReply(u8* packet, int len, u64 timestamp, u16 aid)
{
return SendPacketGeneric(2 | (aid<<16), packet, len, timestamp);
}
int SendAck(u8* packet, int len, u64 timestamp)
{
return SendPacketGeneric(3, packet, len, timestamp);
}
int RecvHostPacket(u8* packet, u64* timestamp)
{
if (LastHostID != -1)
{
// check if the host is still connected
MPQueue->lock();
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
u16 curinstmask = header->ConnectedBitmask;
MPQueue->unlock();
if (!(curinstmask & (1 << LastHostID)))
return -1;
}
return RecvPacketGeneric(packet, true, timestamp);
}
u16 RecvReplies(u8* packets, u64 timestamp, u16 aidmask)
{
u16 ret = 0;
u16 myinstmask = (1 << InstanceID);
u16 curinstmask;
{
MPQueue->lock();
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
curinstmask = header->ConnectedBitmask;
MPQueue->unlock();
}
// if all clients have left: return early
if ((myinstmask & curinstmask) == curinstmask)
return 0;
for (;;)
{
if (!SemWait(16+InstanceID, RecvTimeout))
{
// no more replies available
return ret;
}
MPQueue->lock();
u8* data = (u8*)MPQueue->data();
MPQueueHeader* header = (MPQueueHeader*)&data[0];
MPPacketHeader pktheader;
FIFORead(1, &pktheader, sizeof(pktheader));
if (pktheader.Magic != 0x4946494E)
{
printf("REPLY FIFO OVERFLOW\n");
ReplyReadOffset = header->ReplyWriteOffset;
SemReset(16+InstanceID);
MPQueue->unlock();
return 0;
}
if ((pktheader.SenderID == InstanceID) || // packet we sent out (shouldn't happen, but hey)
(pktheader.Timestamp < (timestamp - 32))) // stale packet
{
// skip this packet
ReplyReadOffset += pktheader.Length;
if (ReplyReadOffset >= kReplyEnd)
ReplyReadOffset += kReplyStart - kReplyEnd;
MPQueue->unlock();
continue;
}
if (pktheader.Length)
{
u32 aid = (pktheader.Type >> 16);
FIFORead(1, &packets[(aid-1)*1024], pktheader.Length);
ret |= (1 << aid);
}
myinstmask |= (1 << pktheader.SenderID);
if (((myinstmask & curinstmask) == curinstmask) ||
((ret & aidmask) == aidmask))
{
// all the clients have sent their reply
MPQueue->unlock();
return ret;
}
MPQueue->unlock();
}
}
}

45
src/frontend/qt_sdl/LocalMP.h Normal file
View File

@ -0,0 +1,45 @@
/*
Copyright 2016-2022 melonDS team
This file is part of melonDS.
melonDS is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#ifndef LOCALMP_H
#define LOCALMP_H
#include "types.h"
namespace LocalMP
{
bool Init();
void DeInit();
void SetRecvTimeout(int timeout);
void Begin();
void End();
int SendPacket(u8* data, int len, u64 timestamp);
int RecvPacket(u8* data, u64* timestamp);
int SendCmd(u8* data, int len, u64 timestamp);
int SendReply(u8* data, int len, u64 timestamp, u16 aid);
int SendAck(u8* data, int len, u64 timestamp);
int RecvHostPacket(u8* data, u64* timestamp);
u16 RecvReplies(u8* data, u64 timestamp, u16 aidmask);
}
#endif // LOCALMP_H

73
src/frontend/qt_sdl/MPSettingsDialog.cpp Normal file
View File

@ -0,0 +1,73 @@
/*
Copyright 2016-2022 melonDS team
This file is part of melonDS.
melonDS is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#include <stdio.h>
#include <QMessageBox>
#include "types.h"
#include "Platform.h"
#include "Config.h"
#include "LAN_Socket.h"
#include "LAN_PCap.h"
#include "Wifi.h"
#include "MPSettingsDialog.h"
#include "ui_MPSettingsDialog.h"
MPSettingsDialog* MPSettingsDialog::currentDlg = nullptr;
extern bool RunningSomething;
MPSettingsDialog::MPSettingsDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MPSettingsDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
grpAudioMode = new QButtonGroup(this);
grpAudioMode->addButton(ui->rbAudioAll, 0);
grpAudioMode->addButton(ui->rbAudioOneOnly, 1);
grpAudioMode->addButton(ui->rbAudioActiveOnly, 2);
grpAudioMode->button(Config::MPAudioMode)->setChecked(true);
ui->sbReceiveTimeout->setValue(Config::MPRecvTimeout);
}
MPSettingsDialog::~MPSettingsDialog()
{
delete ui;
}
void MPSettingsDialog::done(int r)
{
if (r == QDialog::Accepted)
{
Config::MPAudioMode = grpAudioMode->checkedId();
Config::MPRecvTimeout = ui->sbReceiveTimeout->value();
Config::Save();
}
QDialog::done(r);
closeDlg();
}
//

65
src/frontend/qt_sdl/MPSettingsDialog.h Normal file
View File

@ -0,0 +1,65 @@
/*
Copyright 2016-2022 melonDS team
This file is part of melonDS.
melonDS is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
melonDS is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with melonDS. If not, see http://www.gnu.org/licenses/.
*/
#ifndef MPSETTINGSDIALOG_H
#define MPSETTINGSDIALOG_H
#include <QDialog>
#include <QButtonGroup>
namespace Ui { class MPSettingsDialog; }
class MPSettingsDialog;
class MPSettingsDialog : public QDialog
{
Q_OBJECT
public:
explicit MPSettingsDialog(QWidget* parent);
~MPSettingsDialog();
static MPSettingsDialog* currentDlg;
static MPSettingsDialog* openDlg(QWidget* parent)
{
if (currentDlg)
{
currentDlg->activateWindow();
return currentDlg;
}
currentDlg = new MPSettingsDialog(parent);
currentDlg->open();
return currentDlg;
}
static void closeDlg()
{
currentDlg = nullptr;
}
private slots:
void done(int r);
//
private:
Ui::MPSettingsDialog* ui;
QButtonGroup* grpAudioMode;
};
#endif // MPSETTINGSDIALOG_H

142
src/frontend/qt_sdl/MPSettingsDialog.ui Normal file
View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MPSettingsDialog</class>
<widget class="QDialog" name="MPSettingsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>466</width>
<height>202</height>
</rect>
</property>
<property name="windowTitle">
<string>Multiplayer settings - melonDS</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Audio output</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<widget class="QRadioButton" name="rbAudioOneOnly">
<property name="text">
<string>Instance 1 only</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rbAudioAll">
<property name="text">
<string>All instances</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="rbAudioActiveOnly">
<property name="text">
<string>Active instance only</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Network</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QSpinBox" name="sbReceiveTimeout">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Data reception timeout: </string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>milliseconds</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>MPSettingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>MPSettingsDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

7
src/frontend/qt_sdl/PathSettingsDialog.cpp
View File

@ -22,6 +22,7 @@
#include "types.h" #include "types.h"
#include "Config.h" #include "Config.h"
#include "Platform.h"
#include "PathSettingsDialog.h" #include "PathSettingsDialog.h"
#include "ui_PathSettingsDialog.h" #include "ui_PathSettingsDialog.h"
@ -43,6 +44,12 @@ PathSettingsDialog::PathSettingsDialog(QWidget* parent) : QDialog(parent), ui(ne
ui->txtSaveFilePath->setText(QString::fromStdString(Config::SaveFilePath)); ui->txtSaveFilePath->setText(QString::fromStdString(Config::SaveFilePath));
ui->txtSavestatePath->setText(QString::fromStdString(Config::SavestatePath)); ui->txtSavestatePath->setText(QString::fromStdString(Config::SavestatePath));
ui->txtCheatFilePath->setText(QString::fromStdString(Config::CheatFilePath)); ui->txtCheatFilePath->setText(QString::fromStdString(Config::CheatFilePath));
int inst = Platform::InstanceID();
if (inst > 0)
ui->lblInstanceNum->setText(QString("Configuring paths for instance %1").arg(inst+1));
else
ui->lblInstanceNum->hide();
} }
PathSettingsDialog::~PathSettingsDialog() PathSettingsDialog::~PathSettingsDialog()

87
src/frontend/qt_sdl/PathSettingsDialog.ui
View File

@ -7,49 +7,63 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>439</width> <width>439</width>
<height>166</height> <height>185</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Path settings - melonDS</string> <string>Path settings - melonDS</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="3" column="0">
<widget class="QLineEdit" name="txtSaveFilePath"> <widget class="QLabel" name="label_4">
<property name="clearButtonEnabled"> <property name="text">
<bool>true</bool> <string>Cheat files path:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="3" column="2">
<widget class="QPushButton" name="btnCheatFileBrowse"> <widget class="QPushButton" name="btnCheatFileBrowse">
<property name="text"> <property name="text">
<string>Browse...</string> <string>Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Savestates path:</string> <string>Savestates path:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3">
<widget class="QLabel" name="label_5">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="txtSavestatePath">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="btnSaveFileBrowse">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="txtCheatFilePath"> <widget class="QLineEdit" name="txtCheatFilePath">
<property name="clearButtonEnabled"> <property name="clearButtonEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="6" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>Leave a path blank to use the current ROM's path.</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -59,35 +73,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Cheat files path:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="btnSaveFileBrowse">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="btnSavestateBrowse"> <widget class="QPushButton" name="btnSavestateBrowse">
<property name="text"> <property name="text">
<string>Browse...</string> <string>Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="0">
<widget class="QLineEdit" name="txtSavestatePath">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Save files path:</string> <string>Save files path:</string>
@ -95,9 +88,23 @@
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0" colspan="3">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string/> <string>Leave a path blank to use the current ROM's path.</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="txtSaveFilePath">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="lblInstanceNum">
<property name="text">
<string>Configuring paths for instance X</string>
</property> </property>
</widget> </widget>
</item> </item>

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

@ -20,28 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef __WIN32__ #include <string>
#define NTDDI_VERSION 0x06000000 // GROSS FUCKING HACK
#include <winsock2.h>
#include <windows.h>
//#include <knownfolders.h> // FUCK THAT SHIT
#include <shlobj.h>
#include <ws2tcpip.h>
#include <io.h>
#define dup _dup
#define socket_t SOCKET
#define sockaddr_t SOCKADDR
#else
#include <unistd.h>
#include <netinet/in.h>
#include <sys/select.h>
#include <sys/socket.h>
#define socket_t int
#define sockaddr_t struct sockaddr
#define closesocket close
#endif
#include <QStandardPaths> #include <QStandardPaths>
#include <QString> #include <QString>
#include <QDir> #include <QDir>
@ -49,32 +28,80 @@
#include <QSemaphore> #include <QSemaphore>
#include <QMutex> #include <QMutex>
#include <QOpenGLContext> #include <QOpenGLContext>
#include <QSharedMemory>
#include "Platform.h" #include "Platform.h"
#include "Config.h" #include "Config.h"
#include "ROMManager.h" #include "ROMManager.h"
#include "LAN_Socket.h" #include "LAN_Socket.h"
#include "LAN_PCap.h" #include "LAN_PCap.h"
#include <string> #include "LocalMP.h"
#ifndef INVALID_SOCKET
#define INVALID_SOCKET (socket_t)-1
#endif
std::string EmuDirectory; std::string EmuDirectory;
void emuStop(); void emuStop();
namespace Platform namespace Platform
{ {
socket_t MPSocket; QSharedMemory* IPCBuffer = nullptr;
sockaddr_t MPSendAddr; int IPCInstanceID;
u8 PacketBuffer[2048];
#define NIFI_VER 1 void IPCInit()
{
IPCInstanceID = 0;
IPCBuffer = new QSharedMemory("melonIPC");
if (!IPCBuffer->attach())
{
printf("IPC sharedmem doesn't exist. creating\n");
if (!IPCBuffer->create(1024))
{
printf("IPC sharedmem create failed :(\n");
delete IPCBuffer;
IPCBuffer = nullptr;
return;
}
IPCBuffer->lock();
memset(IPCBuffer->data(), 0, IPCBuffer->size());
IPCBuffer->unlock();
}
IPCBuffer->lock();
u8* data = (u8*)IPCBuffer->data();
u16 mask = *(u16*)&data[0];
for (int i = 0; i < 16; i++)
{
if (!(mask & (1<<i)))
{
IPCInstanceID = i;
*(u16*)&data[0] |= (1<<i);
break;
}
}
IPCBuffer->unlock();
printf("IPC: instance ID %d\n", IPCInstanceID);
}
void IPCDeInit()
{
if (IPCBuffer)
{
IPCBuffer->lock();
u8* data = (u8*)IPCBuffer->data();
*(u16*)&data[0] &= ~(1<<IPCInstanceID);
IPCBuffer->unlock();
IPCBuffer->detach();
delete IPCBuffer;
}
IPCBuffer = nullptr;
}
void Init(int argc, char** argv) void Init(int argc, char** argv)
@ -110,10 +137,13 @@ void Init(int argc, char** argv)
confdir = config.absolutePath() + "/melonDS/"; confdir = config.absolutePath() + "/melonDS/";
EmuDirectory = confdir.toStdString(); EmuDirectory = confdir.toStdString();
#endif #endif
IPCInit();
} }
void DeInit() void DeInit()
{ {
IPCDeInit();
} }
@ -123,6 +153,22 @@ void StopEmu()
} }
int InstanceID()
{
return IPCInstanceID;
}
std::string InstanceFileSuffix()
{
int inst = IPCInstanceID;
if (inst == 0) return "";
char suffix[16] = {0};
snprintf(suffix, 15, ".%d", inst+1);
return suffix;
}
int GetConfigInt(ConfigEntry entry) int GetConfigInt(ConfigEntry entry)
{ {
const int imgsizes[] = {0, 256, 512, 1024, 2048, 4096}; const int imgsizes[] = {0, 256, 512, 1024, 2048, 4096};
@ -169,7 +215,6 @@ bool GetConfigBool(ConfigEntry entry)
case DSiSD_ReadOnly: return Config::DSiSDReadOnly != 0; case DSiSD_ReadOnly: return Config::DSiSDReadOnly != 0;
case DSiSD_FolderSync: return Config::DSiSDFolderSync != 0; case DSiSD_FolderSync: return Config::DSiSDFolderSync != 0;
case Firm_RandomizeMAC: return Config::RandomizeMAC != 0;
case Firm_OverrideSettings: return Config::FirmwareOverrideSettings != 0; case Firm_OverrideSettings: return Config::FirmwareOverrideSettings != 0;
} }
@ -372,6 +417,11 @@ bool Mutex_TryLock(Mutex* mutex)
return ((QMutex*) mutex)->try_lock(); return ((QMutex*) mutex)->try_lock();
} }
void Sleep(u64 usecs)
{
QThread::usleep(usecs);
}
void WriteNDSSave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen) void WriteNDSSave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen)
{ {
@ -386,146 +436,60 @@ void WriteGBASave(const u8* savedata, u32 savelen, u32 writeoffset, u32 writelen
} }
bool MP_Init() bool MP_Init()
{ {
int opt_true = 1; return LocalMP::Init();
int res;
#ifdef __WIN32__
WSADATA wsadata;
if (WSAStartup(MAKEWORD(2, 2), &wsadata) != 0)
{
return false;
}
#endif // __WIN32__
MPSocket = socket(AF_INET, SOCK_DGRAM, 0);
if (MPSocket < 0)
{
return false;
}
res = setsockopt(MPSocket, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt_true, sizeof(int));
if (res < 0)
{
closesocket(MPSocket);
MPSocket = INVALID_SOCKET;
return false;
}
#if defined(BSD) || defined(__APPLE__)
res = setsockopt(MPSocket, SOL_SOCKET, SO_REUSEPORT, (const char*)&opt_true, sizeof(int));
if (res < 0)
{
closesocket(MPSocket);
MPSocket = INVALID_SOCKET;
return false;
}
#endif
sockaddr_t saddr;
saddr.sa_family = AF_INET;
*(u32*)&saddr.sa_data[2] = htonl(Config::SocketBindAnyAddr ? INADDR_ANY : INADDR_LOOPBACK);
*(u16*)&saddr.sa_data[0] = htons(7064);
res = bind(MPSocket, &saddr, sizeof(sockaddr_t));
if (res < 0)
{
closesocket(MPSocket);
MPSocket = INVALID_SOCKET;
return false;
}
res = setsockopt(MPSocket, SOL_SOCKET, SO_BROADCAST, (const char*)&opt_true, sizeof(int));
if (res < 0)
{
closesocket(MPSocket);
MPSocket = INVALID_SOCKET;
return false;
}
MPSendAddr.sa_family = AF_INET;
*(u32*)&MPSendAddr.sa_data[2] = htonl(INADDR_BROADCAST);
*(u16*)&MPSendAddr.sa_data[0] = htons(7064);
return true;
} }
void MP_DeInit() void MP_DeInit()
{ {
if (MPSocket >= 0) return LocalMP::DeInit();
closesocket(MPSocket);
#ifdef __WIN32__
WSACleanup();
#endif // __WIN32__
} }
int MP_SendPacket(u8* data, int len) void MP_Begin()
{ {
if (MPSocket < 0) return LocalMP::Begin();
return 0;
if (len > 2048-8)
{
printf("MP_SendPacket: error: packet too long (%d)\n", len);
return 0;
}
*(u32*)&PacketBuffer[0] = htonl(0x4946494E); // NIFI
PacketBuffer[4] = NIFI_VER;
PacketBuffer[5] = 0;
*(u16*)&PacketBuffer[6] = htons(len);
memcpy(&PacketBuffer[8], data, len);
int slen = sendto(MPSocket, (const char*)PacketBuffer, len+8, 0, &MPSendAddr, sizeof(sockaddr_t));
if (slen < 8) return 0;
return slen - 8;
} }
int MP_RecvPacket(u8* data, bool block) void MP_End()
{ {
if (MPSocket < 0) return LocalMP::End();
return 0; }
fd_set fd; int MP_SendPacket(u8* data, int len, u64 timestamp)
struct timeval tv; {
return LocalMP::SendPacket(data, len, timestamp);
}
FD_ZERO(&fd); int MP_RecvPacket(u8* data, u64* timestamp)
FD_SET(MPSocket, &fd); {
tv.tv_sec = 0; return LocalMP::RecvPacket(data, timestamp);
tv.tv_usec = block ? 5000 : 0; }
if (!select(MPSocket+1, &fd, 0, 0, &tv)) int MP_SendCmd(u8* data, int len, u64 timestamp)
{ {
return 0; return LocalMP::SendCmd(data, len, timestamp);
} }
sockaddr_t fromAddr; int MP_SendReply(u8* data, int len, u64 timestamp, u16 aid)
socklen_t fromLen = sizeof(sockaddr_t); {
int rlen = recvfrom(MPSocket, (char*)PacketBuffer, 2048, 0, &fromAddr, &fromLen); return LocalMP::SendReply(data, len, timestamp, aid);
if (rlen < 8+24) }
{
return 0;
}
rlen -= 8;
if (ntohl(*(u32*)&PacketBuffer[0]) != 0x4946494E) int MP_SendAck(u8* data, int len, u64 timestamp)
{ {
return 0; return LocalMP::SendAck(data, len, timestamp);
} }
if (PacketBuffer[4] != NIFI_VER) int MP_RecvHostPacket(u8* data, u64* timestamp)
{ {
return 0; return LocalMP::RecvHostPacket(data, timestamp);
} }
if (ntohs(*(u16*)&PacketBuffer[6]) != rlen) u16 MP_RecvReplies(u8* data, u64 timestamp, u16 aidmask)
{ {
return 0; return LocalMP::RecvReplies(data, timestamp, aidmask);
}
memcpy(data, &PacketBuffer[8], rlen);
return rlen;
} }
@ -573,9 +537,4 @@ int LAN_RecvPacket(u8* data)
return LAN_Socket::RecvPacket(data); return LAN_Socket::RecvPacket(data);
} }
void Sleep(u64 usecs)
{
QThread::usleep(usecs);
}
} }

7
src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp
View File

@ -23,6 +23,7 @@
#include "DSi_I2C.h" #include "DSi_I2C.h"
#include "NDS.h" #include "NDS.h"
#include "Config.h" #include "Config.h"
#include "Platform.h"
#include "types.h" #include "types.h"
@ -65,6 +66,12 @@ PowerManagementDialog::PowerManagementDialog(QWidget* parent) : QDialog(parent),
} }
ui->sliderDSiBatteryLevel->setValue(dsiBatterySliderPos); ui->sliderDSiBatteryLevel->setValue(dsiBatterySliderPos);
int inst = Platform::InstanceID();
if (inst > 0)
ui->lblInstanceNum->setText(QString("Setting battery levels for instance %1").arg(inst+1));
else
ui->lblInstanceNum->hide();
inited = true; inited = true;
} }

79
src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>562</width> <width>562</width>
<height>279</height> <height>288</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -23,37 +23,7 @@
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum> <enum>QLayout::SetFixedSize</enum>
</property> </property>
<item row="0" column="0"> <item row="4" column="0">
<widget class="QGroupBox" name="grpDSBattery">
<property name="title">
<string>DS Battery</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="QRadioButton" name="rbDSBatteryLow">
<property name="text">
<string>Low</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Battery Level</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="rbDSBatteryOkay">
<property name="text">
<string>Okay</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -63,7 +33,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="grpDSiBattery"> <widget class="QGroupBox" name="grpDSiBattery">
<property name="title"> <property name="title">
<string>DSi Battery</string> <string>DSi Battery</string>
@ -219,6 +189,49 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QGroupBox" name="grpDSBattery">
<property name="title">
<string>DS Battery</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="QRadioButton" name="rbDSBatteryLow">
<property name="text">
<string>Low</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Battery Level</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="rbDSBatteryOkay">
<property name="text">
<string>Okay</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblInstanceNum">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Configuring settings for instance X</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

12
src/frontend/qt_sdl/ROMManager.cpp
View File

@ -326,6 +326,7 @@ bool LoadState(std::string filename)
std::string savefile = filename.substr(LastSep(filename)+1); std::string savefile = filename.substr(LastSep(filename)+1);
savefile = GetAssetPath(false, Config::SaveFilePath, ".sav", savefile); savefile = GetAssetPath(false, Config::SaveFilePath, ".sav", savefile);
savefile += Platform::InstanceFileSuffix();
NDSSave->SetPath(savefile, true); NDSSave->SetPath(savefile, true);
} }
@ -350,6 +351,7 @@ bool SaveState(std::string filename)
{ {
std::string savefile = filename.substr(LastSep(filename)+1); std::string savefile = filename.substr(LastSep(filename)+1);
savefile = GetAssetPath(false, Config::SaveFilePath, ".sav", savefile); savefile = GetAssetPath(false, Config::SaveFilePath, ".sav", savefile);
savefile += Platform::InstanceFileSuffix();
NDSSave->SetPath(savefile, false); NDSSave->SetPath(savefile, false);
} }
@ -432,6 +434,7 @@ void Reset()
{ {
std::string oldsave = NDSSave->GetPath(); std::string oldsave = NDSSave->GetPath();
std::string newsave = GetAssetPath(false, Config::SaveFilePath, ".sav"); std::string newsave = GetAssetPath(false, Config::SaveFilePath, ".sav");
newsave += Platform::InstanceFileSuffix();
if (oldsave != newsave) if (oldsave != newsave)
NDSSave->SetPath(newsave, false); NDSSave->SetPath(newsave, false);
} }
@ -440,6 +443,7 @@ void Reset()
{ {
std::string oldsave = GBASave->GetPath(); std::string oldsave = GBASave->GetPath();
std::string newsave = GetAssetPath(true, Config::SaveFilePath, ".sav"); std::string newsave = GetAssetPath(true, Config::SaveFilePath, ".sav");
newsave += Platform::InstanceFileSuffix();
if (oldsave != newsave) if (oldsave != newsave)
GBASave->SetPath(newsave, false); GBASave->SetPath(newsave, false);
} }
@ -562,7 +566,11 @@ bool LoadROM(QStringList filepath, bool reset)
u8* savedata = nullptr; u8* savedata = nullptr;
std::string savname = GetAssetPath(false, Config::SaveFilePath, ".sav"); std::string savname = GetAssetPath(false, Config::SaveFilePath, ".sav");
std::string origsav = savname;
savname += Platform::InstanceFileSuffix();
FILE* sav = Platform::OpenFile(savname, "rb", true); FILE* sav = Platform::OpenFile(savname, "rb", true);
if (!sav) sav = Platform::OpenFile(origsav, "rb", true);
if (sav) if (sav)
{ {
fseek(sav, 0, SEEK_END); fseek(sav, 0, SEEK_END);
@ -711,7 +719,11 @@ bool LoadGBAROM(QStringList filepath)
u8* savedata = nullptr; u8* savedata = nullptr;
std::string savname = GetAssetPath(true, Config::SaveFilePath, ".sav"); std::string savname = GetAssetPath(true, Config::SaveFilePath, ".sav");
std::string origsav = savname;
savname += Platform::InstanceFileSuffix();
FILE* sav = Platform::OpenFile(savname, "rb", true); FILE* sav = Platform::OpenFile(savname, "rb", true);
if (!sav) sav = Platform::OpenFile(origsav, "rb", true);
if (sav) if (sav)
{ {
fseek(sav, 0, SEEK_END); fseek(sav, 0, SEEK_END);

5
src/frontend/qt_sdl/WifiSettingsDialog.cpp
View File

@ -50,12 +50,12 @@ WifiSettingsDialog::WifiSettingsDialog(QWidget* parent) : QDialog(parent), ui(ne
ui->setupUi(this); ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
LAN_Socket::Init();
haspcap = LAN_PCap::Init(false); haspcap = LAN_PCap::Init(false);
ui->rbDirectMode->setText("Direct mode (requires " PCAP_NAME " and ethernet connection)"); ui->rbDirectMode->setText("Direct mode (requires " PCAP_NAME " and ethernet connection)");
ui->cbBindAnyAddr->setChecked(Config::SocketBindAnyAddr); ui->lblAdapterMAC->setText("(none)");
ui->lblAdapterIP->setText("(none)");
int sel = 0; int sel = 0;
for (int i = 0; i < LAN_PCap::NumAdapters; i++) for (int i = 0; i < LAN_PCap::NumAdapters; i++)
@ -88,7 +88,6 @@ void WifiSettingsDialog::done(int r)
if (r == QDialog::Accepted) if (r == QDialog::Accepted)
{ {
Config::SocketBindAnyAddr = ui->cbBindAnyAddr->isChecked();
Config::DirectLAN = ui->rbDirectMode->isChecked(); Config::DirectLAN = ui->rbDirectMode->isChecked();
int sel = ui->cbxDirectAdapter->currentIndex(); int sel = ui->cbxDirectAdapter->currentIndex();

151
src/frontend/qt_sdl/WifiSettingsDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>572</width> <width>572</width>
<height>273</height> <height>217</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -26,92 +26,10 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Local</string> <string>Network mode</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="cbBindAnyAddr">
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enabling this allows (theoretically) playing local multiplayer games over a local network. It may or may not help make for a better connection in general.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Bind socket to any address</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Online</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="0" rowspan="3" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Direct mode settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Network adapter:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cbxDirectAdapter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects the network adapter through which to route network traffic under direct mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>MAC address:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblAdapterMAC">
<property name="text">
<string>[PLACEHOLDER]</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>IP address:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblAdapterIP">
<property name="text">
<string>[PLACEHOLDER]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="rbIndirectMode"> <widget class="QRadioButton" name="rbIndirectMode">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indirect mode uses libslirp. It requires no extra setup and is easy to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indirect mode uses libslirp. It requires no extra setup and is easy to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -121,7 +39,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QRadioButton" name="rbDirectMode"> <widget class="QRadioButton" name="rbDirectMode">
<property name="whatsThis"> <property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Direct mode directly routes network traffic to the host network. It is the most reliable, but requires an ethernet connection.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Non-direct mode uses a layer of emulation to get around this, but is more prone to problems.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Direct mode directly routes network traffic to the host network. It is the most reliable, but requires an ethernet connection.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Non-direct mode uses a layer of emulation to get around this, but is more prone to problems.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -134,6 +52,69 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Direct mode settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Network adapter:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="cbxDirectAdapter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects the network adapter through which to route network traffic under direct mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>MAC address:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblAdapterMAC">
<property name="text">
<string>[PLACEHOLDER]</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>IP address:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblAdapterIP">
<property name="text">
<string>[PLACEHOLDER]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">

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

@ -25,6 +25,7 @@
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <QProcess>
#include <QApplication> #include <QApplication>
#include <QMessageBox> #include <QMessageBox>
#include <QMenuBar> #include <QMenuBar>
@ -57,6 +58,7 @@
#include "AudioSettingsDialog.h" #include "AudioSettingsDialog.h"
#include "FirmwareSettingsDialog.h" #include "FirmwareSettingsDialog.h"
#include "PathSettingsDialog.h" #include "PathSettingsDialog.h"
#include "MPSettingsDialog.h"
#include "WifiSettingsDialog.h" #include "WifiSettingsDialog.h"
#include "InterfaceSettingsDialog.h" #include "InterfaceSettingsDialog.h"
#include "ROMInfoDialog.h" #include "ROMInfoDialog.h"
@ -77,6 +79,7 @@
#include "SPU.h" #include "SPU.h"
#include "Wifi.h" #include "Wifi.h"
#include "Platform.h" #include "Platform.h"
#include "LocalMP.h"
#include "Config.h" #include "Config.h"
#include "Savestate.h" #include "Savestate.h"
@ -101,6 +104,7 @@ bool videoSettingsDirty;
SDL_AudioDeviceID audioDevice; SDL_AudioDeviceID audioDevice;
int audioFreq; int audioFreq;
bool audioMuted;
SDL_cond* audioSync; SDL_cond* audioSync;
SDL_mutex* audioSyncLock; SDL_mutex* audioSyncLock;
@ -138,7 +142,7 @@ void audioCallback(void* data, Uint8* stream, int len)
SDL_CondSignal(audioSync); SDL_CondSignal(audioSync);
SDL_UnlockMutex(audioSyncLock); SDL_UnlockMutex(audioSyncLock);
if (num_in < 1) if ((num_in < 1) || audioMuted)
{ {
memset(stream, 0, len*sizeof(s16)*2); memset(stream, 0, len*sizeof(s16)*2);
return; return;
@ -158,6 +162,23 @@ void audioCallback(void* data, Uint8* stream, int len)
Frontend::AudioOut_Resample(buf_in, num_in, (s16*)stream, len, Config::AudioVolume); Frontend::AudioOut_Resample(buf_in, num_in, (s16*)stream, len, Config::AudioVolume);
} }
void audioMute()
{
int inst = Platform::InstanceID();
audioMuted = false;
switch (Config::MPAudioMode)
{
case 1: // only instance 1
if (inst > 0) audioMuted = true;
break;
case 2: // only currently focused instance
if (!mainWindow->isActiveWindow()) audioMuted = true;
break;
}
}
void micOpen() void micOpen()
{ {
@ -646,7 +667,11 @@ void EmuThread::run()
if (winUpdateFreq < 1) if (winUpdateFreq < 1)
winUpdateFreq = 1; winUpdateFreq = 1;
sprintf(melontitle, "[%d/%.0f] melonDS " MELONDS_VERSION, fps, fpstarget); int inst = Platform::InstanceID();
if (inst == 0)
sprintf(melontitle, "[%d/%.0f] melonDS " MELONDS_VERSION, fps, fpstarget);
else
sprintf(melontitle, "[%d/%.0f] melonDS (%d)", fps, fpstarget, inst+1);
changeWindowTitle(melontitle); changeWindowTitle(melontitle);
} }
} }
@ -661,7 +686,11 @@ void EmuThread::run()
EmuStatus = EmuRunning; EmuStatus = EmuRunning;
sprintf(melontitle, "melonDS " MELONDS_VERSION); int inst = Platform::InstanceID();
if (inst == 0)
sprintf(melontitle, "melonDS " MELONDS_VERSION);
else
sprintf(melontitle, "melonDS (%d)", inst+1);
changeWindowTitle(melontitle); changeWindowTitle(melontitle);
SDL_Delay(75); SDL_Delay(75);
@ -1330,6 +1359,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
setWindowTitle("melonDS " MELONDS_VERSION); setWindowTitle("melonDS " MELONDS_VERSION);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setAcceptDrops(true); setAcceptDrops(true);
setFocusPolicy(Qt::ClickFocus);
int inst = Platform::InstanceID();
QMenuBar* menubar = new QMenuBar(); QMenuBar* menubar = new QMenuBar();
{ {
@ -1462,19 +1494,30 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
actEnableCheats->setCheckable(true); actEnableCheats->setCheckable(true);
connect(actEnableCheats, &QAction::triggered, this, &MainWindow::onEnableCheats); connect(actEnableCheats, &QAction::triggered, this, &MainWindow::onEnableCheats);
actSetupCheats = menu->addAction("Setup cheat codes"); //if (inst == 0)
actSetupCheats->setMenuRole(QAction::NoRole); {
connect(actSetupCheats, &QAction::triggered, this, &MainWindow::onSetupCheats); actSetupCheats = menu->addAction("Setup cheat codes");
actSetupCheats->setMenuRole(QAction::NoRole);
connect(actSetupCheats, &QAction::triggered, this, &MainWindow::onSetupCheats);
menu->addSeparator(); menu->addSeparator();
actROMInfo = menu->addAction("ROM info"); actROMInfo = menu->addAction("ROM info");
connect(actROMInfo, &QAction::triggered, this, &MainWindow::onROMInfo); connect(actROMInfo, &QAction::triggered, this, &MainWindow::onROMInfo);
actRAMInfo = menu->addAction("RAM search"); actRAMInfo = menu->addAction("RAM search");
connect(actRAMInfo, &QAction::triggered, this, &MainWindow::onRAMInfo); connect(actRAMInfo, &QAction::triggered, this, &MainWindow::onRAMInfo);
actTitleManager = menu->addAction("Manage DSi titles"); actTitleManager = menu->addAction("Manage DSi titles");
connect(actTitleManager, &QAction::triggered, this, &MainWindow::onOpenTitleManager); connect(actTitleManager, &QAction::triggered, this, &MainWindow::onOpenTitleManager);
}
{
menu->addSeparator();
QMenu* submenu = menu->addMenu("Multiplayer");
actMPNewInstance = submenu->addAction("Launch new instance");
connect(actMPNewInstance, &QAction::triggered, this, &MainWindow::onMPNewInstance);
}
} }
{ {
QMenu* menu = menubar->addMenu("Config"); QMenu* menu = menubar->addMenu("Config");
@ -1483,7 +1526,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
connect(actEmuSettings, &QAction::triggered, this, &MainWindow::onOpenEmuSettings); connect(actEmuSettings, &QAction::triggered, this, &MainWindow::onOpenEmuSettings);
#ifdef __APPLE__ #ifdef __APPLE__
QAction* actPreferences = menu->addAction("Preferences..."); actPreferences = menu->addAction("Preferences...");
connect(actPreferences, &QAction::triggered, this, &MainWindow::onOpenEmuSettings); connect(actPreferences, &QAction::triggered, this, &MainWindow::onOpenEmuSettings);
actPreferences->setMenuRole(QAction::PreferencesRole); actPreferences->setMenuRole(QAction::PreferencesRole);
#endif #endif
@ -1497,15 +1540,18 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
actAudioSettings = menu->addAction("Audio settings"); actAudioSettings = menu->addAction("Audio settings");
connect(actAudioSettings, &QAction::triggered, this, &MainWindow::onOpenAudioSettings); connect(actAudioSettings, &QAction::triggered, this, &MainWindow::onOpenAudioSettings);
actMPSettings = menu->addAction("Multiplayer settings");
connect(actMPSettings, &QAction::triggered, this, &MainWindow::onOpenMPSettings);
actWifiSettings = menu->addAction("Wifi settings"); actWifiSettings = menu->addAction("Wifi settings");
connect(actWifiSettings, &QAction::triggered, this, &MainWindow::onOpenWifiSettings); connect(actWifiSettings, &QAction::triggered, this, &MainWindow::onOpenWifiSettings);
actInterfaceSettings = menu->addAction("Interface settings");
connect(actInterfaceSettings, &QAction::triggered, this, &MainWindow::onOpenInterfaceSettings);
actFirmwareSettings = menu->addAction("Firmware settings"); actFirmwareSettings = menu->addAction("Firmware settings");
connect(actFirmwareSettings, &QAction::triggered, this, &MainWindow::onOpenFirmwareSettings); connect(actFirmwareSettings, &QAction::triggered, this, &MainWindow::onOpenFirmwareSettings);
actInterfaceSettings = menu->addAction("Interface settings");
connect(actInterfaceSettings, &QAction::triggered, this, &MainWindow::onOpenInterfaceSettings);
actPathSettings = menu->addAction("Path settings"); actPathSettings = menu->addAction("Path settings");
connect(actPathSettings, &QAction::triggered, this, &MainWindow::onOpenPathSettings); connect(actPathSettings, &QAction::triggered, this, &MainWindow::onOpenPathSettings);
@ -1661,6 +1707,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
resize(Config::WindowWidth, Config::WindowHeight); resize(Config::WindowWidth, Config::WindowHeight);
if (Config::FirmwareUsername == "Arisotura")
actMPNewInstance->setText("Fart");
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QPoint screenCenter = screen()->availableGeometry().center(); QPoint screenCenter = screen()->availableGeometry().center();
QRect frameGeo = frameGeometry(); QRect frameGeo = frameGeometry();
@ -1740,6 +1789,19 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
actLimitFramerate->setChecked(Config::LimitFPS); actLimitFramerate->setChecked(Config::LimitFPS);
actAudioSync->setChecked(Config::AudioSync); actAudioSync->setChecked(Config::AudioSync);
if (inst > 0)
{
actEmuSettings->setEnabled(false);
actVideoSettings->setEnabled(false);
actMPSettings->setEnabled(false);
actWifiSettings->setEnabled(false);
actInterfaceSettings->setEnabled(false);
#ifdef __APPLE__
actPreferences->setEnabled(false);
#endif // __APPLE__
}
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -1828,7 +1890,7 @@ void MainWindow::keyPressEvent(QKeyEvent* event)
if (event->isAutoRepeat()) return; if (event->isAutoRepeat()) return;
// TODO!! REMOVE ME IN RELEASE BUILDS!! // TODO!! REMOVE ME IN RELEASE BUILDS!!
//if (event->key() == Qt::Key_F11) NDS::debug(0); if (event->key() == Qt::Key_F11) NDS::debug(0);
Input::KeyPress(event); Input::KeyPress(event);
} }
@ -1930,6 +1992,16 @@ void MainWindow::dropEvent(QDropEvent* event)
} }
} }
void MainWindow::focusInEvent(QFocusEvent* event)
{
audioMute();
}
void MainWindow::focusOutEvent(QFocusEvent* event)
{
audioMute();
}
void MainWindow::onAppStateChanged(Qt::ApplicationState state) void MainWindow::onAppStateChanged(Qt::ApplicationState state)
{ {
if (state == Qt::ApplicationInactive) if (state == Qt::ApplicationInactive)
@ -2602,6 +2674,23 @@ void MainWindow::onOpenTitleManager()
TitleManagerDialog* dlg = TitleManagerDialog::openDlg(this); TitleManagerDialog* dlg = TitleManagerDialog::openDlg(this);
} }
void MainWindow::onMPNewInstance()
{
//QProcess::startDetached(QApplication::applicationFilePath());
QProcess newinst;
newinst.setProgram(QApplication::applicationFilePath());
newinst.setArguments(QApplication::arguments().mid(1, QApplication::arguments().length()-1));
#ifdef __WIN32__
newinst.setCreateProcessArgumentsModifier([] (QProcess::CreateProcessArguments *args)
{
args->flags |= CREATE_NEW_CONSOLE;
});
#endif
newinst.startDetached();
}
void MainWindow::onOpenEmuSettings() void MainWindow::onOpenEmuSettings()
{ {
emuThread->emuPause(); emuThread->emuPause();
@ -2736,6 +2825,22 @@ void MainWindow::onAudioSettingsFinished(int res)
micOpen(); micOpen();
} }
void MainWindow::onOpenMPSettings()
{
emuThread->emuPause();
MPSettingsDialog* dlg = MPSettingsDialog::openDlg(this);
connect(dlg, &MPSettingsDialog::finished, this, &MainWindow::onMPSettingsFinished);
}
void MainWindow::onMPSettingsFinished(int res)
{
audioMute();
LocalMP::SetRecvTimeout(Config::MPRecvTimeout);
emuThread->emuUnpause();
}
void MainWindow::onOpenWifiSettings() void MainWindow::onOpenWifiSettings()
{ {
emuThread->emuPause(); emuThread->emuPause();
@ -2746,12 +2851,6 @@ void MainWindow::onOpenWifiSettings()
void MainWindow::onWifiSettingsFinished(int res) void MainWindow::onWifiSettingsFinished(int res)
{ {
if (Wifi::MPInited)
{
Platform::MP_DeInit();
Platform::MP_Init();
}
Platform::LAN_DeInit(); Platform::LAN_DeInit();
Platform::LAN_Init(); Platform::LAN_Init();
@ -3070,6 +3169,7 @@ int main(int argc, char** argv)
format.setSwapInterval(0); format.setSwapInterval(0);
QSurfaceFormat::setDefaultFormat(format); QSurfaceFormat::setDefaultFormat(format);
audioMuted = false;
audioSync = SDL_CreateCond(); audioSync = SDL_CreateCond();
audioSyncLock = SDL_CreateMutex(); audioSyncLock = SDL_CreateMutex();
@ -3123,6 +3223,8 @@ int main(int argc, char** argv)
emuThread->start(); emuThread->start();
emuThread->emuPause(); emuThread->emuPause();
audioMute();
QObject::connect(&melon, &QApplication::applicationStateChanged, mainWindow, &MainWindow::onAppStateChanged); QObject::connect(&melon, &QApplication::applicationStateChanged, mainWindow, &MainWindow::onAppStateChanged);
if (argc > 1) if (argc > 1)
@ -3180,12 +3282,13 @@ int CALLBACK WinMain(HINSTANCE hinst, HINSTANCE hprev, LPSTR cmdline, int cmdsho
if (argv_w) LocalFree(argv_w); if (argv_w) LocalFree(argv_w);
/*if (AttachConsole(ATTACH_PARENT_PROCESS)) //if (AttachConsole(ATTACH_PARENT_PROCESS))
if (AllocConsole())
{ {
freopen("CONOUT$", "w", stdout); freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr); freopen("CONOUT$", "w", stderr);
printf("\n"); printf("\n");
}*/ }
int ret = main(argc, argv); int ret = main(argc, argv);

11
src/frontend/qt_sdl/main.h
View File

@ -226,6 +226,9 @@ protected:
void dragEnterEvent(QDragEnterEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override;
void dropEvent(QDropEvent* event) override; void dropEvent(QDropEvent* event) override;
void focusInEvent(QFocusEvent* event) override;
void focusOutEvent(QFocusEvent* event) override;
signals: signals:
void screenLayoutChange(); void screenLayoutChange();
@ -255,6 +258,7 @@ private slots:
void onROMInfo(); void onROMInfo();
void onRAMInfo(); void onRAMInfo();
void onOpenTitleManager(); void onOpenTitleManager();
void onMPNewInstance();
void onOpenEmuSettings(); void onOpenEmuSettings();
void onEmuSettingsDialogFinished(int res); void onEmuSettingsDialogFinished(int res);
@ -267,6 +271,8 @@ private slots:
void onOpenPathSettings(); void onOpenPathSettings();
void onUpdateAudioSettings(); void onUpdateAudioSettings();
void onAudioSettingsFinished(int res); void onAudioSettingsFinished(int res);
void onOpenMPSettings();
void onMPSettingsFinished(int res);
void onOpenWifiSettings(); void onOpenWifiSettings();
void onWifiSettingsFinished(int res); void onWifiSettingsFinished(int res);
void onFirmwareSettingsFinished(int res); void onFirmwareSettingsFinished(int res);
@ -344,12 +350,17 @@ public:
QAction* actROMInfo; QAction* actROMInfo;
QAction* actRAMInfo; QAction* actRAMInfo;
QAction* actTitleManager; QAction* actTitleManager;
QAction* actMPNewInstance;
QAction* actEmuSettings; QAction* actEmuSettings;
#ifdef __APPLE__
QAction* actPreferences;
#endif
QAction* actPowerManagement; QAction* actPowerManagement;
QAction* actInputConfig; QAction* actInputConfig;
QAction* actVideoSettings; QAction* actVideoSettings;
QAction* actAudioSettings; QAction* actAudioSettings;
QAction* actMPSettings;
QAction* actWifiSettings; QAction* actWifiSettings;
QAction* actFirmwareSettings; QAction* actFirmwareSettings;
QAction* actPathSettings; QAction* actPathSettings;

488
src/frontend/qt_sdl/sem_timedwait.cpp Normal file
View File

@ -0,0 +1,488 @@
/*
* s e m _ t i m e d w a i t
*
* Function:
* Implements a version of sem_timedwait().
*
* Description:
* Not all systems implement sem_timedwait(), which is a version of
* sem_wait() with a timeout. Mac OS X is one example, at least up to
* and including version 10.6 (Leopard). If such a function is needed,
* this code provides a reasonable implementation, which I think is
* compatible with the standard version, although possibly less
* efficient. It works by creating a thread that interrupts a normal
* sem_wait() call after the specified timeout.
*
* Call:
*
* The Linux man pages say:
*
* #include <semaphore.h>
*
* int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout);
*
* sem_timedwait() is the same as sem_wait(), except that abs_timeout
* specifies a limit on the amount of time that the call should block if
* the decrement cannot be immediately performed. The abs_timeout argument
* points to a structure that specifies an absolute timeout in seconds and
* nanoseconds since the Epoch (00:00:00, 1 January 1970). This structure
* is defined as follows:
*
* struct timespec {
* time_t tv_sec; Seconds
* long tv_nsec; Nanoseconds [0 .. 999999999]
* };
*
* If the timeout has already expired by the time of the call, and the
* semaphore could not be locked immediately, then sem_timedwait() fails
* with a timeout error (errno set to ETIMEDOUT).
* If the operation can be performed immediately, then sem_timedwait()
* never fails with a timeout error, regardless of the value of abs_timeout.
* Furthermore, the validity of abs_timeout is not checked in this case.
*
* Limitations:
*
* The mechanism used involves sending a SIGUSR2 signal to the thread
* calling sem_timedwait(). The handler for this signal is set to a null
* routine which does nothing, and with any flags for the signal
* (eg SA_RESTART) cleared. Note that this effective disabling of the
* SIGUSR2 signal is a side-effect of using this routine, and means it
* may not be a completely transparent plug-in replacement for a
* 'normal' sig_timedwait() call. Since OS X does not declare the
* sem_timedwait() call in its standard include files, the relevant
* declaration (shown above in the man pages extract) will probably have
* to be added to any code that uses this.
*
* Compiling:
* This compiles and runs cleanly on OS X (10.6) with gcc with the
* -Wall -ansi -pedantic flags. On Linux, using -ansi causes a sweep of
* compiler complaints about the timespec structure, but it compiles
* and works fine with just -Wall -pedantic. (Since Linux provides
* sem_timedwait() anyway, this really isn't needed on Linux.) However,
* since Linux provides sem_timedwait anyway, the sem_timedwait()
* code in this file is only compiled on OS X, and is a null on other
* systems.
*
* Testing:
* This file contains a test program that exercises the sem_timedwait
* code. It is compiled if the pre-processor variable TEST is defined.
* For more details, see the comments for the test routine at the end
* of the file.
*
* Author: Keith Shortridge, AAO.
*
* History:
* 8th Sep 2009. Original version. KS.
* 24th Sep 2009. Added test that the calling thread still exists before
* trying to set the timed-out flag. KS.
* 2nd Oct 2009. No longer restores the original SIGUSR2 signal handler.
* See comments in the body of the code for more details.
* Prototypes for now discontinued internal routines removed.
* 12th Aug 2010. Added the cleanup handler, so that this code no longer
* leaks resources if the calling thread is cancelled. KS.
* 21st Sep 2011. Added copyright notice below. Modified header comments
* to describe the use of SIGUSR2 more accurately in the
* light of the 2/10/09 change above. Now undefs DEBUG
* before defining it, to avoid any possible clash. KS.
* 14th Feb 2012. Tidied out a number of TABs that had got into the
* code. KS.
* 6th May 2013. Copyright notice modified to one based on the MIT licence,
* which is more permissive than the previous notice. KS.
*
* Copyright (c) Australian Astronomical Observatory (AAO), (2013).
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
#ifdef __APPLE__
#include <semaphore.h>
#include <time.h>
#include <sys/time.h>
#include <pthread.h>
#include <errno.h>
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/fcntl.h>
#include <setjmp.h>
#include "sem_timedwait.h"
/* Some useful definitions - TRUE, FALSE, and DEBUG */
#undef TRUE
#define TRUE 1
#undef FALSE
#define FALSE 0
#undef DEBUG
#define DEBUG printf
/* A structure of type timeoutDetails is passed to the thread used to
* implement the timeout.
*/
typedef struct {
struct timespec delay; /* Specifies the delay, relative to now */
pthread_t callingThread; /* The thread doing the sem_wait call */
volatile short *timedOutShort; /* Address of a flag set to indicate that
* the timeout was triggered. */
} timeoutDetails;
/* A structure of type cleanupDetails is passed to the thread cleanup
* routine which is called at the end of the routine or if the thread calling
* it is cancelled.
*/
typedef struct {
pthread_t *threadIdAddr; /* Address of the variable that holds
* the Id of the timeout thread. */
struct sigaction *sigHandlerAddr; /* Address of the old signal action
* handler. */
volatile short *timedOutShort; /* Address of a flag set to indicate that
* the timeout was triggered. */
} cleanupDetails;
/* Forward declarations of internal routines */
static void* timeoutThreadMain (void* passedPtr);
static int triggerSignal (int Signal, pthread_t Thread);
static void ignoreSignal (int Signal);
static void timeoutThreadCleanup (void* passedPtr);
/* -------------------------------------------------------------------------- */
/*
* s e m _ t i m e d w a i t
*
* This is the main code for the sem_timedwait() implementation.
*/
int sem_timedwait (
sem_t *sem,
const struct timespec *abs_timeout)
{
int result = 0; /* Code returned by this routine 0 or -1 */
/* "Under no circumstances shall the function fail if the semaphore
* can be locked immediately". So we try to get it quickly to see if we
* can avoid all the timeout overheads.
*/
if (sem_trywait(sem) == 0) {
/* Yes, got it immediately. */
result = 0;
} else {
/* No, we've got to do it with a sem_wait() call and a thread to run
* the timeout. First, work out the time from now to the specified
* timeout, which we will pass to the timeout thread in a way that can
* be used to pass to nanosleep(). So we need this in seconds and
* nanoseconds. Along the way, we check for an invalid passed time,
* and for one that's already expired.
*/
if ((abs_timeout->tv_nsec < 0) || (abs_timeout->tv_nsec > 1000000000)) {
/* Passed time is invalid */
result = -1;
errno = EINVAL;
} else {
struct timeval currentTime; /* Time now */
long secsToWait,nsecsToWait; /* Seconds and nsec to delay */
gettimeofday (&currentTime,NULL);
secsToWait = abs_timeout->tv_sec - currentTime.tv_sec;
nsecsToWait = (abs_timeout->tv_nsec - (currentTime.tv_usec * 1000));
while (nsecsToWait < 0) {
nsecsToWait += 1000000000;
secsToWait--;
}
if ((secsToWait < 0) || ((secsToWait == 0) && (nsecsToWait < 0))) {
/* Time has passed. Report an immediate timeout. */
result = -1;
errno = ETIMEDOUT;
} else {
/* We're going to have to do a sem_wait() with a timeout thread.
* The thread will wait the specified time, then will issue a
* SIGUSR2 signal that will interrupt the sem_wait() call.
* We pass the thread the id of the current thread, the delay,
* and the address of a flag to set on a timeout, so we can
* distinguish an interrupt caused by the timeout thread from
* one caused by some other signal.
*/
volatile short timedOut; /* Flag to set on timeout */
timeoutDetails details; /* All the stuff the thread must know */
struct sigaction oldSignalAction; /* Current signal setting */
pthread_t timeoutThread; /* Id of timeout thread */
cleanupDetails cleaningDetails; /* What the cleanup routine needs */
int oldCancelState; /* Previous cancellation state */
int ignoreCancelState; /* Used in call, but ignored */
int createStatus; /* Status of pthread_create() call */
/* If the current thread is cancelled (and CML does do this)
* we don't want to leave our timer thread running - if we've
* started the thread we want to make sure we join it in order
* to release its resources. So we set a cleanup handler to
* do this. We pass it the address of the structure that will
* hold all it needs to know. While we set all this up,
* we prevent ourselves being cancelled, so all this data is
* coherent.
*/
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE,&oldCancelState);
timeoutThread = (pthread_t) 0;
cleaningDetails.timedOutShort = &timedOut;
cleaningDetails.threadIdAddr = &timeoutThread;
cleaningDetails.sigHandlerAddr = &oldSignalAction;
pthread_cleanup_push (timeoutThreadCleanup,&cleaningDetails);
/* Set up the details for the thread. Clear the timeout flag,
* record the current SIGUSR2 action settings so we can restore
* them later.
*/
details.delay.tv_sec = secsToWait;
details.delay.tv_nsec = nsecsToWait;
details.callingThread = pthread_self();
details.timedOutShort = &timedOut;
timedOut = FALSE;
sigaction (SIGUSR2,NULL,&oldSignalAction);
/* Start up the timeout thread. Once we've done that, we can
* restore the previous cancellation state.
*/
createStatus = pthread_create(&timeoutThread,NULL,
timeoutThreadMain, (void*)&details);
pthread_setcancelstate (oldCancelState,&ignoreCancelState);
if (createStatus < 0) {
/* Failed to create thread. errno will already be set properly */
result = -1;
} else {
/* Thread created OK. This is where we wait for the semaphore.
*/
if (sem_wait(sem) == 0) {
/* Got the semaphore OK. We return zero, and all's well. */
result = 0;
} else {
/* If we got a -1 error from sem_wait(), it may be because
* it was interrupted by a timeout, or failed for some
* other reason. We check for the expected timeout
* condition, which is an 'interrupted' status and the
* timeout flag set by the timeout thread. We report that as
* a timeout error. Anything else is some other error and
* errno is already set properly.
*/
result = -1;
if (errno == EINTR) {
if (timedOut) errno = ETIMEDOUT;
}
}
}
/* The cleanup routine - timeoutThreadCleanup() - packages up
* any tidying up that is needed, including joining with the
* timer thread. This will be called if the current thread is
* cancelled, but we need it to happen anyway, so we set the
* execute flag true here as we remove it from the list of
* cleanup routines to be called. So normally, this line amounts
* to calling timeoutThreadCleanup().
*/
pthread_cleanup_pop (TRUE);
}
}
}
return (result);
}
/* -------------------------------------------------------------------------- */
/*
* t i m e o u t T h r e a d C l e a n u p
*
* This internal routine tidies up at the end of a sem_timedwait() call.
* It is set as a cleanup routine for the current thread (not the timer
* thread) so it is executed even if the thread is cancelled. This is
* important, as we need to tidy up the timeout thread. If we took the
* semaphore (in other words, if we didn't timeout) then the timer thread
* will still be running, sitting in its nanosleep() call, and we need
* to cancel it. If the timer thread did signal a timeout then it will
* now be closing down. In either case, we need to join it (using a call
* to pthread_join()) or its resources will never be released.
* The single argument is a pointer to a cleanupDetails structure that has
* all the routine needs to know.
*/
static void timeoutThreadCleanup (void* passedPtr)
{
/* Get what we need from the structure we've been passed. */
cleanupDetails *detailsPtr = (cleanupDetails*) passedPtr;
short timedOut = *(detailsPtr->timedOutShort);
pthread_t timeoutThread = *(detailsPtr->threadIdAddr);
/* If we created the thread, stop it - doesn't matter if it's no longer
* running, pthread_cancel can handle that. We make sure we wait for it
* to complete, because it is this pthread_join() call that releases any
* memory the thread may have allocated. Note that cancelling a thread is
* generally not a good idea, because of the difficulty of cleaning up
* after it, but this is a very simple thread that does nothing but call
* nanosleep(), and that we can cancel quite happily.
*/
if (!timedOut) pthread_cancel(timeoutThread);
pthread_join(timeoutThread,NULL);
/* The code originally restored the old action handler, which generally
* was the default handler that caused the task to exit. Just occasionally,
* there seem to be cases where the signal is still queued and ready to
* trigger even though the thread that presumably sent it off just before
* it was cancelled has finished. I had thought that once we'd joined
* that thread, we could be sure of not seeing the signal, but that seems
* not to be the case, and so restoring a handler that will allow the task
* to crash is not a good idea, and so the line below has been commented
* out.
*
* sigaction (SIGUSR2,detailsPtr->sigHandlerAddr,NULL);
*/
}
/* -------------------------------------------------------------------------- */
/*
* t i m e o u t T h r e a d M a i n
*
* This internal routine is the main code for the timeout thread.
* The single argument is a pointer to a timeoutDetails structure that has
* all the thread needs to know - thread to signal, delay time, and the
* address of a flag to set if it triggers a timeout.
*/
static void* timeoutThreadMain (void* passedPtr)
{
void* Return = (void*) 0;
/* We grab all the data held in the calling thread right now. In some
* cases, we find that the calling thread has vanished and released
* its memory, including the details structure, by the time the timeout
* expires, and then we get an access violation when we try to set the
* 'timed out' flag.
*/
timeoutDetails details = *((timeoutDetails*) passedPtr);
struct timespec requestedDelay = details.delay;
/* We do a nanosleep() for the specified delay, and then trigger a
* timeout. Note that we allow for the case where the nanosleep() is
* interrupted, and restart it for the remaining time. If the
* thread that is doing the sem_wait() call gets the semaphore, it
* will cancel this thread, which is fine as we aren't doing anything
* other than a sleep and a signal.
*/
for (;;) {
struct timespec remainingDelay;
if (nanosleep (&requestedDelay,&remainingDelay) == 0) {
break;
} else if (errno == EINTR) {
requestedDelay = remainingDelay;
} else {
Return = (void*) errno;
break;
}
}
/* We've completed the delay without being cancelled, so we now trigger
* the timeout by sending a signal to the calling thread. And that's it,
* although we set the timeout flag first to indicate that it was us
* that interrupted the sem_wait() call. One precaution: before we
* try to set the timed-out flag, make sure the calling thread still
* exists - this may not be the case if things are closing down a bit
* messily. We check this quickly using a zero test signal.
*/
if (pthread_kill(details.callingThread,0) == 0) {
*(details.timedOutShort) = TRUE;
if (triggerSignal (SIGUSR2,details.callingThread) < 0) {
Return = (void*) errno;
}
}
return Return;
}
/* -------------------------------------------------------------------------- */
/*
* t r i g g e r S i g n a l
*
* This is a general purpose routine that sends a specified signal to
* a specified thread, setting up a signal handler that does nothing,
* and then giving the signal. The only effect will be to interrupt any
* operation that is currently blocking - in this case, we expect this to
* be a sem_wait() call.
*/
static int triggerSignal (int Signal, pthread_t Thread)
{
int Result = 0;
struct sigaction SignalDetails;
SignalDetails.sa_handler = ignoreSignal;
SignalDetails.sa_flags = 0;
(void) sigemptyset(&SignalDetails.sa_mask);
if ((Result = sigaction(Signal,&SignalDetails,NULL)) == 0) {
Result = pthread_kill(Thread,Signal);
}
return Result;
}
/* -------------------------------------------------------------------------- */
/*
* i g n o r e S i g n a l
*
* And this is the signal handler that does nothing. (It clears its argument,
* but this has no effect and prevents a compiler warning about an unused
* argument.)
*/
static void ignoreSignal (int Signal) {
Signal = 0;
}
#endif

8
src/frontend/qt_sdl/sem_timedwait.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef __SEM_TIMEDWAIT_H
#define __SEM_TIMEDWAIT_H
#ifdef __APPLE__
int sem_timedwait(sem_t *sem, const struct timespec *abs_timeout);
#endif
#endif