Skip to content

Commit

Permalink
Revert "Merge pull request ps2dev#681 from uyjulian/iomanx_file_struc…
Browse files Browse the repository at this point in the history 
…t_stk"

This reverts commit 89d7ece, reversing
changes made to a7d5229.
  • Loading branch information
@fjtrujy
fjtrujy committed Nov 28, 2024
1 parent e730cf2 commit 623b990
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 64 deletions.
2 changes: 1 addition & 1 deletion iop/system/iomanx/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

IOP_BIN ?= iomanX.irx

IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_ENABLE_LEGACY_IOMAN_HOOK -DIOMAN_USE_FILE_STRUCT_TEMP_STACK
IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0 -DIOMANX_OLD_NAME_COMPATIBILITY=0 -DIOMANX_ENABLE_LEGACY_IOMAN_HOOK

IOP_OBJS = iomanX.o ioman_sbv.o exports.o imports.o

Expand Down
63 changes: 0 additions & 63 deletions iop/system/iomanx/src/iomanX.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,17 +608,10 @@ int iomanX_remove(const char *name)
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(name, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand All @@ -640,17 +633,10 @@ static int xx_stat(int op, const char *name, iox_stat_t *stat, unsigned int stat
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(name, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand Down Expand Up @@ -716,17 +702,10 @@ int iomanX_format(const char *dev, const char *blockdev, void *arg, int arglen)
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(dev, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand All @@ -743,17 +722,10 @@ static int xx_rename(int op, const char *oldname, const char *newname)
const char *parsefile_res_new;
iomanX_iop_device_t *device_new;
int unit_new;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(oldname, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand Down Expand Up @@ -811,17 +783,10 @@ static int xx_dir(int op, const char *name, int mode)
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(name, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand Down Expand Up @@ -857,17 +822,10 @@ int iomanX_mount(const char *fsname, const char *devname, int flag, void *arg, i
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(fsname, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand All @@ -884,17 +842,10 @@ int iomanX_umount(const char *fsname)
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(fsname, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand All @@ -909,17 +860,10 @@ int iomanX_devctl(const char *name, int cmd, void *arg, unsigned int arglen, voi
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(name, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand All @@ -934,17 +878,10 @@ int iomanX_readlink(const char *path, char *buf, unsigned int buflen)
{
iomanX_iop_file_t *f;
const char *parsefile_res;
#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
iomanX_iop_file_t f_stk;
#endif

#ifdef IOMAN_USE_FILE_STRUCT_TEMP_STACK
f = &f_stk;
#else
f = new_iob();
if ( !f )
return handle_result(-EMFILE, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
#endif
parsefile_res = parsefile(path, &(f->device), &(f->unit));
if ( !parsefile_res )
return handle_result(-ENODEV, f, HANDLE_RESULT_CLEAR_INFO_ON_ERROR);
Expand Down

0 comments on commit 623b990

Please sign in to comment.