Merge pull request #743 from uyjulian/expose_getdevtype

[iomanX] expose iomanX_GetDevType and iomanX_StdioInit

Author: fjtrujy

iop/system/iomanx/Makefile

@@ -15,7 +15,8 @@ IOP_INCS += \
 	-I$(PS2SDKSRC)/iop/system/loadcore/include \
 	-I$(PS2SDKSRC)/iop/system/stdio/include \
 	-I$(PS2SDKSRC)/iop/system/sysclib/include \
-	-I$(PS2SDKSRC)/iop/system/sysmem/include
+	-I$(PS2SDKSRC)/iop/system/sysmem/include \
+	-I$(PS2SDKSRC)/iop/system/threadman/include
 
 IOP_OBJS = iomanX.o ioman_sbv.o exports.o imports.o
 

iop/system/iomanx/include/iomanX.h

@@ -166,6 +166,7 @@ extern int iomanX_ioctl2(int fd, int cmd, void *arg, unsigned int arglen, void *
 extern int iomanX_AddDrv(iomanX_iop_device_t *device);
 extern int iomanX_DelDrv(const char *name);
 
+extern unsigned int iomanX_GetDevType(int fd);
 extern void iomanX_StdioInit(int mode);
 
 #ifdef _IOP
@@ -205,6 +206,7 @@ extern void iomanX_StdioInit(int mode);
 #define I_iomanX_AddDrv DECLARE_IMPORT(20, iomanX_AddDrv)
 #define I_iomanX_DelDrv DECLARE_IMPORT(21, iomanX_DelDrv)
 #endif
+#define I_iomanX_GetDevType DECLARE_IMPORT(22, iomanX_GetDevType)
 #define I_iomanX_StdioInit DECLARE_IMPORT(23, iomanX_StdioInit)
 #endif
 

iop/system/iomanx/src/exports.tab

@@ -23,8 +23,8 @@ DECLARE_EXPORT_TABLE(iomanx, 1, 1)
 	DECLARE_EXPORT(_retonly)
 /*20*/	DECLARE_EXPORT(iomanX_AddDrv)
 	DECLARE_EXPORT(iomanX_DelDrv)
-	DECLARE_EXPORT(_retonly)
-	DECLARE_EXPORT(_retonly)
+	DECLARE_EXPORT(iomanX_GetDevType)
+	DECLARE_EXPORT(iomanX_StdioInit)
 	DECLARE_EXPORT(_retonly)
 /*25*/	DECLARE_EXPORT(iomanX_rename)
 	DECLARE_EXPORT(iomanX_chdir)

iop/system/iomanx/src/imports.lst

@@ -1,4 +1,9 @@
 
+intrman_IMPORTS_start
+I_CpuSuspendIntr
+I_CpuResumeIntr
+intrman_IMPORTS_end
+
 sysmem_IMPORTS_start
 I_Kprintf
 sysmem_IMPORTS_end
@@ -13,6 +18,7 @@ I_RegisterLibraryEntries
 I_QueryLibraryEntryTable
 I_FlushDcache
 I_FlushIcache
+I_QueryBootMode
 loadcore_IMPORTS_end
 
 sysclib_IMPORTS_start
@@ -26,7 +32,7 @@ I_strncpy
 I_strtol
 sysclib_IMPORTS_end
 
-intrman_IMPORTS_start
-I_CpuSuspendIntr
-I_CpuResumeIntr
-intrman_IMPORTS_end
+thbase_IMPORTS_start
+I_ReferThreadStatus
+I_ChangeThreadPriority
+thbase_IMPORTS_end

iop/system/iomanx/src/iomanX.c

@@ -52,10 +52,8 @@ extern struct irx_export_table _exp_ioman;
 #define MAX_FILES 32
 #endif
 
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 void iomanX_StdioInit(int mode);
 static int open_tty_handles(const char *tty_name);
-#endif
 static int xx_stat(int op, const char *name, iox_stat_t *stat, unsigned int statmask);
 static int xx_rename(int op, const char *oldname, const char *newname);
 static int xx_dir(int op, const char *name, int mode);
@@ -64,13 +62,9 @@ static iomanX_iop_file_t *new_iob(void);
 static iomanX_iop_file_t *get_iob(int fd);
 static iomanX_iop_device_t *lookup_dev(const char *name, int show_unkdev_msg);
 static const char *parsefile(const char *path, iomanX_iop_device_t **p_device, int *p_unit);
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
-static int tty_noop(void);
-unsigned int iomanX_GetDevType(int fd);
-#endif
 static void ShowDrv(void);
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 static void register_tty(void);
+#ifdef _IOP
 static void register_dummytty(void);
 #endif
 
@@ -83,7 +77,6 @@ struct ioman_dev_listentry
 #endif
 
 static int showdrvflag = 1;
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 
 IOMANX_RETURN_VALUE_IMPL(0);
 
@@ -123,6 +116,7 @@ static iomanX_iop_device_t dev_tty = {
 	"CONSOLE",
 	&dev_tty_dev_operations,
 };
+#ifdef _IOP
 static iomanX_iop_device_t dev_dummytty = {
 	"dummytty",
 	IOP_DT_CHAR,
@@ -378,7 +372,6 @@ iomanX_iop_file_t *get_file(int fd)
 }
 #endif
 
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 void iomanX_StdioInit(int mode)
 {
 #ifdef _IOP
@@ -432,7 +425,6 @@ static int open_tty_handles(const char *tty_name)
 		return -1;
 	return 0;
 }
-#endif
 
 int iomanX_open(const char *name, int flags, ...)
 {
@@ -1212,7 +1204,6 @@ int iomanX_DelDrv(const char *name)
 #endif
 }
 
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 unsigned int iomanX_GetDevType(int fd)
 {
 	iomanX_iop_file_t *f;
@@ -1222,7 +1213,6 @@ unsigned int iomanX_GetDevType(int fd)
 		return handle_result(-EBADF, f, 0);
 	return f->device->type;
 }
-#endif
 
 static void ShowDrv(void)
 {
@@ -1247,13 +1237,13 @@ static void ShowDrv(void)
 	showdrvflag = 0;
 }
 
-#ifndef IOMANX_ENABLE_LEGACY_IOMAN_HOOK
 static void register_tty(void)
 {
 	iomanX_DelDrv(dev_tty.name);
 	iomanX_AddDrv(&dev_tty);
 }
 
+#ifdef _IOP
 static void register_dummytty(void)
 {
 	iomanX_DelDrv(dev_dummytty.name);

iop/system/iomanx/src/irx_imports.h

@@ -16,10 +16,11 @@
 #include "irx.h"
 
 /* Please keep these in alphabetical order!  */
+#include "intrman.h"
 #include "loadcore.h"
 #include "stdio.h"
 #include "sysclib.h"
 #include "sysmem.h"
-#include "intrman.h"
+#include "thbase.h"
 
 #endif /* IOP_IRX_IMPORTS_H */