Merge pull request #436 from AKuHAK/clang-format12

Source control optimization

.clang-format

@@ -3,48 +3,70 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: AcrossEmptyLinesAndComments
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   true
+AlignConsecutiveMacros: AcrossComments
+AlignEscapedNewlines: Left
+AlignOperands:   Align
 AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: true
+BitFieldColonSpacing : Both
+BreakBeforeBraces: Custom
 BraceWrapping:
-  AfterClass:      true
+  AfterCaseLabel:        false
+  AfterClass:            true
   AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: false
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
+  AfterEnum:             false
+  AfterFunction:         true
+  AfterNamespace:        true
+  AfterObjCDeclaration:  false
+  AfterStruct:           true
+  AfterUnion:            true
+  AfterExternBlock:      false
+  BeforeCatch:           false
+  BeforeElse:            false
+  BeforeLambdaBody:      false
+  BeforeWhile:           false
+  IndentBraces:          false
+  SplitEmptyFunction:    true
+  SplitEmptyRecord:      true
+  SplitEmptyNamespace:   true
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
+BreakBeforeConceptDeclarations: true
 BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: true
+BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: true
 ColumnLimit:     0
 CommentPragmas:  '^ (IWYU pragma:|NOLINT)'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
+EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: true
 ForEachMacros:   []
+IncludeBlocks: Preserve
+IndentExternBlock: NoIndent
+IndentCaseBlocks: false
 IndentCaseLabels: true
+IndentGotoLabels: true
 IndentWidth:     4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true
@@ -55,21 +77,36 @@ NamespaceIndentation: None
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 80
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 80
 PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 80
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
+# uncomment below when clang >13 will be out
+# IndentPPDirectives: AfterHash
+# PPIndentWidth: 1
 ReflowComments:  true
 SortIncludes:    false
 SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeInheritanceColon: false
 SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
+SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false

.editorconfig

@@ -0,0 +1,25 @@
+# EditorConfig: http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# 4 space indentation
+[*.{c,h,js,css,html}]
+indent_style = space
+indent_size = 4
+
+# 2 space indentation
+[*.{json,xml,yaml,yml}]
+indent_style = space
+indent_size = 2
+
+# Tab indentation
+[Makefile*]
+indent_style = tab

.github/workflows/check-format.yml

@@ -7,16 +7,13 @@ on:
 jobs:
   check-format:
     runs-on: ubuntu-latest
-    container: ps2dev/ps2dev:latest
     steps:
     - name: Install dependencies
+      shell: bash
       run: |
-        apk add git make clang
+        sudo apt-get install git make clang-format
 
     - uses: actions/checkout@v2
-    - run: |
-        git fetch --prune --unshallow
 
     - name: Check format -> make format-check
-      run: |
-        make format-check
+      run: make format-check

.gitignore

@@ -5,6 +5,7 @@
 #
 # Normal rules
 #
+.*
 *.a
 *.diff
 *.elf
@@ -23,9 +24,14 @@
 DETAILED_CHANGELOG
 
 #
-# git files that we don't want to ignore even it they are dot-files
+# files that we don't want to ignore
 #
 !.gitignore
+!.gitattributes
+!.github
+!.editorconfig
+!.clang-format
+!modules/debug/*.irx
 
 #
 # Generated source files

CHANGELOG

@@ -3,7 +3,7 @@
   Copyright 2013, Ifcaro & jimmikaelkael
   Licenced under Academic Free License version 3.0
   Review OpenUsbLd README & LICENSE files for further details.
-  
+
 -----------------------------------------------------------------------------
 
 === Changelog ===
@@ -77,7 +77,7 @@ CORE:
 
 * Merged OPL/OPLGSM codebase
 * GSM Core 0.36.R - don't worry; 0.38 will be coming back better than ever!
-* GSM Core no longer supports 576p, 1080p, Skip FMVs - this is temporary. 
+* GSM Core no longer supports 576p, 1080p, Skip FMVs - this is temporary.
 * GSM Core is now IGR and CodeBreaker/PS2rd compatible!
 * GSM no longer included in Childproof builds.
 * Unified Makefile builds from single source tree via "GSM=0/1" argument (ala VMC/No VMC)
@@ -87,32 +87,32 @@ CORE:
 * Added power-off processing code. Games should be able to power-off the console now.
 * Optimzed CDVDMAN and CDVDFSV
 * Support for PSX (DVR) units
-* Built-in TLB reinitialization mechanism - no more EECORE hooking and patching. 
+* Built-in TLB reinitialization mechanism - no more EECORE hooking and patching.
 * Added compatibility mode 7 - "IOP Threading Hack".
 * Replaced SMAP driver.
 * Modified SMSTCPIP.
 * Ported a version of ETH Mode types from doctorxyz's OPLGSM.
 * Retired the built-in kernel update for Protokernel consoles (SCPH-10000 and SCPH-15000).
 
-GUI: 
+GUI:
 
 * New "Show GSM on Main Menu" toggle in "Settings" (GSM Builds Only)
 * New "GSM Settings" on Main Menu - easier navigation! (GSM Builds Only)
 * Fixed issue with HDLSERV and GSM Settings not showing up immediately.
-* Full Ethernet controls - can disable Auto-Negotiation and force a mode. 
+* Full Ethernet controls - can disable Auto-Negotiation and force a mode.
 * Some things were are worded differently as less words carry more freight.
 * Removed redundant UDMA modes - PS2 will never handle UDMA 5 and UDMA 6.
-* Updated SMB support to give better error messages. 
-* Network error codes changed slightly - 300 for connection errors, 301 for logon errors, 302 for ECHO isalive         
+* Updated SMB support to give better error messages.
+* Network error codes changed slightly - 300 for connection errors, 301 for logon errors, 302 for ECHO isalive
   test failing, and 303 for share opening errors.
 
-	
-COMPATIBILITY: 
+
+COMPATIBILITY:
 
 	* Kingdom Hearts 2 Final Mix (Gummi Fix)
 	* Baldar's Gate Series (HDD)
 	* Champions of Norrath (HDD)
-	* New Mode 7 fixes stuttering with games such as DDR and Pop'N Music (HDD ONLY!) 
+	* New Mode 7 fixes stuttering with games such as DDR and Pop'N Music (HDD ONLY!)
 
 ==== Version 0.9 ====
 

LICENSE

@@ -154,7 +154,7 @@ of such entity.
 restricted or conditioned by this License or by law, and Licensor promises not
 to interfere with or be responsible for such uses by You.
 
-16) Modification of This License. This License is Copyright � 2005 Lawrence
+16) Modification of This License. This License is Copyright � 2005 Lawrence
 Rosen. Permission is granted to copy, distribute, or communicate this License
 without modification. Nothing in this License permits You to modify this
 License as applied to the Original Work or to Derivative Works. However, You