diff --git a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs index 824c14fcb..eec209d6e 100644 --- a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs +++ b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.FileSystem.Content { "FontNintendoExtended" , 0x0100000000000810 }, }; - this._device = device; + _device = device; } public void LoadEntries() diff --git a/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs b/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs index ab72c123d..5c9b97fbc 100644 --- a/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs +++ b/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs @@ -14,15 +14,15 @@ namespace Ryujinx.HLE.FileSystem.Content public LocationEntry(string contentPath, int flag, long titleId, ContentType contentType) { - this.ContentPath = contentPath; - this.Flag = flag; - this.TitleId = titleId; - this.ContentType = contentType; + ContentPath = contentPath; + Flag = flag; + TitleId = titleId; + ContentType = contentType; } public void SetFlag(int flag) { - this.Flag = flag; + Flag = flag; } } } diff --git a/Ryujinx.HLE/FileSystem/FileSystemProvider.cs b/Ryujinx.HLE/FileSystem/FileSystemProvider.cs index 01783194a..8461467d1 100644 --- a/Ryujinx.HLE/FileSystem/FileSystemProvider.cs +++ b/Ryujinx.HLE/FileSystem/FileSystemProvider.cs @@ -15,8 +15,8 @@ namespace Ryujinx.HLE.FileSystem public FileSystemProvider(string basePath, string rootPath) { - this._basePath = basePath; - this._rootPath = rootPath; + _basePath = basePath; + _rootPath = rootPath; CheckIfDescendentOfRootPath(basePath); } diff --git a/Ryujinx.HLE/FileSystem/PFsProvider.cs b/Ryujinx.HLE/FileSystem/PFsProvider.cs index aaeb2e98e..63edadf11 100644 --- a/Ryujinx.HLE/FileSystem/PFsProvider.cs +++ b/Ryujinx.HLE/FileSystem/PFsProvider.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.FileSystem public PFsProvider(Pfs pfs) { - this._pfs = pfs; + _pfs = pfs; } public long CreateDirectory(string name) diff --git a/Ryujinx.HLE/FileSystem/SaveInfo.cs b/Ryujinx.HLE/FileSystem/SaveInfo.cs index a3e6fad5b..db7f6765d 100644 --- a/Ryujinx.HLE/FileSystem/SaveInfo.cs +++ b/Ryujinx.HLE/FileSystem/SaveInfo.cs @@ -18,11 +18,11 @@ namespace Ryujinx.HLE.FileSystem UInt128 userId, SaveSpaceId saveSpaceId) { - this.TitleId = titleId; - this.UserId = userId; - this.SaveId = saveId; - this.SaveDataType = saveDataType; - this.SaveSpaceId = saveSpaceId; + TitleId = titleId; + UserId = userId; + SaveId = saveId; + SaveDataType = saveDataType; + SaveSpaceId = saveSpaceId; } } } diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArraySubscriptingExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArraySubscriptingExpression.cs index fb76f072d..5145ff7b0 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArraySubscriptingExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArraySubscriptingExpression.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ArraySubscriptingExpression(BaseNode leftNode, BaseNode subscript) : base(NodeType.ArraySubscriptingExpression) { - this._leftNode = leftNode; - this._subscript = subscript; + _leftNode = leftNode; + _subscript = subscript; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs index 886395a31..4b1041ab7 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs @@ -10,14 +10,14 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ArrayType(BaseNode Base, BaseNode dimensionExpression = null) : base(NodeType.ArrayType) { - this._base = Base; - this._dimensionExpression = dimensionExpression; + _base = Base; + _dimensionExpression = dimensionExpression; } public ArrayType(BaseNode Base, string dimensionString) : base(NodeType.ArrayType) { - this._base = Base; - this._dimensionString = dimensionString; + _base = Base; + _dimensionString = dimensionString; } public override bool HasRightPart() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs index 0116a8f12..ca4b98f88 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public BaseNode(NodeType type) { - this.Type = type; + Type = type; } public virtual void Print(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs index d09387598..0c492df39 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public BinaryExpression(BaseNode leftPart, string name, BaseNode rightPart) : base(NodeType.BinaryExpression) { - this._leftPart = leftPart; - this._name = name; - this._rightPart = rightPart; + _leftPart = leftPart; + _name = name; + _rightPart = rightPart; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs index 04ab42ebe..6b9782f5c 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public BracedExpression(BaseNode element, BaseNode expression, bool isArrayExpression) : base(NodeType.BracedExpression) { - this._element = element; - this._expression = expression; - this._isArrayExpression = isArrayExpression; + _element = element; + _expression = expression; + _isArrayExpression = isArrayExpression; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs index 800485625..802422d9a 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public BracedRangeExpression(BaseNode firstNode, BaseNode lastNode, BaseNode expression) : base(NodeType.BracedRangeExpression) { - this._firstNode = firstNode; - this._lastNode = lastNode; - this._expression = expression; + _firstNode = firstNode; + _lastNode = lastNode; + _expression = expression; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs index 2d258d6f0..8e3fc3e69 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public CallExpression(BaseNode callee, List nodes) : base(nodes, NodeType.CallExpression) { - this._callee = callee; + _callee = callee; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CastExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CastExpression.cs index 62bd5d694..1149a788c 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CastExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CastExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public CastExpression(string kind, BaseNode to, BaseNode from) : base(NodeType.CastExpression) { - this._kind = kind; - this._to = to; - this._from = from; + _kind = kind; + _to = to; + _from = from; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConditionalExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConditionalExpression.cs index ef75590ef..c0dd67179 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConditionalExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConditionalExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ConditionalExpression(BaseNode conditionNode, BaseNode thenNode, BaseNode elseNode) : base(NodeType.ConditionalExpression) { - this._thenNode = thenNode; - this._conditionNode = conditionNode; - this._elseNode = elseNode; + _thenNode = thenNode; + _conditionNode = conditionNode; + _elseNode = elseNode; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionExpression.cs index 4a97b1fad..dd1f7a008 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionExpression.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ConversionExpression(BaseNode typeNode, BaseNode expressions) : base(NodeType.ConversionExpression) { - this._typeNode = typeNode; - this._expressions = expressions; + _typeNode = typeNode; + _expressions = expressions; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs index 3cfdf21aa..5f4581235 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public CtorDtorNameType(BaseNode name, bool isDestructor) : base(NodeType.CtorDtorNameType, name) { - this._isDestructor = isDestructor; + _isDestructor = isDestructor; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorVtableSpecialName.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorVtableSpecialName.cs index e36c0eca0..3bb5b1631 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorVtableSpecialName.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorVtableSpecialName.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public CtorVtableSpecialName(BaseNode firstType, BaseNode secondType) : base(NodeType.CtorVtableSpecialName) { - this._firstType = firstType; - this._secondType = secondType; + _firstType = firstType; + _secondType = secondType; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs index 9a73c3657..14715d25e 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public DeleteExpression(BaseNode child, bool isGlobal, bool isArrayExpression) : base(NodeType.DeleteExpression, child) { - this._isGlobal = isGlobal; - this._isArrayExpression = isArrayExpression; + _isGlobal = isGlobal; + _isArrayExpression = isArrayExpression; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs index 8c6a0e7b6..086cd3dc7 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ElaboratedType(string elaborated, BaseNode type) : base(NodeType.ElaboratedType, type) { - this._elaborated = elaborated; + _elaborated = elaborated; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EnclosedExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EnclosedExpression.cs index 0d971815d..b45481ddc 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EnclosedExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EnclosedExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public EnclosedExpression(string prefix, BaseNode expression, string postfix) : base(NodeType.EnclosedExpression) { - this._prefix = prefix; - this._expression = expression; - this._postfix = postfix; + _prefix = prefix; + _expression = expression; + _postfix = postfix; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs index d4539df3a..c7b6dab1a 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs @@ -13,12 +13,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public EncodedFunction(BaseNode name, BaseNode Params, BaseNode cv, BaseNode Ref, BaseNode attrs, BaseNode ret) : base(NodeType.NameType) { - this._name = name; - this._params = Params; - this._cv = cv; - this._ref = Ref; - this._attrs = attrs; - this._ret = ret; + _name = name; + _params = Params; + _cv = cv; + _ref = Ref; + _attrs = attrs; + _ret = ret; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs index d2b231e5b..04f7053e3 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs @@ -11,10 +11,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public FoldExpression(bool isLeftFold, string operatorName, BaseNode expression, BaseNode initializer) : base(NodeType.FunctionParameter) { - this._isLeftFold = isLeftFold; - this._operatorName = operatorName; - this._expression = expression; - this._initializer = initializer; + _isLeftFold = isLeftFold; + _operatorName = operatorName; + _expression = expression; + _initializer = initializer; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs index b8a83d804..1bbf6ef9a 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ForwardTemplateReference(int index) : base(NodeType.ForwardTemplateReference) { - this._index = index; + _index = index; } public override string GetName() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs index 94d9fd690..5654a048f 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public FunctionParameter(string number) : base(NodeType.FunctionParameter) { - this._number = number; + _number = number; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs index 9e3d00963..4ad0c9f5f 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs @@ -12,11 +12,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public FunctionType(BaseNode returnType, BaseNode Params, BaseNode cvQualifier, SimpleReferenceType referenceQualifier, BaseNode exceptionSpec) : base(NodeType.FunctionType) { - this._returnType = returnType; - this._params = Params; - this._cvQualifier = cvQualifier; - this._referenceQualifier = referenceQualifier; - this._exceptionSpec = exceptionSpec; + _returnType = returnType; + _params = Params; + _cvQualifier = cvQualifier; + _referenceQualifier = referenceQualifier; + _exceptionSpec = exceptionSpec; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs index b114bec22..7155dd601 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs @@ -10,8 +10,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public InitListExpression(BaseNode typeNode, List nodes) : base(NodeType.InitListExpression) { - this._typeNode = typeNode; - this._nodes = nodes; + _typeNode = typeNode; + _nodes = nodes; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs index 89c113e96..ef07414de 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public IntegerCastExpression(BaseNode type, string number) : base(NodeType.IntegerCastExpression, type) { - this._number = number; + _number = number; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs index a3a260ef7..951faa554 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public IntegerLiteral(string literalName, string literalValue) : base(NodeType.IntegerLiteral) { - this._literalValue = literalValue; - this._literalName = literalName; + _literalValue = literalValue; + _literalName = literalName; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LocalName.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LocalName.cs index cb607f415..15d46b387 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LocalName.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LocalName.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public LocalName(BaseNode encoding, BaseNode entity) : base(NodeType.LocalName) { - this._encoding = encoding; - this._entity = entity; + _encoding = encoding; + _entity = entity; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs index 9dc8e4ed1..9b91f6f5d 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs @@ -10,9 +10,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public MemberExpression(BaseNode leftNode, string kind, BaseNode rightNode) : base(NodeType.MemberExpression) { - this._leftNode = leftNode; - this._kind = kind; - this._rightNode = rightNode; + _leftNode = leftNode; + _kind = kind; + _rightNode = rightNode; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs index ccc753ea6..f9f4cb20e 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs @@ -8,12 +8,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public NameType(string nameValue, NodeType type) : base(type) { - this._nameValue = nameValue; + _nameValue = nameValue; } public NameType(string nameValue) : base(NodeType.NameType) { - this._nameValue = nameValue; + _nameValue = nameValue; } public override string GetName() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs index b1356fb6e..ee725f36b 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public NameTypeWithTemplateArguments(BaseNode prev, BaseNode templateArgument) : base(NodeType.NameTypeWithTemplateArguments) { - this._prev = prev; - this._templateArgument = templateArgument; + _prev = prev; + _templateArgument = templateArgument; } public override string GetName() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NestedName.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NestedName.cs index ba2affa0c..640c200cb 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NestedName.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NestedName.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public NestedName(BaseNode name, BaseNode type) : base(NodeType.NestedName, type) { - this._name = name; + _name = name; } public override string GetName() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NewExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NewExpression.cs index 68707398e..ba4690af4 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NewExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NewExpression.cs @@ -13,12 +13,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public NewExpression(NodeArray expressions, BaseNode typeNode, NodeArray initializers, bool isGlobal, bool isArrayExpression) : base(NodeType.NewExpression) { - this._expressions = expressions; - this._typeNode = typeNode; - this._initializers = initializers; + _expressions = expressions; + _typeNode = typeNode; + _initializers = initializers; - this._isGlobal = isGlobal; - this._isArrayExpression = isArrayExpression; + _isGlobal = isGlobal; + _isArrayExpression = isArrayExpression; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NodeArray.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NodeArray.cs index 4d32285ad..1482dfc37 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NodeArray.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NodeArray.cs @@ -9,12 +9,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public NodeArray(List nodes) : base(NodeType.NodeArray) { - this.Nodes = nodes; + Nodes = nodes; } public NodeArray(List nodes, NodeType type) : base(type) { - this.Nodes = nodes; + Nodes = nodes; } public override bool IsArray() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ParentNode.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ParentNode.cs index f05071c40..786abced8 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ParentNode.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ParentNode.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ParentNode(NodeType type, BaseNode child) : base(type) { - this.Child = child; + Child = child; } public override string GetName() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PointerType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PointerType.cs index 772c19745..b1a3ec422 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PointerType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PointerType.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public PointerType(BaseNode child) : base(NodeType.PointerType) { - this._child = child; + _child = child; } public override bool HasRightPart() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixExpression.cs index 6d4c22f1f..ccaea3ba7 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixExpression.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public PostfixExpression(BaseNode type, string Operator) : base(NodeType.PostfixExpression, type) { - this._operator = Operator; + _operator = Operator; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixQualifiedType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixQualifiedType.cs index 51be23fa3..5024a8f99 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixQualifiedType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixQualifiedType.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public PostfixQualifiedType(string postfixQualifier, BaseNode type) : base(NodeType.PostfixQualifiedType, type) { - this._postfixQualifier = postfixQualifier; + _postfixQualifier = postfixQualifier; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PrefixExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PrefixExpression.cs index 3858d0d89..9c3d4552a 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PrefixExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PrefixExpression.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public PrefixExpression(string prefix, BaseNode child) : base(NodeType.PrefixExpression, child) { - this._prefix = prefix; + _prefix = prefix; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/QualifiedName.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/QualifiedName.cs index 9933cf94f..2e18f564e 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/QualifiedName.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/QualifiedName.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public QualifiedName(BaseNode qualifier, BaseNode name) : base(NodeType.QualifiedName) { - this._qualifier = qualifier; - this._name = name; + _qualifier = qualifier; + _name = name; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/Qualifier.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/Qualifier.cs index 9c7d753f9..cb6dd6bf6 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/Qualifier.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/Qualifier.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public CvType(Cv qualifier, BaseNode child) : base(NodeType.CvQualifierType, child) { - this.Qualifier = qualifier; + Qualifier = qualifier; } public void PrintQualifier(TextWriter writer) @@ -74,7 +74,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public SimpleReferenceType(Reference qualifier, BaseNode child) : base(NodeType.SimpleReferenceType, child) { - this.Qualifier = qualifier; + Qualifier = qualifier; } public void PrintQualifier(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ReferenceType.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ReferenceType.cs index 90afffa1b..a3214171f 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ReferenceType.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ReferenceType.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ReferenceType(string reference, BaseNode child) : base(NodeType.ReferenceType) { - this._reference = reference; - this._child = child; + _reference = reference; + _child = child; } public override bool HasRightPart() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialName.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialName.cs index a9712e275..1447458b3 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialName.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialName.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public SpecialName(string specialValue, BaseNode type) : base(NodeType.SpecialName, type) { - this._specialValue = specialValue; + _specialValue = specialValue; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialSubstitution.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialSubstitution.cs index a85579de3..23f82eec0 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialSubstitution.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialSubstitution.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public SpecialSubstitution(SpecialType specialSubstitutionKey) : base(NodeType.SpecialSubstitution) { - this._specialSubstitutionKey = specialSubstitutionKey; + _specialSubstitutionKey = specialSubstitutionKey; } public void SetExtended() diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ThrowExpression.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ThrowExpression.cs index 8d9ec2f36..2972a31c2 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ThrowExpression.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ThrowExpression.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast public ThrowExpression(BaseNode expression) : base(NodeType.ThrowExpression) { - this._expression = expression; + _expression = expression; } public override void PrintLeft(TextWriter writer) diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs index 12150e244..b89c920f4 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler public Demangler(string mangled) { - this.Mangled = mangled; + Mangled = mangled; _position = 0; _length = mangled.Length; _canParseTemplateArgs = true; diff --git a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs index b821b6d84..28c65785b 100644 --- a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs +++ b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs @@ -26,8 +26,8 @@ namespace Ryujinx.HLE.HOS.Font public FontInfo(int offset, int size) { - this.Offset = offset; - this.Size = size; + Offset = offset; + Size = size; } } @@ -35,9 +35,9 @@ namespace Ryujinx.HLE.HOS.Font public SharedFontManager(Switch device, long physicalAddress) { - this._physicalAddress = physicalAddress; + _physicalAddress = physicalAddress; - this._device = device; + _device = device; _fontsPath = Path.Combine(device.FileSystem.GetSystemPath(), "fonts"); } diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index b554c078f..0160c1672 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -97,7 +97,7 @@ namespace Ryujinx.HLE.HOS public Horizon(Switch device) { - this.Device = device; + Device = device; State = new SystemStateMgr(); diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs index 32eaa4d3d..14b7e3ad5 100644 --- a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs +++ b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Ipc public IpcHandleDesc(int[] copy, int[] move, long pId) : this(copy, move) { - this.PId = pId; + PId = pId; HasPId = true; } diff --git a/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs b/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs index 27381c0a1..35e139143 100644 --- a/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs +++ b/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs @@ -24,8 +24,8 @@ namespace Ryujinx.HLE.HOS.Kernel public Image(long baseAddress, ElfSymbol[] symbols) { - this.BaseAddress = baseAddress; - this.Symbols = symbols; + BaseAddress = baseAddress; + Symbols = symbols; } } @@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Kernel public HleProcessDebugger(KProcess owner) { - this._owner = owner; + _owner = owner; _images = new List(); } diff --git a/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs b/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs index caa4bc951..1a4c9dfef 100644 --- a/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs +++ b/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Kernel { int selectedCount = 0; - for (int core = 0; core < KScheduler.CpuCoresCount; core++) + for (int core = 0; core < CpuCoresCount; core++) { KCoreContext coreContext = CoreContexts[core]; diff --git a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs index 8b5f77353..485a9905e 100644 --- a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs +++ b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KAddressArbiter(Horizon system) { - this._system = system; + _system = system; CondVarThreads = new List(); ArbiterThreads = new List(); diff --git a/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs b/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs index 35f375d1e..f49beaac9 100644 --- a/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs +++ b/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KAutoObject(Horizon system) { - this.System = system; + System = system; } public virtual KernelResult SetName(string name) diff --git a/Ryujinx.HLE/HOS/Kernel/KClientPort.cs b/Ryujinx.HLE/HOS/Kernel/KClientPort.cs index f597d14c5..575476277 100644 --- a/Ryujinx.HLE/HOS/Kernel/KClientPort.cs +++ b/Ryujinx.HLE/HOS/Kernel/KClientPort.cs @@ -12,13 +12,13 @@ namespace Ryujinx.HLE.HOS.Kernel public void Initialize(KPort parent, int maxSessions) { - this._maxSessions = maxSessions; - this._parent = parent; + _maxSessions = maxSessions; + _parent = parent; } public new static KernelResult RemoveName(Horizon system, string name) { - KAutoObject foundObj = KAutoObject.FindNamedObject(system, name); + KAutoObject foundObj = FindNamedObject(system, name); if (!(foundObj is KClientPort)) { diff --git a/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs b/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs index 0cff5dd42..4ca3c25a0 100644 --- a/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs +++ b/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs @@ -19,8 +19,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KCoreContext(KScheduler scheduler, HleCoreManager coreManager) { - this._scheduler = scheduler; - this._coreManager = coreManager; + _scheduler = scheduler; + _coreManager = coreManager; } public void SelectThread(KThread thread) diff --git a/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs b/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs index 7cf4589a9..a54dc6cbc 100644 --- a/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs +++ b/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KCriticalSection(Horizon system) { - this._system = system; + _system = system; LockObj = new object(); } diff --git a/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs b/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs index 250a19385..42e593295 100644 --- a/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs +++ b/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KHandleEntry(int index) { - this.Index = index; + Index = index; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs b/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs index c3b4425e3..805ad4ff6 100644 --- a/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs +++ b/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KHandleTable(Horizon system) { - this._system = system; + _system = system; } public KernelResult Initialize(int size) @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Kernel size = 1024; } - this._size = size; + _size = size; _idCounter = 1; diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs index ff8a31558..de8bf3b1f 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs @@ -13,10 +13,10 @@ namespace Ryujinx.HLE.HOS.Kernel KMemoryArrangeRegion applet, KMemoryArrangeRegion application) { - this.Service = service; - this.NvServices = nvServices; - this.Applet = applet; - this.Application = application; + Service = service; + NvServices = nvServices; + Applet = applet; + Application = application; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs index 689603eaa..4fe58d730 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs @@ -9,8 +9,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KMemoryArrangeRegion(ulong address, ulong size) { - this.Address = address; - this.Size = size; + Address = address; + Size = size; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs index daa841fc1..44b7a6834 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs @@ -19,11 +19,11 @@ namespace Ryujinx.HLE.HOS.Kernel MemoryPermission permission, MemoryAttribute attribute) { - this.BaseAddress = baseAddress; - this.PagesCount = pagesCount; - this.State = state; - this.Attribute = attribute; - this.Permission = permission; + BaseAddress = baseAddress; + PagesCount = pagesCount; + State = state; + Attribute = attribute; + Permission = permission; } public KMemoryInfo GetInfo() diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs index 0c4dbb59f..375685e67 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs @@ -8,12 +8,12 @@ namespace Ryujinx.HLE.HOS.Kernel public KMemoryBlockAllocator(ulong capacityElements) { - this._capacityElements = capacityElements; + _capacityElements = capacityElements; } public bool CanAllocate(int count) { - return (ulong)(this.Count + count) <= _capacityElements; + return (ulong)(Count + count) <= _capacityElements; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs index c610bee4d..0372e0d38 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs @@ -21,13 +21,13 @@ namespace Ryujinx.HLE.HOS.Kernel int ipcRefCount, int deviceRefCount) { - this.Address = address; - this.Size = size; - this.State = state; - this.Attribute = attribute; - this.Permission = permission; - this.IpcRefCount = ipcRefCount; - this.DeviceRefCount = deviceRefCount; + Address = address; + Size = size; + State = state; + Attribute = attribute; + Permission = permission; + IpcRefCount = ipcRefCount; + DeviceRefCount = deviceRefCount; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs index ba424eed7..831844c72 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs @@ -62,8 +62,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KMemoryManager(Horizon system, MemoryManager cpuMemory) { - this._system = system; - this._cpuMemory = cpuMemory; + _system = system; + _cpuMemory = cpuMemory; _blocks = new LinkedList(); } @@ -218,12 +218,12 @@ namespace Ryujinx.HLE.HOS.Kernel ulong aslrMaxOffset = mapAvailableSize - mapTotalSize; - this._aslrEnabled = aslrEnabled; + _aslrEnabled = aslrEnabled; - this.AddrSpaceStart = addrSpaceStart; - this.AddrSpaceEnd = addrSpaceEnd; + AddrSpaceStart = addrSpaceStart; + AddrSpaceEnd = addrSpaceEnd; - this._blockAllocator = blockAllocator; + _blockAllocator = blockAllocator; if (mapAvailableSize < mapTotalSize) { @@ -287,8 +287,8 @@ namespace Ryujinx.HLE.HOS.Kernel _heapCapacity = 0; PhysicalMemoryUsage = 0; - this._memRegion = memRegion; - this._aslrDisabled = aslrDisabled; + _memRegion = memRegion; + _aslrDisabled = aslrDisabled; return InitializeBlocks(addrSpaceStart, addrSpaceEnd); } diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs index 0afb950e9..b9265b13c 100644 --- a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs @@ -18,9 +18,9 @@ namespace Ryujinx.HLE.HOS.Kernel { _blocks = new KMemoryRegionBlock[BlockOrders.Length]; - this.Address = address; - this.Size = size; - this.EndAddr = endAddr; + Address = address; + Size = size; + EndAddr = endAddr; _blockOrdersCount = BlockOrders.Length; diff --git a/Ryujinx.HLE/HOS/Kernel/KPageNode.cs b/Ryujinx.HLE/HOS/Kernel/KPageNode.cs index aeb839142..5cdb1c493 100644 --- a/Ryujinx.HLE/HOS/Kernel/KPageNode.cs +++ b/Ryujinx.HLE/HOS/Kernel/KPageNode.cs @@ -7,8 +7,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KPageNode(ulong address, ulong pagesCount) { - this.Address = address; - this.PagesCount = pagesCount; + Address = address; + PagesCount = pagesCount; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KPort.cs b/Ryujinx.HLE/HOS/Kernel/KPort.cs index cf2c7101b..a6c5b375f 100644 --- a/Ryujinx.HLE/HOS/Kernel/KPort.cs +++ b/Ryujinx.HLE/HOS/Kernel/KPort.cs @@ -19,8 +19,8 @@ namespace Ryujinx.HLE.HOS.Kernel ServerPort.Initialize(this); ClientPort.Initialize(this, maxSessions); - this._isLight = isLight; - this._nameAddress = nameAddress; + _isLight = isLight; + _nameAddress = nameAddress; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/KProcess.cs index 7ff665dac..c5cfd9646 100644 --- a/Ryujinx.HLE/HOS/Kernel/KProcess.cs +++ b/Ryujinx.HLE/HOS/Kernel/KProcess.cs @@ -120,8 +120,8 @@ namespace Ryujinx.HLE.HOS.Kernel KResourceLimit resourceLimit, MemoryRegion memRegion) { - this.ResourceLimit = resourceLimit; - this._memRegion = memRegion; + ResourceLimit = resourceLimit; + _memRegion = memRegion; AddressSpaceType addrSpaceType = (AddressSpaceType)((creationInfo.MmuFlags >> 1) & 7); @@ -190,8 +190,8 @@ namespace Ryujinx.HLE.HOS.Kernel KResourceLimit resourceLimit, MemoryRegion memRegion) { - this.ResourceLimit = resourceLimit; - this._memRegion = memRegion; + ResourceLimit = resourceLimit; + _memRegion = memRegion; ulong personalMmHeapSize = GetPersonalMmHeapSize((ulong)creationInfo.PersonalMmHeapPagesCount, memRegion); @@ -375,7 +375,7 @@ namespace Ryujinx.HLE.HOS.Kernel return result; } - this.UserExceptionContextAddress = userExceptionContextAddress; + UserExceptionContextAddress = userExceptionContextAddress; MemoryHelper.FillWithZeros(CpuMemory, (long)userExceptionContextAddress, KTlsPageInfo.TlsEntrySize); diff --git a/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs b/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs index 037b385ee..4dc8500c6 100644 --- a/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs +++ b/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs @@ -246,7 +246,7 @@ namespace Ryujinx.HLE.HOS.Kernel return KernelResult.ReservedValue; } - this.ApplicationType = applicationType; + ApplicationType = applicationType; break; } @@ -273,7 +273,7 @@ namespace Ryujinx.HLE.HOS.Kernel return KernelResult.ReservedValue; } - this.HandleTableSize = handleTableSize; + HandleTableSize = handleTableSize; break; } @@ -287,8 +287,8 @@ namespace Ryujinx.HLE.HOS.Kernel return KernelResult.ReservedValue; } - this.DebuggingFlags &= ~3; - this.DebuggingFlags |= debuggingFlags; + DebuggingFlags &= ~3; + DebuggingFlags |= debuggingFlags; break; } diff --git a/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs b/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs index b83a40763..e1a3e63fc 100644 --- a/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs +++ b/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KReadableEvent(Horizon system, KEvent parent) : base(system) { - this._parent = parent; + _parent = parent; } public override void Signal() diff --git a/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs b/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs index bcb20a8e4..09c53e5b0 100644 --- a/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs +++ b/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Kernel _waitingThreads = new LinkedList(); - this._system = system; + _system = system; } public bool Reserve(LimitableResource resource, ulong amount) @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Kernel { if (_current[index] <= limit) { - this._limit[index] = limit; + _limit[index] = limit; return KernelResult.Success; } diff --git a/Ryujinx.HLE/HOS/Kernel/KScheduler.cs b/Ryujinx.HLE/HOS/Kernel/KScheduler.cs index 486c224c1..f85b9e8c4 100644 --- a/Ryujinx.HLE/HOS/Kernel/KScheduler.cs +++ b/Ryujinx.HLE/HOS/Kernel/KScheduler.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KScheduler(Horizon system) { - this._system = system; + _system = system; SchedulingData = new KSchedulingData(); diff --git a/Ryujinx.HLE/HOS/Kernel/KServerPort.cs b/Ryujinx.HLE/HOS/Kernel/KServerPort.cs index b6d7f7995..0aa74e487 100644 --- a/Ryujinx.HLE/HOS/Kernel/KServerPort.cs +++ b/Ryujinx.HLE/HOS/Kernel/KServerPort.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Kernel public void Initialize(KPort parent) { - this._parent = parent; + _parent = parent; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KSession.cs b/Ryujinx.HLE/HOS/Kernel/KSession.cs index 2edd568af..361a7479f 100644 --- a/Ryujinx.HLE/HOS/Kernel/KSession.cs +++ b/Ryujinx.HLE/HOS/Kernel/KSession.cs @@ -11,8 +11,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KSession(IpcService service, string serviceName) { - this.Service = service; - this.ServiceName = serviceName; + Service = service; + ServiceName = serviceName; } public void Dispose() diff --git a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs index f09eb16f7..0e9f8840e 100644 --- a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs +++ b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs @@ -17,10 +17,10 @@ namespace Ryujinx.HLE.HOS.Kernel MemoryPermission ownerPermission, MemoryPermission userPermission) { - this._pageList = pageList; - this._ownerPid = ownerPid; - this._ownerPermission = ownerPermission; - this._userPermission = userPermission; + _pageList = pageList; + _ownerPid = ownerPid; + _ownerPermission = ownerPermission; + _userPermission = userPermission; } public KernelResult MapIntoProcess( diff --git a/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs b/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs index 21b80a8d0..51b74a03d 100644 --- a/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs +++ b/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KSynchronization(Horizon system) { - this._system = system; + _system = system; } public long WaitFor(KSynchronizationObject[] syncObjs, long timeout, ref int hndIndex) diff --git a/Ryujinx.HLE/HOS/Kernel/KThread.cs b/Ryujinx.HLE/HOS/Kernel/KThread.cs index 047190e3c..846b41aa3 100644 --- a/Ryujinx.HLE/HOS/Kernel/KThread.cs +++ b/Ryujinx.HLE/HOS/Kernel/KThread.cs @@ -115,7 +115,7 @@ namespace Ryujinx.HLE.HOS.Kernel ObjSyncResult = 0x7201; - this._entrypoint = entrypoint; + _entrypoint = entrypoint; if (type == ThreadType.User) { @@ -131,7 +131,7 @@ namespace Ryujinx.HLE.HOS.Kernel if (owner != null) { - this.Owner = owner; + Owner = owner; owner.IncrementThreadCount(); diff --git a/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs b/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs index 362f897a6..0c2551a39 100644 --- a/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs @@ -14,10 +14,10 @@ namespace Ryujinx.HLE.HOS.Kernel public long TimePoint { get; private set; } - public WaitingObject(IKFutureSchedulerObject Object, long timePoint) + public WaitingObject(IKFutureSchedulerObject schedulerObj, long timePoint) { - this.Object = Object; - this.TimePoint = timePoint; + Object = schedulerObj; + TimePoint = timePoint; } } @@ -38,13 +38,13 @@ namespace Ryujinx.HLE.HOS.Kernel work.Start(); } - public void ScheduleFutureInvocation(IKFutureSchedulerObject Object, long timeout) + public void ScheduleFutureInvocation(IKFutureSchedulerObject schedulerObj, long timeout) { long timePoint = PerformanceCounter.ElapsedMilliseconds + ConvertNanosecondsToMilliseconds(timeout); lock (_waitingObjects) { - _waitingObjects.Add(new WaitingObject(Object, timePoint)); + _waitingObjects.Add(new WaitingObject(schedulerObj, timePoint)); } _waitEvent.Set(); diff --git a/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs b/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs index ce140b981..ff5ecf139 100644 --- a/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs +++ b/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KTlsPageInfo(ulong pageAddress) { - this.PageAddr = pageAddress; + PageAddr = pageAddress; _isSlotFree = new bool[KMemoryManager.PageSize / TlsEntrySize]; diff --git a/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs b/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs index b67f498ac..75f595ebc 100644 --- a/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs @@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KTlsPageManager(long pagePosition) { - this._pagePosition = pagePosition; + _pagePosition = pagePosition; _slots = new bool[KMemoryManager.PageSize / TlsEntrySize]; } diff --git a/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs b/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs index 9db63f119..d88378518 100644 --- a/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs +++ b/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs @@ -7,8 +7,8 @@ namespace Ryujinx.HLE.HOS.Kernel public KTransferMemory(ulong address, ulong size) { - this.Address = address; - this.Size = size; + Address = address; + Size = size; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs b/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs index 9bcc4828f..4d56a92d2 100644 --- a/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs +++ b/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Kernel public KWritableEvent(KEvent parent) { - this._parent = parent; + _parent = parent; } public void Signal() diff --git a/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs b/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs index 8baf76b63..7b2e8b72f 100644 --- a/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs +++ b/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs @@ -24,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Kernel int resourceLimitHandle, int personalMmHeapPagesCount) { - this.Name = name; - this.Category = category; - this.TitleId = titleId; - this.CodeAddress = codeAddress; - this.CodePagesCount = codePagesCount; - this.MmuFlags = mmuFlags; - this.ResourceLimitHandle = resourceLimitHandle; - this.PersonalMmHeapPagesCount = personalMmHeapPagesCount; + Name = name; + Category = category; + TitleId = titleId; + CodeAddress = codeAddress; + CodePagesCount = codePagesCount; + MmuFlags = mmuFlags; + ResourceLimitHandle = resourceLimitHandle; + PersonalMmHeapPagesCount = personalMmHeapPagesCount; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs index 39c98473d..38cd794b5 100644 --- a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs +++ b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs @@ -32,10 +32,10 @@ namespace Ryujinx.HLE.HOS.Kernel IpcMessage message, long messagePtr) { - this.Thread = thread; - this.Session = session; - this.Message = message; - this.MessagePtr = messagePtr; + Thread = thread; + Session = session; + Message = message; + MessagePtr = messagePtr; } } @@ -93,10 +93,10 @@ namespace Ryujinx.HLE.HOS.Kernel { 0x71, ManageNamedPort64 } }; - this._device = device; - this._process = process; - this._system = device.System; - this._memory = process.CpuMemory; + _device = device; + _process = process; + _system = device.System; + _memory = process.CpuMemory; } public void SvcCall(object sender, InstExceptionEventArgs e) diff --git a/Ryujinx.HLE/HOS/ServiceCtx.cs b/Ryujinx.HLE/HOS/ServiceCtx.cs index 1dcec63b2..f55e45461 100644 --- a/Ryujinx.HLE/HOS/ServiceCtx.cs +++ b/Ryujinx.HLE/HOS/ServiceCtx.cs @@ -26,14 +26,14 @@ namespace Ryujinx.HLE.HOS BinaryReader requestData, BinaryWriter responseData) { - this.Device = device; - this.Process = process; - this.Memory = memory; - this.Session = session; - this.Request = request; - this.Response = response; - this.RequestData = requestData; - this.ResponseData = responseData; + Device = device; + Process = process; + Memory = memory; + Session = session; + Request = request; + Response = response; + RequestData = requestData; + ResponseData = responseData; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs b/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs index 0362dab02..93dc2290f 100644 --- a/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc { 1, GetAccountId } }; - this._uuid = uuid; + _uuid = uuid; } // CheckAvailability() diff --git a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs index 1171a5b90..710374cf9 100644 --- a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs +++ b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc { 11, LoadImage }, }; - this._profile = profile; + _profile = profile; _profilePictureStream = Assembly.GetCallingAssembly().GetManifestResourceStream("Ryujinx.HLE.RyujinxProfileImage.jpg"); } diff --git a/Ryujinx.HLE/HOS/Services/Am/IStorage.cs b/Ryujinx.HLE/HOS/Services/Am/IStorage.cs index 1a4266104..759fa94f4 100644 --- a/Ryujinx.HLE/HOS/Services/Am/IStorage.cs +++ b/Ryujinx.HLE/HOS/Services/Am/IStorage.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Am { 0, Open } }; - this.Data = data; + Data = data; } public long Open(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs index cd9b346d5..cc7105b5a 100644 --- a/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs +++ b/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Am { 11, Read } }; - this._storage = storage; + _storage = storage; } public long GetSize(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs index 8deae497f..fb9295b72 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs @@ -34,9 +34,9 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioOut { 8, GetReleasedAudioOutBufferAuto } }; - this._audioOut = audioOut; - this._releaseEvent = releaseEvent; - this._track = track; + _audioOut = audioOut; + _releaseEvent = releaseEvent; + _track = track; } public long GetAudioOutState(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs index 5647a7c2f..d672705c5 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs @@ -62,9 +62,9 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer _updateEvent = new KEvent(system); - this._memory = memory; - this._audioOut = audioOut; - this._params = Params; + _memory = memory; + _audioOut = audioOut; + _params = Params; _track = audioOut.OpenTrack( AudioConsts.HostSampleRate, diff --git a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs index 01a0cea89..db638dbea 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs @@ -27,8 +27,8 @@ namespace Ryujinx.HLE.HOS.Services.Aud { 4, DecodeInterleavedWithPerf } }; - this._sampleRate = sampleRate; - this._channelsCount = channelsCount; + _sampleRate = sampleRate; + _channelsCount = channelsCount; _decoder = new OpusDecoder(FixedSampleRate, channelsCount); } diff --git a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs index be88582f2..2dc9c6f2e 100644 --- a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs +++ b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs @@ -137,7 +137,7 @@ namespace Ryujinx.HLE.HOS.Services.Bsd { 27, DuplicateSocket }, }; - this._isPrivileged = isPrivileged; + _isPrivileged = isPrivileged; } private LinuxError ConvertError(WsaError errorCode) diff --git a/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs b/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs index da2abf2f6..3f3e4463e 100644 --- a/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs +++ b/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs @@ -19,10 +19,10 @@ public PollEvent(int socketFd, BsdSocket socket, EventTypeMask inputEvents, EventTypeMask outputEvents) { - this.SocketFd = socketFd; - this.Socket = socket; - this.InputEvents = inputEvents; - this.OutputEvents = outputEvents; + SocketFd = socketFd; + Socket = socket; + InputEvents = inputEvents; + OutputEvents = outputEvents; } } } diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/DirectoryEntry.cs b/Ryujinx.HLE/HOS/Services/FspSrv/DirectoryEntry.cs index e2cfabd85..aa47e511f 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/DirectoryEntry.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/DirectoryEntry.cs @@ -13,9 +13,9 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv public DirectoryEntry(string path, DirectoryEntryType directoryEntryType, long size = 0) { - this.Path = path; + Path = path; EntryType = directoryEntryType; - this.Size = size; + Size = size; } } } diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs index 03c9a9123..664072d64 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs @@ -33,8 +33,8 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv { 1, GetEntryCount } }; - this._provider = provider; - this.DirectoryPath = directoryPath; + _provider = provider; + DirectoryPath = directoryPath; _directoryEntries = new List(); diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs index f5db114e6..76c01f4bd 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs @@ -28,8 +28,8 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv { 4, GetSize } }; - this._baseStream = baseStream; - this.HostPath = hostPath; + _baseStream = baseStream; + HostPath = hostPath; } // Read(u32, u64 offset, u64 size) -> (u64 out_size, buffer out_buf) diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs index 603927492..ba7f989cb 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs @@ -44,8 +44,8 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv _openPaths = new HashSet(); - this._path = path; - this._provider = provider; + _path = path; + _provider = provider; } // CreateFile(u32 mode, u64 size, buffer, 0x19, 0x301> path) diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs index a38c43f20..500b5106a 100644 --- a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs +++ b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv { 0, Read } }; - this._baseStream = baseStream; + _baseStream = baseStream; } // Read(u64 offset, u64 length) -> buffer buffer diff --git a/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs b/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs index 50814abc9..974c09d88 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid { 0, GetSharedMemoryHandle } }; - this._hidSharedMem = hidSharedMem; + _hidSharedMem = hidSharedMem; } public long GetSharedMemoryHandle(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs index 97196a624..6493853c4 100644 --- a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs @@ -57,9 +57,9 @@ namespace Ryujinx.HLE.HOS.Services.Ldr public NrrInfo(long nrrAddress, NrrHeader header, List hashes) { - this.NrrAddress = nrrAddress; - this.Header = header; - this.Hashes = hashes; + NrrAddress = nrrAddress; + Header = header; + Hashes = hashes; } } @@ -84,13 +84,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldr ulong bssSize, ulong totalSize) { - this.Executable = executable; - this.Hash = hash; - this.NroAddress = nroAddress; - this.NroSize = nroSize; - this.BssAddress = bssAddress; - this.BssSize = bssSize; - this.TotalSize = totalSize; + Executable = executable; + Hash = hash; + NroAddress = nroAddress; + NroSize = nroSize; + BssAddress = bssAddress; + BssSize = bssSize; + TotalSize = totalSize; } } diff --git a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs index f1dc34407..c6ad57779 100644 --- a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs +++ b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs @@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Lr { 15, DeleteInfoHtmlNcaPath } }; - this._storageId = storageId; + _storageId = storageId; } // DeleteInfoHtmlNcaPath() diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs b/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs index 4e8728ce8..b6c654e4e 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv public NvFd(string name) { - this.Name = name; + Name = name; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs index e7cdff4b2..67b80e33e 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs @@ -30,8 +30,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS long physicalAddress, bool vaAllocated) : base(position, size) { - this.PhysicalAddress = physicalAddress; - this.VaAllocated = vaAllocated; + PhysicalAddress = physicalAddress; + VaAllocated = vaAllocated; } } diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs index 8d1989f18..51d074feb 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvMap public NvMapHandle(int size) : this() { - this.Size = size; + Size = size; } public void IncrementRefCount() diff --git a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs index eb8117e09..45eb5c520 100644 --- a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs +++ b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl { 1, Initialize } }; - this._needInitialize = needInitialize; + _needInitialize = needInitialize; } public long Initialize(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs b/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs index b4fab664c..e16cbf710 100644 --- a/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Services.Time { 3, SetSystemClockContext } }; - this._clockType = clockType; + _clockType = clockType; _systemClockContextEpoch = System.Diagnostics.Process.GetCurrentProcess().StartTime; _systemClockContextEnding = new byte[0x10]; _timeOffset = 0; diff --git a/Ryujinx.HLE/HOS/Services/Vi/Display.cs b/Ryujinx.HLE/HOS/Services/Vi/Display.cs index 835deb765..47c7b2aea 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/Display.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/Display.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi public Display(string name) { - this.Name = name; + Name = name; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs b/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs index 1ab0e5438..306c4b9c3 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs @@ -83,8 +83,8 @@ namespace Ryujinx.HLE.HOS.Services.Android { ("android.gui.IGraphicBufferProducer", 0xe), GbpPreallocBuffer } }; - this._renderer = renderer; - this._binderEvent = binderEvent; + _renderer = renderer; + _binderEvent = binderEvent; _bufferQueue = new BufferEntry[0x40]; diff --git a/Ryujinx.HLE/HOS/SystemState/UserProfile.cs b/Ryujinx.HLE/HOS/SystemState/UserProfile.cs index cb078fb68..9240389c6 100644 --- a/Ryujinx.HLE/HOS/SystemState/UserProfile.cs +++ b/Ryujinx.HLE/HOS/SystemState/UserProfile.cs @@ -18,8 +18,8 @@ namespace Ryujinx.HLE.HOS.SystemState public UserProfile(UInt128 uuid, string name) { - this.Uuid = uuid; - this.Name = name; + Uuid = uuid; + Name = name; LastModifiedTimestamp = 0; diff --git a/Ryujinx.HLE/Input/Hid.cs b/Ryujinx.HLE/Input/Hid.cs index 8e39dc5af..c35fb07cd 100644 --- a/Ryujinx.HLE/Input/Hid.cs +++ b/Ryujinx.HLE/Input/Hid.cs @@ -13,8 +13,8 @@ namespace Ryujinx.HLE.Input public Hid(Switch device, long hidPosition) { - this._device = device; - this.HidPosition = hidPosition; + _device = device; + HidPosition = hidPosition; device.Memory.FillWithZeros(hidPosition, Horizon.HidSize); } diff --git a/Ryujinx.HLE/Input/HidBaseController.cs b/Ryujinx.HLE/Input/HidBaseController.cs index df7b79f06..8b29d8918 100644 --- a/Ryujinx.HLE/Input/HidBaseController.cs +++ b/Ryujinx.HLE/Input/HidBaseController.cs @@ -13,14 +13,14 @@ namespace Ryujinx.HLE.Input public HidControllerBase(HidControllerType controllerType, Switch device) { - this.Device = device; + Device = device; HidControllerType = controllerType; } public virtual void Connect(HidControllerId controllerId) { - this.ControllerId = controllerId; + ControllerId = controllerId; Offset = Device.Hid.HidPosition + HidControllersOffset + (int)controllerId * HidControllerSize; diff --git a/Ryujinx.HLE/Input/HidNpadController.cs b/Ryujinx.HLE/Input/HidNpadController.cs index 66289fc10..90cffbdd7 100644 --- a/Ryujinx.HLE/Input/HidNpadController.cs +++ b/Ryujinx.HLE/Input/HidNpadController.cs @@ -15,8 +15,8 @@ (NpadColor, NpadColor) npadBodyColors, (NpadColor, NpadColor) npadButtonColors) : base(controllerType, device) { - this._npadBodyColors = npadBodyColors; - this._npadButtonColors = npadButtonColors; + _npadBodyColors = npadBodyColors; + _npadButtonColors = npadButtonColors; _currentLayout = HidControllerLayouts.HandheldJoined; diff --git a/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs b/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs index 9c1c87f60..166ae60a9 100644 --- a/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs +++ b/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.Loaders.Compression public BackwardsReader(Stream baseStream) { - this._baseStream = baseStream; + _baseStream = baseStream; } public byte ReadByte() diff --git a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs index 215d76bb8..f489e85af 100644 --- a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs +++ b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs @@ -8,8 +8,8 @@ namespace Ryujinx.HLE.Loaders.Elf public ElfDynamic(ElfDynamicTag tag, long value) { - this.Tag = tag; - this.Value = value; + Tag = tag; + Value = value; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs index 6c82e08a7..b655816f1 100644 --- a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs +++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs @@ -28,13 +28,13 @@ namespace Ryujinx.HLE.Loaders.Elf long value, long size) { - this.Name = name; - this.Type = (ElfSymbolType)(info & 0xf); - this.Binding = (ElfSymbolBinding)(info >> 4); - this.Visibility = (ElfSymbolVisibility)other; - this.ShIdx = shIdx; - this.Value = value; - this.Size = size; + Name = name; + Type = (ElfSymbolType)(info & 0xf); + Binding = (ElfSymbolBinding)(info >> 4); + Visibility = (ElfSymbolVisibility)other; + ShIdx = shIdx; + Value = value; + Size = size; } } } \ No newline at end of file diff --git a/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs b/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs index c25dbdf18..8b09bfcd2 100644 --- a/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs +++ b/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs @@ -45,10 +45,10 @@ namespace Ryujinx.HLE.Loaders.Executables int compressedSize, int attribute) { - this.Offset = offset; - this.DecompressedSize = decompressedSize; - this.CompressedSize = compressedSize; - this.Attribute = attribute; + Offset = offset; + DecompressedSize = decompressedSize; + CompressedSize = compressedSize; + Attribute = attribute; } } diff --git a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs b/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs index 86fbca708..eb3ca94a9 100644 --- a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs +++ b/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs @@ -21,8 +21,8 @@ namespace Ryujinx.HLE.Loaders.Executables public NxRelocatableObject(Stream input, ulong sourceAddress = 0, ulong bssAddress = 0) { - this.SourceAddress = sourceAddress; - this.BssAddress = bssAddress; + SourceAddress = sourceAddress; + BssAddress = bssAddress; BinaryReader reader = new BinaryReader(input); @@ -43,11 +43,11 @@ namespace Ryujinx.HLE.Loaders.Executables int dataSize = reader.ReadInt32(); int bssSize = reader.ReadInt32(); - this.Mod0Offset = mod0Offset; - this.TextOffset = textOffset; - this.RoOffset = roOffset; - this.DataOffset = dataOffset; - this.BssSize = bssSize; + Mod0Offset = mod0Offset; + TextOffset = textOffset; + RoOffset = roOffset; + DataOffset = dataOffset; + BssSize = bssSize; byte[] Read(long position, int size) { diff --git a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs index 3b00b9594..c0b2e9475 100644 --- a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs +++ b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs @@ -70,10 +70,10 @@ namespace Ryujinx.HLE.Loaders.Executables NsoFlags flags = (NsoFlags)flagsMsk; - this.TextOffset = textMemOffset; - this.RoOffset = roMemOffset; - this.DataOffset = dataMemOffset; - this.BssSize = bssSize; + TextOffset = textMemOffset; + RoOffset = roMemOffset; + DataOffset = dataMemOffset; + BssSize = bssSize; //Text segment input.Seek(textOffset, SeekOrigin.Begin); diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs index 488ad6de2..368dbae75 100644 --- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs +++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs @@ -36,7 +36,7 @@ namespace Ryujinx.HLE.Loaders.Npdm byteReaded += length + 1; } - this.Services = new ReadOnlyDictionary(services); + Services = new ReadOnlyDictionary(services); } } } diff --git a/Ryujinx.HLE/Switch.cs b/Ryujinx.HLE/Switch.cs index f19006e30..d661b273a 100644 --- a/Ryujinx.HLE/Switch.cs +++ b/Ryujinx.HLE/Switch.cs @@ -43,7 +43,7 @@ namespace Ryujinx.HLE throw new ArgumentNullException(nameof(audioOut)); } - this.AudioOut = audioOut; + AudioOut = audioOut; Memory = new DeviceMemory(); diff --git a/Ryujinx.HLE/Utilities/StructReader.cs b/Ryujinx.HLE/Utilities/StructReader.cs index 230e1de94..441dfd195 100644 --- a/Ryujinx.HLE/Utilities/StructReader.cs +++ b/Ryujinx.HLE/Utilities/StructReader.cs @@ -11,8 +11,8 @@ namespace Ryujinx.HLE.Utilities public StructReader(MemoryManager memory, long position) { - this._memory = memory; - this.Position = position; + _memory = memory; + Position = position; } public T Read() where T : struct diff --git a/Ryujinx.HLE/Utilities/StructWriter.cs b/Ryujinx.HLE/Utilities/StructWriter.cs index 167d7ef94..86cfeedd7 100644 --- a/Ryujinx.HLE/Utilities/StructWriter.cs +++ b/Ryujinx.HLE/Utilities/StructWriter.cs @@ -11,8 +11,8 @@ namespace Ryujinx.HLE.Utilities public StructWriter(MemoryManager memory, long position) { - this._memory = memory; - this.Position = position; + _memory = memory; + Position = position; } public void Write(T value) where T : struct diff --git a/Ryujinx.HLE/Utilities/UInt128.cs b/Ryujinx.HLE/Utilities/UInt128.cs index cc199f414..a637cfb60 100644 --- a/Ryujinx.HLE/Utilities/UInt128.cs +++ b/Ryujinx.HLE/Utilities/UInt128.cs @@ -11,8 +11,8 @@ namespace Ryujinx.HLE.Utilities public UInt128(long low, long high) { - this.Low = low; - this.High = high; + Low = low; + High = high; } public UInt128(string uInt128Hex)