diff --git a/.clang-format b/.clang-format index 6c2fac02..260c48c3 100644 --- a/.clang-format +++ b/.clang-format @@ -1,79 +1,116 @@ --- -Language: Cpp +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 + AfterEnum: false + AfterFunction: true + AfterNamespace: true AfterObjCDeclaration: false - AfterStruct: true - AfterUnion: true - BeforeCatch: false - BeforeElse: false - IndentBraces: 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 -ColumnLimit: 0 -CommentPragmas: '^ (IWYU pragma:|NOLINT)' +BreakConstructorInitializers: BeforeComma +BreakStringLiterals: true +ColumnLimit: 0 +CommentPragmas: "^ (IWYU pragma:|NOLINT)" ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true +DeriveLineEnding: true DerivePointerAlignment: false -DisableFormat: false -ForEachMacros: [] +DisableFormat: false +EmptyLineBeforeAccessModifier: LogicalBlock +FixNamespaceComments: true +ForEachMacros: [] +IncludeBlocks: Preserve +IndentExternBlock: NoIndent +IndentCaseBlocks: false IndentCaseLabels: true -IndentWidth: 4 +IndentGotoLabels: true +IndentWidth: 4 IndentWrappedFunctionNames: false KeepEmptyLinesAtTheStartOfBlocks: true -MacroBlockBegin: '' -MacroBlockEnd: '' +MacroBlockBegin: "" +MacroBlockEnd: "" MaxEmptyLinesToKeep: 3 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 -ReflowComments: true -SortIncludes: false +# 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: 2 -SpacesInAngles: false +SpacesInAngles: false +SpacesInConditionalStatement: false SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp11 -TabWidth: 4 -UseTab: ForIndentation +Standard: Cpp11 +TabWidth: 4 +UseTab: Never diff --git a/.clang-format-ignore b/.clang-format-ignore new file mode 100644 index 00000000..c9d7ae4a --- /dev/null +++ b/.clang-format-ignore @@ -0,0 +1,4 @@ +# ignore files with non-unicode symbols +./jpgviewer.c +./draw.c +./makeicon.c diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..a672df1f --- /dev/null +++ b/.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*, .make, linkfile] +indent_style = tab diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1dc99558 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml index 66e0f278..110aa8ee 100644 --- a/.github/workflows/check-format.yml +++ b/.github/workflows/check-format.yml @@ -2,21 +2,26 @@ name: CI-format-check on: push: + paths: + - "**.h" + - "**.c" + - ".github/workflows/check-format.yml" + - ".clang-format" pull_request: + paths: + - "**.h" + - "**.c" + - ".github/workflows/check-format.yml" + - ".clang-format" jobs: check-format: runs-on: ubuntu-latest - container: ps2dev/ps2dev:latest - steps: - - name: Install dependencies - run: | - apk add git make clang - - - uses: actions/checkout@v2 - - run: | - git fetch --prune --unshallow - - name: Check format -> make format-check - run: | - make format-check + steps: + - uses: actions/checkout@v2 + - uses: DoozyX/clang-format-lint-action@v0.12 + with: + source: "." + clangFormatVersion: 12 + inplace: false diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml index ca99cdf5..a829553b 100644 --- a/.github/workflows/compilation.yml +++ b/.github/workflows/compilation.yml @@ -11,34 +11,35 @@ jobs: runs-on: ubuntu-latest container: ps2dev/ps2dev:latest steps: - - name: Install dependencies - run: | - apk add build-base git zip + - name: Install dependencies + run: | + apk add build-base git zip - - uses: actions/checkout@v2 - - run: | - git fetch --prune --unshallow + - uses: actions/checkout@v2 + - run: | + git fetch --prune --unshallow - - name: Compile wLaunchELF - run: | - make - - - name: Get short SHA - id: slug - run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" + - name: Compile wLaunchELF + run: | + make + git ls-files -i --exclude-standard -c - - name: Upload artifacts - if: ${{ success() }} - uses: actions/upload-artifact@v2 - with: - name: wLaunchELF-${{ steps.slug.outputs.sha8 }} - path: BOOT.ELF + - name: Get short SHA + id: slug + run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" - - name: Create release - if: github.ref == 'refs/heads/master' - uses: marvinpinto/action-automatic-releases@latest - with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" - title: "Latest development build" - files: BOOT.ELF + - name: Upload artifacts + if: ${{ success() }} + uses: actions/upload-artifact@v2 + with: + name: wLaunchELF-${{ steps.slug.outputs.sha8 }} + path: BOOT.ELF + + - name: Create release + if: github.ref == 'refs/heads/master' + uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + title: "Latest development build" + files: BOOT.ELF diff --git a/.gitignore b/.gitignore index 63cdf557..16cdc7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,37 @@ +# +# NOTE! Please use 'git ls-files -i --exclude-standard -c' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Normal rules +# +.* *.a +*.diff *.elf *.ELF *.erl *.exe -*.o -*.swp -*.tmp *.irx +*.map +*.o +*.patch +*.rej *.s -githash.h \ No newline at end of file +*.zip +*.ZIP +*.a + +# +# files that we don't want to ignore +# +!.gitignore +!.gitattributes +!.github +!.editorconfig +!.clang-format* + +# +# Generated source files +# +githash.h diff --git a/AllowDVDV/Makefile b/AllowDVDV/Makefile index 6bfbb379..45106910 100644 --- a/AllowDVDV/Makefile +++ b/AllowDVDV/Makefile @@ -8,7 +8,7 @@ IOP_INCS += -I$(PS2SDK)/iop/include -I$(PS2SDK)/common/include all: $(IOP_BIN) clean: - rm -f $(IOP_BIN) $(IOP_OBJS) + rm -f $(IOP_OBJS_DIR) $(IOP_BIN) include $(PS2SDK)/Defs.make include ../Rules.make diff --git a/README.md b/README.md index 4a0d6690..4c05657c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![CI](https://github.com/ps2homebrew/wLaunchELF/workflows/CI/badge.svg)](https://github.com/ps2homebrew/wLaunchELF/actions?query=workflow%3ACI) # wLaunchELF -wLaunchELF, formerly known as uLaunchELF, also known as wLE or uLE (abbreviated), is an open source file manager and executable launcher for the Playstation 2 console based off of the original LaunchELF. It contains many different features, including a text editor, hard drive manager, as well as network support, and much more. + +wLaunchELF, formerly known as uLaunchELF, also known as wLE or uLE (abbreviated), is an open-source file manager and executable launcher for the Playstation 2 console based on the original LaunchELF. It contains many different features, including a text editor, hard drive manager, FTP support, and much more. diff --git a/docs/FileBrowser sort+display modes.txt b/docs/FileBrowser sort+display modes.txt index 5b60b74c..db45fd14 100644 --- a/docs/FileBrowser sort+display modes.txt +++ b/docs/FileBrowser sort+display modes.txt @@ -22,7 +22,7 @@ This is the default mode, and works as the traditional main sort mode of older u 1a: All folders, sorted by name 1b: All ELF files, sorted by name 1c: All non-ELF files, sorted by name - + Sort mode 2 == Sort by Game Title This works as the alternate sort mode used by older uLE versions when displaying game titles, but in the new version it can also be used when displaying filenames. In addition to the title sorting, this mode also separates folders and ELFs in the same way as mode 1. Additionally, objects that have no title will be separated to follow those of the same object type that do have titles, and the internal sorting of title-less objects will be by name. This means that such a display can contain five object groups. diff --git a/docs/LAUNCHELF.CNF b/docs/LAUNCHELF.CNF index 87929e2d..87277436 100644 --- a/docs/LAUNCHELF.CNF +++ b/docs/LAUNCHELF.CNF @@ -7,7 +7,7 @@ # ---------------------------------------------------------------------- # Note that LaunchELF v3.41t (or later) will accept this file as-is when # loading CNF, but if you modify any settings so that LaunchELF saves -# the file again, then all comments will be removed. Also note that each +# the file again, then all comments will be removed. Also, note that each # LaunchELF version can only recognize those variables that were defined # for that version. Using newer variables with older versions is futile. # It should not crash the program, but will not have meaningful effects. @@ -21,7 +21,7 @@ CNF_version = 3 # From LaunchELF v3.81 the CNF_version value will be 3 or higher, which # means that the Screen_X and Screen_Y offsets are valid for gsKit, as # used by that program version. Also, when that program version is used -# with a CNF file having lower CNF_version value than 3, then the old +# with a CNF file having a lower CNF_version value than 3, then the old # screen offsets will be converted to ones suitable for gsKit. # ---------------------------------------------------------------------- # In v3.95 Multi-language support was added, which caused the built-in @@ -56,9 +56,9 @@ Misc_About_uLE = About uLE # 12 variables the following name conventions apply: # # "LK_" is an abbreviation for "Launch Key" and is used as a prefix for -# the key descriptor (eg: "Square"). That is then followed by the suffix +# the key descriptor (e.g. "Square"). That is then followed by the suffix # "_E1" which is an abbreviation for "Execution Method 1". At present -# that is the only method we have, but hopefully that will change... +# that is the only method we have, but hopefully, that will change... # # The default value for most of these should be an empty string, except # that one link should start the file browser, so people can start to @@ -131,7 +131,7 @@ GUI_Col_8_ABGR = 00000000 # ---------------------------------------------------------------------- # Screen_X and Screen_Y are offsets used to center the LaunchELF screen # on the physical TV screen. The values shown below are old defaults, -# but nowdays it's better to leave them out completely, which is why +# but nowadays it's better to leave them out completely, which is why # these lines were made into comments below. This way the program can # choose correct defaults for the TV_mode and Screen_Interlace settings # you've chosen further down in this file. And the values you use for @@ -144,7 +144,7 @@ GUI_Col_8_ABGR = 00000000 # Note that I have changed the default for IOP reset, as this has been # long-term tested now, and proven superior to starting without it. # I have also changed the default for CDVD checking, as the old default -# could cause lockup on some PS2 models if started with empty tray. +# could cause lockup on some PS2 models if started with an empty tray. # ---------------------------------------------------------------------- Init_CDVD_Check = 0 Screen_Interlace = 1 @@ -164,7 +164,7 @@ USBD_FILE = # NET_HOSTwrite is valid in v3.44 and later versions. It can enable # the ability of the networked HOST interface to write on your PC HDDs! # Users who want to avoid risks for their PC should leave it as default, -# which disables these new abilities. For safety reasons it can only be +# which disables these new abilities. For safety reasons, it can only be # changed by direct user editing. Edit it to a non-zero value to enable # the new abilities. (You'll need a very new ps2client.exe as well.) # ---------------------------------------------------------------------- @@ -192,7 +192,7 @@ GUI_SKIN_FILE = Menu_Title = # ---------------------------------------------------------------------- # Menu_Frame flags whether or not the big frame that encloses the menu -# should be visible or not. By default it will be visible. +# should be visible or not. By default, it will be visible. # ---------------------------------------------------------------------- Menu_Frame = 1 # ---------------------------------------------------------------------- @@ -204,7 +204,7 @@ Menu_Frame = 1 SKIN_Brightness = 50 # ---------------------------------------------------------------------- # Show_Menu flags whether or not the main menu is visible when a GUI -# skin is selected. By default it will be visible. +# skin is selected. By default, it will be visible. # ---------------------------------------------------------------------- Show_Menu = 1 # ---------------------------------------------------------------------- @@ -235,7 +235,7 @@ Popup_Opaque = 0 # ---------------------------------------------------------------------- Init_Delay = 0 # ---------------------------------------------------------------------- -# USBKBD_USED allows you to disable initialization of the USB keyboard +# USBKBD_USED allows you to disable the initialization of the USB keyboard # driver. This is mainly useful when you need to test some specific # software without any USB drivers active. For example, when testing # software that should provide its own USB drivers. Such a test would @@ -251,7 +251,7 @@ USBKBD_USED = 1 # ---------------------------------------------------------------------- USBKBD_FILE = # ---------------------------------------------------------------------- -# KBDMAP_FILE is a string used to specify an alternate key map KBD file +# KBDMAP_FILE is a string used to specify an alternate keymap KBD file # for the USB keyboard driver, which will then be used instead of the # default map. You can set it in the 'STARTUP SETTINGS' screen. # ---------------------------------------------------------------------- @@ -259,7 +259,7 @@ KBDMAP_FILE = # ---------------------------------------------------------------------- # Menu_Show_Titles is a flag that when set enables the use of Launch # key titles in the menu. Previously this was controlled by the variable -# Menu_Hide_Paths, but that is no longer the case. By default the new +# Menu_Hide_Paths, but that is no longer the case. By default, the new # variable is enabled, though this only affects launch keys that have # some title string defined. # ---------------------------------------------------------------------- @@ -299,9 +299,9 @@ FONT_FILE = # From v3.84 two settings of JpgViewer are also saved here. These are # the slideshow interval timer (in seconds), and the picture transition # choice, a value from 1-4, with 1==NONE, 2==ZOOM 3==FADE, 4==BOTH. -# In v3.96 another setting was added, being a flag for fullscreen mode. -# To save latest slideshow settings, just enter the main configuration -# menu and exit it again using the OK command. This resaves the file. +# In v3.96 another setting was added, being a flag for fullscreen mode. +# To save the latest slideshow settings, enter the main configuration +# menu and exit it again using the OK command. This saves the file. # Viewer settings found in a CNF will be used instead of the original # defaults, which are the values shown below. # ---------------------------------------------------------------------- diff --git a/docs/New resolutions.txt b/docs/New resolutions.txt index d52aebda..41f00ab9 100644 --- a/docs/New resolutions.txt +++ b/docs/New resolutions.txt @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- -File name: New Resolutions.txt +Filename: New Resolutions.txt ----------------------------------------------------------------------------- LaunchELF is now relying on gsKit to initialize the screen display parameters, rather than setting them directly. As such, the Screen_X and Screen_Y have been deprecated, in favour of Screen_Offset_X and Screen_Offset_Y. @@ -18,7 +18,7 @@ The text below relates to an older version update, and is no longer valid. ----------------------------------------------------------------------------- From version v3.81 and on uLaunchELF is using gsKit instead of libito to handle screen display, which has resulted in yet another increase of the screen resolution. As a result of this the old settings for screen offsets have yet again become invalid, but this time we have added a filter to the configuration loader, so that it can and will adapt old offset settings, when it recognizes that the configuration file was saved by an older version of the program. (When the CNF_version value in the file is less than 3.) -Another big change in this version is that interlace mode is now default, and even mandatory, so non-interlace modes can no longer be set. (Would halve resolution...) +Another big change in this version is that interlace mode is now the default, and even mandatory, so non-interlaced modes can no longer be set. (Would halve resolution...) In case you wish to edit the offsets yourself, the new defaults are as follows: diff --git a/docs/SMB.CNF b/docs/SMB.CNF index ecd213b8..585b6877 100644 --- a/docs/SMB.CNF +++ b/docs/SMB.CNF @@ -12,8 +12,8 @@ smbIndex = 0 smbServer_IP = 192.168.10.64 smbServer_Port = 445 -smbUsername = -smbPassword = +smbUsername = +smbPassword = smbPasswordType = -1 smbClient_ID = ps2 smbServer_ID = RA1 @@ -22,8 +22,8 @@ smbServer_FBID = RA1 WinXP smbIndex = 1 smbServer_IP = 192.168.10.80 smbServer_Port = 445 -smbUsername = -smbPassword = +smbUsername = +smbPassword = smbPasswordType = -1 smbClient_ID = ps2 smbServer_ID = RA2 @@ -32,8 +32,8 @@ smbServer_FBID = RA2 Win2K smbIndex = 2 smbServer_IP = 192.168.10.96 smbServer_Port = 445 -smbUsername = -smbPassword = +smbUsername = +smbPassword = smbPasswordType = -1 smbServer_ID = RA3 smbClient_ID = ps2 diff --git a/docs/TODO.txt b/docs/TODO.txt index efbab286..d0ba7ef7 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -1,4 +1,4 @@ --bind button combination for interrupting HDD_manager (cause with 200 partition it takes 7 minutes and it will be useful to stop hdd manager at some point) --rewrite ftp part to be more stable --make SMB (samba share) working +-bind button combination for interrupting HDD_manager (cause with 200 partitions it takes 7 minutes and it will be useful to stop hdd manager at some point) +-rewrite FTP part to be more stable +-make SMB (samba share) working -cleanup code. diff --git a/docs/changes.txt b/docs/changes.txt index de1858d9..15828af3 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -86,7 +86,7 @@ ps2ftpd new additions and changes: LaunchELF v4.40h (2010.02.12) -Modified screen update delay methods, so as to avoid freezing in PCSX2 use due to their incomplete implementation of EE timers. --Reverted to use MCMAN and MCSERV modules from bios, as required not only for compatibility to PCSX2, but also for compatibility to v0 PS2 consoles. +-Reverted to use MCMAN and MCSERV modules from bios, as required not only for compatibility to PCSX2, but also for compatibility to v0 PS2 consoles. LaunchELF v4.40g (2010.02.09) -Updated gsKit and existing source files to SVN rev 1664. @@ -715,7 +715,7 @@ LaunchELF v3.61 (2006.04.18) -Slightly modified CD init for MISC/PS2Disc launching (eliminated a rare error case) LaunchELF v3.60 (2006.04.11) --Split the background colour usage into one colour used by libito/GS for pixels outside of the normal screen area, and another used inside the normal screen area. The former will now always be max black (value 0) while the latter will remain as used previously. This change eliminates the inconsistent colouring of screen borders, making them consistently black from now on. +-Split the background colour usage into one colour used by libito/GS for pixels outside of the normal screen area, and another used inside the normal screen area. The former will now always be max black (value 0) while the latter will remain as used previously. This change eliminates the inconsistent colouring of screen borders, making them consistently black from now on. -Added configurable option for opaque popup menus to the 'SCREEN SETTINGS' submenu. -Fixed a bug in loadSkin function, that prevented skins from being loaded from HDD folders using long path strings (as for deeply nestled folders or very long names). That bug may have caused other errors too, depending on path strings used -Fixed a cosmetic bug that affected top right corner of menu frame in filebrowser, when using simple colour setup instead of JPG skin. @@ -873,7 +873,7 @@ ps2ftpd new additions and changes: Included ps2ftpd.irx and source changes. -Altered files: iomanX.c=radad's changes, draw.c=version_id, FtpClient.c=ps2ftpd changes LaunchELF v3.41n (10/30/2005) --Changed order of loading device drivers when starting ps2net. +-Changed order of loading device drivers when starting ps2net. -Updated Slam-Tilts "NETWORK SETTINGS" with dlanor's added change to hopefully fix an issue some were experiencing. -Updated ps2sdk's libmc.c, with dlanor's prior changes, to the source package. -Updated "Development related issues.txt" removing an issue that has now been resolved. diff --git a/hdl_info/Makefile b/hdl_info/Makefile index 86476b2c..6d1bbbfc 100644 --- a/hdl_info/Makefile +++ b/hdl_info/Makefile @@ -9,7 +9,7 @@ reset: clean ps2client -h 192.168.0.10 reset clean: - rm -f -r $(IOP_OBJS) $(IOP_BIN) + rm -f -r $(IOP_OBJS_DIR) $(IOP_BIN) include $(PS2SDK)/Defs.make include $(PS2SDK)/samples/Makefile.pref diff --git a/hdl_info/imports.lst b/hdl_info/imports.lst index fc46e3de..a95ec14e 100644 --- a/hdl_info/imports.lst +++ b/hdl_info/imports.lst @@ -9,9 +9,9 @@ I_dev9Shutdown dev9_IMPORTS_end sifcmd_IMPORTS_start -I_sceSifInitRpc -I_sceSifSetRpcQueue -I_sceSifRegisterRpc +I_sceSifInitRpc +I_sceSifSetRpcQueue +I_sceSifRegisterRpc I_sceSifRpcLoop sifcmd_IMPORTS_end diff --git a/loader/Makefile b/loader/Makefile index 664248fb..62daa75c 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -16,7 +16,7 @@ endif all: $(EE_BIN) clean: - rm -f -r $(EE_OBJS) $(EE_BIN) + rm -f -r $(EE_OBJS_DIR) $(EE_BIN) include $(PS2SDK)/Defs.make include Rules.make diff --git a/oldlibs/ps2ftpd/LICENSE b/oldlibs/ps2ftpd/LICENSE index ea811ce0..3017d6b5 100644 --- a/oldlibs/ps2ftpd/LICENSE +++ b/oldlibs/ps2ftpd/LICENSE @@ -127,7 +127,7 @@ conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and -penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the +penalties of the U.S. Copyright Act, 17 U.S.C. � 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. diff --git a/oldlibs/ps2ftpd/changes.txt b/oldlibs/ps2ftpd/changes.txt index 7fc11405..a65ff86c 100644 --- a/oldlibs/ps2ftpd/changes.txt +++ b/oldlibs/ps2ftpd/changes.txt @@ -44,7 +44,7 @@ FileSystem.c -Fixed a few issues that prevented PS1 memory cards from appearing in the listing. (Note: Files on PS1 memory cards lack timestamps so the timestamps come from the current PS2 system time). -Modified the partition-hiding patches, so as to allow access to "__common", the partition used for memory card backups by Sony's HDD browser. -Added a define "DEVICE_UNITS 4" to set the maximum number of device units from 16 to a variable. The variable was assigned the value four because it fits the maximum number of mounted partitions to PFS. (Ex: includes: pfs/0, pfs/1, pfs/2, and pfs/3). --Changed procedure for evaluating devices when one was not found. Before when a device unit such as mc/0 was not found it wouldn't even look for a memory card in mc/1. Now since the number of device units was changed from 16 to 4, it’s easier to check all possible instances without penalty. +-Changed procedure for evaluating devices when one was not found. Before when a device unit such as mc/0 was not found it wouldn't even look for a memory card in mc/1. Now since the number of device units was changed from 16 to 4, it�s easier to check all possible instances without penalty. -Changed partition filter and removed the codebreaker partition from the hdd partition listing. -Fixed a future year attribute issue with dlanor's fix. -Updated ps2ftpd and existing source files to SVN rev 587. @@ -56,7 +56,7 @@ FileSystem.c -Fixed an issues that prevented PS1 memory cards from appearing in the listing with the new mc drivers. Now should work correctly for either driver. -Added a fix to better resolve the hard drive compatibility issue with later ps2sdk updates. -FtpClient.h, FileSystem.h, and FtpCommands.c +FtpClient.h, FileSystem.h, and FtpCommands.c -Made the necessary changes for rename to be implemented. FileSystem.h, imports.lst, and irx_imports.h diff --git a/ps2host/Makefile b/ps2host/Makefile index 0548b5b2..e9f20355 100644 --- a/ps2host/Makefile +++ b/ps2host/Makefile @@ -3,14 +3,14 @@ IOP_BIN = ps2host.irx IOP_OBJS = net_fsys.o net_fio.o ps2host.o imports.o IOP_INCS += -I../include -IOP_LIBS += -IOP_LDFLAGS += +IOP_LIBS += +IOP_LDFLAGS += IOP_CFLAGS += -Wall all: $(IOP_BIN) clean: - -rm -f $(IOP_OBJS) $(IOP_BIN) + -rm -f $(IOP_OBJS_DIR) $(IOP_BIN) include $(PS2SDK)/Defs.make include ../Rules.make diff --git a/ps2host/imports.lst b/ps2host/imports.lst index b6222b15..d2969fe2 100644 --- a/ps2host/imports.lst +++ b/ps2host/imports.lst @@ -19,7 +19,7 @@ thsemap_IMPORTS_end thbase_IMPORTS_start I_CreateThread -I_StartThread +I_StartThread I_ExitDeleteThread thbase_IMPORTS_end diff --git a/vmc_fs/Makefile b/vmc_fs/Makefile index 9b2b735e..b3bd41dc 100644 --- a/vmc_fs/Makefile +++ b/vmc_fs/Makefile @@ -7,7 +7,7 @@ IOP_LDFLAGS += -s all: $(IOP_BIN) clean: - rm -f $(IOP_OBJS) $(IOP_BIN) + rm -f $(IOP_OBJS_DIR) $(IOP_BIN) include $(PS2SDK)/Defs.make include ../Rules.make