Skip to content

Commit

Permalink
Cleaned formatting for various files
Browse files Browse the repository at this point in the history
  • Loading branch information
AKuHAK committed Aug 31, 2021
1 parent 311285f commit fd2ba75
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 45 deletions.
2 changes: 1 addition & 1 deletion AllowDVDV/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion docs/FileBrowser sort+display modes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
30 changes: 15 additions & 15 deletions docs/LAUNCHELF.CNF
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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.)
# ----------------------------------------------------------------------
Expand Down Expand Up @@ -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
# ----------------------------------------------------------------------
Expand All @@ -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
# ----------------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand All @@ -251,15 +251,15 @@ 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.
# ----------------------------------------------------------------------
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.
# ----------------------------------------------------------------------
Expand Down Expand Up @@ -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.
# ----------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/New resolutions.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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:

Expand Down
12 changes: 6 additions & 6 deletions docs/SMB.CNF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/TODO.txt
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions docs/changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion hdl_info/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions hdl_info/imports.lst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion loader/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion oldlibs/ps2ftpd/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions oldlibs/ps2ftpd/changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ps2host/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ps2host/imports.lst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ thsemap_IMPORTS_end

thbase_IMPORTS_start
I_CreateThread
I_StartThread
I_StartThread
I_ExitDeleteThread
thbase_IMPORTS_end

Expand Down
2 changes: 1 addition & 1 deletion vmc_fs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fd2ba75

Please sign in to comment.