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

cleanup NDS settings code

This commit is contained in:
adelikat 2020-03-21 13:38:42 -05:00
parent 85fcb99717
commit 7a558f1951
2 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BizHawk.Client.EmuHawk/config/NDS/NDSSettings.cs
View File

@ -21,12 +21,12 @@ namespace BizHawk.Client.EmuHawk
private void NDSSettings_Load(object sender, EventArgs e)
{
chkBootToFirmware.Checked = _syncSettings.bootToFirmware;
txtName.Text = _syncSettings.nickname;
cbxFavColor.SelectedIndex = _syncSettings.favoriteColor;
numBirthDay.Value = _syncSettings.birthdayDay;
numBirthMonth.Value = _syncSettings.birthdayMonth;
dtpStartupTime.Value = DateTimeOffset.FromUnixTimeSeconds(_syncSettings.timeAtBoot).UtcDateTime;
chkBootToFirmware.Checked = _syncSettings.BootToFirmware;
txtName.Text = _syncSettings.Nickname;
cbxFavColor.SelectedIndex = _syncSettings.FavoriteColor;
numBirthDay.Value = _syncSettings.BirthdayDay;
numBirthMonth.Value = _syncSettings.BirthdayMonth;
dtpStartupTime.Value = DateTimeOffset.FromUnixTimeSeconds(_syncSettings.TimeAtBoot).UtcDateTime;
}
private void numBirthMonth_ValueChanged(object sender, EventArgs e)
@ -63,15 +63,15 @@ namespace BizHawk.Client.EmuHawk
private void SaveBtn_Click(object sender, EventArgs e)
{
_syncSettings.bootToFirmware = chkBootToFirmware.Checked;
_syncSettings.nickname = txtName.Text;
_syncSettings.favoriteColor = (byte)cbxFavColor.SelectedIndex;
_syncSettings.birthdayDay = (byte)numBirthDay.Value;
_syncSettings.birthdayMonth = (byte)numBirthMonth.Value;
_syncSettings.BootToFirmware = chkBootToFirmware.Checked;
_syncSettings.Nickname = txtName.Text;
_syncSettings.FavoriteColor = (byte)cbxFavColor.SelectedIndex;
_syncSettings.BirthdayDay = (byte)numBirthDay.Value;
_syncSettings.BirthdayMonth = (byte)numBirthMonth.Value;
// Converting to local time is necessary, because user-set values are "unspecified" which ToUnixTimeSeconds assumes are local.
// But ToLocalTime assumes these are UTC. So here we are adding and then subtracting the UTC-to-local offset.
_syncSettings.timeAtBoot = (uint)new DateTimeOffset(dtpStartupTime.Value.ToLocalTime()).ToUnixTimeSeconds();
_syncSettings.TimeAtBoot = (uint)new DateTimeOffset(dtpStartupTime.Value.ToLocalTime()).ToUnixTimeSeconds();
_mainForm.PutCoreSyncSettings(_syncSettings);
DialogResult = DialogResult.OK;

82
BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS_Settable.cs
View File

@ -9,28 +9,22 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
{
unsafe partial class MelonDS : ISettable<object, MelonDS.MelonSyncSettings>
{
public object GetSettings()
{
return new object();
}
public object GetSettings() => new object();
public MelonSyncSettings GetSyncSettings()
{
MelonSyncSettings ret = new MelonSyncSettings();
fixed (byte* ptr = ret.userSettings)
fixed (byte* ptr = ret.UserSettings)
{
if (!GetUserSettings(ptr))
return null;
}
ret.bootToFirmware = !GetDirectBoot();
ret.timeAtBoot = GetTimeAtBoot();
ret.BootToFirmware = !GetDirectBoot();
ret.TimeAtBoot = GetTimeAtBoot();
return ret;
}
public bool PutSettings(object o)
{
return false;
}
public bool PutSettings(object o) => false;
public bool PutSyncSettings(MelonSyncSettings o)
{
@ -41,12 +35,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
}
else
{
fixed (byte* ptr = o.userSettings)
fixed (byte* ptr = o.UserSettings)
SetUserSettings(ptr);
}
SetDirectBoot(!o.bootToFirmware);
SetTimeAtBoot(o.timeAtBoot);
SetDirectBoot(!o.BootToFirmware);
SetTimeAtBoot(o.TimeAtBoot);
// At present, no sync settings can be modified without requiring a reboot.
return true;
@ -56,7 +50,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
private static extern bool GetUserSettings(byte* dst);
[DllImport(dllPath)]
private static extern int getUserSettingsLength();
static int userSettingsLength = getUserSettingsLength();
private static readonly int UserSettingsLength = getUserSettingsLength();
[DllImport(dllPath)]
private static extern void SetUserSettings(byte* src);
@ -70,76 +66,74 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
[DllImport(dllPath)]
private static extern uint GetTimeAtBoot();
unsafe public class MelonSettings
{
}
public class MelonSyncSettings
{
public MelonSyncSettings()
{
userSettings = new byte[userSettingsLength];
UserSettings = new byte[UserSettingsLength];
}
public MelonSyncSettings Clone() => (MelonSyncSettings)MemberwiseClone();
public bool bootToFirmware = false;
public uint timeAtBoot = 946684800; // 2000-01-01 00:00:00 (earliest date possible on a DS)
public byte[] userSettings;
public bool BootToFirmware { get; set; }
public uint TimeAtBoot { get; set; } = 946684800; // 2000-01-01 00:00:00 (earliest date possible on a DS)
[JsonProperty]
internal byte[] UserSettings;
[JsonIgnore]
public byte favoriteColor
public byte FavoriteColor
{
get => userSettings[2];
set { userSettings[2] = value; }
get => UserSettings[2];
set => UserSettings[2] = value;
}
[JsonIgnore]
public byte birthdayMonth
public byte BirthdayMonth
{
get => userSettings[3];
set { userSettings[3] = value; }
get => UserSettings[3];
set => UserSettings[3] = value;
}
[JsonIgnore]
public byte birthdayDay
public byte BirthdayDay
{
get => userSettings[4];
set { userSettings[4] = value; }
get => UserSettings[4];
set => UserSettings[4] = value;
}
const int maxNicknameLength = 10;
private const int MaxNicknameLength = 10;
[JsonIgnore]
public string nickname
public string Nickname
{
get
{
fixed (byte* ptr = userSettings)
return Encoding.Unicode.GetString(ptr + 6, nicknameLength * 2);
fixed (byte* ptr = UserSettings)
return Encoding.Unicode.GetString(ptr + 6, NicknameLength * 2);
}
set
{
if (value.Length > maxNicknameLength) value = value.Substring(0, maxNicknameLength);
byte[] nick = new byte[maxNicknameLength * 2 + 2];
if (value.Length > MaxNicknameLength) value = value.Substring(0, MaxNicknameLength);
byte[] nick = new byte[MaxNicknameLength * 2 + 2];
// I do not know how an actual NDS would handle characters that require more than 2 bytes to encode.
// They can't be input normally, so I will ignore attempts to set a nickname that uses them.
if (Encoding.Unicode.GetBytes(value, 0, value.Length, nick, 0) != value.Length * 2)
return;
// The extra 2 bytes on the end will overwrite nickname length, which is set immediately after
nick.CopyTo(userSettings, 6);
userSettings[0x1A] = (byte)value.Length;
nick.CopyTo(UserSettings, 6);
UserSettings[0x1A] = (byte)value.Length;
}
}
[JsonIgnore]
public short nicknameLength => userSettings[0x1A];
public short NicknameLength => UserSettings[0x1A];
[JsonIgnore]
public long rtcOffset
public long RtcOffset
{
get => BitConverter.ToInt64(userSettings, 0x68);
set => BitConverter.GetBytes(value).CopyTo(userSettings, 0x68);
get => BitConverter.ToInt64(UserSettings, 0x68);
set => BitConverter.GetBytes(value).CopyTo(UserSettings, 0x68);
}
}
}