From c9bd49c7e7c800c2a6662080ad0deea5f13e37f2 Mon Sep 17 00:00:00 2001 From: Pedro Duarte Date: Sat, 20 Mar 2021 16:53:23 +0100 Subject: [PATCH] 01/05/2009 - v1.0.3.0 - Now loads the .wad from current directory. No need to put it at a root of a USB device anymore. As consequence, loads perfectly from memory card. - The Quit option menu now boots back to the OSD PS2 Browser --- Makefile | 2 +- Whatsthis.txt | 10 +- cosmitoFileIO.c | 95 ++ cosmitoFileIO.h | 14 + d_main.c | 12 +- i_main.c | 8 +- i_system.c | Bin 3067 -> 3251 bytes ps2sdldoom_VS2005/ps2sdldoom_VS2005.suo | Bin 169984 -> 169984 bytes ps2sdldoom_VS2005/ps2sdldoom_VS2005.vcproj | 1236 ++++++++++---------- w_wad.c | 2 +- 10 files changed, 757 insertions(+), 622 deletions(-) create mode 100644 cosmitoFileIO.c create mode 100644 cosmitoFileIO.h diff --git a/Makefile b/Makefile index 8f1b4df..d3a14c0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o p_map.o p_maputl.o \ p_mobj.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_spec.o \ p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o \ r_main.o r_plane.o r_segs.o r_sky.o r_things.o s_sound.o sounds.o \ -st_lib.o st_stuff.o tables.o v_video.o w_wad.o wi_stuff.o z_zone.o ps2doom.o mixer_thread.o mixer.o sjpcm_rpc.o usbd.s usbhdfsd.s SJPCM.s +st_lib.o st_stuff.o tables.o v_video.o w_wad.o wi_stuff.o z_zone.o ps2doom.o mixer_thread.o mixer.o cosmitoFileIO.o sjpcm_rpc.o usbd.s usbhdfsd.s SJPCM.s EE_BIN = ps2doom.elf diff --git a/Whatsthis.txt b/Whatsthis.txt index dda3313..6e8c84c 100644 --- a/Whatsthis.txt +++ b/Whatsthis.txt @@ -1,6 +1,6 @@ -Is is version 1.0.2.2 of PS2Doom, a port of Doom for the PS2, started by Lukasz Bruun (http://lukasz.dk) and currently maintained by me, cosmito (http://ps2homebrewing.wordpress.com). It also features audio support functions by Jason Yu (http://www.jasonyu.net). +Is is version 1.0.3.0 of PS2Doom, a port of Doom for the PS2, started by Lukasz Bruun (http://lukasz.dk) and currently maintained by me, cosmito (http://ps2homebrewing.wordpress.com). It also features audio support functions by Jason Yu (http://www.jasonyu.net). -Run PS2Doom.elf using uLaunchELF and make sure you have a doom1.wad, doom.wad, or doom2.wad copied at the root of a USB pen attached to tou PS2 (put only one .wad at the USB pen since currently no selector is made). +Run PS2Doom.elf using uLaunchELF and make sure you have a doom1.wad, doom.wad, or doom2.wad copied at the same directory as the ps2doom.elf. Memory cards and USB storage devices can be used and also. Currently HD support is not implemented. Put only one .wad at a time since currently no selector is made yet. Dualshock Joystick mappings: @@ -23,7 +23,7 @@ Analog Right click: Brightness (gamma) Please note: Enter key action (required to menu operations like starting new game) is a bit clumsy for now. For bringing up the menu, use the Cross button but to select items, use the Start button. This will be fixed. -You can use any USB compatible with the PlayStation2 also. +You can use any USB compatible keyboard with the PlayStation2 also. Source is included. Also a Visual Studio 2005 project just for code browsing (it doesn't compile). @@ -45,6 +45,10 @@ cosmito History: ======== +01/05/2009 - v1.0.3.0 + - Now loads the .wad from current directory. No need to put it at a root of a USB device anymore. As consequence, loads perfectly from memory card. + - The Quit option menu now boots back to the OSD PS2 Browser + 20/04/2009 - v1.0.2.2 - Enabled game save/load to memory card (mc0:). Use R1 e R2 buttons to write funny savenames - Nicer 'debug' font (thanks NoEffex and Allen http://forums.ps2dev.org/viewtopic.php?t=11663) diff --git a/cosmitoFileIO.c b/cosmitoFileIO.c new file mode 100644 index 0000000..06254fb --- /dev/null +++ b/cosmitoFileIO.c @@ -0,0 +1,95 @@ +#include "cosmitoFileIO.h" + +// Note: This calls fseek, so watch out... +int GetFilesize(FILE * fd) +{ + int size; + fseek(fd, 0, SEEK_END); + size = (int)ftell(fd); + fseek(fd, 0, SEEK_SET); + return (size); +} + +/// +int GetWAVsize(char *filename) +{ + int size; + FILE *wav; + wav = fopen(filename, "rb"); + + if (wav != NULL) + { + fseek(wav, 0, SEEK_END); + size = (int)ftell(wav); + size -= 0x30; + fclose(wav); + return size; + } + else + return 0; +} + +/// TBD +//// Dynamically mallocs a signed char buffer and loads from file into it. res < 0 means error. +//FILE AllocLoad_scharbuffer(char *filename, int optionalBufSize, int *res) +//{ +// FILE *fd; +// int size; +// +// +// if (optionalBufSize == 0) +// +//} + +/// +void GetElfFilename(const char *argv0_probe, char* deviceName, char* fullPath, char* elfFilename) +{ + int i; + + int lenght = strlen(argv0_probe); + int doispontosIndex = 0; + int slashIndex = 0; + int isFileOnRoot = 0; + + + // locate '/' from the end of path + for(i=lenght-1; i>=0; i--) + { + if (argv0_probe[i] == '/') + { + slashIndex = i; + break; + } + } + if (slashIndex == 0) + isFileOnRoot = 1; // elf is located on root of device + + // locate ':' from the start of path + for(i=0; i +#include + +// Note: This calls fseek, so watch out... +int GetFilesize(FILE * fd); + +int GetWAVsize(char *filename); + +void GetElfFilename(const char *argv0_probe, char* deviceName, char* fullPath, char* elfFilename); + +#endif // _COSMITOFILEIO diff --git a/d_main.c b/d_main.c index d8f6dcc..0688853 100644 --- a/d_main.c +++ b/d_main.c @@ -86,6 +86,7 @@ static int access(char *file, int mode) #include "p_setup.h" #include "r_local.h" +#include "cosmitoFileIO.h" #include "d_main.h" @@ -588,11 +589,20 @@ void IdentifyVersion (void) char *home; char *doomwaddir; + +#ifdef _EE + char elfFilename[100]; + char deviceName[10]; + char fullPath[100]; +#endif + doomwaddir = getenv("DOOMWADDIR"); #ifdef _EE //doomwaddir = ""; - doomwaddir = "mass:"; + //doomwaddir = "mass:"; + GetElfFilename(myargv[0], deviceName, fullPath, elfFilename); + doomwaddir = fullPath; #else if (!doomwaddir) doomwaddir = "./"; diff --git a/i_main.c b/i_main.c index 00e0e0f..512596d 100644 --- a/i_main.c +++ b/i_main.c @@ -57,6 +57,9 @@ static char s_pUDNL [] __attribute__( ( section( ".data" ), aligned( 1 ) ) #include //for GetThreadId #include +#include "cosmitoFileIO.h" + + extern int SAMPLECOUNT; int getDisplayModeFromELFName(char **argv); @@ -74,8 +77,9 @@ int main( int argc, char** argv ) SifInitRpc(0); init_scr(); - scr_printf(" --==== PS2DOOM v1.0.2.2 ====--\n\n"); - scr_printf(" A Doom PS2 port started by Lukasz Bruun and improved by cosmito\n\n\n"); + //scr_printf(" --==== PS2DOOM v1.0.2.2 ====--\n\n"); + //scr_printf(" A Doom PS2 port started by Lukasz Bruun and improved by cosmito\n\n\n"); + scr_printf(" --==== PS2DOOM v1.0.3.0 ====--\n\n\n"); int ret; printf("sample: kicking IRXs\n"); diff --git a/i_system.c b/i_system.c index b611372c1e7ea006b69b121ca2a871e2db50774d..281ab97fcef08db02012ddd054403a59261c1ad8 100644 GIT binary patch literal 3251 zcmY+Gdpwl+`^G=d9G-C)Oye}hX=XDFCPs~HC=ZqMVMZldX^4zUX(>Z1&oJaXP9efD zh?bU8YTKvi4N`?>&te%`UOVZ(JSl-<1q z05nN>D*|8}OYFsLS1F;}(d#l#XGx#;PTV0bPe>{#*v?xsBbgwKDydPz@Lw0+SUHj} zzoQ2wF<*^n=gVf%3TPm3^hhwk$?V=I>qg1uf7*?bE*cuC(al4oFhlynqn8DZ9U#Xd zPGB%(o3a7B|J(~ga!=uKXga9#6ri&bol;l4HK<4SB^{^RZFm~LKK8QYh2o`a zN-K?KUY$VtZVd5z_QcPOyH{2AYJU956-w;hfFrJ_n?@@#KSgr#uY2@`Hx~DXdG`dA znZog_LfmWAl;&qTIG=NLp_Ak^k@!zT&=GZ9lf`LsQ)gI1I%MS9&}Z1nRDbT_F`g04 zTdAq#C8R{{l~p}ny2YEe)(n#^2jn{^b{xL>q^SAl_j^nqOlVO?|KN$zl#9XvYTjmD z??4L=`ZdE{oRkgT9jsKQnE#{tzAfH1MS8!m%PuMXV&;C8%)IyJwZ<}E-hJtrd3C-U zpHpzXIsP>9m&@gvUGL0pCZsab`^xM`zoaxOzj}UXr1t$Bp0}n7h3s;!E6-%}ro;A% zT*cJIFEvE8+UF)bwlEc%|NY7``i}9V<@L|GN=T&UdS3PZikE(YG82{l2nPOz*tdLMs%* zC-n62Gh)F7LbwRs%`Wwe7{d12Uwr3Uk+}Z5&E^)`+r6S^B~R}q$w`7LbR(wW{w$1+ zvt#7htGP_})T?s6L`KR`^^=01WFLmHZMoX&Z(h-SY*kQy3?EOk13&abqeQl5zkf32 zFztm*vVJ09*bx+G)Cz+CyAj*20gOQycSJ9UdQGm5XrU2c)FB`8)a+6*&&j?~>Bl5M zZD=WI#mUv41A=_7hV_q==hT)LH!&KlG zbd~tqU)WviCbGHrKTXi(=0~<34bSv4wD{s|2<}P#gdcm4M2(wHq}gW-Y|{Rk?v>-A zmq2moyuO1oXhRpdt~?436ny2Wd=A+?a$?SNDaY<*fa#3Fef<{`_Hgo+l`xJ_vx-+w zZ}K=d)%5AY<|@}ye}12FkNGvg+qHFrV0x}OfwQxfWIK||Y@lw|>x?Ls?ch}g7JjAX zxmk<73v5bd{;bZxy+s}ihw>~B?zfm~aw!=u?YLaPoAb;STJ8){2n;gLzH}l9vxI}o5 ztXJdQhjPFmGzz0y*I6)KrZ*#7H3|^n@Nw9AT$Gf9lbh2U2s`d{vD9Iri|r*ZBrG+S zOu@Djq|}B=U#1wpZh(H&baX~eM1B2;7||WLylZ^oT94ey59|iZSVRY1Plp*!X(Sw4 zLAs;7R`EWYgvIb76-a*$N74g3FeE~FYjrN>SIHI&lfTTa7^pO$4QFqrV>yNLdlUh# zNA9^g(gK~CptCWPMAQx=zQT5342R)WGOIGB4>y_p`iN}2hk2aI!2>EhN3b`G zZ-Kyk45BSn2EGc=n8}f}weK5J*$4qDPCQy0%1JK15DjkN03}YYC70@Id?^j?-uVum z)|+bP>YAYo^hSeKw*lyN>s(Ix4;J~SUQRB?$4>t1CYBqck=vnf;cWS4OiMT$8)pSx zKw+?tbtX8BGKP8!5o=}iMExX` zDA$Iey^IqzZ&4Qzx*a;ZdZ+vESEv#jSp3r;i>N;oCpfqmJ(3b}yw2-^6Tg|HP&`E} zOQQxPxA)$nn4Qd!pR$8mKy#(|-TQ7SWu{GaG9``(B9wcv6Tp#GMiI@r-iZi`SK2w3 zhj+3Kjy|?45%%AKRjxX$5xuT%*jjJ^<>m)wuNfz2*XPrWJ?>$pvhJNm?@dOMy-j(w-dn$6K73Tp zI+e|9TBl`v4qo_4F~FOvPt+-UCz+W~s?l3BBh}XTgHA+E(Z`FtGW4WL@udRZ!8wnt zuIXxZ*|NQ*kJgbkC}(Ifl@YEZuxG_GA9Ag94C>gw{Y%!gv4iR@0o@_2&()$AlEP3Bt)8}S$x%=CXGOA z?*A|UH~Q}RfBC;L?Qa`(bZto`yPUt>wBe0|zKvhu*k?}SxyqD(9DT1wUHIMCu^Uy& znH)zV>(v(Qa-k-A39)kXjB(o@&uo*-LmR zgKKe##dku$lYLsg5GB!j_%&xh!jzCe~sgSRQ8j9j4H2{0k0V9pXEW~7>J-3U@JN+zi@_RSJ5w4iR1=5D~MfKsF zO1!EFIAQ918&N?V;#5GA+3uJLIL)2yd~y#Iia zap>)!(GNFoq%^LTGZQR{h}uI6BE;uwqRpD=s;yKCbol|+%&c-QNZCD!EKeF^fDvj5 z+`&=>w%rodrHS#}IWIPrONn?;E5k8zx6Y9I`CJ@@ow?msl=*GrS7TB)gk6*yPxB!; zgsP?^;l3QJVAK1idcMfP;^CUpGY9cI%{s+){?c-Xm%>{+`sFyO7D|Ny3sTqt znC8@r_Sg-W7j~T~F)Z2#tm!CufyBq7>R_WeP+p|KfkCr3t53Jz0b(4`2NBSDK0&G` z59o;bU*Y{kA(ZTim=nJbd}dvpRj9e@HEU_K#I8gA+S0J#6t*3vsme{n;1HB#8?~O? zzONG!>d>{pDPKx$KVr8jjfSz1?*TOP6$tT6nx+xC5Q@E)03p8{UM;GB(Rj4@mEnlg2_saS8-bChLS#>jCtG^)Haq)eVjQtSiE{PeL8nW2%14BmLozm)QE1u?N-GJ zfx{9%A z*t(xfJ?aBlwX5F9QLV7?G6tMbl>ckwp)LxwW%vjC_w_ksF?o) D;OIm< literal 3067 zcmb_eZFAa25dMsQ#g@1kfqBo{#I8F-fH+ERZ~-TizKljl2f9YmG13W}rupxE_JnNk zIMaRz!@%9%?z8WE*KX4&_WX=8y^RFLDiD;3NcftFn)N0Pj*rd1)owSx=LdNB(vcIK z9PQQvwce(36>72vHR`^8{j7E|gPg=~?L_9Ggy||zeL+}x8&5{w z0*)+IN`cIDDi^tyDj_ck+MvNfxs<-gG}f<@XiIq#h?I0FNQ*SiNG;7~IGJ2RtpOi! zU@oLDl1z}7vFJKqL^2CS@W8+p^`nT4BN?S46X`|-_XZ=rclO>{2oRYVrJ-8GjL_30 zHQh)cEd=G6SmsfKwZa|x=*-_uuIJPrf1;25>9jwde>w%T4i!$tMifvoUPlthh+66; zdJDf8;jJ?tk7hG^JDF0SuKLrtGq}F!PwDDEO|YTHR%IIGPQn&ehzRj87nh@AoXBre$Rsne@q5Nv6pUz0^wmOa{OINoQ2$+M?K9 zEYxkwZ)~XB>T*@RYIl0=&NJ%uPM*Iw>2_$*rP1x0j;g1YWj&FJALU5)PnixPxoCwy zAJV*Zbx8B|b}bG_)!Fc(6;|)%nBZy|iW?IAsNF?a4J>~m{h^-|PU5OVi$~i!SULxKcnD+_@(*I2L zzjiAefR!8<4V?I1Cj5A9b9$)`O1EKBZPvX88b?zklA86!su&)h8G68|+=LRdz%Hcd z>C-}l7Z7MRsYZ~g_+1!dfRB$)dEeXZd&OQZ0ijjCUW?TByEXdZ?0(y;Q4KPcROmcS z>~0MRU#)W6!S<_VZIlcw$DMn=hC!CiHdj>Au&7uqm*r9`?L|QRf+OVfdVD<_4O`eC z)@NwoC4LK@GwK*@M9z-`S64*5)>|x3t&&u)IPM!nZ*Ev@wxU2L%q2FLp56<=OcQiO z{aomG!duVe-w56#Qo9t^yPe*1^J5HIY_+IE`Ztvb)=D}vDe}jN!)8^gy5qm^@leXT;>?Od7{fQXBUSe^0u~Z=;)D7r`CRTDE>yQ zWHJ?AaMxnHNx>;gf`=!jz0lBjTqyrS-59kPV=En&dJC3V#6_amY?Coi5csmK%C6eU z7QA4|1mcYUMyGLbv>O!$mWM={CsQfB6SsIaCA3f~5?+D_0ly1;l?F0dA+@^}G3>OP z;(|-EL9JG+w0+~bcunaFuGh6rch!edyA)aGt?;0eX{LD)5`h)>ehO;~=7vGrRp)Y@ zA|II8xV}MeP}L|tq3Vud^N^#krGWY-$REj_yyxPYD|K`2vQ5inlxLxhXEbZ2k_-pR zs%+6af#*_e9=LeZDZH>!GRpCIVhrx{gW%y}Id=!4@IMa`(;2SZyy!LN{;w{0SinYw Msp2MIQeUlq0Xav3djJ3c diff --git a/ps2sdldoom_VS2005/ps2sdldoom_VS2005.suo b/ps2sdldoom_VS2005/ps2sdldoom_VS2005.suo index 157c47f241c5d40d9991de835667111161e0cc97..692617febd8319f56f72ce11eed8b0515c203525 100644 GIT binary patch delta 10346 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 delta 9885 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 diff --git a/ps2sdldoom_VS2005/ps2sdldoom_VS2005.vcproj b/ps2sdldoom_VS2005/ps2sdldoom_VS2005.vcproj index 140dc37..ccd425a 100644 --- a/ps2sdldoom_VS2005/ps2sdldoom_VS2005.vcproj +++ b/ps2sdldoom_VS2005/ps2sdldoom_VS2005.vcproj @@ -1,614 +1,622 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/w_wad.c b/w_wad.c index 09ee98b..bd10f44 100644 --- a/w_wad.c +++ b/w_wad.c @@ -312,7 +312,7 @@ void W_InitMultipleFiles (char** filenames) { scr_clear(); scr_printf ("\n\nERROR at W_InitFiles: no files found\n\n"); - scr_printf ("Put a .WAD file into the root of a USB pen or USB hard disk before running Doom.\n\n"); + scr_printf ("Put a .WAD file along with PS2Doom.elf before running it.\n\n"); SleepThread(); }