diff --git a/common/include/errno.h b/common/include/errno.h index 491c85c4211..102acf36e01 100644 --- a/common/include/errno.h +++ b/common/include/errno.h @@ -3,7 +3,7 @@ # ____| | ____| | | |____| # | ___| |____ ___| ____| | \ PS2DEV Open Source Project. #----------------------------------------------------------------------- -# Copyright 2001-2004, ps2dev - http://www.ps2dev.org +# Copyright ps2dev - http://www.ps2dev.org # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. */ @@ -11,12 +11,13 @@ /** * @file * global error codes and string values + * This is based on newlib's errno.h, with the additions of EFORMAT and EUNSUP. */ #ifndef __ERRNO_H__ #define __ERRNO_H__ -/** Not super-user */ +/** Not owner */ #define EPERM 1 /** No such file or directory */ #define ENOENT 2 @@ -38,7 +39,7 @@ #define ECHILD 10 /** No more processes */ #define EAGAIN 11 -/** Not enough core */ +/** Not enough space */ #define ENOMEM 12 /** Permission denied */ #define EACCES 13 @@ -46,7 +47,7 @@ #define EFAULT 14 /** Block device required */ #define ENOTBLK 15 -/** Mount device busy */ +/** Device or resource busy */ #define EBUSY 16 /** File exists */ #define EEXIST 17 @@ -62,9 +63,9 @@ #define EINVAL 22 /** Too many open files in system */ #define ENFILE 23 -/** Too many open files */ +/** File descriptor value too large */ #define EMFILE 24 -/** Not a typewriter */ +/** Not a character device */ #define ENOTTY 25 /** Text file busy */ #define ETXTBSY 26 @@ -74,15 +75,15 @@ #define ENOSPC 28 /** Illegal seek */ #define ESPIPE 29 -/** Read only file system */ +/** Read-only file system */ #define EROFS 30 /** Too many links */ #define EMLINK 31 /** Broken pipe */ #define EPIPE 32 -/** Math arg out of domain of func */ +/** Mathematics argument out of domain of function */ #define EDOM 33 -/** Math result not representable */ +/** Result too large */ #define ERANGE 34 /** No message of desired type */ #define ENOMSG 35 @@ -106,10 +107,14 @@ #define ENOCSI 43 /** Level 2 halted */ #define EL2HLT 44 -/** Deadlock condition */ +/** Deadlock */ #define EDEADLK 45 -/** No record locks available */ +/** No lock */ #define ENOLCK 46 +/** Bad file format */ +#define EFORMAT 47 +/** Operation unsupported by device */ +#define EUNSUP 48 /** Invalid exchange */ #define EBADE 50 /** Invalid request descriptor */ @@ -126,13 +131,13 @@ #define EDEADLOCK 56 /** Bad font file fmt */ #define EBFONT 57 -/** Device not a stream */ +/** Not a stream */ #define ENOSTR 60 /** No data (for no delay io) */ #define ENODATA 61 -/** Timer expired */ +/** Stream ioctl timeout */ #define ETIME 62 -/** Out of streams resources */ +/** No stream resources */ #define ENOSR 63 /** Machine is not on the network */ #define ENONET 64 @@ -140,7 +145,7 @@ #define ENOPKG 65 /** The object is remote */ #define EREMOTE 66 -/** The link has been severed */ +/** Virtual circuit is gone */ #define ENOLINK 67 /** Advertise error */ #define EADV 68 @@ -156,7 +161,7 @@ #define ELBIN 75 /** Cross mount point (not really error) */ #define EDOTDOT 76 -/** Trying to read unreadable message */ +/** Bad message */ #define EBADMSG 77 /** Inappropriate file type or format */ #define EFTYPE 79 @@ -186,7 +191,7 @@ #define ENAMETOOLONG 91 /** Too many symbolic links */ #define ELOOP 92 -/** Operation not supported on transport endpoint */ +/** Operation not supported on socket */ #define EOPNOTSUPP 95 /** Protocol family not supported */ #define EPFNOSUPPORT 96 @@ -208,7 +213,7 @@ #define ECONNREFUSED 111 /** Address already in use */ #define EADDRINUSE 112 -/** Connection aborted */ +/** Software caused connection abort */ #define ECONNABORTED 113 /** Network is unreachable */ #define ENETUNREACH 114 @@ -234,15 +239,21 @@ #define ESOCKTNOSUPPORT 124 /** Address not available */ #define EADDRNOTAVAIL 125 +/** Connection aborted by network */ #define ENETRESET 126 /** Socket is already connected */ #define EISCONN 127 /** Socket is not connected */ #define ENOTCONN 128 +/** Too many references: cannot splice */ #define ETOOMANYREFS 129 +/** Too many processes */ #define EPROCLIM 130 +/** Too many users */ #define EUSERS 131 +/** Disk quota exceeded */ #define EDQUOT 132 +/** Stale file handle */ #define ESTALE 133 /** Not supported */ #define ENOTSUP 134 @@ -252,157 +263,168 @@ #define ENOSHARE 136 /** Filename exists with different case */ #define ECASECLASH 137 +/** Illegal byte sequence */ #define EILSEQ 138 /** Value too large for defined data type */ #define EOVERFLOW 139 +/** Operation canceled */ +#define ECANCELED 140 +/** State not recoverable */ +#define ENOTRECOVERABLE 141 +/** Previous owner died */ +#define EOWNERDEAD 142 +/** Streams pipe error */ +#define ESTRPIPE 143 #ifndef E_USE_NAMES #define error_to_string(errnum) ("") #else char *file_errors[] = { - "", /* 0 */ - "Not super-user", /* 1 */ - "No such file or directory", /* 2 */ - "No such process", /* 3 */ - "Interrupted system call", /* 4 */ - "I/O error", /* 5 */ - "No such device or address", /* 6 */ - "Arg list too long", /* 7 */ - "Exec format error", /* 8 */ - "Bad file number", /* 9 */ - "No children", /* 10 */ - "No more processes", /* 11 */ - "Not enough core", /* 12 */ - "Permission denied", /* 13 */ - "Bad address", /* 14 */ - "Block device required", /* 15 */ - "Mount device busy", /* 16 */ - "File exists", /* 17 */ - "Cross-device link", /* 18 */ - "No such device", /* 19 */ - "Not a directory", /* 20 */ - "Is a directory", /* 21 */ - "Invalid argument", /* 22 */ - "Too many open files in system", /* 23 */ - "Too many open files", /* 24 */ - "Not a typewriter", /* 25 */ - "Text file busy", /* 26 */ - "File too large", /* 27 */ - "No space left on device", /* 28 */ - "Illegal seek", /* 29 */ - "Read only file system", /* 30 */ - "Too many links", /* 31 */ - "Broken pipe", /* 32 */ - "Math arg out of domain of func", /* 33 */ - "Math result not representable", /* 34 */ - "No message of desired type", /* 35 */ - "Identifier removed", /* 36 */ - "Channel number out of range", /* 37 */ - "Level 2 not synchronized", /* 38 */ - "Level 3 halted", /* 39 */ - "Level 3 reset", /* 40 */ - "Link number out of range", /* 41 */ - "Protocol driver not attached", /* 42 */ - "No CSI structure available", /* 43 */ - "Level 2 halted", /* 44 */ - "Deadlock condition", /* 45 */ - "No record locks available", /* 46 */ - "", /* 47 */ - "", /* 48 */ - "", /* 49 */ - "Invalid exchange", /* 50 */ - "Invalid request descriptor", /* 51 */ - "Exchange full", /* 52 */ - "No anode", /* 53 */ - "Invalid request code", /* 54 */ - "Invalid slot", /* 55 */ - "File locking deadlock error", /* 56 */ - "Bad font file fmt", /* 57 */ - "", /* 58 */ - "", /* 59 */ - "Device not a stream", /* 60 */ - "No data (for no delay io)", /* 61 */ - "Timer expired", /* 62 */ - "Out of streams resources", /* 63 */ - "Machine is not on the network", /* 64 */ - "Package not installed", /* 65 */ - "The object is remote", /* 66 */ - "The link has been severed", /* 67 */ - "Advertise error", /* 68 */ - "Srmount error", /* 69 */ - "Communication error on send", /* 70 */ - "Protocol error", /* 71 */ - "", /* 72 */ - "", /* 73 */ - "Multihop attempted", /* 74 */ - "Inode is remote (not really error)", /* 75 */ - - - "Cross mount point (not really error)", /* 76 */ - "Trying to read unreadable message", /* 77 */ - "", /* 78 */ - "Inappropriate file type or format", /* 79 */ - "Given log. name not unique", /* 80 */ - "f.d. invalid for this operation", /* 81 */ - "Remote address changed", /* 82 */ - "Can't access a needed shared lib", /* 83 */ - "Accessing a corrupted shared lib", /* 84 */ - ".lib section in a.out corrupted", /* 85 */ - "Attempting to link in too many libs", /* 86 */ - "Attempting to exec a shared library", /* 87 */ - "Function not implemented", /* 88 */ - "No more files", /* 89 */ - "Directory not empty", /* 90 */ - "File or path name too long", /* 91 */ - "Too many symbolic links", /* 92 */ - "", /* 93 */ - "", /* 94 */ - "Operation not supported on transport endpoint", /* 95 */ - "Protocol family not supported", /* 96 */ - "", /* 97 */ - "", /* 98 */ - "", /* 99 */ - "", /* 100 */ - "", /* 101 */ - "", /* 102 */ - "", /* 103 */ - "Connection reset by peer", /* 104 */ - "No buffer space available", /* 105 */ - "Address family not supported by protocol family", /* 106 */ - "Protocol wrong type for socket", /* 107 */ - "Socket operation on non-socket", /* 108 */ - "Protocol not available", /* 109 */ - "Can't send after socket shutdown", /* 110 */ - "Connection refused", /* 111 */ - "Address already in use", /* 112 */ - "Connection aborted", /* 113 */ - "Network is unreachable", /* 114 */ - "Network interface is not configured", /* 115 */ - "Connection timed out", /* 116 */ - "Host is down", /* 117 */ - "Host is unreachable", /* 118 */ - "Connection already in progress", /* 119 */ - "Socket already connected", /* 120 */ - "Destination address required", /* 121 */ - "Message too long", /* 122 */ - "Unknown protocol", /* 123 */ - "Socket type not supported", /* 124 */ - "Address not available", /* 125 */ - "", /* 126 */ - "Socket is already connected", /* 127 */ - "Socket is not connected", /* 128 */ - "", /* 129 */ - "EPROCLIM", /* 130 */ - "EUSERS", /* 131 */ - "EDQUOT", /* 132 */ - "ESTALE", /* 133 */ - "Not supported", /* 134 */ - "No medium (in tape drive)", /* 135 */ - "No such host or network path", /* 136 */ - "Filename exists with different case", /* 137 */ - "EILSEQ", /* 138 */ - "Value too large for defined data type", /* 139 */ - ""}; + "Success", /* 0 */ + "Not owner", /* 1 */ + "No such file or directory", /* 2 */ + "No such process", /* 3 */ + "Interrupted system call", /* 4 */ + "I/O error", /* 5 */ + "No such device or address", /* 6 */ + "Arg list too long", /* 7 */ + "Exec format error", /* 8 */ + "Bad file number", /* 9 */ + "No children", /* 10 */ + "No more processes", /* 11 */ + "Not enough space", /* 12 */ + "Permission denied", /* 13 */ + "Bad address", /* 14 */ + "Block device required", /* 15 */ + "Device or resource busy", /* 16 */ + "File exists", /* 17 */ + "Cross-device link", /* 18 */ + "No such device", /* 19 */ + "Not a directory", /* 20 */ + "Is a directory", /* 21 */ + "Invalid argument", /* 22 */ + "Too many open files in system", /* 23 */ + "File descriptor value too large", /* 24 */ + "Not a character device", /* 25 */ + "Text file busy", /* 26 */ + "File too large", /* 27 */ + "No space left on device", /* 28 */ + "Illegal seek", /* 29 */ + "Read-only file system", /* 30 */ + "Too many links", /* 31 */ + "Broken pipe", /* 32 */ + "Mathematics argument out of domain of function", /* 33 */ + "Result too large", /* 34 */ + "No message of desired type", /* 35 */ + "Identifier removed", /* 36 */ + "Channel number out of range", /* 37 */ + "Level 2 not synchronized", /* 38 */ + "Level 3 halted", /* 39 */ + "Level 3 reset", /* 40 */ + "Link number out of range", /* 41 */ + "Protocol driver not attached", /* 42 */ + "No CSI structure available", /* 43 */ + "Level 2 halted", /* 44 */ + "Deadlock", /* 45 */ + "No lock", /* 46 */ + "Bad file format", /* 47 */ + "Operation unsupported by device", /* 48 */ + "", + "Invalid exchange", /* 50 */ + "Invalid request descriptor", /* 51 */ + "Exchange full", /* 52 */ + "No anode", /* 53 */ + "Invalid request code", /* 54 */ + "Invalid slot", /* 55 */ + "File locking deadlock error", /* 56 */ + "Bad font file fmt", /* 57 */ + "", + "", + "Not a stream", /* 60 */ + "No data (for no delay io)", /* 61 */ + "Stream ioctl timeout", /* 62 */ + "No stream resources", /* 63 */ + "Machine is not on the network", /* 64 */ + "Package not installed", /* 65 */ + "The object is remote", /* 66 */ + "Virtual circuit is gone", /* 67 */ + "Advertise error", /* 68 */ + "Srmount error", /* 69 */ + "Communication error on send", /* 70 */ + "Protocol error", /* 71 */ + "", + "", + "Multihop attempted", /* 74 */ + "Inode is remote (not really error)", /* 75 */ + "Cross mount point (not really error)", /* 76 */ + "Bad message", /* 77 */ + "", + "Inappropriate file type or format", /* 79 */ + "Given log. name not unique", /* 80 */ + "f.d. invalid for this operation", /* 81 */ + "Remote address changed", /* 82 */ + "Can't access a needed shared lib", /* 83 */ + "Accessing a corrupted shared lib", /* 84 */ + ".lib section in a.out corrupted", /* 85 */ + "Attempting to link in too many libs", /* 86 */ + "Attempting to exec a shared library", /* 87 */ + "Function not implemented", /* 88 */ + "No more files", /* 89 */ + "Directory not empty", /* 90 */ + "File or path name too long", /* 91 */ + "Too many symbolic links", /* 92 */ + "", + "", + "Operation not supported on socket", /* 95 */ + "Protocol family not supported", /* 96 */ + "", + "", + "", + "", + "", + "", + "", + "Connection reset by peer", /* 104 */ + "No buffer space available", /* 105 */ + "Address family not supported by protocol family", /* 106 */ + "Protocol wrong type for socket", /* 107 */ + "Socket operation on non-socket", /* 108 */ + "Protocol not available", /* 109 */ + "Can't send after socket shutdown", /* 110 */ + "Connection refused", /* 111 */ + "Address already in use", /* 112 */ + "Software caused connection abort", /* 113 */ + "Network is unreachable", /* 114 */ + "Network interface is not configured", /* 115 */ + "Connection timed out", /* 116 */ + "Host is down", /* 117 */ + "Host is unreachable", /* 118 */ + "Connection already in progress", /* 119 */ + "Socket already connected", /* 120 */ + "Destination address required", /* 121 */ + "Message too long", /* 122 */ + "Unknown protocol", /* 123 */ + "Socket type not supported", /* 124 */ + "Address not available", /* 125 */ + "Connection aborted by network", /* 126 */ + "Socket is already connected", /* 127 */ + "Socket is not connected", /* 128 */ + "Too many references: cannot splice", /* 129 */ + "Too many processes", /* 130 */ + "Too many users", /* 131 */ + "Disk quota exceeded", /* 132 */ + "Stale file handle", /* 133 */ + "Not supported", /* 134 */ + "No medium (in tape drive)", /* 135 */ + "No such host or network path", /* 136 */ + "Filename exists with different case", /* 137 */ + "Illegal byte sequence", /* 138 */ + "Value too large for defined data type", /* 139 */ + "Operation canceled", /* 140 */ + "State not recoverable", /* 141 */ + "Previous owner died", /* 142 */ + "Streams pipe error", /* 143 */ +}; #define error_to_string(errnum) (file_errors[errnum * -1]) #endif diff --git a/common/include/libmc-common.h b/common/include/libmc-common.h index 893464ae76c..c2f49bc75be 100644 --- a/common/include/libmc-common.h +++ b/common/include/libmc-common.h @@ -17,6 +17,7 @@ #define __LIBMC_COMMON_H__ #include +#include typedef struct _sceMcStDateTime { @@ -148,7 +149,9 @@ typedef struct } mcRpcStat_t; // in addition to errno -#define EFORMAT 140 +#ifndef EFORMAT +#define EFORMAT 47 +#endif // MCMAN basic error codes #define sceMcResSucceed 0 diff --git a/iop/arcade/accdvd/src/accdvd_internal.h b/iop/arcade/accdvd/src/accdvd_internal.h index 772854e418d..40dfc67102b 100644 --- a/iop/arcade/accdvd/src/accdvd_internal.h +++ b/iop/arcade/accdvd/src/accdvd_internal.h @@ -12,6 +12,7 @@ #define _ACCDVD_INTERNAL_H #include +#include #include typedef acUint32 acd_lsn_t; diff --git a/iop/arcade/accdvd/src/cddrv.c b/iop/arcade/accdvd/src/cddrv.c index e32d52a8f9a..5e065fc3e91 100644 --- a/iop/arcade/accdvd/src/cddrv.c +++ b/iop/arcade/accdvd/src/cddrv.c @@ -70,11 +70,11 @@ static int cddrv_open(iop_file_t *io, const char *name, int flg) if ( io->unit ) { - return -6; + return -ENXIO; } if ( flg != 1 ) { - return -22; + return -EINVAL; } ret_v2 = cdfs_lookup(&dirent, name, strlen(name)); if ( ret_v2 >= 0 ) @@ -85,13 +85,13 @@ static int cddrv_open(iop_file_t *io, const char *name, int flg) } if ( (dirent.d_ftype & 2) != 0 ) { - return -21; + return -EISDIR; } v9 = (struct cdfs_file *)AllocSysMemory(1, 16, 0); file = v9; if ( !v9 ) { - return -12; + return -ENOMEM; } io->privdata = v9; v9->f_lsn = dirent.d_lsn; @@ -125,7 +125,7 @@ static int cddrv_write(iop_file_t *io, void *buf, int cnt) (void)buf; (void)cnt; - return -30; + return -EROFS; } static int cddrv_lseek(iop_file_t *io, int offset, int whence) @@ -155,12 +155,12 @@ static int cddrv_ioctl(iop_file_t *io, int cmd, void *arg) (void)cmd; (void)arg; - return -22; + return -EINVAL; } static int cddrv_dummy() { - return -22; + return -EINVAL; } int cddrv_module_start(int argc, char **argv) diff --git a/iop/cdvd/cdfs/src/main.c b/iop/cdvd/cdfs/src/main.c index a495df7c623..c867a7b1a43 100755 --- a/iop/cdvd/cdfs/src/main.c +++ b/iop/cdvd/cdfs/src/main.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "cdfs_iop.h" @@ -93,12 +94,12 @@ static int fio_open(iop_file_t *f, const char *name, int mode) // check if the file exists if (!cdfs_findfile(name, &tocEntry)) { printf("***** FILE %s CAN NOT FOUND ******\n\n", name); - return -1; + return -EPERM; } if (mode != O_RDONLY) { printf("mode is different than O_RDONLY, expected %i, received %i\n\n", O_RDONLY, mode); - return -2; + return -ENOENT; } DPRINTF("CDFS: fio_open TocEntry info\n"); @@ -117,7 +118,7 @@ static int fio_open(iop_file_t *f, const char *name, int mode) if (j >= MAX_FILES_OPENED) { printf("File descriptor overflow!!\n\n"); - return -3; + return -ESRCH; } fd_used[j] = 1; @@ -142,7 +143,7 @@ static int fio_close(iop_file_t *f) if (i >= MAX_FILES_OPENED) { printf("fio_close: ERROR: File does not appear to be open!\n"); - return -1; + return -EPERM; } fd_used[i] = 0; @@ -170,7 +171,7 @@ static int fio_read(iop_file_t *f, void *buffer, int size) if (i >= MAX_FILES_OPENED) { printf("fio_read: ERROR: File does not appear to be open!\n"); - return -1; + return -EPERM; } // A few sanity checks @@ -231,7 +232,7 @@ static int fio_write(iop_file_t *f, void *buffer, int size) return 0; else { printf("CDFS: dummy fio_write function called, this is not a re-writer xD"); - return -1; + return -EPERM; } } @@ -248,7 +249,7 @@ static int fio_lseek(iop_file_t *f, int offset, int whence) if (i >= 16) { DPRINTF("fio_lseek: ERROR: File does not appear to be open!\n"); - return -1; + return -EPERM; } switch (whence) { @@ -293,12 +294,12 @@ static int fio_openDir(iop_file_t *f, const char *path) { } if (j >= MAX_FOLDERS_OPENED) - return -3; + return -ESRCH; fod_table[j].files = cdfs_getDir(path, NULL, CDFS_GET_FILES_AND_DIRS, fod_table[j].entries, MAX_FILES_PER_FOLDER); if (fod_table[j].files < 0) { printf("The path doesn't exist\n\n"); - return -2; + return -ENOENT; } fod_table[j].filesIndex = 0; @@ -337,7 +338,7 @@ static int fio_closeDir(iop_file_t *fd) if (i >= MAX_FOLDERS_OPENED) { printf("fio_close: ERROR: File does not appear to be open!\n"); - return -1; + return -EPERM; } fod_used[i] = 0; @@ -358,13 +359,13 @@ static int fio_dread(iop_file_t *fd, io_dirent_t *dirent) if (i >= MAX_FOLDERS_OPENED) { printf("fio_dread: ERROR: Folder does not appear to be open!\n\n"); - return -1; + return -EPERM; } filesIndex = fod_table[i].filesIndex; if (filesIndex >= fod_table[i].files) { printf("fio_dread: No more items pending to read!\n\n"); - return -1; + return -EPERM; } entry = fod_table[i].entries[filesIndex]; @@ -392,7 +393,7 @@ static int fio_dread(iop_file_t *fd, io_dirent_t *dirent) static int fio_getstat(iop_file_t *fd, const char *name, io_stat_t *stat) { struct TocEntry entry; - int ret = -1; + int ret = -EPERM; (void)fd; @@ -419,7 +420,7 @@ static int fio_getstat(iop_file_t *fd, const char *name, io_stat_t *stat) static int cdfs_dummy() { DPRINTF("CDFS: dummy function called\n\n"); - return -5; + return -EIO; } static iop_device_ops_t fio_ops = { diff --git a/iop/cdvd/xesdrv/src/xesdrv.c b/iop/cdvd/xesdrv/src/xesdrv.c index ddc5846599e..d06313942a6 100644 --- a/iop/cdvd/xesdrv/src/xesdrv.c +++ b/iop/cdvd/xesdrv/src/xesdrv.c @@ -374,12 +374,12 @@ esdrv_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int arglen, v static int esdrv_df_null() { - return -48; + return -EUNSUP; } static s64 esdrv_df_null_long() { - return -48; + return -EUNSUP; } static void EsAcsSetAaryptorIoMode(void) diff --git a/iop/debug/iop_sbusdbg/src/sbus_tty.c b/iop/debug/iop_sbusdbg/src/sbus_tty.c index 85606059941..96fa2a75f9c 100644 --- a/iop/debug/iop_sbusdbg/src/sbus_tty.c +++ b/iop/debug/iop_sbusdbg/src/sbus_tty.c @@ -14,6 +14,7 @@ Of course this requires that the EE-side code accept this command and output the #include #include #include +#include #include #include #include @@ -26,7 +27,7 @@ Of course this requires that the EE-side code accept this command and output the extern void sbus_tty_puts(const char *str); -static int ttyfs_error() { return -1; } +static int ttyfs_error() { return -EPERM; } static int ttyfs_init() { diff --git a/iop/debug/ppctty/src/tty.c b/iop/debug/ppctty/src/tty.c index b2ead964920..00179055d62 100644 --- a/iop/debug/ppctty/src/tty.c +++ b/iop/debug/ppctty/src/tty.c @@ -7,6 +7,7 @@ IOP->PPC TTY #include #include #include +#include #include #include #include @@ -25,7 +26,7 @@ static int tty_sema = -1; extern void tty_puts(const char *str); -static int ttyfs_error() { return -1; } +static int ttyfs_error() { return -EPERM; } static int ttyfs_init() { diff --git a/iop/dvrp/dvr/src/dvr.c b/iop/dvrp/dvr/src/dvr.c index f1500e5b603..40bb2eab66f 100644 --- a/iop/dvrp/dvr/src/dvr.c +++ b/iop/dvrp/dvr/src/dvr.c @@ -239,7 +239,7 @@ int dvr_df_ioctl(iomanX_iop_file_t *f, int cmd, void *param) WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvr_df_devctl( @@ -267,7 +267,7 @@ int dvr_df_devctl( v11 = DevctlCmdTbl[v13].fn(a1, name, cmd, arg, arglen, buf, buflen); LABEL_5: if (v12 == sizeof(DevctlCmdTbl) / sizeof(DevctlCmdTbl[0])) - v11 = -22; + v11 = -EINVAL; SignalSema(sema_id); return v11; } @@ -283,17 +283,17 @@ int dvr_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int arglen, WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvr_df_null() { - return -48; + return -EUNSUP; } s64 dvr_df_null_long() { - return -48LL; + return -EUNSUP; } int dvrioctl2_rec_start( @@ -335,7 +335,7 @@ int dvrioctl2_rec_start( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_rec_start -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } #ifdef DEBUG err = cmdack.ack_status_ack; @@ -348,7 +348,7 @@ int dvrioctl2_rec_start( #endif } DPRINTF("dvrioctl2_rec_start -> Status error!,%04X\n", err); - return -68; + return -EADV; } int dvrioctl2_rec_pause( @@ -385,11 +385,11 @@ int dvrioctl2_rec_pause( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_rec_pause -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_rec_pause -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -421,7 +421,7 @@ int dvrioctl2_rec_stop( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_rec_stop -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_rec_stop -> Status error!,%04X\n", cmdack.ack_status_ack); @@ -430,7 +430,7 @@ int dvrioctl2_rec_stop( return 0; DPRINTF("dvrioctl2_rec_start -> Status error!,%04X\n", cmdack.comp_status); } - return -68; + return -EADV; } int dvrioctl2_set_rec_end_time( @@ -459,11 +459,11 @@ int dvrioctl2_set_rec_end_time( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_rec_end_time -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_rec_end_time -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -492,13 +492,13 @@ int dvrioctl2_get_rec_info( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_rec_info -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { int v9; v9 = 0; if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_rec_info -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { int v10; *(u16 *)buf = 0; @@ -517,7 +517,7 @@ int dvrioctl2_get_rec_info( } } else { DPRINTF("dvrioctl2_get_rec_info -> buflen is smaller than 21.\n"); - return -22; + return -EINVAL; } } @@ -545,11 +545,11 @@ int dvrioctl2_get_rec_time( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_rec_time -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_rec_time -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { *(u16 *)buf = 0; *((u32 *)buf + 1) = (cmdack.output_word[0] << 16) + cmdack.output_word[1]; @@ -582,10 +582,10 @@ int dvrioctl2_get_ifo_time_entry( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_ifo_time_entry -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_ifo_time_entry -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { *(u16 *)buf = 0; *((u16 *)buf + 1) = cmdack.output_word[0]; @@ -620,10 +620,10 @@ int dvrioctl2_get_ifo_vobu_entry( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_ifo_vobu_entry -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_ifo_vobu_entry -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { *(u16 *)buf = 0; *((u16 *)buf + 1) = cmdack.output_word[0]; @@ -658,11 +658,11 @@ int dvrioctl2_read_resfile( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_read_resfile -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_read_resfile -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -693,11 +693,11 @@ int dvrioctl2_clear_resfile_flag( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_clear_resfile_flag -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_clear_resfile_flag -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -728,11 +728,11 @@ int dvrioctl2_rec_prohibit( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_rec_prohibit -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_rec_prohibit -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -763,11 +763,11 @@ int dvrioctl2_epg_test( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_epg_test -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_epg_test -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -797,14 +797,14 @@ int dvrioctl2_send_timer_event( cmdack.input_buffer_length = arglen; if (DvrdrvExecCmdAckDmaSendComp(&cmdack)) { DPRINTF("dvrioctl2_send_timer_event -> IO error (phase %d)\n", cmdack.phase); - return -5; + return -EIO; } else { if (cmdack.comp_status) { DPRINTF( "dvrioctl2_send_timer_event -> Complete parameter (%04X) error (phase %d)\n", cmdack.comp_status, cmdack.phase); - return -5; + return -EIO; } } return 0; @@ -835,11 +835,11 @@ int dvrioctl2_epg_cancel( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_epg_cancel -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_epg_cancel -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -953,14 +953,14 @@ int dvrioctl2_tevent_buf_trans_dvrp( cmdack.input_buffer_length = tevent_data_sz; if (DvrdrvExecCmdAckDmaSendComp(&cmdack)) { DPRINTF("dvrioctl2_tevent_buf_trans_dvrp -> IO error (phase %d)\n", cmdack.phase); - return -5; + return -EIO; } else { if (cmdack.comp_status) { DPRINTF( "dvrioctl2_tevent_buf_trans_dvrp -> Complete parameter (%04X) error (phase %d)\n", cmdack.comp_status, cmdack.phase); - return -5; + return -EIO; } } return 0; @@ -1002,7 +1002,7 @@ int dvrioctl2_start_hdd_test( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_start_hdd_test -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } #ifdef DEBUG ack_status_ack = cmdack.ack_status_ack; @@ -1015,7 +1015,7 @@ int dvrioctl2_start_hdd_test( #endif } DPRINTF("dvrioctl2_start_hdd_test -> Status error!,%04X\n", ack_status_ack); - return -68; + return -EADV; } int dvrioctl2_stop_hdd_test( @@ -1047,7 +1047,7 @@ int dvrioctl2_stop_hdd_test( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_stop_hdd_test -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } #ifdef DEBUG ack_status_ack = cmdack.ack_status_ack; @@ -1062,7 +1062,7 @@ int dvrioctl2_stop_hdd_test( #ifdef DEBUG DPRINTF("dvrioctl2_stop_hdd_test -> Status error!,%04X\n", ack_status_ack); #endif - return -68; + return -EADV; } int dvrioctl2_get_hdd_test_stat( @@ -1089,10 +1089,10 @@ int dvrioctl2_get_hdd_test_stat( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_hdd_test_stat -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_hdd_test_stat -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u32 *)buf + 1) = (cmdack.output_word[1] << 16) + cmdack.output_word[2]; @@ -1128,10 +1128,10 @@ int dvrioctl2_pre_update_a( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_pre_update_a -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_pre_update_a -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { *(u16 *)buf = dvrpAuthEnc(cmdack.output_word[0]); return 0; @@ -1167,7 +1167,7 @@ int dvrioctl2_pre_update_b( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_pre_update_b -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } #ifdef DEBUG ack_status_ack = cmdack.ack_status_ack; @@ -1182,7 +1182,7 @@ int dvrioctl2_pre_update_b( #ifdef DEBUG DPRINTF("dvrioctl2_pre_update_b -> Status error!,%04X\n", ack_status_ack); #endif - return -68; + return -EADV; } int dvrioctl2_get_rec_vro_pckn( @@ -1209,7 +1209,7 @@ int dvrioctl2_get_rec_vro_pckn( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_get_rec_vro_pckn -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack == 0xFFFE) { DPRINTF("dvrioctl2_get_rec_vro_pckn -> Mode error!,%04X\n", 0xFFFE); @@ -1220,7 +1220,7 @@ int dvrioctl2_get_rec_vro_pckn( } DPRINTF("dvrioctl2_get_rec_vro_pckn -> Status error!,%04X\n", cmdack.ack_status_ack); } - return -68; + return -EADV; } int dvrioctl2_enc_dec_test( @@ -1249,7 +1249,7 @@ int dvrioctl2_enc_dec_test( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_enc_dec_test -> ACK Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_enc_dec_test -> ACK Status error!,%04X\n", cmdack.ack_status_ack); @@ -1258,7 +1258,7 @@ int dvrioctl2_enc_dec_test( return 0; DPRINTF("dvrioctl2_enc_dec_test -> COMP Status error!,%04X\n", cmdack.comp_status); } - return -68; + return -EADV; } int dvrioctl2_make_menu( @@ -1316,16 +1316,16 @@ int dvrioctl2_make_menu( *(u16 *)buf = cmdack.comp_status; if (cmdackerr) { DPRINTF("dvrioctl2_make_menu -> ACK Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_make_menu -> ACK Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } v16 = 1; if (cmdack.comp_status) { DPRINTF("dvrioctl2_make_menu -> COMP Status error!,%04X\n", cmdack.comp_status); - return -68; + return -EADV; } v17 = 1; input_word = cmdack.return_result_word; @@ -1435,16 +1435,16 @@ int dvrioctl2_re_enc_start( *(u16 *)buf = cmdack.comp_status; if (cmdackerr) { DPRINTF("dvrioctl2_re_enc_start -> ACK Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_re_enc_start -> ACK Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } v24 = 2; if (cmdack.comp_status) { DPRINTF("dvrioctl2_re_enc_start -> COMP Status error!,%04X\n", cmdack.comp_status); - return -68; + return -EADV; } v25 = 1; v26 = &cmdack.input_word[1]; @@ -1477,7 +1477,7 @@ int dvr_recv_dma(iomanX_iop_file_t *a1, u8 *buf, int buflen) DPRINTF("------------------- 2 ------------------ dvr_recv_dma(io=%p, buf=%p, buflen=%d)\n", a1, buf, buflen); if (((u32)buf & 3) != 0) { DPRINTF("dvr_recv_dma : Address is not a multiple of 4.\n"); - return -14; + return -EFAULT; } else { u8 *buf_tmp; int buflen_tmp; @@ -1497,12 +1497,12 @@ int dvr_recv_dma(iomanX_iop_file_t *a1, u8 *buf, int buflen) cmdack.output_buffer = buf_tmp; cmdack.timeout = 0x10000; if (DvrdrvExecCmdAckDmaRecvComp(&cmdack)) { - err = -5; + err = -EIO; DPRINTF("dvr_recv_dma : IO error (phase %d)\n", cmdack.phase); goto finish; } if (cmdack.comp_status) { - err = -5; + err = -EIO; DPRINTF("dvr_recv_dma : Complete parameter error (phase %d), %04X\n", cmdack.phase, cmdack.comp_status); goto finish; } @@ -1621,7 +1621,7 @@ int dvrioctl2_finish_auto_process( cmdackerr = DvrdrvExecCmdAck(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_finish_auto_process -> Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack == 0xFFFE) { DPRINTF("dvrioctl2_finish_auto_process -> Mode error!,%04X\n", 0xFFFE); @@ -1632,7 +1632,7 @@ int dvrioctl2_finish_auto_process( } DPRINTF("dvrioctl2_finish_auto_process -> Status error!,%04X\n", cmdack.ack_status_ack); } - return -68; + return -EADV; } int dvrioctl2_rec_pictclip( @@ -1671,7 +1671,7 @@ int dvrioctl2_rec_pictclip( cmdackerr = DvrdrvExecCmdAckComp(&cmdack); if (cmdackerr) { DPRINTF("dvrioctl2_re_enc_start -> ACK Handshake error!,%d\n", cmdackerr); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_re_enc_start -> ACK Status error!,%04X\n", cmdack.ack_status_ack); @@ -1680,5 +1680,5 @@ int dvrioctl2_rec_pictclip( return 0; DPRINTF("dvrioctl2_re_enc_start -> COMP Status error!,%04X\n", cmdack.comp_status); } - return -68; + return -EADV; } diff --git a/iop/dvrp/dvrav/src/dvrav.c b/iop/dvrp/dvrav/src/dvrav.c index ee9e6b408b5..3c31f7000c4 100644 --- a/iop/dvrp/dvrav/src/dvrav.c +++ b/iop/dvrp/dvrav/src/dvrav.c @@ -235,7 +235,7 @@ int dvrav_df_ioctl(iomanX_iop_file_t *f, int cmd, void *param) WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrav_df_devctl( @@ -265,7 +265,7 @@ int dvrav_df_devctl( v10 = DevctlCmdTbl[v12].fn(a1, cmd, arg, arglen, buf, buflen); LABEL_5: if (v11 == sizeof(DevctlCmdTbl) / sizeof(DevctlCmdTbl[0])) - v10 = -22; + v10 = -EINVAL; SignalSema(sema_id); return v10; } @@ -281,17 +281,17 @@ int dvrav_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int argle WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrav_df_null() { - return -48; + return -EUNSUP; } s64 dvrav_df_null_long() { - return -48LL; + return -EUNSUP; } int avioctl2_get_tun_offset( @@ -314,10 +314,10 @@ int avioctl2_get_tun_offset( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_tun_offset -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_tun_offset -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -345,10 +345,10 @@ int avioctl2_tun_offset_up( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_tun_offset_up -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_tun_offset_up -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -379,10 +379,10 @@ int avioctl2_tun_offset_down( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_tun_offset_down -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_tun_offset_down -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -416,10 +416,10 @@ int avioctl2_tun_scan_ch( cmdack.timeout = 35000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("avioctl2_tun_scan_ch -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("avioctl2_tun_scan_ch -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.return_result_word[0]; *((u16 *)buf + 1) = cmdack.return_result_word[1]; @@ -451,11 +451,11 @@ int avioctl2_get_bs_gain( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_bs_gain -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_bs_gain -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -485,11 +485,11 @@ int avioctl2_set_preset_info( cmdack.input_word_count = 2; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_set_preset_info -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_set_preset_info -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -515,11 +515,11 @@ int avioctl2_change_sound( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_change_sound -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_change_sound -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -551,11 +551,11 @@ int avioctl2_set_d_audio_sel( cmdack.input_word_count = 4; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_set_d_audio_sel -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_set_d_audio_sel -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -582,11 +582,11 @@ int avioctl2_set_d_video_sel( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_set_d_video_sel -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_set_d_video_sel -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -612,10 +612,10 @@ int avioctl2_get_av_src( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_av_src -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_av_src -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -643,11 +643,11 @@ int avioctl2_get_preset_info( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_preset_info -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_preset_info -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -676,11 +676,11 @@ int avioctl2_select_position( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_select_position -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_select_position -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -706,11 +706,11 @@ int avioctl2_position_up( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_position_up -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_position_up -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -738,11 +738,11 @@ int avioctl2_position_down( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_position_down -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_position_down -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -770,10 +770,10 @@ int avioctl2_get_position( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_position -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_position -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; DPRINTF("Now position = %d\n", cmdack.output_word[0]); @@ -806,11 +806,11 @@ int avioctl2_set_position_info( cmdack.input_word_count = 5; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_set_position_info -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_set_position_info -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -836,10 +836,10 @@ int avioctl2_get_position_info( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_position_info -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_position_info -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = *(u16 *)arg; *((u16 *)buf + 1) = cmdack.output_word[0]; @@ -871,11 +871,11 @@ int avioctl2_tun_scan_mode( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_tun_scan_mode -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_tun_scan_mode -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -902,11 +902,11 @@ int avioctl2_f_select_position( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_f_select_position -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_f_select_position -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -934,10 +934,10 @@ int avioctl2_select_rec_src( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("avioctl2_select_rec_src -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("avioctl2_select_rec_src -> Status error!\n"); - return -68; + return -EADV; } return 0; } @@ -962,11 +962,11 @@ int avioctl2_get_rec_src( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("avioctl2_get_rec_src -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("avioctl2_get_rec_src -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; } @@ -1004,11 +1004,11 @@ int avioctl2_cmd_ack( cmdack.input_word_count = arglen >> 1; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF(" %s -> Handshake error!\n", a1); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF(" %s -> Status error!\n", a1); - return -68; + return -EADV; } else { u16 *input_word; char *buf_tmp; @@ -1059,10 +1059,10 @@ int avioctl2_cmd_ack_comp( cmdack.timeout = a2; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF(" %s -> Handshake error!\n", a1); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF(" %s -> Status error!\n", a1); - return -68; + return -EADV; } else { int out_count; u16 *input_word; diff --git a/iop/dvrp/dvrdv/src/dvrdv.c b/iop/dvrp/dvrdv/src/dvrdv.c index 0752dcc8a6b..27e019c0a88 100644 --- a/iop/dvrp/dvrdv/src/dvrdv.c +++ b/iop/dvrp/dvrdv/src/dvrdv.c @@ -179,7 +179,7 @@ int dvrdv_df_ioctl(iomanX_iop_file_t *f, int cmd, void *param) WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrdv_df_devctl( @@ -207,7 +207,7 @@ int dvrdv_df_devctl( v10 = DevctlCmdTbl[v12].fn(a1, name, cmd, arg, arglen, buf, buflen); LABEL_5: if (v11 == sizeof(DevctlCmdTbl) / sizeof(DevctlCmdTbl[0])) - v10 = -22; + v10 = -EINVAL; SignalSema(sema_id); return v10; } @@ -230,17 +230,17 @@ int dvrdv_df_ioctl2( WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrdv_df_null() { - return -48; + return -EUNSUP; } s64 dvrdv_df_null_long() { - return -48LL; + return -EUNSUP; } int dvrioctl2_dv_dubb_start( @@ -269,11 +269,11 @@ int dvrioctl2_dv_dubb_start( cmdack_err = DvrdrvExecCmdAck(&cmdack); if (cmdack_err) { DPRINTF("dvrioctl2_dv_dubb_start -> Handshake error!,%d\n", cmdack_err); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_dv_dubb_start -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -305,11 +305,11 @@ int dvrioctl2_dv_dubb_stop( cmdack_err = DvrdrvExecCmdAck(&cmdack); if (cmdack_err) { DPRINTF("dvrioctl2_dv_dubb_stop -> Handshake error!,%d\n", cmdack_err); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_dv_dubb_stop -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -356,11 +356,11 @@ int dvrioctl2_dv_dubb_rec_start( cmdack_err = DvrdrvExecCmdAck(&cmdack); if (cmdack_err) { DPRINTF("dvrioctl2_dv_dubb_rec_start -> Handshake error!,%d\n", cmdack_err); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_dv_dubb_rec_start -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -394,12 +394,12 @@ int dvrioctl2_dv_dubb_rec_stop( if (cmdack_err) { DPRINTF("phase %d\n", cmdack.phase); DPRINTF("dvrioctl2_dv_dubb_rec_stop -> Handshake error!,%d\n", cmdack_err); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("phase %d\n", cmdack.phase); DPRINTF("dvrioctl2_dv_dubb_rec_stop -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } } return 0; @@ -430,11 +430,11 @@ int dvrioctl2_get_dvcam_info( if (cmdack_err) { DPRINTF("phase %d\n", cmdack.phase); DPRINTF("dvrioctl2_get_dvcam_info -> Handshake error!,%d\n", cmdack_err); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_dvcam_info -> Status error!,%04X\n", cmdack.ack_status_ack); - return -68; + return -EADV; } else { u16 *v11; int cpy_cnt; @@ -477,11 +477,11 @@ int dvrioctl2_get_dvcam_name( cmdack.timeout = 5000000; if (DvrdrvExecCmdAckDmaRecvComp(&cmdack)) { DPRINTF("dvrioctl2_get_dvcam_name : IO error (phase %d)\n", cmdack.phase); - return -5; + return -EIO; } else { if (cmdack.comp_status) { DPRINTF("dvrioctl2_get_dvcam_name : Complete parameter error (phase %d), %04X\n", cmdack.phase, cmdack.comp_status); - return -5; + return -EIO; } } return 0; diff --git a/iop/dvrp/dvripl/src/dvripl.c b/iop/dvrp/dvripl/src/dvripl.c index 12975e79205..31e6baa54dd 100644 --- a/iop/dvrp/dvripl/src/dvripl.c +++ b/iop/dvrp/dvripl/src/dvripl.c @@ -157,7 +157,7 @@ int dvripl_df_ioctl(iomanX_iop_file_t *f, int cmd, void *param) DPRINTF("dvripl_df_ioctl\n"); WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvripl_df_devctl( @@ -178,7 +178,7 @@ int dvripl_df_devctl( DPRINTF("dvripl_df_devctl\n"); WaitSema(sema_id); - v11 = -22; + v11 = -EINVAL; if (cmd == 0x5602) v11 = iplioctl2_update(a1, 0x5602, arg); SignalSema(sema_id); @@ -197,17 +197,17 @@ int dvripl_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int argl DPRINTF("dvripl_df_ioctl2\n"); WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvripl_df_null() { - return -48; + return -EUNSUP; } s64 dvripl_df_null_long() { - return -48LL; + return -EUNSUP; } int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) @@ -242,7 +242,7 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) goto LABEL_2; if (cmdack.ack_status_ack) { DPRINTF("NOP -> Status error!\n"); - return -5; + return -EIO; } DPRINTF("VERSION\n"); cmdack.command = 0x102; @@ -252,11 +252,11 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) if (cmdackerr2) { LABEL_2: DPRINTF("NOP -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("NOP -> Status error!\n"); - return -5; + return -EIO; } DPRINTF("major : %04x\n", cmdack.output_word[0]); DPRINTF("minor : %04x\n", cmdack.output_word[1]); @@ -275,11 +275,11 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) DPRINTF("dvrcmd.ack_p[0]:%x\n", cmdack.ack_status_ack); if (cmdackerr3) { DPRINTF("CONFIG -> Handshake error!(%d)\n", cmdackerr3); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("CONFIG -> Status error!\n"); - return -5; + return -EIO; } update_fd = iomanX_open((const char *)arg, 1, 0x124); if (update_fd >= 0) { @@ -301,7 +301,7 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) read_size = iomanX_read(update_fd, SBUF, 0x8000); chunk_size = read_size; if (read_size < 0) { - retval = -5; + retval = -EIO; DPRINTF("Cannot read \"%s\"\n", (const char *)arg); goto LABEL_30; } @@ -321,7 +321,7 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) cmdack.input_buffer = SBUF; cmdack.input_buffer_length = chunk_size; if (DvrdrvExecCmdAckDmaSendComp(&cmdack)) { - retval = -5; + retval = -EIO; DPRINTF("Handshake error! (phase:%d)\n", cmdack.phase); goto LABEL_30; } @@ -353,14 +353,14 @@ int iplioctl2_update(iomanX_iop_file_t *a1, int cmd, void *arg) DPRINTF("dvrcmd.ack_p[1]:%x\n", cmdack.output_word[0]); DPRINTF("dvrcmd.ack_p[2]:%x\n", cmdack.output_word[1]); if (cmdackerr4) { - retval = -5; + retval = -EIO; goto LABEL_30; } if (cmdack.ack_status_ack) LABEL_29: - retval = -5; + retval = -EIO; } else { - retval = -89; + retval = -ENMFILE; } LABEL_30: iomanX_close(update_fd); diff --git a/iop/dvrp/dvrmisc/src/dvrmisc.c b/iop/dvrp/dvrmisc/src/dvrmisc.c index 8d5aff0829c..305339c0f6c 100644 --- a/iop/dvrp/dvrmisc/src/dvrmisc.c +++ b/iop/dvrp/dvrmisc/src/dvrmisc.c @@ -220,7 +220,7 @@ int dvrmisc_df_ioctl(iomanX_iop_file_t *f, int cmd, void *param) WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrmisc_df_devctl( @@ -250,7 +250,7 @@ int dvrmisc_df_devctl( v10 = DevctlCmdTbl[v12].fn(a1, cmd, arg, arglen, buf, buflen); LABEL_5: if (v11 == sizeof(DevctlCmdTbl) / sizeof(DevctlCmdTbl[0])) - v10 = -22; + v10 = -EINVAL; SignalSema(sema_id); return v10; } @@ -273,17 +273,17 @@ int dvrmisc_df_ioctl2( WaitSema(sema_id); SignalSema(sema_id); - return -22; + return -EINVAL; } int dvrmisc_df_null() { - return -48; + return -EUNSUP; } s64 dvrmisc_df_null_long() { - return -48LL; + return -EUNSUP; } int dvrioctl2_nop(iomanX_iop_file_t *a1, int cmd, void *arg, unsigned int arglen, void *buf, unsigned int buflen) @@ -301,11 +301,11 @@ int dvrioctl2_nop(iomanX_iop_file_t *a1, int cmd, void *arg, unsigned int arglen cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_nop -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_nop -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -331,10 +331,10 @@ int dvrioctl2_version( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_version -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_version -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -363,11 +363,11 @@ int dvrioctl2_led_hdd_rec( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_led_hdd_rec -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_led_hdd_rec -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -394,11 +394,11 @@ int dvrioctl2_led_dvd_rec( cmdack.input_word[0] = *(u16 *)arg; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_led_dvd_rec -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_led_dvd_rec -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -424,10 +424,10 @@ int dvrioctl2_get_sircs( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_get_sircs -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_sircs -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -458,10 +458,10 @@ int dvrioctl2_get_time( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_get_time -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_time -> Status error!\n"); - return -68; + return -EADV; } else { *(u8 *)buf = cmdack.output_word[0]; *((u8 *)buf + 1) = cmdack.output_word[1]; @@ -496,11 +496,11 @@ int dvrioctl2_set_timezone( cmdack.input_word[1] = *((u16 *)arg + 1); if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_set_timezone -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_set_timezone -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -528,10 +528,10 @@ int dvrioctl2_save_preset_info( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_save_preset_info -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_save_preset_info -> Status error!\n"); - return -68; + return -EADV; } return 0; } @@ -558,10 +558,10 @@ int dvrioctl2_load_preset_info( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_load_preset_info -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_load_preset_info -> Status error!\n"); - return -68; + return -EADV; } return 0; } @@ -588,10 +588,10 @@ int dvrioctl2_test_dev_rst( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_test_dev_rst -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_test_dev_rst -> Status error!\n"); - return -68; + return -EADV; } return 0; } @@ -617,10 +617,10 @@ int dvrioctl2_test_sdram_chk( cmdack.timeout = 20000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_test_sdram_chk -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_test_sdram_chk -> Status error!\n"); - return -68; + return -EADV; } else { *(u32 *)buf = (cmdack.return_result_word[0] << 16) + cmdack.return_result_word[1]; *((u32 *)buf + 1) = (cmdack.return_result_word[2] << 16) + cmdack.return_result_word[3]; @@ -650,10 +650,10 @@ int dvrioctl2_test_mpe_chk( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_test_mpe_chk -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_test_mpe_chk -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.return_result_word[0]; } @@ -681,10 +681,10 @@ int dvrioctl2_test_mpd_chk( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_test_mpd_chk -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_test_mpd_chk -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.return_result_word[0]; } @@ -713,10 +713,10 @@ int dvrioctl2_test_vdec_chk( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_test_vdec_chk -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("dvrioctl2_test_vdec_chk -> Status error!\n"); - return -68; + return -EADV; } return 0; } @@ -743,13 +743,13 @@ int dvrioctl2_partition_free( v8 = v7; if (v7 < 0) { DPRINTF("dvrioctl2_partition_free : Cannot execute PDIOC_ZONEFREE.,%d\n", v7); - return -5; + return -EIO; } v9 = iomanX_devctl((const char *)arg, 0x5001, 0, 0, 0, 0); v10 = v8 * (s64)v9; if (v9 < 0) { DPRINTF("dvrioctl2_partition_free : Cannot execute PDIOC_ZONESZ.,%d\n", v9); - return -5; + return -EIO; } *(u64 *)buf = v10; if (*(s64 *)buf <= 0x7FFFFFF) { @@ -783,11 +783,11 @@ int dvrioctl2_buzzer( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_buzzer -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_buzzer -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -815,11 +815,11 @@ int dvrioctl2_clr_preset_info( cmdack.timeout = 20000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("dvrioctl2_clr_preset_info -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_clr_preset_info -> Status error!\n"); - return -68; + return -EADV; } } return 0; @@ -845,11 +845,11 @@ int dvrioctl2_get_vbi_err_rate( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_get_vbi_err_rate -> Handshake error!\n"); - return -5; + return -EIO; } else { if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_get_vbi_err_rate -> Status error!\n"); - return -68; + return -EADV; } else { *(u32 *)buf = (cmdack.output_word[0] << 16) + cmdack.output_word[1]; *((u32 *)buf + 1) = (cmdack.output_word[2] << 16) + cmdack.output_word[3]; @@ -881,10 +881,10 @@ int dvrioctl2_update_dvrp_firmware( read_offset = 0; checksum = 0; - retval = -1; + retval = -EPERM; update_fd = iomanX_open((const char *)arg, 1, 0x49, arglen); if (update_fd < 0) { - retval = -2; + retval = -ENOENT; goto LABEL_38; } update_size = iomanX_lseek(update_fd, 0, 2); @@ -898,7 +898,7 @@ int dvrioctl2_update_dvrp_firmware( if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("FLASH_DATA_TOTALSIZE -> Handshake error!\n"); LABEL_37: - retval = -5; + retval = -EIO; goto LABEL_38; } if (cmdack.ack_status_ack) { @@ -960,7 +960,7 @@ int dvrioctl2_update_dvrp_firmware( DPRINTF("MISCCMD_FLASH_DATA_CHECKSUM -> ACK Status error!\n"); } else { if (cmdack.comp_status) { - retval = -68; + retval = -EADV; DPRINTF("MISCCMD_FLASH_DATA_CHECKSUM -> COMP Status error!\n"); DPRINTF( "Check sum error! IOP:%08X,DVRP:%08X\n", @@ -984,7 +984,7 @@ int dvrioctl2_update_dvrp_firmware( DPRINTF("MISCCMD_FLASH_DATA_WRITE -> COMP Status error!\n"); } } - retval = -68; + retval = -EADV; LABEL_38: iomanX_close(update_fd); return retval; @@ -1010,10 +1010,10 @@ int dvrioctl2_flash_write_status( cmdack.input_word_count = 0; if (DvrdrvExecCmdAck(&cmdack)) { DPRINTF("dvrioctl2_flash_write_status -> Handshake error!\n"); - return -5; + return -EIO; } else if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_flash_write_status -> Status error!\n"); - return -68; + return -EADV; } else { *(u16 *)buf = cmdack.output_word[0]; *((u16 *)buf + 1) = cmdack.output_word[1]; @@ -1057,11 +1057,11 @@ int dvrioctl2_set_device_key( DPRINTF("dvrcmd.ack_p[0]:%x\n", cmdack.ack_status_ack); if (cmdack_err) { DPRINTF("DEVKEY_TOTALSIZE -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack || cmdack.comp_status) { DPRINTF("DEVKEY_TOTALSIZE -> Status error!\n"); - return -5; + return -EIO; } bsize = (cmdack.return_result_word[0] << 16) + cmdack.return_result_word[1]; if (bsize != 456) @@ -1092,15 +1092,15 @@ int dvrioctl2_set_device_key( DPRINTF("dvrcmd.ack_p[0]:%x\n", cmdack.ack_status_ack); if (cmdack_err3) { DPRINTF("MISCCMD_DEVKEY_DOWNLOAD -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_DEVKEY_DOWNLOAD -> Status error!\n"); - return -5; + return -EIO; } if (cmdack.comp_status) { DPRINTF("MISCCMD_DEVKEY_DOWNLOAD -> Status error!\n"); - return -5; + return -EIO; } cmdack.command = 0x5119; cmdack.input_word_count = 0; @@ -1109,15 +1109,15 @@ int dvrioctl2_set_device_key( DPRINTF("dvrcmd.ack_p[0]:%x\n", cmdack.ack_status_ack); if (cmdack_err2) { DPRINTF("MISCCMD_SAVE_DEVKEY_INFO -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_SAVE_DEVKEY_INFO -> Status error!\n"); - return -68; + return -EADV; } if (cmdack.comp_status) { DPRINTF("MISCCMD_SAVE_DEVKEY_INFO -> Status error!\n"); - return -5; + return -EIO; } return 0; } @@ -1149,15 +1149,15 @@ int dvrioctl2_get_device_key( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Status error!\n"); - return -68; + return -EADV; } if (cmdack.comp_status) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Status error!\n"); - return -5; + return -EIO; } v6 = 0; return_result_word = cmdack.return_result_word; @@ -1206,16 +1206,16 @@ int dvrioctl2_get_device_key( cmdack.timeout = 30000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Status error!\n"); - return -68; + return -EADV; } v22 = 1; if (cmdack.comp_status) { DPRINTF("MISCCMD_GET_DEVKEY_INFO -> Status error!\n"); - return -5; + return -EIO; } if ((u16)v21 + 1 > 1) { u16 *in_word_tmp2; @@ -1237,7 +1237,7 @@ int dvrioctl2_get_device_key( return 0; } } - return -68; + return -EADV; } int dvrioctl2_set_dv_nodeid( @@ -1274,15 +1274,15 @@ int dvrioctl2_set_dv_nodeid( cmdack.timeout = 10000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("MISCCMD_SAVE_DV_NODEID -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_SAVE_DV_NODEID -> Status error!\n"); - return -68; + return -EADV; } if (cmdack.comp_status) { DPRINTF("MISCCMD_SAVE_DV_NODEID -> Status error!\n"); - return -5; + return -EIO; } return 0; } @@ -1308,15 +1308,15 @@ int dvrioctl2_get_dv_nodeid( cmdack.timeout = 15000000; if (DvrdrvExecCmdAckComp(&cmdack)) { DPRINTF("MISCCMD_GET_DV_NODEID -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("MISCCMD_GET_DV_NODEID -> Status error!\n"); - return -68; + return -EADV; } if (cmdack.comp_status) { DPRINTF("MISCCMD_GET_DV_NODEID -> Status error!\n"); - return -5; + return -EIO; } bufwalked = 0; if (buflen) { @@ -1392,15 +1392,15 @@ int dvrioctl2_diag_test( DPRINTF("diag_test dvrcmd.phase:%x\n", cmdack.phase); if (cmdack_err) { DPRINTF("dvrioctl2_diag_test -> Handshake error!\n"); - return -5; + return -EIO; } if (cmdack.ack_status_ack) { DPRINTF("dvrioctl2_diag_test -> Status error in ACK! param:%04x\n", cmdack.ack_status_ack); - return -68; + return -EADV; } if (cmdack.comp_status) { DPRINTF("dvrioctl2_diag_test -> Status error in COMP! param:%04x\n", cmdack.comp_status); - return -68; + return -EADV; } outbuf_cnt = 0; DPRINTF("---------------------------- return buffer\n"); diff --git a/iop/fs/bdmfs_fatfs/src/fs_driver.c b/iop/fs/bdmfs_fatfs/src/fs_driver.c index 2cc6f965920..e38d5441b41 100644 --- a/iop/fs/bdmfs_fatfs/src/fs_driver.c +++ b/iop/fs/bdmfs_fatfs/src/fs_driver.c @@ -265,7 +265,7 @@ static int fs_dummy(void) { M_DEBUG("%s\n", __func__); - return -5; + return -EIO; } //--------------------------------------------------------------------------- diff --git a/iop/fs/devfs/src/devfs.c b/iop/fs/devfs/src/devfs.c index 60e9328cf6c..ea68e0cd796 100644 --- a/iop/fs/devfs/src/devfs.c +++ b/iop/fs/devfs/src/devfs.c @@ -23,6 +23,7 @@ #include "intrman.h" #include "stdio.h" #include "sysclib.h" +#include #include "devfs.h" #include "sysmem.h" #include "stdio.h" @@ -331,7 +332,7 @@ int devfs_dummy(void) { printf("devfs_dummy\n"); - return -1; + return -EPERM; } /** ioman init handler @@ -375,7 +376,7 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) if(name == NULL) { M_PRINTF("open: Name is NULL\n"); - return -1; + return -EPERM; } if((name[0] == '\\') || (name[0] == '/')) @@ -397,7 +398,7 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) if((unsigned int)name_len == strlen(name)) /* If this is has not got a subnumber */ { M_PRINTF("open: No subdevice number in filename %s\n", name); - return -1; + return -EPERM; } subdev = strtoul(&name[name_len + fn_offset], &endp, 10); @@ -406,21 +407,21 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) /* Invalid number */ { M_PRINTF("open: Invalid subdev number %d\n", subdev); - return -1; + return -EPERM; } if(*endp) /* Extra charactes after filename */ { M_PRINTF("open: Invalid filename\n"); - return -1; + return -EPERM; } if(!dev->subdevs[subdev].valid) /* No subdev */ { M_PRINTF("open: No subdev registered\n"); - return -1; + return -EPERM; } if((dev->subdevs[subdev].mode & DEVFS_MODE_EX) @@ -428,7 +429,7 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) /* Already opened in exclusive mode */ { M_PRINTF("open: Exclusive subdevice already opened\n"); - return -1; + return -EPERM; } if(dev->subdevs[subdev].open_refcount == MAX_OPENFILES) @@ -441,21 +442,21 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) && !(dev->subdevs[subdev].mode & DEVFS_MODE_R)) { M_PRINTF("open: Read mode requested but not permitted\n"); - return -1; + return -EPERM; } if(((mode & O_WRONLY) || ((mode & O_RDWR) == O_RDWR)) && !(dev->subdevs[subdev].mode & DEVFS_MODE_W)) { M_PRINTF("open: Write mode requested but not permitted\n"); - return -1; + return -EPERM; } file->privdata = AllocSysMemory(ALLOC_FIRST, sizeof(ioman_data_t), NULL); if(file->privdata == NULL) { M_PRINTF("open: Allocation failure\n"); - return -1; + return -EPERM; } ((ioman_data_t *) file->privdata)->hDev = dev->hDev; @@ -474,7 +475,7 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) { FreeSysMemory(file->privdata); M_PRINTF("open: Inconsistency between number of open files and available slot\n"); - return -1; + return -EPERM; } dev->subdevs[subdev].open_files[loop] = file->privdata; @@ -484,7 +485,7 @@ int devfs_open(iop_file_t *file, const char *name, int mode, int unused) else { M_PRINTF("open: Couldn't find the device\n"); - return -1; + return -EPERM; } return 0; @@ -541,12 +542,12 @@ int devfs_close(iop_file_t *file) { FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } } else { - return -1; + return -EPERM; } return 0; @@ -566,7 +567,7 @@ int devfs_ioctl(iop_file_t *file, int cmd, void *args) if(cmd == DEVFS_IOCTL_GETDESC) { - return -1; /* ioctl cannot support this call */ + return -EPERM; /* ioctl cannot support this call */ } data = file->privdata; @@ -578,7 +579,7 @@ int devfs_ioctl(iop_file_t *file, int cmd, void *args) /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } if(dev->node.ioctl != NULL) @@ -594,7 +595,7 @@ int devfs_ioctl(iop_file_t *file, int cmd, void *args) } - return -1; + return -EPERM; } /** ioman ioctl2 handler @@ -621,7 +622,7 @@ int devfs_ioctl2(iop_file_t *file, int cmd, void *args, unsigned int arglen, voi /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } if((cmd == DEVFS_IOCTL_GETDESC) && (buf) && (buflen >= DEVFS_MAX_DESC_LENGTH)) @@ -649,7 +650,7 @@ int devfs_ioctl2(iop_file_t *file, int cmd, void *args, unsigned int arglen, voi } - return -1; + return -EPERM; } /** ioman read handler @@ -675,7 +676,7 @@ int devfs_read(iop_file_t *file, void *buf, int len) /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } if((dev->node.read != NULL) @@ -697,7 +698,7 @@ int devfs_read(iop_file_t *file, void *buf, int len) } } - return -1; + return -EPERM; } /** ioman write handler @@ -722,7 +723,7 @@ int devfs_write(iop_file_t *file, void *buf, int len) /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } if((dev->node.write != NULL) @@ -744,7 +745,7 @@ int devfs_write(iop_file_t *file, void *buf, int len) } } - return -1; + return -EPERM; } /** ioman lseek handler @@ -768,7 +769,7 @@ int devfs_lseek(iop_file_t *file, long loc, int whence) /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } switch(whence) @@ -785,12 +786,12 @@ int devfs_lseek(iop_file_t *file, long loc, int whence) && (dev->subdevs[data->subdev].extent.loc64 >= (u64) loc)) data->loc.loc64 = dev->subdevs[data->subdev].extent.loc64 - (u64) loc; break; - default: return -1; + default: return -EPERM; } } else { - return -1; + return -EPERM; } return data->loc.loc32[0]; @@ -816,7 +817,7 @@ int devfs_lseek64(iop_file_t *file, long long loc, int whence) /* Delete data to try and prevent a memory leak */ FreeSysMemory(data); file->privdata = NULL; - return -1; + return -EPERM; } switch(whence) @@ -832,13 +833,13 @@ int devfs_lseek64(iop_file_t *file, long long loc, int whence) case SEEK_END: if((loc > 0) && (dev->subdevs[data->subdev].extent.loc64 >= (u64) loc)) data->loc.loc64 = dev->subdevs[data->subdev].extent.loc64 - (u64) loc; break; - default: return -1; + default: return -EPERM; } } else { - return -1; + return -EPERM; } return data->loc.loc32[0]; @@ -856,7 +857,7 @@ int devfs_dopen(iop_file_t *file, const char *name) if((name == NULL) || ((name[0] != '\\') && (name[0] != '/'))) { M_PRINTF("dopen: Not a valid directory name\n"); - return -1; + return -EPERM; } //M_PRINTF("dopen: file=%p name=%s\n", file, name); @@ -871,7 +872,7 @@ int devfs_dopen(iop_file_t *file, const char *name) } } - return -1; + return -EPERM; } /** ioman dclose handler @@ -936,7 +937,7 @@ int devfs_getstat(iop_file_t *file, const char *name, iox_stat_t *stat) if(name == NULL) { - return -1; + return -EPERM; } if((name[0] == '\\') || (name[0] == '/')) @@ -946,7 +947,7 @@ int devfs_getstat(iop_file_t *file, const char *name, iox_stat_t *stat) if(stat == NULL) { - return -1; + return -EPERM; } dev = devfs_find_devicename(name + fn_offset); @@ -962,7 +963,7 @@ int devfs_getstat(iop_file_t *file, const char *name, iox_stat_t *stat) if((unsigned int)name_len == strlen(name)) /* If this is has not got a subnumber */ { M_PRINTF("getstat: No subdevice number in filename %s\n", name); - return -1; + return -EPERM; } subdev = strtoul(&name[name_len + fn_offset], &endp, 10); @@ -971,20 +972,20 @@ int devfs_getstat(iop_file_t *file, const char *name, iox_stat_t *stat) /* Invalid number */ { M_PRINTF("getstat: Invalid subdev number %d\n", subdev); - return -1; + return -EPERM; } if(*endp) /* Extra charactes after filename */ { M_PRINTF("getstat: Invalid filename\n"); - return -1; + return -EPERM; } if(!dev->subdevs[subdev].valid) { M_PRINTF("getstat: No subdev registered\n"); - return -1; + return -EPERM; } #ifdef USE_IOMAN diff --git a/iop/fs/fakehost/src/fakehost.c b/iop/fs/fakehost/src/fakehost.c index 6fd360aa7c9..36d622437b5 100644 --- a/iop/fs/fakehost/src/fakehost.c +++ b/iop/fs/fakehost/src/fakehost.c @@ -23,6 +23,7 @@ #include "loadcore.h" #include "stdio.h" #include "sysclib.h" +#include #include "thbase.h" #include "intrman.h" #include "sysmem.h" @@ -109,7 +110,7 @@ int realfd( iop_io_file_t *f ) int dummy() { M_DEBUG("dummy function called\n"); - return -5; + return -EIO; } /** Initialise fs driver. diff --git a/iop/fs/http/src/ps2http.c b/iop/fs/http/src/ps2http.c index 96e845a2e39..aa917b50798 100644 --- a/iop/fs/http/src/ps2http.c +++ b/iop/fs/http/src/ps2http.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -352,7 +353,7 @@ const char *resolveAddress( struct sockaddr_in *server, const char * url, char * int httpDummy() { M_PRINTF("dummy function called\n"); - return -5; + return -EIO; } int httpInitialize(iop_io_device_t *driver) @@ -386,7 +387,7 @@ int httpOpen(iop_io_file_t *f, const char *name, int mode) M_DEBUG("httpOpen(-, %s, %d)\n", name, mode); if((privData = AllocSysMemory(ALLOC_FIRST, sizeof(t_fioPrivData), NULL)) == NULL) - return -1; + return -EPERM; f->privdata = privData; @@ -398,7 +399,7 @@ int httpOpen(iop_io_file_t *f, const char *name, int mode) if((getName = resolveAddress( &server, name, hostAddr )) == NULL) { FreeSysMemory(privData); - return -2; + return -ENOENT; } // Now we connect and initiate the transfer by sending a @@ -491,7 +492,7 @@ int httpLseek(iop_io_file_t *f, int offset, int mode) break; default: - return -1; + return -EPERM; } return privData->filePos; diff --git a/iop/fs/vfat/src/fs_driver.c b/iop/fs/vfat/src/fs_driver.c index 02bbfe489e5..99ddb7ee530 100644 --- a/iop/fs/vfat/src/fs_driver.c +++ b/iop/fs/vfat/src/fs_driver.c @@ -232,7 +232,7 @@ static int fs_dummy(void) { M_DEBUG("%s\n", __func__); - return -5; + return -EIO; } //--------------------------------------------------------------------------- @@ -441,7 +441,7 @@ static int fs_lseek(iop_file_t *fd, int offset, int whence) break; default: _fs_unlock(); - return -1; + return -EPERM; } if ((int)(rec->filePos) < 0) { rec->filePos = 0; diff --git a/iop/hdd/apa/src/hdd_fio.c b/iop/hdd/apa/src/hdd_fio.c index 3f68d86967d..8676298807d 100644 --- a/iop/hdd/apa/src/hdd_fio.c +++ b/iop/hdd/apa/src/hdd_fio.c @@ -1177,5 +1177,5 @@ int hddUnsupported(iomanX_iop_file_t *f) { (void)f; - return -1; + return -EPERM; } diff --git a/iop/hdd/hdck/src/hdck.c b/iop/hdd/hdck/src/hdck.c index a3daf4bc3ab..63151249867 100644 --- a/iop/hdd/hdck/src/hdck.c +++ b/iop/hdd/hdck/src/hdck.c @@ -100,7 +100,7 @@ static struct HdckPrivateData PrivateData = { static int HdckUnsupported(void) { - return -1; + return -EPERM; } static int HdckInit(iomanX_iop_device_t *device) diff --git a/iop/hdd/hdsk/src/hdsk.c b/iop/hdd/hdsk/src/hdsk.c index acfe25de69f..7420b4dc8c6 100644 --- a/iop/hdd/hdsk/src/hdsk.c +++ b/iop/hdd/hdsk/src/hdsk.c @@ -595,7 +595,7 @@ static int HdskInit(iomanX_iop_device_t *device) static int HdskUnsupported(void) { - return -1; + return -EPERM; } int BitmapUsed; diff --git a/iop/usb/keyboard/src/ps2kbd.c b/iop/usb/keyboard/src/ps2kbd.c index c6eaf30b2d7..5fd38795887 100644 --- a/iop/usb/keyboard/src/ps2kbd.c +++ b/iop/usb/keyboard/src/ps2kbd.c @@ -20,6 +20,7 @@ #include "sifcmd.h" #include "sifrpc.h" #include "sysclib.h" +#include #include "sysmem.h" #include "usbd.h" #include "usbd_macro.h" @@ -981,7 +982,7 @@ void ps2kbd_ioctl_setrepeatrate(u32 rate) int fio_dummy() { //printf("fio_dummy()\n"); - return -5; + return -EIO; } int fio_init(iop_device_t *driver) @@ -1008,7 +1009,7 @@ int fio_open(iop_file_t *f, const char *name, int mode) //printf("fio_open() %s %d\n", name, mode); if(strcmp(name, PS2KBD_KBDFILE)) /* If not the keyboard file */ { - return -1; + return -EPERM; } return 0; @@ -1100,7 +1101,7 @@ int fio_ioctl(iop_file_t *f, int cmd, void *param) break; case PS2KBD_IOCTL_SETREPEATRATE: ps2kbd_ioctl_setrepeatrate(*(u32 *) param); break; - default : return -1; + default : return -EPERM; } return 0;