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

Enable SA1106 and fix noncompliance 

"Code should not contain empty statements"
i.e. don't put a semicolon there
This commit is contained in:
YoshiRulz 2020-01-25 15:16:12 +10:00
parent 6f3f01125c
commit b1e02fbdce
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
45 changed files with 96 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/miniz/LibMiniz.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Client.Common.Miniz
MZ_ZIP_FLAG_IGNORE_PATH = 0x0200, MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400, MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800 MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800
}; }
enum mz_compression_level : uint enum mz_compression_level : uint
{ {
@ -28,7 +28,7 @@ namespace BizHawk.Client.Common.Miniz
MZ_UBER_COMPRESSION = 10, MZ_UBER_COMPRESSION = 10,
MZ_DEFAULT_LEVEL = 6, MZ_DEFAULT_LEVEL = 6,
MZ_DEFAULT_COMPRESSION = unchecked((uint)-1) MZ_DEFAULT_COMPRESSION = unchecked((uint)-1)
}; }
[DllImport(DllName, CallingConvention = CC)] [DllImport(DllName, CallingConvention = CC)]
public static extern bool mz_zip_writer_init_file(IntPtr pZip, string pFilename, long size_to_reserve_at_beginning); public static extern bool mz_zip_writer_init_file(IntPtr pZip, string pFilename, long size_to_reserve_at_beginning);

6
BizHawk.Client.DiscoHawk/DiscoHawk.cs
View File

@ -146,16 +146,16 @@ namespace BizHawk.Client.DiscoHawk
public enum ChangeWindowMessageFilterFlags : uint public enum ChangeWindowMessageFilterFlags : uint
{ {
Add = 1, Remove = 2 Add = 1, Remove = 2
}; }
public enum MessageFilterInfo : uint public enum MessageFilterInfo : uint
{ {
None = 0, AlreadyAllowed = 1, AlreadyDisAllowed = 2, AllowedHigher = 3 None = 0, AlreadyAllowed = 1, AlreadyDisAllowed = 2, AllowedHigher = 3
}; }
public enum ChangeWindowMessageFilterExAction : uint public enum ChangeWindowMessageFilterExAction : uint
{ {
Reset = 0, Allow = 1, DisAllow = 2 Reset = 0, Allow = 1, DisAllow = 2
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct CHANGEFILTERSTRUCT public struct CHANGEFILTERSTRUCT

2
BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs
View File

@ -225,7 +225,7 @@ namespace BizHawk.Client.EmuHawk
Syncpoint = 0x4e4be4adeeca4569, Syncpoint = 0x4e4be4adeeca4569,
Index = 0x4e58dd672f23e64e, Index = 0x4e58dd672f23e64e,
Info = 0x4e49ab68b596ba78 Info = 0x4e49ab68b596ba78
}; }
private MemoryStream _data; private MemoryStream _data;
private readonly StartCode _startCode; private readonly StartCode _startCode;

6
BizHawk.Client.EmuHawk/ArchiveChooser.cs
View File

@ -199,7 +199,7 @@ namespace BizHawk.Client.EmuHawk
private interface IMatcher private interface IMatcher
{ {
bool Matches(ListViewItem value); bool Matches(ListViewItem value);
}; }
private class SimpleMatcher : IMatcher private class SimpleMatcher : IMatcher
{ {
@ -217,7 +217,7 @@ namespace BizHawk.Client.EmuHawk
return true; return true;
} }
}; }
private class RegExMatcher : IMatcher private class RegExMatcher : IMatcher
{ {
@ -226,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
{ {
return Matcher.IsMatch(value.Text); return Matcher.IsMatch(value.Text);
} }
}; }
private IMatcher CreateMatcher(string searchKey) private IMatcher CreateMatcher(string searchKey)
{ {

2
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -686,7 +686,7 @@ namespace BizHawk.Client.EmuHawk
&& MovieSession.Movie.Mode != MovieMode.Play; && MovieSession.Movie.Mode != MovieMode.Play;
HardResetMenuItem.Enabled = Emulator.ControllerDefinition.BoolButtons.Contains("Power") HardResetMenuItem.Enabled = Emulator.ControllerDefinition.BoolButtons.Contains("Power")
&& MovieSession.Movie.Mode != MovieMode.Play;; && MovieSession.Movie.Mode != MovieMode.Play;
PauseMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Pause"].Bindings; PauseMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Pause"].Bindings;
RebootCoreMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Reboot Core"].Bindings; RebootCoreMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Reboot Core"].Bindings;

6
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Tastudio.cs
View File

@ -35,20 +35,20 @@ namespace BizHawk.Client.EmuHawk
public string Button; public string Button;
public bool ValueBool; public bool ValueBool;
public float ValueFloat; public float ValueFloat;
}; }
public enum LuaChangeTypes public enum LuaChangeTypes
{ {
InputChange, InputChange,
InsertFrames, InsertFrames,
DeleteFrames, DeleteFrames,
}; }
private enum InputChangeTypes private enum InputChangeTypes
{ {
Bool, Bool,
Float, Float,
}; }
public class TastudioBranchInfo public class TastudioBranchInfo
{ {

2
BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs
View File

@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
public enum OutputChannel public enum OutputChannel
{ {
ERROR, WARNING, INFO, DEBUG, VERBOSE, LOG, COUNT ERROR, WARNING, INFO, DEBUG, VERBOSE, LOG, COUNT
}; }
// main launcher // main launcher
[DllImport(dll, CallingConvention = cc)] [DllImport(dll, CallingConvention = cc)]

2
BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
View File

@ -147,7 +147,7 @@ namespace BizHawk.Emulation.Cores.Components.I8048
FetchOperand = 2, FetchOperand = 2,
Data = 4, Data = 4,
Write = 8 Write = 8
}; }
// Execute instructions // Execute instructions
public void ExecuteOne() public void ExecuteOne()

2
BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
View File

@ -120,7 +120,7 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
FetchOperand = 2, FetchOperand = 2,
Data = 4, Data = 4,
Write = 8 Write = 8
}; }
// Execute instructions // Execute instructions
public void ExecuteOne(ref byte interrupt_src, byte interrupt_enable) public void ExecuteOne(ref byte interrupt_src, byte interrupt_enable)

2
BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
View File

@ -140,7 +140,7 @@ namespace BizHawk.Emulation.Cores.Components.MC6800
FetchOperand = 2, FetchOperand = 2,
Data = 4, Data = 4,
Write = 8 Write = 8
}; }
// Execute instructions // Execute instructions
public void ExecuteOne() public void ExecuteOne()

4
BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
View File

@ -149,7 +149,7 @@ namespace BizHawk.Emulation.Cores.Components.MC6809
FetchOperand = 2, FetchOperand = 2,
Data = 4, Data = 4,
Write = 8 Write = 8
}; }
// Execute instructions // Execute instructions
public void ExecuteOne() public void ExecuteOne()
@ -234,7 +234,7 @@ namespace BizHawk.Emulation.Cores.Components.MC6809
Regs[reg_d_ad] = (ushort)((Regs[reg_h_ad] << 8) | Regs[reg_l_ad]); Regs[reg_d_ad] = (ushort)((Regs[reg_h_ad] << 8) | Regs[reg_l_ad]);
break; break;
case JPE: case JPE:
if (!FlagE) { instr_pntr = 44; irq_pntr = 10; }; if (!FlagE) { instr_pntr = 44; irq_pntr = 10; }
break; break;
case IDX_DCDE: case IDX_DCDE:
Index_decode(); Index_decode();

2
BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
View File

@ -249,7 +249,7 @@ namespace BizHawk.Emulation.Cores.Components.W65816
default: default:
length = 1; length = 1;
return "???"; return "???";
}; }
// Parse out parameter list // Parse out parameter list
switch (opcode) switch (opcode)

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

@ -3,8 +3,8 @@ using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Cores.Components.x86 namespace BizHawk.Emulation.Cores.Components.x86
{ {
public interface x86CpuType { }; public interface x86CpuType { }
public struct Intel8086 : x86CpuType { }; public struct Intel8086 : x86CpuType { }
public sealed partial class x86<CpuType> where CpuType : struct, x86CpuType public sealed partial class x86<CpuType> where CpuType : struct, x86CpuType
{ {

2
BizHawk.Emulation.Cores/Consoles/GCE/Vectrex/VectrexHawk.ICodeDataLog.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Vectrex
ExecFirst = 0x01, ExecFirst = 0x01,
ExecOperand = 0x02, ExecOperand = 0x02,
Data = 0x04 Data = 0x04
}; }
private struct CDLog_MapResults private struct CDLog_MapResults
{ {

4
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IDebuggable.cs
View File

@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
break; break;
case "R2": case "R2":
cpu.Regs[2 + cpu.RB] = (byte)value; cpu.Regs[2 + cpu.RB] = (byte)value;
break; ; break;
case "R3": case "R3":
cpu.Regs[3 + cpu.RB] = (byte)value; cpu.Regs[3 + cpu.RB] = (byte)value;
break; break;
@ -57,7 +57,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
break; break;
case "R6": case "R6":
cpu.Regs[6 + cpu.RB] = (byte)value; cpu.Regs[6 + cpu.RB] = (byte)value;
break; ; break;
case "R7": case "R7":
cpu.Regs[7 + cpu.RB] = (byte)value; cpu.Regs[7 + cpu.RB] = (byte)value;
break; break;

2
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
vbagbnew, vbagbnew,
vbabgbold, vbabgbold,
gba gba
}; }
public static int[] GetLut(ColorType c) public static int[] GetLut(ColorType c)
{ {

2
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/LibGambatte.cs
View File

@ -116,7 +116,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
BG_PALETTE = 0, BG_PALETTE = 0,
SP1_PALETTE = 1, SP1_PALETTE = 1,
SP2_PALETTE = 2 SP2_PALETTE = 2
}; }
/// <param name="core">opaque state pointer</param> /// <param name="core">opaque state pointer</param>
/// <param name="palnum">in [0, 2]: One of BG_PALETTE, SP1_PALETTE and SP2_PALETTE.</param> /// <param name="palnum">in [0, 2]: One of BG_PALETTE, SP1_PALETTE and SP2_PALETTE.</param>

18
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusCoreApi.cs
View File

@ -46,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64ERR_SYSTEM_FAIL, /* A system function call, such as an SDL or file operation, failed */ M64ERR_SYSTEM_FAIL, /* A system function call, such as an SDL or file operation, failed */
M64ERR_UNSUPPORTED, /* Function call is not supported (ie, core not built with debugger) */ M64ERR_UNSUPPORTED, /* Function call is not supported (ie, core not built with debugger) */
M64ERR_WRONG_TYPE /* A given input type parameter cannot be used for desired operation */ M64ERR_WRONG_TYPE /* A given input type parameter cannot be used for desired operation */
}; }
public enum m64p_plugin_type public enum m64p_plugin_type
{ {
@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64PLUGIN_AUDIO, M64PLUGIN_AUDIO,
M64PLUGIN_INPUT, M64PLUGIN_INPUT,
M64PLUGIN_CORE M64PLUGIN_CORE
}; }
private enum m64p_command private enum m64p_command
{ {
@ -83,7 +83,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64CMD_ADVANCE_FRAME, M64CMD_ADVANCE_FRAME,
M64CMD_SET_VI_CALLBACK, M64CMD_SET_VI_CALLBACK,
M64CMD_SET_RENDER_CALLBACK M64CMD_SET_RENDER_CALLBACK
}; }
private enum m64p_dbg_bkp_command private enum m64p_dbg_bkp_command
{ {
@ -96,7 +96,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64P_BKP_CMD_ENABLE, M64P_BKP_CMD_ENABLE,
M64P_BKP_CMD_DISABLE, M64P_BKP_CMD_DISABLE,
M64P_BKP_CMD_CHECK M64P_BKP_CMD_CHECK
}; }
[Flags] [Flags]
private enum m64p_dbg_bkp_flags private enum m64p_dbg_bkp_flags
@ -108,7 +108,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64P_BPT_FLAG_WRITE = 0x10, M64P_BPT_FLAG_WRITE = 0x10,
M64P_BPT_FLAG_EXEC = 0x20, M64P_BPT_FLAG_EXEC = 0x20,
M64P_BPT_FLAG_LOG = 0x40 M64P_BPT_FLAG_LOG = 0x40
}; }
private enum m64p_dbg_state private enum m64p_dbg_state
{ {
@ -117,21 +117,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64P_DBG_NUM_BREAKPOINTS, M64P_DBG_NUM_BREAKPOINTS,
M64P_DBG_CPU_DYNACORE, M64P_DBG_CPU_DYNACORE,
M64P_DBG_CPU_NEXT_INTERRUPT M64P_DBG_CPU_NEXT_INTERRUPT
}; }
private enum m64p_dbg_runstate private enum m64p_dbg_runstate
{ {
M64P_DBG_RUNSTATE_PAUSED = 0, M64P_DBG_RUNSTATE_PAUSED = 0,
M64P_DBG_RUNSTATE_STEPPING, M64P_DBG_RUNSTATE_STEPPING,
M64P_DBG_RUNSTATE_RUNNING M64P_DBG_RUNSTATE_RUNNING
}; }
public enum m64p_emu_state public enum m64p_emu_state
{ {
M64EMU_STOPPED = 1, M64EMU_STOPPED = 1,
M64EMU_RUNNING, M64EMU_RUNNING,
M64EMU_PAUSED M64EMU_PAUSED
}; }
public enum m64p_type public enum m64p_type
{ {
@ -139,7 +139,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
M64TYPE_FLOAT, M64TYPE_FLOAT,
M64TYPE_BOOL, M64TYPE_BOOL,
M64TYPE_STRING M64TYPE_STRING
}; }
public enum N64_MEMORY : uint public enum N64_MEMORY : uint
{ {

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

@ -40,7 +40,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
enum EState enum EState
{ {
Off, Select, Ignore, Address, Read, Write Off, Select, Ignore, Address, Read, Write
}; }
EState State; EState State;
/// <summary> /// <summary>

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

@ -304,7 +304,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
RESET, RESET,
/// <summary>nothing happening</summary> /// <summary>nothing happening</summary>
IDLE, IDLE,
}; }
/// <summary> /// <summary>
/// set cycleswaiting param after a state change /// set cycleswaiting param after a state change

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

@ -56,7 +56,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
void ApplyCustomAudio(short[] samples); void ApplyCustomAudio(short[] samples);
Dictionary<string, string> InitialRegisterValues { get; set; } Dictionary<string, string> InitialRegisterValues { get; set; }
}; }
[INESBoardImpl] [INESBoardImpl]
public abstract class NESBoardBase : INESBoard public abstract class NESBoardBase : INESBoard

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ICodeDataLogger.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ExecFirst = 0x01, ExecFirst = 0x01,
ExecOperand = 0x02, ExecOperand = 0x02,
Data = 0x04 Data = 0x04
}; }
private struct CDLog_MapResults private struct CDLog_MapResults
{ {

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.ISettable.cs
View File

@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
NTSC, NTSC,
PAL, PAL,
Dendy Dendy
}; }
public Region RegionOverride = Region.Default; public Region RegionOverride = Region.Default;

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

@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
int preNMIlines; int preNMIlines;
int postNMIlines; int postNMIlines;
bool chopdot; bool chopdot;
public enum Region { NTSC, PAL, Dendy, RGB }; public enum Region { NTSC, PAL, Dendy, RGB }
Region _region; Region _region;
public Region region public Region region
{ {

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

@ -256,7 +256,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
v &= 1; v &= 1;
fv &= 7; fv &= 7;
} }
}; }
public sealed class Reg_2000 public sealed class Reg_2000
{ {

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

@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
public byte nt, at; public byte nt, at;
public byte pt_0, pt_1; public byte pt_0, pt_1;
}; }
BGDataRecord[] bgdata = new BGDataRecord[34]; BGDataRecord[] bgdata = new BGDataRecord[34];

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

@ -159,7 +159,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
CARTROM, CARTRAM, WRAM, APURAM, CARTROM, CARTRAM, WRAM, APURAM,
SGB_CARTROM, SGB_CARTRAM, SGB_WRAM, SGB_HRAM, SGB_CARTROM, SGB_CARTRAM, SGB_WRAM, SGB_HRAM,
NUM NUM
}; }
public enum eTRACE : uint public enum eTRACE : uint
{ {
@ -175,7 +175,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
CPUData = 0x04, CPUData = 0x04,
DMAData = 0x08, //not supported yet DMAData = 0x08, //not supported yet
BRR = 0x80, BRR = 0x80,
}; }
snes_video_refresh_t video_refresh; snes_video_refresh_t video_refresh;
snes_input_poll_t input_poll; snes_input_poll_t input_poll;

4
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_Enums.cs
View File

@ -70,14 +70,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
eMessage_BRK_hook_read_smp, eMessage_BRK_hook_read_smp,
eMessage_BRK_hook_write_smp, eMessage_BRK_hook_write_smp,
eMessage_BRK_scanlineStart, eMessage_BRK_scanlineStart,
}; }
enum eStatus : int enum eStatus : int
{ {
eStatus_Idle, eStatus_Idle,
eStatus_CMD, eStatus_CMD,
eStatus_BRK eStatus_BRK
}; }
public enum SNES_INPUT_PORT : int public enum SNES_INPUT_PORT : int
{ {

2
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/SnesColors.cs
View File

@ -79,7 +79,7 @@
BizHawk, BizHawk,
BSNES, BSNES,
Snes9x Snes9x
}; }
//I separated these out to try and make them lazy construct, but it didnt work. try it some other way later. //I separated these out to try and make them lazy construct, but it didnt work. try it some other way later.

2
BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.ICodeDataLog.cs
View File

@ -65,7 +65,7 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
ExecFirst = 0x01, ExecFirst = 0x01,
ExecOperand = 0x02, ExecOperand = 0x02,
Data = 0x04 Data = 0x04
}; }
private ICodeDataLog CDL; private ICodeDataLog CDL;

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

@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
ExecFirst = 0x01, ExecFirst = 0x01,
ExecOperand = 0x02, ExecOperand = 0x02,
Data = 0x04 Data = 0x04
}; }
public struct CDLog_MapResults public struct CDLog_MapResults
{ {

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

@ -395,7 +395,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
case 0x01: Port01 = value; break; case 0x01: Port01 = value; break;
case 0x02: Port02 = value; break; case 0x02: Port02 = value; break;
case 0x03: p3_write = true; Port03 = value; break; case 0x03: p3_write = true; Port03 = value; break;
case 0x04: /*Port04 = value*/; break; // receive port, not sure what writing does case 0x04: /*Port04 = value;*/ break; // receive port, not sure what writing does
case 0x05: Port05 = (byte)(value & 0xF8); break; case 0x05: Port05 = (byte)(value & 0xF8); break;
case 0x06: PSG.Set_Panning(value); break; case 0x06: PSG.Set_Panning(value); break;
case 0x3E: Port3E = value; break; case 0x3E: Port3E = value; break;

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

@ -7,7 +7,7 @@
byte xCoord = 128; byte xCoord = 128;
byte yCoord = 100; byte yCoord = 100;
enum Axis { XAxis, YAxis }; enum Axis { XAxis, YAxis }
Axis axis = Axis.XAxis; Axis axis = Axis.XAxis;

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

@ -357,7 +357,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
{ {
HIntPending = true; HIntPending = true;
if (EnableLineInterrupts) if (EnableLineInterrupts)
{; {
Cpu.FlagI = true; Cpu.FlagI = true;
} }
lineIntLinesRemaining = Registers[0x0A]; lineIntLinesRemaining = Registers[0x0A];

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

@ -185,7 +185,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
Teamplayer, Teamplayer,
Wayplay, Wayplay,
Mouse Mouse
}; }
/// <summary> /// <summary>

10
BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs
View File

@ -97,7 +97,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
SYSTEM_SPORTSPAD = 10, // Sega Sports Pad -- Master System SYSTEM_SPORTSPAD = 10, // Sega Sports Pad -- Master System
SYSTEM_TEAMPLAYER = 11, // Multi Tap -- Sega TeamPlayer SYSTEM_TEAMPLAYER = 11, // Multi Tap -- Sega TeamPlayer
SYSTEM_WAYPLAY = 12, // Multi Tap -- EA 4-Way Play -- use both ports SYSTEM_WAYPLAY = 12, // Multi Tap -- EA 4-Way Play -- use both ports
}; }
public enum INPUT_DEVICE : byte public enum INPUT_DEVICE : byte
{ {
@ -113,13 +113,13 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
DEVICE_TEREBI = 0x08, // Terebi Oekaki tablet DEVICE_TEREBI = 0x08, // Terebi Oekaki tablet
DEVICE_XE_A1P = 0x09, // XE-A1P analog controller DEVICE_XE_A1P = 0x09, // XE-A1P analog controller
DEVICE_ACTIVATOR = 0x0a,// Activator DEVICE_ACTIVATOR = 0x0a,// Activator
}; }
public enum CDLog_AddrType public enum CDLog_AddrType
{ {
MDCART, RAM68k, RAMZ80, SRAM, MDCART, RAM68k, RAMZ80, SRAM,
}; }
[Flags] [Flags]
public enum CDLog_Flags public enum CDLog_Flags
@ -130,7 +130,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
ExecZ80Operand = 0x10, ExecZ80Operand = 0x10,
DataZ80 = 0x20, DataZ80 = 0x20,
DMASource = 0x40, DMASource = 0x40,
}; }
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
@ -216,7 +216,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
/* Menacer */ /* Menacer */
INPUT_MENACER_TRIGGER = 0x0040, INPUT_MENACER_TRIGGER = 0x0040,
INPUT_MENACER_START = 0x0080, INPUT_MENACER_START = 0x0080,
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public class InputData public class InputData

26
BizHawk.Emulation.Cores/Consoles/Sony/PSX/OctoshockDll.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public enum eShockStep public enum eShockStep
{ {
Frame Frame
}; }
public enum eShockFramebufferFlags public enum eShockFramebufferFlags
{ {
@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
GPURAM = 3, //512K GPURAM = 3, //512K
SPURAM = 4, //512K SPURAM = 4, //512K
DCache = 5 //1K DCache = 5 //1K
}; }
public enum eShockStateTransaction : int public enum eShockStateTransaction : int
{ {
@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
Write = 2, //writes from the frontend to the memcard Write = 2, //writes from the frontend to the memcard
Read = 3, //reads from the memcard to the frontend. Also clears the dirty flag Read = 3, //reads from the memcard to the frontend. Also clears the dirty flag
CheckDirty = 4, //checks whether the memcard is dirty CheckDirty = 4, //checks whether the memcard is dirty
}; }
public enum ePeripheralType : int public enum ePeripheralType : int
@ -77,7 +77,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
NegCon = 4, NegCon = 4,
Multitap = 10, Multitap = 10,
}; }
/// <summary> /// <summary>
/// this is implemented as an overall render type instead of a horizontal clip control /// this is implemented as an overall render type instead of a horizontal clip control
@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
Normal, Normal,
ClipOverscan, ClipOverscan,
Framebuffer Framebuffer
}; }
public enum eShockDeinterlaceMode : int public enum eShockDeinterlaceMode : int
{ {
@ -120,7 +120,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
{ {
public eRegion region; public eRegion region;
public unsafe fixed sbyte id[5]; //SCEI, SCEA, SCEE, etc. with null terminator public unsafe fixed sbyte id[5]; //SCEI, SCEA, SCEE, etc. with null terminator
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockTOCTrack public struct ShockTOCTrack
@ -128,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public byte adr; public byte adr;
public byte control; public byte control;
public uint lba; public uint lba;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockTOC public struct ShockTOC
@ -136,7 +136,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public byte first_track; public byte first_track;
public byte last_track; public byte last_track;
public byte disc_type; public byte disc_type;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockFramebufferInfo public struct ShockFramebufferInfo
@ -145,7 +145,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
[MarshalAs(UnmanagedType.I4)] [MarshalAs(UnmanagedType.I4)]
public eShockFramebufferFlags flags; public eShockFramebufferFlags flags;
public void* ptr; public void* ptr;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockRenderOptions public struct ShockRenderOptions
@ -154,7 +154,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public eShockRenderType renderType; public eShockRenderType renderType;
public eShockDeinterlaceMode deinterlaceMode; public eShockDeinterlaceMode deinterlaceMode;
public bool skip; public bool skip;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockMemcardTransaction public struct ShockMemcardTransaction
@ -162,7 +162,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
[MarshalAs(UnmanagedType.I4)] [MarshalAs(UnmanagedType.I4)]
public eShockMemcardTransaction transaction; public eShockMemcardTransaction transaction;
public void* buffer128k; public void* buffer128k;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockRegisters_CPU public struct ShockRegisters_CPU
@ -172,7 +172,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public uint IN_BD_SLOT; public uint IN_BD_SLOT;
public uint LO, HI; public uint LO, HI;
public uint SR, CAUSE, EPC; public uint SR, CAUSE, EPC;
}; }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct ShockStateTransaction public struct ShockStateTransaction
@ -181,7 +181,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
public void* buffer; public void* buffer;
public int bufferLength; public int bufferLength;
public TextStateFPtrs ff; public TextStateFPtrs ff;
}; }
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]

2
BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
View File

@ -134,7 +134,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan
PS = 12, PS = 12,
SS = 13, SS = 13,
DS0 = 14 DS0 = 14
}; }
[Flags] [Flags]
public enum Buttons : uint public enum Buttons : uint

28
BizHawk.Emulation.Cores/Libretro/LibretroApi_Enums.cs
View File

@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Libretro
SIG_VideoUpdate, SIG_VideoUpdate,
SIG_Sample, SIG_Sample,
SIG_SampleBatch, SIG_SampleBatch,
}; }
public enum RETRO_MEMORY public enum RETRO_MEMORY
@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Libretro
RTC = 1, RTC = 1,
SYSTEM_RAM = 2, SYSTEM_RAM = 2,
VIDEO_RAM = 3, VIDEO_RAM = 3,
}; }
public enum RETRO_DEVICE public enum RETRO_DEVICE
@ -55,14 +55,14 @@ namespace BizHawk.Emulation.Cores.Libretro
ANALOG = 5, ANALOG = 5,
POINTER = 6, POINTER = 6,
SENSOR_ACCELEROMETER = 7 SENSOR_ACCELEROMETER = 7
}; }
public enum RETRO_DEVICE_ID_ANALOG public enum RETRO_DEVICE_ID_ANALOG
{ {
// LEFT / RIGHT? // LEFT / RIGHT?
X = 0, X = 0,
Y = 1 Y = 1
}; }
public enum RETRO_DEVICE_ID_MOUSE public enum RETRO_DEVICE_ID_MOUSE
{ {
@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Cores.Libretro
Y = 1, Y = 1,
LEFT = 2, LEFT = 2,
RIGHT = 3 RIGHT = 3
}; }
public enum RETRO_DEVICE_ID_LIGHTGUN public enum RETRO_DEVICE_ID_LIGHTGUN
{ {
@ -81,14 +81,14 @@ namespace BizHawk.Emulation.Cores.Libretro
TURBO = 4, TURBO = 4,
PAUSE = 5, PAUSE = 5,
START = 6 START = 6
}; }
public enum RETRO_DEVICE_ID_POINTER public enum RETRO_DEVICE_ID_POINTER
{ {
X = 0, X = 0,
Y = 1, Y = 1,
PRESSED = 2 PRESSED = 2
}; }
public enum RETRO_KEY public enum RETRO_KEY
{ {
@ -236,7 +236,7 @@ namespace BizHawk.Emulation.Cores.Libretro
UNDO = 322, UNDO = 322,
LAST LAST
}; }
[Flags] [Flags]
public enum RETRO_MOD public enum RETRO_MOD
@ -249,14 +249,14 @@ namespace BizHawk.Emulation.Cores.Libretro
NUMLOCK = 16, NUMLOCK = 16,
CAPSLOCK = 32, CAPSLOCK = 32,
SCROLLLOCK = 64 SCROLLLOCK = 64
}; }
public enum RETRO_DEVICE_ID_SENSOR_ACCELEROMETER public enum RETRO_DEVICE_ID_SENSOR_ACCELEROMETER
{ {
X = 0, X = 0,
Y = 1, Y = 1,
Z = 2 Z = 2
}; }
public enum RETRO_DEVICE_ID_JOYPAD public enum RETRO_DEVICE_ID_JOYPAD
{ {
@ -276,14 +276,14 @@ namespace BizHawk.Emulation.Cores.Libretro
R2 = 13, R2 = 13,
L3 = 14, L3 = 14,
R3 = 15 R3 = 15
}; }
public enum eStatus : int public enum eStatus : int
{ {
eStatus_Idle, eStatus_Idle,
eStatus_CMD, eStatus_CMD,
eStatus_BRK eStatus_BRK
}; }
public enum BufId : int public enum BufId : int
{ {
@ -303,13 +303,13 @@ namespace BizHawk.Emulation.Cores.Libretro
XRGB1555 = 0, XRGB1555 = 0,
XRGB8888 = 1, XRGB8888 = 1,
RGB565 = 2 RGB565 = 2
}; }
public enum retro_region : uint public enum retro_region : uint
{ {
NTSC = 0, NTSC = 0,
PAL = 1 PAL = 1
}; }
} }
} }

2
BizHawk.Emulation.Cores/Libretro/LibretroApi_Structs.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Emulation.Cores.Libretro
[MarshalAs(UnmanagedType.U1)] [MarshalAs(UnmanagedType.U1)]
public bool registered; public bool registered;
}; }
//perf callbacks //perf callbacks
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]

4
BizHawk.Emulation.Cores/Sound/YM2413.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Components
Default = 0, Default = 0,
VRC7 = 1, VRC7 = 1,
YMF281B = 2 YMF281B = 2
}; }
public YM2413(ChipType type) public YM2413(ChipType type)
{ {
@ -301,7 +301,7 @@ namespace BizHawk.Emulation.Cores.Components
static OPLL_PATCH[,] default_patch = new OPLL_PATCH[OPLL_TONE_NUM, (16 + 3) * 2]; static OPLL_PATCH[,] default_patch = new OPLL_PATCH[OPLL_TONE_NUM, (16 + 3) * 2];
/* Definition of envelope mode */ /* Definition of envelope mode */
public enum OPLL_EG_STATE { READY, ATTACK, DECAY, SUSHOLD, SUSTINE, RELEASE, SETTLE, FINISH }; public enum OPLL_EG_STATE { READY, ATTACK, DECAY, SUSHOLD, SUSTINE, RELEASE, SETTLE, FINISH }
/* Phase incr table for Attack */ /* Phase incr table for Attack */
static uint[,] dphaseARTable = new uint[16, 16]; static uint[,] dphaseARTable = new uint[16, 16];

4
BizHawk.Emulation.DiscSystem/API_MednaDisc.cs
View File

@ -123,7 +123,7 @@ namespace BizHawk.Emulation.DiscSystem
public byte first_track; public byte first_track;
public byte last_track; public byte last_track;
public byte disc_type; public byte disc_type;
}; }
[StructLayout(LayoutKind.Explicit)] [StructLayout(LayoutKind.Explicit)]
public struct MednadiscTOCTrack public struct MednadiscTOCTrack
@ -136,7 +136,7 @@ namespace BizHawk.Emulation.DiscSystem
[FieldOffset(8)] public byte _validByte; [FieldOffset(8)] public byte _validByte;
public bool Valid { get { return _validByte != 0; } } public bool Valid { get { return _validByte != 0; } }
}; }
[DllImport("mednadisc.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport("mednadisc.dll", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr mednadisc_LoadCD(string path); public static extern IntPtr mednadisc_LoadCD(string path);

2
BizHawk.Emulation.DiscSystem/DiscJob.cs
View File

@ -58,5 +58,5 @@ namespace BizHawk.Emulation.DiscSystem
class DiscJobAbortException : Exception class DiscJobAbortException : Exception
{ {
}; }
} }

4
Bizware/BizHawk.Bizware.BizwareGL/TexAtlas.cs
View File

@ -190,7 +190,7 @@ namespace BizHawk.Bizware.BizwareGL
public int height; public int height;
public RectItem ri; public RectItem ri;
}; }
/// Starts a new packing process to a bin of the given dimension. /// Starts a new packing process to a bin of the given dimension.
public void Init(int width, int height) public void Init(int width, int height)
@ -317,7 +317,7 @@ namespace BizHawk.Bizware.BizwareGL
node.height = height; node.height = height;
return node; return node;
} }
}; }
} }

3
Common.ruleset
View File

@ -80,9 +80,6 @@
<!-- Prefix local calls with this --> <!-- Prefix local calls with this -->
<Rule Id="SA1101" Action="Hidden" /> <Rule Id="SA1101" Action="Hidden" />
<!-- Code should not contain empty statements -->
<Rule Id="SA1106" Action="Hidden" />
<!-- Code should not contain multiple statements on one line --> <!-- Code should not contain multiple statements on one line -->
<Rule Id="SA1107" Action="Hidden" /> <Rule Id="SA1107" Action="Hidden" />