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

Enable SA1504 and fix noncompliance 

"All accessors should be single-line or multi-line"
i.e. no block form on one line
This commit is contained in:
YoshiRulz 2020-01-25 14:53:45 +10:00
parent f6365a03e2
commit 6f3f01125c
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
110 changed files with 769 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.BizInvoke/MemoryBlockBase.cs
View File

@ -132,7 +132,7 @@ namespace BizHawk.BizInvoke
public override long Length => _length;
public override long Position
{
get { return _pos; }
get => _pos;
set
{
if (value < 0 || _length < value) throw new ArgumentOutOfRangeException();

12
BizHawk.Client.Common/OpenAdvanced.cs
View File

@ -122,7 +122,11 @@ namespace BizHawk.Client.Common
tw.Write(JsonConvert.SerializeObject(token));
}
public string CorePath { get { return token.CorePath; } set { token.CorePath = value; } }
public string CorePath
{
get => token.CorePath;
set => token.CorePath = value;
}
}
public class OpenAdvanced_LibretroNoGame : IOpenAdvanced, IOpenAdvancedLibretro
@ -159,7 +163,11 @@ namespace BizHawk.Client.Common
tw.Write(_corePath);
}
public string CorePath { get { return _corePath; } set { _corePath = value; } }
public string CorePath
{
get => _corePath;
set => _corePath = value;
}
}
public class OpenAdvanced_OpenRom : IOpenAdvanced

4
BizHawk.Client.Common/inputAdapters/SimpleController.cs
View File

@ -24,8 +24,8 @@ namespace BizHawk.Client.Common
public bool this[string button]
{
get { return Buttons[button]; }
set { Buttons[button] = value; }
get => Buttons[button];
set => Buttons[button] = value;
}
public virtual bool IsPressed(string button)

2
BizHawk.Client.EmuHawk/Sound/Utilities/SoundOutputProvider.cs
View File

@ -66,7 +66,7 @@ namespace BizHawk.Client.EmuHawk
/// <exception cref="InvalidOperationException">(from setter) constructed in standalone mode</exception>
public int MaxSamplesDeficit
{
get { return _maxSamplesDeficit; }
get => _maxSamplesDeficit;
set
{
if (_standaloneMode) throw new InvalidOperationException();

18
BizHawk.Client.EmuHawk/tools/Debugger/AddBreakpointDialog.cs
View File

@ -28,10 +28,7 @@ namespace BizHawk.Client.EmuHawk
private BreakpointOperation Operation
{
get
{
return _operation;
}
get => _operation;
set
{
@ -104,22 +101,19 @@ namespace BizHawk.Client.EmuHawk
public uint Address
{
get { return (uint)AddressBox.ToRawInt().Value & AddressMask; }
set { AddressBox.SetFromLong(value & AddressMask); }
get => (uint)AddressBox.ToRawInt().Value & AddressMask;
set => AddressBox.SetFromLong(value & AddressMask);
}
public uint AddressMask
{
get { return (uint)AddressMaskBox.ToRawInt().Value; }
set { AddressMaskBox.SetFromLong(value); }
get => (uint)AddressMaskBox.ToRawInt().Value;
set => AddressMaskBox.SetFromLong(value);
}
public long MaxAddressSize
{
get
{
return AddressBox.GetMax();
}
get => AddressBox.GetMax();
set
{

29
BizHawk.Common/AWEMemoryStream.cs
View File

@ -90,10 +90,7 @@ namespace BizHawk.Common
public override long Length { get { return mLength; } }
public override long Position
{
get
{
return mPosition;
}
get => mPosition;
set
{
if (!Ensure(value + 1))
@ -239,14 +236,14 @@ namespace BizHawk.Common
public uint LowPart
{
get { return lp; }
set { lp = value; }
get => lp;
set => lp = value;
}
public int HighPart
{
get { return hp; }
set { hp = value; }
get => hp;
set => hp = value;
}
}
@ -258,14 +255,14 @@ namespace BizHawk.Common
public LUID LUID
{
get { return luid; }
set { luid = value; }
get => luid;
set => luid = value;
}
public uint Attributes
{
get { return attributes; }
set { attributes = value; }
get => attributes;
set => attributes = value;
}
}
@ -278,14 +275,14 @@ namespace BizHawk.Common
public uint PrivilegeCount
{
get { return prvct; }
set { prvct = value; }
get => prvct;
set => prvct = value;
}
public LUID_AND_ATTRIBUTES[] Privileges
{
get { return privileges; }
set { privileges = value; }
get => privileges;
set => privileges = value;
}
}

24
BizHawk.Common/Buffer.cs
View File

@ -76,11 +76,11 @@ namespace BizHawk.Common
public byte this[int index]
{
#if DEBUG
get { return this.Arr[index]; }
set { this.Arr[index] = value; }
get => this.Arr[index];
set => this.Arr[index] = value;
#else
set { Write08(index, value); }
get { return Read08(index);}
set => Write08(index, value);
get => Read08(index);
#endif
}
}
@ -92,11 +92,11 @@ namespace BizHawk.Common
public int this[int index]
{
#if DEBUG
get { return this.Arr[index]; }
set { this.Arr[index] = value; }
get => this.Arr[index];
set => this.Arr[index] = value;
#else
set { Write32(index<<2, (uint) value); }
get { return (int)Read32(index<<2);}
set => Write32(index<<2, (uint) value);
get => (int)Read32(index<<2);
#endif
}
}
@ -108,11 +108,11 @@ namespace BizHawk.Common
public short this[int index]
{
#if DEBUG
get { return this.Arr[index]; }
set { this.Arr[index] = value; }
get => this.Arr[index];
set => this.Arr[index] = value;
#else
set { Write32(index << 1, (uint)value); }
get { return (short)Read16(index << 1); }
set => Write32(index << 1, (uint)value);
get => (short)Read16(index << 1);
#endif
}
}

9
BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs
View File

@ -22,12 +22,17 @@ namespace BizHawk.Emulation.Cores.Components.M68000
int usp, ssp;
/// <summary>Machine/Interrupt mode</summary>
public bool M { get { return m; } set { m = value; } } // TODO probably have some switch logic maybe
/// <remarks>TODO probably have some switch logic maybe</remarks>
public bool M
{
get => m;
set => m = value;
}
/// <summary>Supervisor/User mode</summary>
public bool S
{
get { return s; }
get => s;
set
{
if (value == s) return;

14
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
View File

@ -13,8 +13,18 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
internal bool FlagS, FlagC, FlagZ, FlagO, FlagI, FlagD, IntRM, BusRq, BusAk, Interruptible, Interrupted;
//private bool MSync;
internal ushort[] Register = new ushort[8];
private ushort RegisterSP { get { return Register[6]; } set { Register[6] = value; } }
private ushort RegisterPC { get { return Register[7]; } set { Register[7] = value; } }
private ushort RegisterSP
{
get => Register[6];
set => Register[6] = value;
}
private ushort RegisterPC
{
get => Register[7];
set => Register[7] = value;
}
public string TraceHeader
{

32
BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
View File

@ -164,57 +164,57 @@ namespace BizHawk.Emulation.Cores.Components.H6280
/// <summary>Carry Flag</summary>
private bool FlagC
{
get { return (P & 0x01) != 0; }
set { P = (byte)((P & ~0x01) | (value ? 0x01 : 0x00)); }
get => (P & 0x01) != 0;
set => P = (byte)((P & ~0x01) | (value ? 0x01 : 0x00));
}
/// <summary>Zero Flag</summary>
private bool FlagZ
{
get { return (P & 0x02) != 0; }
set { P = (byte)((P & ~0x02) | (value ? 0x02 : 0x00)); }
get => (P & 0x02) != 0;
set => P = (byte)((P & ~0x02) | (value ? 0x02 : 0x00));
}
/// <summary>Interrupt Disable Flag</summary>
private bool FlagI
{
get { return (P & 0x04) != 0; }
set { P = (byte)((P & ~0x04) | (value ? 0x04 : 0x00)); }
get => (P & 0x04) != 0;
set => P = (byte)((P & ~0x04) | (value ? 0x04 : 0x00));
}
/// <summary>Decimal Mode Flag</summary>
private bool FlagD
{
get { return (P & 0x08) != 0; }
set { P = (byte)((P & ~0x08) | (value ? 0x08 : 0x00)); }
get => (P & 0x08) != 0;
set => P = (byte)((P & ~0x08) | (value ? 0x08 : 0x00));
}
/// <summary>Break Flag</summary>
private bool FlagB
{
get { return (P & 0x10) != 0; }
set { P = (byte)((P & ~0x10) | (value ? 0x10 : 0x00)); }
get => (P & 0x10) != 0;
set => P = (byte)((P & ~0x10) | (value ? 0x10 : 0x00));
}
/// <summary>T... Flag</summary>
private bool FlagT
{
get { return (P & 0x20) != 0; }
set { P = (byte)((P & ~0x20) | (value ? 0x20 : 0x00)); }
get => (P & 0x20) != 0;
set => P = (byte)((P & ~0x20) | (value ? 0x20 : 0x00));
}
/// <summary>Overflow Flag</summary>
private bool FlagV
{
get { return (P & 0x40) != 0; }
set { P = (byte)((P & ~0x40) | (value ? 0x40 : 0x00)); }
get => (P & 0x40) != 0;
set => P = (byte)((P & ~0x40) | (value ? 0x40 : 0x00));
}
/// <summary>Negative Flag</summary>
private bool FlagN
{
get { return (P & 0x80) != 0; }
set { P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00)); }
get => (P & 0x80) != 0;
set => P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00));
}
// ==== Memory ====

2
BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
{
public string Cpu
{
get { return "6280"; }
get => "6280";
set { }
}

18
BizHawk.Emulation.Cores/CPUs/Intel8048/Registers.cs
View File

@ -61,13 +61,13 @@ namespace BizHawk.Emulation.Cores.Components.I8048
public bool Flag3
{
get { return (Regs[PSW] & 0x08) != 0; }
set { Regs[PSW] = (byte)((Regs[PSW] & ~0x08) | 0x08); }
get => (Regs[PSW] & 0x08) != 0;
set => Regs[PSW] = (byte)((Regs[PSW] & ~0x08) | 0x08);
}
public bool FlagBS
{
get { return (Regs[PSW] & 0x10) != 0; }
get => (Regs[PSW] & 0x10) != 0;
set
{
// change register bank also
@ -86,20 +86,20 @@ namespace BizHawk.Emulation.Cores.Components.I8048
public bool FlagF0
{
get { return (Regs[PSW] & 0x20) != 0; }
set { Regs[PSW] = (byte)((Regs[PSW] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (Regs[PSW] & 0x20) != 0;
set => Regs[PSW] = (byte)((Regs[PSW] & ~0x20) | (value ? 0x20 : 0x00));
}
public bool FlagAC
{
get { return (Regs[PSW] & 0x40) != 0; }
set { Regs[PSW] = (byte)((Regs[PSW] & ~0x40) | (value ? 0x40 : 0x00)); }
get => (Regs[PSW] & 0x40) != 0;
set => Regs[PSW] = (byte)((Regs[PSW] & ~0x40) | (value ? 0x40 : 0x00));
}
public bool FlagC
{
get { return (Regs[PSW] & 0x80) != 0; }
set { Regs[PSW] = (byte)((Regs[PSW] & ~0x80) | (value ? 0x80 : 0x00)); }
get => (Regs[PSW] & 0x80) != 0;
set => Regs[PSW] = (byte)((Regs[PSW] & ~0x80) | (value ? 0x80 : 0x00));
}
private void ResetRegisters()

18
BizHawk.Emulation.Cores/CPUs/LR35902/Registers.cs
View File

@ -29,31 +29,31 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
public bool FlagC
{
get { return (Regs[5] & 0x10) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (Regs[5] & 0x10) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x10) | (value ? 0x10 : 0x00));
}
public bool FlagH
{
get { return (Regs[5] & 0x20) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (Regs[5] & 0x20) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x20) | (value ? 0x20 : 0x00));
}
public bool FlagN
{
get { return (Regs[5] & 0x40) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x40) | (value ? 0x40 : 0x00)); }
get => (Regs[5] & 0x40) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x40) | (value ? 0x40 : 0x00));
}
public bool FlagZ
{
get { return (Regs[5] & 0x80) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x80) | (value ? 0x80 : 0x00)); }
get => (Regs[5] & 0x80) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x80) | (value ? 0x80 : 0x00));
}
public ushort RegPC
{
get { return (ushort)(Regs[0] | (Regs[1] << 8)); }
get => (ushort)(Regs[0] | (Regs[1] << 8));
set
{
Regs[0] = (ushort)(value & 0xFF);

24
BizHawk.Emulation.Cores/CPUs/MC6800/Registers.cs
View File

@ -21,38 +21,38 @@ namespace BizHawk.Emulation.Cores.Components.MC6800
public bool FlagC
{
get { return (Regs[CC] & 0x01) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x01) | (value ? 0x01 : 0x00)); }
get => (Regs[CC] & 0x01) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x01) | (value ? 0x01 : 0x00));
}
public bool FlagV
{
get { return (Regs[CC] & 0x02) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x02) | (value ? 0x02 : 0x00)); }
get => (Regs[CC] & 0x02) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x02) | (value ? 0x02 : 0x00));
}
public bool FlagZ
{
get { return (Regs[CC] & 0x04) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x04) | (value ? 0x04 : 0x00)); }
get => (Regs[CC] & 0x04) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x04) | (value ? 0x04 : 0x00));
}
public bool FlagN
{
get { return (Regs[CC] & 0x08) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x08) | (value ? 0x08 : 0x00)); }
get => (Regs[CC] & 0x08) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x08) | (value ? 0x08 : 0x00));
}
public bool FlagI
{
get { return (Regs[CC] & 0x10) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (Regs[CC] & 0x10) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x10) | (value ? 0x10 : 0x00));
}
public bool FlagH
{
get { return (Regs[CC] & 0x20) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (Regs[CC] & 0x20) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x20) | (value ? 0x20 : 0x00));
}
private void ResetRegisters()

34
BizHawk.Emulation.Cores/CPUs/MC6809/Registers.cs
View File

@ -24,56 +24,56 @@ namespace BizHawk.Emulation.Cores.Components.MC6809
public ushort D
{
get { return (ushort)(Regs[B] | (Regs[A] << 8)); }
get => (ushort)(Regs[B] | (Regs[A] << 8));
set { Regs[B] = (ushort)(value & 0xFF); Regs[A] = (ushort)((value >> 8) & 0xFF); }
}
public bool FlagC
{
get { return (Regs[CC] & 0x01) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x01) | (value ? 0x01 : 0x00)); }
get => (Regs[CC] & 0x01) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x01) | (value ? 0x01 : 0x00));
}
public bool FlagV
{
get { return (Regs[CC] & 0x02) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x02) | (value ? 0x02 : 0x00)); }
get => (Regs[CC] & 0x02) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x02) | (value ? 0x02 : 0x00));
}
public bool FlagZ
{
get { return (Regs[CC] & 0x04) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x04) | (value ? 0x04 : 0x00)); }
get => (Regs[CC] & 0x04) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x04) | (value ? 0x04 : 0x00));
}
public bool FlagN
{
get { return (Regs[CC] & 0x08) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x08) | (value ? 0x08 : 0x00)); }
get => (Regs[CC] & 0x08) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x08) | (value ? 0x08 : 0x00));
}
public bool FlagI
{
get { return (Regs[CC] & 0x10) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (Regs[CC] & 0x10) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x10) | (value ? 0x10 : 0x00));
}
public bool FlagH
{
get { return (Regs[CC] & 0x20) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (Regs[CC] & 0x20) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x20) | (value ? 0x20 : 0x00));
}
public bool FlagF
{
get { return (Regs[CC] & 0x40) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x40) | (value ? 0x40 : 0x00)); }
get => (Regs[CC] & 0x40) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x40) | (value ? 0x40 : 0x00));
}
public bool FlagE
{
get { return (Regs[CC] & 0x80) != 0; }
set { Regs[CC] = (byte)((Regs[CC] & ~0x80) | (value ? 0x80 : 0x00)); }
get => (Regs[CC] & 0x80) != 0;
set => Regs[CC] = (byte)((Regs[CC] & ~0x80) | (value ? 0x80 : 0x00));
}
private void ResetRegisters()

32
BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
View File

@ -163,57 +163,57 @@ namespace BizHawk.Emulation.Cores.Components.M6502
/// <summary>Carry Flag</summary>
public bool FlagC
{
get { return (P & 0x01) != 0; }
private set { P = (byte)((P & ~0x01) | (value ? 0x01 : 0x00)); }
get => (P & 0x01) != 0;
private set => P = (byte)((P & ~0x01) | (value ? 0x01 : 0x00));
}
/// <summary>Zero Flag</summary>
public bool FlagZ
{
get { return (P & 0x02) != 0; }
private set { P = (byte)((P & ~0x02) | (value ? 0x02 : 0x00)); }
get => (P & 0x02) != 0;
private set => P = (byte)((P & ~0x02) | (value ? 0x02 : 0x00));
}
/// <summary>Interrupt Disable Flag</summary>
public bool FlagI
{
get { return (P & 0x04) != 0; }
set { P = (byte)((P & ~0x04) | (value ? 0x04 : 0x00)); }
get => (P & 0x04) != 0;
set => P = (byte)((P & ~0x04) | (value ? 0x04 : 0x00));
}
/// <summary>Decimal Mode Flag</summary>
public bool FlagD
{
get { return (P & 0x08) != 0; }
private set { P = (byte)((P & ~0x08) | (value ? 0x08 : 0x00)); }
get => (P & 0x08) != 0;
private set => P = (byte)((P & ~0x08) | (value ? 0x08 : 0x00));
}
/// <summary>Break Flag</summary>
public bool FlagB
{
get { return (P & 0x10) != 0; }
private set { P = (byte)((P & ~0x10) | (value ? 0x10 : 0x00)); }
get => (P & 0x10) != 0;
private set => P = (byte)((P & ~0x10) | (value ? 0x10 : 0x00));
}
/// <summary>T... Flag</summary>
public bool FlagT
{
get { return (P & 0x20) != 0; }
private set { P = (byte)((P & ~0x20) | (value ? 0x20 : 0x00)); }
get => (P & 0x20) != 0;
private set => P = (byte)((P & ~0x20) | (value ? 0x20 : 0x00));
}
/// <summary>Overflow Flag</summary>
public bool FlagV
{
get { return (P & 0x40) != 0; }
private set { P = (byte)((P & ~0x40) | (value ? 0x40 : 0x00)); }
get => (P & 0x40) != 0;
private set => P = (byte)((P & ~0x40) | (value ? 0x40 : 0x00));
}
/// <summary>Negative Flag</summary>
public bool FlagN
{
get { return (P & 0x80) != 0; }
private set { P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00)); }
get => (P & 0x80) != 0;
private set => P = (byte)((P & ~0x80) | (value ? 0x80 : 0x00));
}
public long TotalExecutedCycles;

22
BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
View File

@ -5,25 +5,37 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public partial class Z80A
{
private bool iff1;
public bool IFF1 { get { return iff1; } set { iff1 = value; } }
public bool IFF1
{
get => iff1;
set => iff1 = value;
}
private bool iff2;
public bool IFF2 { get { return iff2; } set { iff2 = value; } }
public bool IFF2
{
get => iff2;
set => iff2 = value;
}
private bool nonMaskableInterrupt;
public bool NonMaskableInterrupt
{
get { return nonMaskableInterrupt; }
get => nonMaskableInterrupt;
set { if (value && !nonMaskableInterrupt) NonMaskableInterruptPending = true; nonMaskableInterrupt = value; }
}
private bool nonMaskableInterruptPending;
public bool NonMaskableInterruptPending { get { return nonMaskableInterruptPending; } set { nonMaskableInterruptPending = value; } }
public bool NonMaskableInterruptPending
{
get => nonMaskableInterruptPending;
set => nonMaskableInterruptPending = value;
}
private int interruptMode;
public int InterruptMode
{
get { return interruptMode; }
get => interruptMode;
set { if (value < 0 || value > 2) throw new ArgumentOutOfRangeException(); interruptMode = value; }
}

2
BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
View File

@ -435,7 +435,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public string Cpu
{
get { return "Z80"; }
get => "Z80";
set { }
}

34
BizHawk.Emulation.Cores/CPUs/Z80A/Registers.cs
View File

@ -64,55 +64,55 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public bool FlagC
{
get { return (Regs[5] & 0x01) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x01) | (value ? 0x01 : 0x00)); }
get => (Regs[5] & 0x01) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x01) | (value ? 0x01 : 0x00));
}
public bool FlagN
{
get { return (Regs[5] & 0x02) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x02) | (value ? 0x02 : 0x00)); }
get => (Regs[5] & 0x02) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x02) | (value ? 0x02 : 0x00));
}
public bool FlagP
{
get { return (Regs[5] & 0x04) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x04) | (value ? 0x04 : 0x00)); }
get => (Regs[5] & 0x04) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x04) | (value ? 0x04 : 0x00));
}
public bool Flag3
{
get { return (Regs[5] & 0x08) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x08) | (value ? 0x08 : 0x00)); }
get => (Regs[5] & 0x08) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x08) | (value ? 0x08 : 0x00));
}
public bool FlagH
{
get { return (Regs[5] & 0x10) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (Regs[5] & 0x10) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x10) | (value ? 0x10 : 0x00));
}
public bool Flag5
{
get { return (Regs[5] & 0x20) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (Regs[5] & 0x20) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x20) | (value ? 0x20 : 0x00));
}
public bool FlagZ
{
get { return (Regs[5] & 0x40) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x40) | (value ? 0x40 : 0x00)); }
get => (Regs[5] & 0x40) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x40) | (value ? 0x40 : 0x00));
}
public bool FlagS
{
get { return (Regs[5] & 0x80) != 0; }
set { Regs[5] = (ushort)((Regs[5] & ~0x80) | (value ? 0x80 : 0x00)); }
get => (Regs[5] & 0x80) != 0;
set => Regs[5] = (ushort)((Regs[5] & ~0x80) | (value ? 0x80 : 0x00));
}
public ushort RegPC
{
get { return (ushort)(Regs[0] | (Regs[1] << 8)); }
get => (ushort)(Regs[0] | (Regs[1] << 8));
set
{
Regs[0] = (ushort)(value & 0xFF);

72
BizHawk.Emulation.Cores/CPUs/x86/x86.cs
View File

@ -66,18 +66,66 @@ namespace BizHawk.Emulation.Cores.Components.x86
}
// We expect these properties to get inlined by the CLR -- at some point we should test this assumption
public ushort AX { get { return RegAX.Word; } set { RegAX.Word = value; } }
public ushort BX { get { return RegBX.Word; } set { RegBX.Word = value; } }
public ushort CX { get { return RegCX.Word; } set { RegCX.Word = value; } }
public ushort DX { get { return RegDX.Word; } set { RegDX.Word = value; } }
public byte AL { get { return RegAX.Low; } set { RegAX.Low = value; } }
public byte BL { get { return RegBX.Low; } set { RegBX.Low = value; } }
public byte CL { get { return RegCX.Low; } set { RegCX.Low = value; } }
public byte DL { get { return RegDX.Low; } set { RegDX.Low = value; } }
public byte AH { get { return RegAX.High; } set { RegAX.High = value; } }
public byte BH { get { return RegBX.High; } set { RegBX.High = value; } }
public byte CH { get { return RegCX.High; } set { RegCX.High = value; } }
public byte DH { get { return RegDX.High; } set { RegDX.High = value; } }
public ushort AX
{
get => RegAX.Word;
set => RegAX.Word = value;
}
public ushort BX
{
get => RegBX.Word;
set => RegBX.Word = value;
}
public ushort CX
{
get => RegCX.Word;
set => RegCX.Word = value;
}
public ushort DX
{
get => RegDX.Word;
set => RegDX.Word = value;
}
public byte AL
{
get => RegAX.Low;
set => RegAX.Low = value;
}
public byte BL
{
get => RegBX.Low;
set => RegBX.Low = value;
}
public byte CL
{
get => RegCX.Low;
set => RegCX.Low = value;
}
public byte DL
{
get => RegDX.Low;
set => RegDX.Low = value;
}
public byte AH
{
get => RegAX.High;
set => RegAX.High = value;
}
public byte BH
{
get => RegBX.High;
set => RegBX.High = value;
}
public byte CH
{
get => RegCX.High;
set => RegCX.High = value;
}
public byte DH
{
get => RegDX.High;
set => RegDX.High = value;
}
}
[StructLayout(LayoutKind.Explicit)]

8
BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.InputPollable.cs
View File

@ -11,14 +11,14 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
{
public int LagCount
{
get { return _lagCount; }
set { _lagCount = value; }
get => _lagCount;
set => _lagCount = value;
}
public bool IsLagFrame
{
get { return _isLag; }
set { _isLag = value; }
get => _isLag;
set => _isLag = value;
}
public IInputCallbackSystem InputCallbacks { get; }

6
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Datacorder/DatacorderDevice.cs
View File

@ -44,7 +44,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private bool tapeMotor;
public bool TapeMotor
{
get { return tapeMotor; }
get => tapeMotor;
set
{
if (tapeMotor == value)
@ -129,8 +129,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private List<TapeDataBlock> _dataBlocks = new List<TapeDataBlock>();
public List<TapeDataBlock> DataBlocks
{
get { return _dataBlocks; }
set { _dataBlocks = value; }
get => _dataBlocks;
set => _dataBlocks = value;
}
/// <summary>

26
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/CHRN.cs
View File

@ -32,8 +32,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte _flag1;
public byte Flag1
{
get { return _flag1; }
set { _flag1 = value; }
get => _flag1;
set => _flag1 = value;
}
/// <summary>
@ -42,8 +42,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte _flag2;
public byte Flag2
{
get { return _flag2; }
set { _flag2 = value; }
get => _flag2;
set => _flag2 = value;
}
/// <summary>
@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST1MA
{
get { return NECUPD765.GetBit(0, _flag1); }
get => NECUPD765.GetBit(0, _flag1);
set
{
if (value) { NECUPD765.SetBit(0, ref _flag1); }
@ -76,7 +76,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST1ND
{
get { return NECUPD765.GetBit(2, _flag1); }
get => NECUPD765.GetBit(2, _flag1);
set
{
if (value) { NECUPD765.SetBit(2, ref _flag1); }
@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST1DE
{
get { return NECUPD765.GetBit(5, _flag1); }
get => NECUPD765.GetBit(5, _flag1);
set
{
if (value) { NECUPD765.SetBit(5, ref _flag1); }
@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST1EN
{
get { return NECUPD765.GetBit(7, _flag1); }
get => NECUPD765.GetBit(7, _flag1);
set
{
if (value) { NECUPD765.SetBit(7, ref _flag1); }
@ -115,7 +115,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST2MD
{
get { return NECUPD765.GetBit(0, _flag2); }
get => NECUPD765.GetBit(0, _flag2);
set
{
if (value) { NECUPD765.SetBit(0, ref _flag2); }
@ -128,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST2BC
{
get { return NECUPD765.GetBit(1, _flag2); }
get => NECUPD765.GetBit(1, _flag2);
set
{
if (value) { NECUPD765.SetBit(1, ref _flag2); }
@ -141,7 +141,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST2WC
{
get { return NECUPD765.GetBit(4, _flag2); }
get => NECUPD765.GetBit(4, _flag2);
set
{
if (value) { NECUPD765.SetBit(4, ref _flag2); }
@ -154,7 +154,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST2DD
{
get { return NECUPD765.GetBit(5, _flag2); }
get => NECUPD765.GetBit(5, _flag2);
set
{
if (value) { NECUPD765.SetBit(5, ref _flag2); }
@ -167,7 +167,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public bool ST2CM
{
get { return NECUPD765.GetBit(6, _flag2); }
get => NECUPD765.GetBit(6, _flag2);
set
{
if (value) { NECUPD765.SetBit(6, ref _flag2); }

2
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -192,7 +192,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public int CMDIndex
{
get { return _cmdIndex; }
get => _cmdIndex;
set
{
_cmdIndex = value;

2
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
View File

@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public int DiskDriveIndex
{
get { return _diskDriveIndex; }
get => _diskDriveIndex;
set
{
// when index is changed update the ActiveDrive

39
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/AmstradGateArray.cs
View File

@ -184,7 +184,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte _PENR;
public byte PENR
{
get { return _PENR; }
get => _PENR;
set
{
_PENR = value;
@ -225,7 +225,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte _INKR;
public byte INKR
{
get { return _INKR; }
get => _INKR;
set
{
_INKR = value;
@ -248,7 +248,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte _RMR;
public byte RMR
{
get { return _RMR; }
get => _RMR;
set
{
_RMR = value;
@ -310,11 +310,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public byte RAMR
{
get { return _RAMR; }
set
{
_RAMR = value;
}
get => _RAMR;
set => _RAMR = value;
}
/// <summary>
@ -328,8 +325,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _interruptCounter;
public int InterruptCounter
{
get { return _interruptCounter; }
set { _interruptCounter = value; }
get => _interruptCounter;
set => _interruptCounter = value;
}
/// <summary>
@ -996,26 +993,26 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public int VirtualWidth
{
get { return _virtualWidth; }
set { _virtualWidth = value; }
get => _virtualWidth;
set => _virtualWidth = value;
}
public int VirtualHeight
{
get { return _virtualHeight; }
set { _virtualHeight = value; }
get => _virtualHeight;
set => _virtualHeight = value;
}
public int BufferWidth
{
get { return _bufferWidth; }
set { _bufferWidth = value; }
get => _bufferWidth;
set => _bufferWidth = value;
}
public int BufferHeight
{
get { return _bufferHeight; }
set { _bufferHeight = value; }
get => _bufferHeight;
set => _bufferHeight = value;
}
public int SysBufferWidth;
@ -1023,7 +1020,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public int VsyncNumerator
{
get { return 200000000; }
get => 200000000;
set { }
}
@ -1185,8 +1182,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public AmstradCPC.BorderType borderType
{
get { return _borderType; }
set { _borderType = value; }
get => _borderType;
set => _borderType = value;
}
#endregion

10
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTC6845.cs
View File

@ -215,7 +215,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _CharacterCTR;
private int CharacterCTR
{
get { return _CharacterCTR; }
get => _CharacterCTR;
set
{
if (value > 255)
@ -229,7 +229,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _HorizontalSyncWidthCTR;
private int HorizontalSyncWidthCTR
{
get { return _HorizontalSyncWidthCTR; }
get => _HorizontalSyncWidthCTR;
set
{
if (value > 15)
@ -243,7 +243,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _VerticalSyncWidthCTR;
private int VerticalSyncWidthCTR
{
get { return _VerticalSyncWidthCTR; }
get => _VerticalSyncWidthCTR;
set
{
if (value > 15)
@ -257,7 +257,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _LineCTR;
private int LineCTR
{
get { return _LineCTR; }
get => _LineCTR;
set
{
if (value > 127)
@ -271,7 +271,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _RasterCTR;
private int RasterCTR
{
get { return _RasterCTR; }
get => _RasterCTR;
set
{
if (value > 31)

18
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Display/CRTDevice.cs
View File

@ -195,31 +195,31 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public int VirtualWidth
{
get { return _virtualWidth; }
set { _virtualWidth = value; }
get => _virtualWidth;
set => _virtualWidth = value;
}
public int VirtualHeight
{
get { return _virtualHeight; }
set { _virtualHeight = value; }
get => _virtualHeight;
set => _virtualHeight = value;
}
public int BufferWidth
{
get { return _bufferWidth; }
set { _bufferWidth = value; }
get => _bufferWidth;
set => _bufferWidth = value;
}
public int BufferHeight
{
get { return _bufferHeight; }
set { _bufferHeight = value; }
get => _bufferHeight;
set => _bufferHeight = value;
}
public int VsyncNumerator
{
get { return GateArray.Z80ClockSpeed * 50; }
get => GateArray.Z80ClockSpeed * 50;
set { }
}

14
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Input/StandardKeyboard.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _currentLine;
public int CurrentLine
{
get { return _currentLine; }
get => _currentLine;
set
{
// bits 0-3 contain the line
@ -34,22 +34,22 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private bool[] _keyStatus;
public bool[] KeyStatus
{
get { return _keyStatus; }
set { _keyStatus = value; }
get => _keyStatus;
set => _keyStatus = value;
}
private string[] _keyboardMatrix;
public string[] KeyboardMatrix
{
get { return _keyboardMatrix; }
set { _keyboardMatrix = value; }
get => _keyboardMatrix;
set => _keyboardMatrix = value;
}
private string[] _nonMatrixKeys;
public string[] NonMatrixKeys
{
get { return _nonMatrixKeys; }
set { _nonMatrixKeys = value; }
get => _nonMatrixKeys;
set => _nonMatrixKeys = value;
}
public StandardKeyboard(CPCBase machine)

17
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/AY38912.cs
View File

@ -84,10 +84,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public AYPanConfig PanningConfiguration
{
get
{
return _currentPanTab;
}
get => _currentPanTab;
set
{
if (value != _currentPanTab)
@ -104,10 +101,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public int Volume
{
get
{
return _volume;
}
get => _volume;
set
{
//value = Math.Max(0, value);
@ -126,11 +120,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public int SelectedRegister
{
get { return _activeRegister; }
set
{
_activeRegister = (byte)value;
}
get => _activeRegister;
set => _activeRegister = (byte)value;
}
#endregion

9
BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/SoundOutput/Beeper.cs
View File

@ -21,8 +21,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _sampleRate;
public int SampleRate
{
get { return _sampleRate; }
set { _sampleRate = value; }
get => _sampleRate;
set => _sampleRate = value;
}
/// <summary>
@ -32,10 +32,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _volume;
public int Volume
{
get
{
return VolumeConverterOut(_volume);
}
get => VolumeConverterOut(_volume);
set
{
var newVol = VolumeConverterIn(value);

4
BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Input.cs
View File

@ -288,8 +288,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private bool inputRead;
public bool InputRead
{
get { return inputRead; }
set { inputRead = value; }
get => inputRead;
set => inputRead = value;
}
}
}

4
BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/CPCBase.Media.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
protected int tapeMediaIndex;
public int TapeMediaIndex
{
get { return tapeMediaIndex; }
get => tapeMediaIndex;
set
{
int tmp = value;
@ -69,7 +69,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
protected int diskMediaIndex;
public int DiskMediaIndex
{
get { return diskMediaIndex; }
get => diskMediaIndex;
set
{
int tmp = value;

18
BizHawk.Emulation.Cores/Computers/AmstradCPC/Machine/GateArrayBase.cs
View File

@ -459,31 +459,31 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
public int VirtualWidth
{
get { return _virtualWidth; }
set { _virtualWidth = value; }
get => _virtualWidth;
set => _virtualWidth = value;
}
public int VirtualHeight
{
get { return _virtualHeight; }
set { _virtualHeight = value; }
get => _virtualHeight;
set => _virtualHeight = value;
}
public int BufferWidth
{
get { return _bufferWidth; }
set { _bufferWidth = value; }
get => _bufferWidth;
set => _bufferWidth = value;
}
public int BufferHeight
{
get { return _bufferHeight; }
set { _bufferHeight = value; }
get => _bufferHeight;
set => _bufferHeight = value;
}
public int VsyncNumerator
{
get { return Z80ClockSpeed * 50; }
get => Z80ClockSpeed * 50;
set { }
}

2
BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Disk/FloppyDisk.cs
View File

@ -68,7 +68,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public int RandomCounter
{
get { return _randomCounter; }
get => _randomCounter;
set
{
_randomCounter = value;

16
BizHawk.Emulation.Cores/Computers/AmstradCPC/Media/Tape/TapeDataBlock.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _blockID = -1;
public int BlockID
{
get { return _blockID; }
get => _blockID;
set
{
_blockID = value;
@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private BlockType _blockType;
public BlockType BlockDescription
{
get { return _blockType; }
get => _blockType;
set
{
_blockType = value;
@ -49,8 +49,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private byte[] _blockData;
public byte[] BlockData
{
get { return _blockData; }
set { _blockData = value; }
get => _blockData;
set => _blockData = value;
}
/*
@ -124,8 +124,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private TapeCommand _command = TapeCommand.NONE;
public TapeCommand Command
{
get { return _command; }
set { _command = value; }
get => _command;
set => _command = value;
}
/// <summary>
@ -134,8 +134,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private int _pauseInMS;
public int PauseInMS
{
get { return _pauseInMS; }
set { _pauseInMS = value; }
get => _pauseInMS;
set => _pauseInMS = value;
}

4
BizHawk.Emulation.Cores/Computers/AmstradCPC/ROM/RomData.cs
View File

@ -11,8 +11,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
/// </summary>
public byte[] RomBytes
{
get { return _romBytes; }
set { _romBytes = value; }
get => _romBytes;
set => _romBytes = value;
}
private byte[] _romBytes;

4
BizHawk.Emulation.Cores/Computers/AmstradCPC/SoundProviderMixer.cs
View File

@ -25,8 +25,8 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
private bool _stereo = true;
public bool Stereo
{
get { return _stereo; }
set { _stereo = value; }
get => _stereo;
set => _stereo = value;
}
private readonly List<Provider> SoundProviders;

8
BizHawk.Emulation.Cores/Computers/Commodore64/Cartridge/CartridgeDevice.cs
View File

@ -262,14 +262,14 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge
public bool DriveLightEnabled
{
get { return _driveLightEnabled; }
protected set { _driveLightEnabled = value; }
get => _driveLightEnabled;
protected set => _driveLightEnabled = value;
}
public bool DriveLightOn
{
get { return _driveLightOn; }
protected set { _driveLightOn = value; }
get => _driveLightOn;
protected set => _driveLightOn = value;
}
}
}

4
BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
View File

@ -62,8 +62,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
public Action<TraceInfo> TraceCallback
{
get { return _cpu.TraceCallback; }
set { _cpu.TraceCallback = value; }
get => _cpu.TraceCallback;
set => _cpu.TraceCallback = value;
}
public void HardReset()

8
BizHawk.Emulation.Cores/Computers/MSX/MSX.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
{
public int LagCount
{
get { return _lagCount; }
set { _lagCount = value; }
get => _lagCount;
set => _lagCount = value;
}
public bool IsLagFrame
{
get { return _isLag; }
set { _isLag = value; }
get => _isLag;
set => _isLag = value;
}
public IInputCallbackSystem InputCallbacks { get; private set; }

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
View File

@ -96,8 +96,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private List<TapeDataBlock> _dataBlocks = new List<TapeDataBlock>();
public List<TapeDataBlock> DataBlocks
{
get { return _dataBlocks; }
set { _dataBlocks = value; }
get => _dataBlocks;
set => _dataBlocks = value;
}
/// <summary>

26
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/CHRN.cs
View File

@ -32,8 +32,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private byte _flag1;
public byte Flag1
{
get { return _flag1; }
set { _flag1 = value; }
get => _flag1;
set => _flag1 = value;
}
/// <summary>
@ -42,8 +42,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private byte _flag2;
public byte Flag2
{
get { return _flag2; }
set { _flag2 = value; }
get => _flag2;
set => _flag2 = value;
}
/// <summary>
@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST1MA
{
get { return NECUPD765.GetBit(0, _flag1); }
get => NECUPD765.GetBit(0, _flag1);
set
{
if (value) { NECUPD765.SetBit(0, ref _flag1); }
@ -76,7 +76,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST1ND
{
get { return NECUPD765.GetBit(2, _flag1); }
get => NECUPD765.GetBit(2, _flag1);
set
{
if (value) { NECUPD765.SetBit(2, ref _flag1); }
@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST1DE
{
get { return NECUPD765.GetBit(5, _flag1); }
get => NECUPD765.GetBit(5, _flag1);
set
{
if (value) { NECUPD765.SetBit(5, ref _flag1); }
@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST1EN
{
get { return NECUPD765.GetBit(7, _flag1); }
get => NECUPD765.GetBit(7, _flag1);
set
{
if (value) { NECUPD765.SetBit(7, ref _flag1); }
@ -115,7 +115,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST2MD
{
get { return NECUPD765.GetBit(0, _flag2); }
get => NECUPD765.GetBit(0, _flag2);
set
{
if (value) { NECUPD765.SetBit(0, ref _flag2); }
@ -128,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST2BC
{
get { return NECUPD765.GetBit(1, _flag2); }
get => NECUPD765.GetBit(1, _flag2);
set
{
if (value) { NECUPD765.SetBit(1, ref _flag2); }
@ -141,7 +141,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST2WC
{
get { return NECUPD765.GetBit(4, _flag2); }
get => NECUPD765.GetBit(4, _flag2);
set
{
if (value) { NECUPD765.SetBit(4, ref _flag2); }
@ -154,7 +154,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST2DD
{
get { return NECUPD765.GetBit(5, _flag2); }
get => NECUPD765.GetBit(5, _flag2);
set
{
if (value) { NECUPD765.SetBit(5, ref _flag2); }
@ -167,7 +167,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public bool ST2CM
{
get { return NECUPD765.GetBit(6, _flag2); }
get => NECUPD765.GetBit(6, _flag2);
set
{
if (value) { NECUPD765.SetBit(6, ref _flag2); }

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
View File

@ -192,7 +192,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int CMDIndex
{
get { return _cmdIndex; }
get => _cmdIndex;
set
{
_cmdIndex = value;

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
View File

@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int DiskDriveIndex
{
get { return _diskDriveIndex; }
get => _diskDriveIndex;
set
{
// when index is changed update the ActiveDrive

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/CursorJoystick.cs
View File

@ -50,8 +50,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _playerNumber;
public int PlayerNumber
{
get { return _playerNumber; }
set { _playerNumber = value; }
get => _playerNumber;
set => _playerNumber = value;
}
/// <summary>

8
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/KempstonJoystick.cs
View File

@ -37,8 +37,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _playerNumber;
public int PlayerNumber
{
get { return _playerNumber; }
set { _playerNumber = value; }
get => _playerNumber;
set => _playerNumber = value;
}
/// <summary>
@ -70,8 +70,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int JoyLine
{
get { return _joyLine; }
set { _joyLine = value; }
get => _joyLine;
set => _joyLine = value;
}
/// <summary>

8
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/NullJoystick.cs
View File

@ -36,8 +36,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _playerNumber;
public int PlayerNumber
{
get { return _playerNumber; }
set { _playerNumber = value; }
get => _playerNumber;
set => _playerNumber = value;
}
/// <summary>
@ -69,8 +69,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int JoyLine
{
get { return _joyLine; }
set { _joyLine = value; }
get => _joyLine;
set => _joyLine = value;
}
/// <summary>

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick1.cs
View File

@ -50,8 +50,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _playerNumber;
public int PlayerNumber
{
get { return _playerNumber; }
set { _playerNumber = value; }
get => _playerNumber;
set => _playerNumber = value;
}
/// <summary>

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/SinclairJoystick2.cs
View File

@ -50,8 +50,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _playerNumber;
public int PlayerNumber
{
get { return _playerNumber; }
set { _playerNumber = value; }
get => _playerNumber;
set => _playerNumber = value;
}
/// <summary>

16
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Input/StandardKeyboard.cs
View File

@ -19,26 +19,26 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
public bool IsIssue2Keyboard
{
get { return _isIssue2Keyboard; }
set { _isIssue2Keyboard = value; }
get => _isIssue2Keyboard;
set => _isIssue2Keyboard = value;
}
public int[] KeyLine
{
get { return _keyLine; }
set { _keyLine = value; }
get => _keyLine;
set => _keyLine = value;
}
public string[] KeyboardMatrix
{
get { return _keyboardMatrix; }
set { _keyboardMatrix = value; }
get => _keyboardMatrix;
set => _keyboardMatrix = value;
}
public string[] NonMatrixKeys
{
get { return _nonMatrixKeys; }
set { _nonMatrixKeys = value; }
get => _nonMatrixKeys;
set => _nonMatrixKeys = value;
}
public StandardKeyboard(SpectrumBase machine)

24
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Rom/RomData.cs
View File

@ -11,8 +11,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public byte[] RomBytes
{
get { return _romBytes; }
set { _romBytes = value; }
get => _romBytes;
set => _romBytes = value;
}
/// <summary>
@ -20,28 +20,28 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public ushort SaveBytesRoutineAddress
{
get { return _saveBytesRoutineAddress; }
set { _saveBytesRoutineAddress = value; }
get => _saveBytesRoutineAddress;
set => _saveBytesRoutineAddress = value;
}
public ushort LoadBytesRoutineAddress
{
get { return _loadBytesRoutineAddress; }
set { _loadBytesRoutineAddress = value; }
get => _loadBytesRoutineAddress;
set => _loadBytesRoutineAddress = value;
}
public ushort SaveBytesResumeAddress
{
get { return _saveBytesResumeAddress; }
set { _saveBytesResumeAddress = value; }
get => _saveBytesResumeAddress;
set => _saveBytesResumeAddress = value;
}
public ushort LoadBytesResumeAddress
{
get { return _loadBytesResumeAddress; }
set { _loadBytesResumeAddress = value; }
get => _loadBytesResumeAddress;
set => _loadBytesResumeAddress = value;
}
public ushort LoadBytesInvalidHeaderAddress
{
get { return _loadBytesInvalidHeaderAddress; }
set { _loadBytesInvalidHeaderAddress = value; }
get => _loadBytesInvalidHeaderAddress;
set => _loadBytesInvalidHeaderAddress = value;
}
private byte[] _romBytes;

17
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/SoundOuput/AY38912.cs
View File

@ -135,10 +135,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public AYPanConfig PanningConfiguration
{
get
{
return _currentPanTab;
}
get => _currentPanTab;
set
{
if (value != _currentPanTab)
@ -155,10 +152,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int Volume
{
get
{
return _volume;
}
get => _volume;
set
{
//value = Math.Max(0, value);
@ -177,11 +171,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int SelectedRegister
{
get { return _activeRegister; }
set
{
_activeRegister = (byte)value;
}
get => _activeRegister;
set => _activeRegister = (byte)value;
}
/// <summary>

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
View File

@ -333,8 +333,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private bool inputRead;
public bool InputRead
{
get { return inputRead; }
set { inputRead = value; }
get => inputRead;
set => inputRead = value;
}
}

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Media.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
protected int tapeMediaIndex;
public int TapeMediaIndex
{
get { return tapeMediaIndex; }
get => tapeMediaIndex;
set
{
int tmp = value;
@ -78,7 +78,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
protected int diskMediaIndex;
public int DiskMediaIndex
{
get { return diskMediaIndex; }
get => diskMediaIndex;
set
{
int tmp = value;

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs
View File

@ -55,8 +55,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
protected int ROMPaged;
public virtual int _ROMpaged
{
get { return ROMPaged; }
set { ROMPaged = value; }
get => ROMPaged;
set => ROMPaged = value;
}
/*

4
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Port.cs
View File

@ -13,8 +13,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
protected byte LastULAOutByte;
public byte LASTULAOutByte
{
get { return LastULAOutByte; }
set { LastULAOutByte = value; }
get => LastULAOutByte;
set => LastULAOutByte = value;
}
public byte Last7ffd;

22
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ULA.cs
View File

@ -829,31 +829,31 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
public int VirtualWidth
{
get { return _virtualWidth; }
set { _virtualWidth = value; }
get => _virtualWidth;
set => _virtualWidth = value;
}
public int VirtualHeight
{
get { return _virtualHeight; }
set { _virtualHeight = value; }
get => _virtualHeight;
set => _virtualHeight = value;
}
public int BufferWidth
{
get { return _bufferWidth; }
set { _bufferWidth = value; }
get => _bufferWidth;
set => _bufferWidth = value;
}
public int BufferHeight
{
get { return _bufferHeight; }
set { _bufferHeight = value; }
get => _bufferHeight;
set => _bufferHeight = value;
}
public int VsyncNumerator
{
get { return ClockSpeed * 50; }// ClockSpeed; }
get => ClockSpeed * 50; // ClockSpeed; }
set { }
}
@ -1016,8 +1016,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
public ZXSpectrum.BorderType borderType
{
get { return _borderType; }
set { _borderType = value; }
get => _borderType;
set => _borderType = value;
}
#endregion

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Port.cs
View File

@ -184,7 +184,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
return rp;
}
set { ROMPaged = value; }
set => ROMPaged = value;
}
}
}

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus3/ZX128Plus3.Port.cs
View File

@ -191,7 +191,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
return rp;
}
set { ROMPaged = value; }
set => ROMPaged = value;
}
}
}

2
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Disk/FloppyDisk.cs
View File

@ -68,7 +68,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary>
public int RandomCounter
{
get { return _randomCounter; }
get => _randomCounter;
set
{
_randomCounter = value;

16
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Media/Tape/TapeDataBlock.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _blockID = -1;
public int BlockID
{
get { return _blockID; }
get => _blockID;
set
{
_blockID = value;
@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private BlockType _blockType;
public BlockType BlockDescription
{
get { return _blockType; }
get => _blockType;
set
{
_blockType = value;
@ -49,8 +49,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private byte[] _blockData;
public byte[] BlockData
{
get { return _blockData; }
set { _blockData = value; }
get => _blockData;
set => _blockData = value;
}
/*
@ -125,8 +125,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private TapeCommand _command = TapeCommand.NONE;
public TapeCommand Command
{
get { return _command; }
set { _command = value; }
get => _command;
set => _command = value;
}
/// <summary>
@ -135,8 +135,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
private int _pauseInMS;
public int PauseInMS
{
get { return _pauseInMS; }
set { _pauseInMS = value; }
get => _pauseInMS;
set => _pauseInMS = value;
}

8
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.IInputPollable.cs
View File

@ -11,14 +11,14 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
{
public int LagCount
{
get { return _lagCount; }
set { _lagCount = value; }
get => _lagCount;
set => _lagCount = value;
}
public bool IsLagFrame
{
get { return _isLag; }
set { _isLag = value; }
get => _isLag;
set => _isLag = value;
}
public IInputCallbackSystem InputCallbacks { get; }

4
BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
View File

@ -29,8 +29,8 @@ namespace BizHawk.Emulation.Cores.ColecoVision
public bool InterruptPending
{
get { return (StatusByte & 0x80) != 0; }
set { StatusByte = (byte)((StatusByte & ~0x02) | (value ? 0x80 : 0x00)); }
get => (StatusByte & 0x80) != 0;
set => StatusByte = (byte)((StatusByte & ~0x02) | (value ? 0x80 : 0x00));
}
private int ColorTableBase;

8
BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/ChannelF.InputPollable.cs
View File

@ -8,14 +8,14 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
{
public int LagCount
{
get { return _lagCount; }
set { _lagCount = value; }
get => _lagCount;
set => _lagCount = value;
}
public bool IsLagFrame
{
get { return _isLag; }
set { _isLag = value; }
get => _isLag;
set => _isLag = value;
}
public IInputCallbackSystem InputCallbacks { get; }

2
BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Disassembler.cs
View File

@ -324,7 +324,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
public string Cpu
{
get { return "F3850"; }
get => "F3850";
set { }
}

26
BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/F8/F3850.Registers.cs
View File

@ -101,8 +101,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public bool FlagS
{
get { return (Regs[W] & 0x01) != 0; }
set { Regs[W] = (byte)((Regs[W] & ~0x01) | (value ? 0x01 : 0x00)); }
get => (Regs[W] & 0x01) != 0;
set => Regs[W] = (byte)((Regs[W] & ~0x01) | (value ? 0x01 : 0x00));
}
/// <summary>
@ -110,8 +110,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public bool FlagC
{
get { return (Regs[W] & 0x02) != 0; }
set { Regs[W] = (byte)((Regs[W] & ~0x02) | (value ? 0x02 : 0x00)); }
get => (Regs[W] & 0x02) != 0;
set => Regs[W] = (byte)((Regs[W] & ~0x02) | (value ? 0x02 : 0x00));
}
/// <summary>
@ -119,8 +119,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public bool FlagZ
{
get { return (Regs[W] & 0x04) != 0; }
set { Regs[W] = (byte)((Regs[W] & ~0x04) | (value ? 0x04 : 0x00)); }
get => (Regs[W] & 0x04) != 0;
set => Regs[W] = (byte)((Regs[W] & ~0x04) | (value ? 0x04 : 0x00));
}
/// <summary>
@ -128,8 +128,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public bool FlagO
{
get { return (Regs[W] & 0x08) != 0; }
set { Regs[W] = (byte)((Regs[W] & ~0x08) | (value ? 0x08 : 0x00)); }
get => (Regs[W] & 0x08) != 0;
set => Regs[W] = (byte)((Regs[W] & ~0x08) | (value ? 0x08 : 0x00));
}
/// <summary>
@ -137,8 +137,8 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public bool FlagICB
{
get { return (Regs[W] & 0x10) != 0; }
set { Regs[W] = (byte)((Regs[W] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (Regs[W] & 0x10) != 0;
set => Regs[W] = (byte)((Regs[W] & ~0x10) | (value ? 0x10 : 0x00));
}
/// <summary>
@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public ushort RegPC0
{
get { return (ushort)(Regs[PC0l] | (Regs[PC0h] << 8)); }
get => (ushort)(Regs[PC0l] | (Regs[PC0h] << 8));
set
{
Regs[PC0l] = (byte)(value & 0xFF);
@ -159,7 +159,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public ushort RegPC1
{
get { return (ushort)(Regs[PC1l] | (Regs[PC1h] << 8)); }
get => (ushort)(Regs[PC1l] | (Regs[PC1h] << 8));
set
{
Regs[PC1l] = (byte)(value & 0xFF);
@ -172,7 +172,7 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
/// </summary>
public ushort RegDC0
{
get { return (ushort)(Regs[DC0l] | (Regs[DC0h] << 8)); }
get => (ushort)(Regs[DC0l] | (Regs[DC0h] << 8));
set
{
Regs[DC0l] = (byte)(value & 0xFF);

8
BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

4
BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ISettable.cs
View File

@ -71,7 +71,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex
[DefaultValue(ControllerType.Digital)]
public ControllerType VectrexController1
{
get { return _VectrexController1; }
get => _VectrexController1;
set
{
if (value == ControllerType.Digital) { Port1 = VectrexHawkControllerDeck.DefaultControllerName; }
@ -86,7 +86,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex
[DefaultValue(ControllerType.Digital)]
public ControllerType VectrexController2
{
get { return _VectrexController2; }
get => _VectrexController2;
set
{
if (value == ControllerType.Digital) { Port2 = VectrexHawkControllerDeck.DefaultControllerName; }

8
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

54
BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
View File

@ -170,55 +170,91 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
[Description("Show layer BG0")]
[DefaultValue(true)]
public bool ShowLayerBG0 { get { return _showLayerBG0; } set { _showLayerBG0 = value; } }
public bool ShowLayerBG0
{
get => _showLayerBG0;
set => _showLayerBG0 = value;
}
[DeepEqualsIgnore]
private bool _showLayerBG0;
[Description("Show layer BG1")]
[DefaultValue(true)]
public bool ShowLayerBG1 { get { return _showLayerBG1; } set { _showLayerBG1 = value; } }
public bool ShowLayerBG1
{
get => _showLayerBG1;
set => _showLayerBG1 = value;
}
[DeepEqualsIgnore]
private bool _showLayerBG1;
[Description("Show layer BG2")]
[DefaultValue(true)]
public bool ShowLayerBG2 { get { return _showLayerBG2; } set { _showLayerBG2 = value; } }
public bool ShowLayerBG2
{
get => _showLayerBG2;
set => _showLayerBG2 = value;
}
[DeepEqualsIgnore]
private bool _showLayerBG2;
[Description("Show layer BG3")]
[DefaultValue(true)]
public bool ShowLayerBG3 { get { return _showLayerBG3; } set { _showLayerBG3 = value; } }
public bool ShowLayerBG3
{
get => _showLayerBG3;
set => _showLayerBG3 = value;
}
[DeepEqualsIgnore]
private bool _showLayerBG3;
[Description("Show layer VDC-A BG")]
[DefaultValue(true)]
public bool ShowLayerVDCABG { get { return _showLayerVDCABG; } set { _showLayerVDCABG = value; } }
public bool ShowLayerVDCABG
{
get => _showLayerVDCABG;
set => _showLayerVDCABG = value;
}
[DeepEqualsIgnore]
private bool _showLayerVDCABG;
[Description("Show layer VDC-A SPR")]
[DefaultValue(true)]
public bool ShowLayerVDCASPR { get { return _showLayerVDCASPR; } set { _showLayerVDCASPR = value; } }
public bool ShowLayerVDCASPR
{
get => _showLayerVDCASPR;
set => _showLayerVDCASPR = value;
}
[DeepEqualsIgnore]
private bool _showLayerVDCASPR;
[Description("Show layer VDC-B BG")]
[DefaultValue(true)]
public bool ShowLayerVDCBBG { get { return _showLayerVDCBBG; } set { _showLayerVDCBBG = value; } }
public bool ShowLayerVDCBBG
{
get => _showLayerVDCBBG;
set => _showLayerVDCBBG = value;
}
[DeepEqualsIgnore]
private bool _showLayerVDCBBG;
[Description("Show layer VDC-B SPR")]
[DefaultValue(true)]
public bool ShowLayerVDCBSPR { get { return _showLayerVDCBSPR; } set { _showLayerVDCBSPR = value; } }
public bool ShowLayerVDCBSPR
{
get => _showLayerVDCBSPR;
set => _showLayerVDCBSPR = value;
}
[DeepEqualsIgnore]
private bool _showLayerVDCBSPR;
[Description("Show layer RAINBOW")]
[DefaultValue(true)]
public bool ShowLayerRAINBOW { get { return _showLayerRAINBOW; } set { _showLayerRAINBOW = value; } }
public bool ShowLayerRAINBOW
{
get => _showLayerRAINBOW;
set => _showLayerRAINBOW = value;
}
[DeepEqualsIgnore]
private bool _showLayerRAINBOW;

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

10
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
View File

@ -79,7 +79,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[DefaultValue(ControllerType.Default)]
public ControllerType GBController
{
get { return _GBController; }
get => _GBController;
set
{
if (value == ControllerType.Default) { Port1 = GBHawkControllerDeck.DefaultControllerName; }
@ -111,8 +111,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[DefaultValue(0)]
public int RTCInitialTime
{
get { return _RTCInitialTime; }
set { _RTCInitialTime = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime;
set => _RTCInitialTime = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Offset")]
@ -120,8 +120,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[DefaultValue(0)]
public int RTCOffset
{
get { return _RTCOffset; }
set { _RTCOffset = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset;
set => _RTCOffset = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("Use Existing SaveRAM")]

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

16
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.ISettable.cs
View File

@ -106,8 +106,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
[DefaultValue(0)]
public int RTCInitialTime_L
{
get { return _RTCInitialTime_L; }
set { _RTCInitialTime_L = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_L;
set => _RTCInitialTime_L = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time R")]
@ -115,8 +115,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
[DefaultValue(0)]
public int RTCInitialTime_R
{
get { return _RTCInitialTime_R; }
set { _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_R;
set => _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Offset L")]
@ -124,8 +124,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
[DefaultValue(0)]
public int RTCOffset_L
{
get { return _RTCOffset_L; }
set { _RTCOffset_L = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_L;
set => _RTCOffset_L = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset R")]
@ -133,8 +133,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
[DefaultValue(0)]
public int RTCOffset_R
{
get { return _RTCOffset_R; }
set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_R;
set => _RTCOffset_R = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("Use Existing SaveRAM")]

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
View File

@ -95,8 +95,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
public bool LinkConnected
{
get { return _cableconnected; }
set { _cableconnected = value; }
get => _cableconnected;
set => _cableconnected = value;
}
private void ExecFetch(ushort addr)

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

24
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.ISettable.cs
View File

@ -105,8 +105,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCInitialTime_L
{
get { return _RTCInitialTime_L; }
set { _RTCInitialTime_L = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_L;
set => _RTCInitialTime_L = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time C")]
@ -114,8 +114,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCInitialTime_C
{
get { return _RTCInitialTime_C; }
set { _RTCInitialTime_C = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_C;
set => _RTCInitialTime_C = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time R")]
@ -123,8 +123,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCInitialTime_R
{
get { return _RTCInitialTime_R; }
set { _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_R;
set => _RTCInitialTime_R = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Offset L")]
@ -132,8 +132,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCOffset_L
{
get { return _RTCOffset_L; }
set { _RTCOffset_L = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_L;
set => _RTCOffset_L = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset C")]
@ -141,8 +141,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCOffset_C
{
get { return _RTCOffset_C; }
set { _RTCOffset_C = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_C;
set => _RTCOffset_C = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset R")]
@ -150,8 +150,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
[DefaultValue(0)]
public int RTCOffset_R
{
get { return _RTCOffset_R; }
set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_R;
set => _RTCOffset_R = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("Use Existing SaveRAM")]

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return _islag; }
set { _islag = value; }
get => _islag;
set => _islag = value;
}
public IInputCallbackSystem InputCallbacks { get; } = new InputCallbackSystem();

32
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink4x/GBHawkLink4x.ISettable.cs
View File

@ -116,8 +116,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCInitialTime_A
{
get { return _RTCInitialTime_A; }
set { _RTCInitialTime_A = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_A;
set => _RTCInitialTime_A = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time B")]
@ -125,8 +125,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCInitialTime_B
{
get { return _RTCInitialTime_B; }
set { _RTCInitialTime_B = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_B;
set => _RTCInitialTime_B = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time C")]
@ -134,8 +134,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCInitialTime_C
{
get { return _RTCInitialTime_C; }
set { _RTCInitialTime_C = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_C;
set => _RTCInitialTime_C = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Initial Time D")]
@ -143,8 +143,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCInitialTime_D
{
get { return _RTCInitialTime_D; }
set { _RTCInitialTime_D = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value)); }
get => _RTCInitialTime_D;
set => _RTCInitialTime_D = Math.Max(0, Math.Min(1024 * 24 * 60 * 60, value));
}
[DisplayName("RTC Offset A")]
@ -152,8 +152,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCOffset_A
{
get { return _RTCOffset_A; }
set { _RTCOffset_A = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_A;
set => _RTCOffset_A = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset B")]
@ -161,8 +161,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCOffset_B
{
get { return _RTCOffset_B; }
set { _RTCOffset_B = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_B;
set => _RTCOffset_B = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset C")]
@ -170,8 +170,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCOffset_C
{
get { return _RTCOffset_C; }
set { _RTCOffset_C = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_C;
set => _RTCOffset_C = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("RTC Offset D")]
@ -179,8 +179,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
[DefaultValue(0)]
public int RTCOffset_D
{
get { return _RTCOffset_D; }
set { _RTCOffset_D = Math.Max(-127, Math.Min(127, value)); }
get => _RTCOffset_D;
set => _RTCOffset_D = Math.Max(-127, Math.Min(127, value));
}
[DisplayName("Use Existing SaveRAM")]

4
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
View File

@ -126,8 +126,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
[DefaultValue(false)]
public bool EqualLengthFrames
{
get { return _equalLengthFrames; }
set { _equalLengthFrames = value; }
get => _equalLengthFrames;
set => _equalLengthFrames = value;
}
[JsonIgnore]

4
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -53,8 +53,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public bool LinkConnected
{
get { return _cableconnected; }
set { _cableconnected = value; }
get => _cableconnected;
set => _cableconnected = value;
}
private bool _disposed = false;

2
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public string Cpu
{
get { return "R4300"; }
get => "R4300";
set { }
}

8
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.Controller.cs
View File

@ -40,8 +40,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
/// </summary>
public N64ControllerPakType PakType
{
get { return _type; }
set { _type = value; }
get => _type;
set => _type = value;
}
[JsonIgnore]
@ -53,8 +53,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
/// </summary>
public bool IsConnected
{
get { return _isConnected; }
set { _isConnected = value; }
get => _isConnected;
set => _isConnected = value;
}
/// <summary>

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
View File

@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
EMMC3Type _mmc3type = EMMC3Type.None;
public EMMC3Type MMC3Type
{
get { return _mmc3type; }
get => _mmc3type;
set
{
_mmc3type = value;

12
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs
View File

@ -235,8 +235,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
IRQSignal = _diskirq || _timerirq;
}
bool diskirq { get { return _diskirq; } set { _diskirq = value; SetIRQ(); } }
bool timerirq { get { return _timerirq; } set { _timerirq = value; SetIRQ(); } }
bool diskirq
{
get => _diskirq;
set { _diskirq = value; SetIRQ(); }
}
bool timerirq
{
get => _timerirq;
set { _timerirq = value; SetIRQ(); }
}
int timerirq_cd;
bool timer_irq_active;

24
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
View File

@ -82,7 +82,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
Dictionary<string, string> _initialRegisterValues = new Dictionary<string, string>();
public Dictionary<string, string> InitialRegisterValues { get { return _initialRegisterValues; } set { _initialRegisterValues = value; } }
public Dictionary<string, string> InitialRegisterValues
{
get => _initialRegisterValues;
set => _initialRegisterValues = value;
}
public abstract bool Configure(NES.EDetectionOrigin origin);
public virtual void ClockPPU() { }
@ -110,7 +114,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
private bool irq_signal;
public bool IRQSignal { get { return irq_signal; } set { irq_signal = value; } }
public bool IRQSignal
{
get => irq_signal;
set => irq_signal = value;
}
public virtual void Dispose() { }
@ -295,8 +303,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
public byte[] WRAM { get { return wram; } set { wram = value; } }
public byte[] VRAM { get { return vram; } set { vram = value; } }
public byte[] WRAM
{
get => wram;
set => wram = value;
}
public byte[] VRAM
{
get => vram;
set => vram = value;
}
public byte[] ROM { get; set; }
public byte[] VROM { get; set; }
byte[] wram, vram;

8
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
public int LagCount
{
get { return _lagcount; }
set { _lagcount = value; }
get => _lagcount;
set => _lagcount = value;
}
public bool IsLagFrame
{
get { return islag; }
set { islag = value; }
get => islag;
set => islag = value;
}
public IInputCallbackSystem InputCallbacks

12
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NESControllers.cs
View File

@ -1164,14 +1164,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
[JsonIgnore]
private bool _Famicom;
public bool Famicom { get { return _Famicom; } set { _Famicom = value; } }
public bool Famicom
{
get => _Famicom;
set => _Famicom = value;
}
[JsonIgnore]
private string _NesLeftPort;
[JsonIgnore]
private string _NesRightPort;
public string NesLeftPort
{
get { return _NesLeftPort; }
get => _NesLeftPort;
set
{
if (NesPortDevices.ContainsKey(value))
@ -1182,7 +1186,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
public string NesRightPort
{
get { return _NesRightPort; }
get => _NesRightPort;
set
{
if (NesPortDevices.ContainsKey(value))
@ -1195,7 +1199,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
private string _FamicomExpPort;
public string FamicomExpPort
{
get { return _FamicomExpPort; }
get => _FamicomExpPort;
set
{
if (FamicomExpansions.ContainsKey(value))

12
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.cs
View File

@ -15,7 +15,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
bool chopdot;
public enum Region { NTSC, PAL, Dendy, RGB };
Region _region;
public Region region { set { _region = value; SyncRegion(); } get { return _region; } }
public Region region
{
set { _region = value; SyncRegion(); }
get => _region;
}
void SyncRegion()
{
switch (region)
@ -93,7 +97,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
private int[] _currentLuma = PaletteLumaNES;
public int[] CurrentLuma { get { return _currentLuma; } set { _currentLuma = value; } }
public int[] CurrentLuma
{
get => _currentLuma;
set => _currentLuma = value;
}
// true = light sensed
public bool LightGunCallback(int x, int y)

72
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
View File

@ -228,19 +228,67 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
byte _BG4_Prio0, _BG4_Prio1;
byte _Obj_Prio0, _Obj_Prio1, _Obj_Prio2, _Obj_Prio3;
public bool BG1_Prio0 { get { return _BG1_Prio0 != 0; } set { _BG1_Prio0 = (byte)(value ? 1 : 0); } }
public bool BG1_Prio1 { get { return _BG1_Prio1 != 0; } set { _BG1_Prio1 = (byte)(value ? 1 : 0); } }
public bool BG2_Prio0 { get { return _BG2_Prio0 != 0; } set { _BG2_Prio0 = (byte)(value ? 1 : 0); } }
public bool BG2_Prio1 { get { return _BG2_Prio1 != 0; } set { _BG2_Prio1 = (byte)(value ? 1 : 0); } }
public bool BG3_Prio0 { get { return _BG3_Prio0 != 0; } set { _BG3_Prio0 = (byte)(value ? 1 : 0); } }
public bool BG3_Prio1 { get { return _BG3_Prio1 != 0; } set { _BG3_Prio1 = (byte)(value ? 1 : 0); } }
public bool BG4_Prio0 { get { return _BG4_Prio0 != 0; } set { _BG4_Prio0 = (byte)(value ? 1 : 0); } }
public bool BG4_Prio1 { get { return _BG4_Prio1 != 0; } set { _BG4_Prio1 = (byte)(value ? 1 : 0); } }
public bool BG1_Prio0
{
get => _BG1_Prio0 != 0;
set => _BG1_Prio0 = (byte)(value ? 1 : 0);
}
public bool BG1_Prio1
{
get => _BG1_Prio1 != 0;
set => _BG1_Prio1 = (byte)(value ? 1 : 0);
}
public bool BG2_Prio0
{
get => _BG2_Prio0 != 0;
set => _BG2_Prio0 = (byte)(value ? 1 : 0);
}
public bool BG2_Prio1
{
get => _BG2_Prio1 != 0;
set => _BG2_Prio1 = (byte)(value ? 1 : 0);
}
public bool BG3_Prio0
{
get => _BG3_Prio0 != 0;
set => _BG3_Prio0 = (byte)(value ? 1 : 0);
}
public bool BG3_Prio1
{
get => _BG3_Prio1 != 0;
set => _BG3_Prio1 = (byte)(value ? 1 : 0);
}
public bool BG4_Prio0
{
get => _BG4_Prio0 != 0;
set => _BG4_Prio0 = (byte)(value ? 1 : 0);
}
public bool BG4_Prio1
{
get => _BG4_Prio1 != 0;
set => _BG4_Prio1 = (byte)(value ? 1 : 0);
}
public bool Obj_Prio0 { get { return _Obj_Prio0 != 0; } set { _Obj_Prio0 = (byte)(value ? 1 : 0); } }
public bool Obj_Prio1 { get { return _Obj_Prio1 != 0; } set { _Obj_Prio1 = (byte)(value ? 1 : 0); } }
public bool Obj_Prio2 { get { return _Obj_Prio2 != 0; } set { _Obj_Prio2 = (byte)(value ? 1 : 0); } }
public bool Obj_Prio3 { get { return _Obj_Prio3 != 0; } set { _Obj_Prio3 = (byte)(value ? 1 : 0); } }
public bool Obj_Prio0
{
get => _Obj_Prio0 != 0;
set => _Obj_Prio0 = (byte)(value ? 1 : 0);
}
public bool Obj_Prio1
{
get => _Obj_Prio1 != 0;
set => _Obj_Prio1 = (byte)(value ? 1 : 0);
}
public bool Obj_Prio2
{
get => _Obj_Prio2 != 0;
set => _Obj_Prio2 = (byte)(value ? 1 : 0);
}
public bool Obj_Prio3
{
get => _Obj_Prio3 != 0;
set => _Obj_Prio3 = (byte)(value ? 1 : 0);
}
}
[StructLayout(LayoutKind.Explicit)]

2
BizHawk.Emulation.Cores/Consoles/PC Engine/ADPCM.cs
View File

@ -48,7 +48,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
byte port180E;
public byte Port180E
{
get { return port180E; }
get => port180E;
set
{
port180E = value;

20
BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.TurboCD.cs
View File

@ -9,32 +9,32 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool IntADPCM // INTA
{
get { return (CdIoPorts[3] & 0x04) != 0; }
set { CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x04) | (value ? 0x04 : 0x00)); }
get => (CdIoPorts[3] & 0x04) != 0;
set => CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x04) | (value ? 0x04 : 0x00));
}
public bool IntStop // INTSTOP
{
get { return (CdIoPorts[3] & 0x08) != 0; }
set { CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x08) | (value ? 0x8 : 0x00)); }
get => (CdIoPorts[3] & 0x08) != 0;
set => CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x08) | (value ? 0x8 : 0x00));
}
public bool IntSubchannel // INTSUB
{
get { return (CdIoPorts[3] & 0x10) != 0; }
set { CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x10) | (value ? 0x10 : 0x00)); }
get => (CdIoPorts[3] & 0x10) != 0;
set => CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x10) | (value ? 0x10 : 0x00));
}
public bool IntDataTransferComplete // INTM
{
get { return (CdIoPorts[3] & 0x20) != 0; }
set { CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x20) | (value ? 0x20 : 0x00)); }
get => (CdIoPorts[3] & 0x20) != 0;
set => CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x20) | (value ? 0x20 : 0x00));
}
public bool IntDataTransferReady // INTD
{
get { return (CdIoPorts[3] & 0x40) != 0; }
set { CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x40) | (value ? 0x40 : 0x00)); }
get => (CdIoPorts[3] & 0x40) != 0;
set => CdIoPorts[3] = (byte)((CdIoPorts[3] & ~0x40) | (value ? 0x40 : 0x00));
}
private void SetCDAudioCallback()

18
BizHawk.Emulation.Cores/Consoles/PC Engine/ScsiCDBus.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool BSY
{
get { return bsy; }
get => bsy;
set
{
if (value != BSY) signalsChanged = true;
@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool SEL
{
get { return sel; }
get => sel;
set
{
if (value != SEL) signalsChanged = true;
@ -52,7 +52,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool CD // CONTROL = true, DATA = false
{
get { return cd; }
get => cd;
set
{
if (value != CD) signalsChanged = true;
@ -62,7 +62,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool IO // INPUT = true, OUTPUT = false
{
get { return io; }
get => io;
set
{
if (value != IO) signalsChanged = true;
@ -72,7 +72,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool MSG
{
get { return msg; }
get => msg;
set
{
if (value != MSG) signalsChanged = true;
@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool REQ
{
get { return req; }
get => req;
set
{
if (value != REQ) signalsChanged = true;
@ -92,7 +92,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool ACK
{
get { return ack; }
get => ack;
set
{
if (value != ACK) signalsChanged = true;
@ -102,7 +102,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool ATN
{
get { return atn; }
get => atn;
set
{
if (value != ATN) signalsChanged = true;
@ -112,7 +112,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public bool RST
{
get { return rst; }
get => rst;
set
{
if (value != RST) signalsChanged = true;

8
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IInputPollable.cs
View File

@ -6,14 +6,14 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{
public int LagCount
{
get { return _lagCount; }
set { _lagCount = value; }
get => _lagCount;
set => _lagCount = value;
}
public bool IsLagFrame
{
get { return _isLag; }
set { _isLag = value; }
get => _isLag;
set => _isLag = value;
}
public IInputCallbackSystem InputCallbacks { get; private set; }

2
BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.cs
View File

@ -420,7 +420,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
public string _region;
public string RegionStr
{
get { return _region; }
get => _region;
set
{
if (value.NotIn(validRegions))

36
BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ISettable.cs
View File

@ -124,7 +124,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Background Layer A")]
[Description("True to draw BG layer A")]
[DefaultValue(true)]
public bool DrawBGA { get { return _DrawBGA; } set { _DrawBGA = value; } }
public bool DrawBGA
{
get => _DrawBGA;
set => _DrawBGA = value;
}
[DeepEqualsIgnore]
[JsonIgnore]
@ -133,7 +137,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Background Layer B")]
[Description("True to draw BG layer B")]
[DefaultValue(true)]
public bool DrawBGB { get { return _DrawBGB; } set { _DrawBGB = value; } }
public bool DrawBGB
{
get => _DrawBGB;
set => _DrawBGB = value;
}
[DeepEqualsIgnore]
[JsonIgnore]
@ -142,7 +150,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Background Layer W")]
[Description("True to draw BG layer W")]
[DefaultValue(true)]
public bool DrawBGW { get { return _DrawBGW; } set { _DrawBGW = value; } }
public bool DrawBGW
{
get => _DrawBGW;
set => _DrawBGW = value;
}
[DeepEqualsIgnore]
[JsonIgnore]
@ -151,7 +163,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Sprite Layer")]
[Description("True to draw sprite layer")]
[DefaultValue(true)]
public bool DrawObj { get { return _DrawObj; } set { _DrawObj = value; } }
public bool DrawObj
{
get => _DrawObj;
set => _DrawObj = value;
}
[DeepEqualsIgnore]
[JsonIgnore]
@ -160,7 +176,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Pad screen to 320")]
[Description("When using 1:1 aspect ratio, enable to make screen width constant (320) between game modes")]
[DefaultValue(false)]
public bool PadScreen320 { get { return _PadScreen320; } set { _PadScreen320 = value; } }
public bool PadScreen320
{
get => _PadScreen320;
set => _PadScreen320 = value;
}
[DeepEqualsIgnore]
@ -170,7 +190,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
[DisplayName("Use custom backdrop color")]
[Description("Filler when layers are off")]
[DefaultValue((bool)false)]
public bool Backdrop { get { return _Backdrop; } set { _Backdrop = value; } }
public bool Backdrop
{
get => _Backdrop;
set => _Backdrop = value;
}
public GPGXSettings()

2
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
View File

@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
{
public string Cpu
{
get { return "R3000A"; }
get => "R3000A";
set { }
}

8
BizHawk.Emulation.Cores/Libretro/LibretroCore.cs
View File

@ -297,7 +297,11 @@ namespace BizHawk.Emulation.Cores.Libretro
public ControllerDefinition ControllerDefinition { get; private set; }
int timeFrameCounter;
public int Frame { get { return timeFrameCounter; } set { timeFrameCounter = value; } }
public int Frame
{
get => timeFrameCounter;
set => timeFrameCounter = value;
}
public int LagCount { get; set; }
public bool IsLagFrame { get; set; }
public string SystemId { get { return "Libretro"; } }
@ -344,7 +348,7 @@ namespace BizHawk.Emulation.Cores.Libretro
}
[FeatureNotImplemented]
set { throw new NotImplementedException(); }
set => throw new NotImplementedException();
}
#endregion

2
BizHawk.Emulation.Cores/Sound/OneBitBeeper.cs
View File

@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Sound
/// </summary>
public int Volume
{
get { return VolumeConverterOut(_volume); }
get => VolumeConverterOut(_volume);
set
{
var newVol = VolumeConverterIn(value);

Some files were not shown because too many files have changed in this diff Show More