From acd41fe951403f50c2b07e1db909379b503c6ea0 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Wed, 14 May 2025 17:08:36 +0200 Subject: [PATCH] Apply needed fixes for GCC 15.1 --- iop/cdvd/cdvdman/src/cdvdman.c | 80 ++++++++---------- iop/cdvd/cdvdstm/src/cdvdstm.c | 82 +++++++++---------- iop/debug/iop_sbusdbg/src/main.c | 6 +- iop/debug/iop_sbusdbg/src/sbus_tty.c | 6 +- iop/debug/ppctty/src/tty.c | 6 +- iop/debug/sior/src/xprintf.c | 18 ++-- iop/dev9/poweroff/src/poweroff.c | 6 +- iop/fs/netfs/src/ps2_fio.c | 13 +-- iop/memorycard/mcserv/src/mcserv.c | 2 +- iop/network/spduart/src/spduart.c | 5 +- iop/sound/ahx/src/ahx_irx.c | 2 +- iop/sound/audsrv/src/audsrv.c | 2 +- iop/sound/audsrv/src/common.c | 2 +- iop/sound/audsrv/src/common.h | 2 +- iop/sound/ps2snd/Makefile | 2 - iop/sound/ps2snd/src/ps2snd.c | 2 +- iop/system/modload/src/modload.c | 36 +++++--- iop/system/mtapman/src/freemtap.c | 4 +- iop/system/mtapman/src/rpcservers.c | 20 +++-- iop/system/sifman/src/sifman.c | 4 +- .../src/embeddedartistry_libc/stdlib/strtol.c | 4 +- .../embeddedartistry_libc/stdlib/strtoul.c | 4 +- 22 files changed, 156 insertions(+), 152 deletions(-) diff --git a/iop/cdvd/cdvdman/src/cdvdman.c b/iop/cdvd/cdvdman/src/cdvdman.c index 1ce8d781cef..a9dff330cbd 100644 --- a/iop/cdvd/cdvdman/src/cdvdman.c +++ b/iop/cdvd/cdvdman/src/cdvdman.c @@ -9,6 +9,7 @@ */ #include "irx_imports.h" +#include "iomanX.h" #include @@ -155,7 +156,7 @@ typedef struct iso9660_dirent_ static int cdrom_init(iop_device_t *dev); void cdvdman_termcall(int with_stop); -static int cdrom_deinit(); +static int cdrom_deinit(iop_device_t *dev); static int cdrom_dopen(iop_file_t *f, const char *dirname); static int cdrom_getstat(iop_file_t *f, const char *name, iox_stat_t *buf); static int cdrom_dread(iop_file_t *f, iox_dirent_t *buf); @@ -167,8 +168,6 @@ static int cdrom_ioctl2(iop_file_t *f, int request, void *argp, size_t arglen, v static int cdrom_devctl(iop_file_t *f, const char *, int cmd, void *argp, unsigned int arglen, void *bufp, unsigned int buflen); static int cdrom_lseek(iop_file_t *f, int offset, int pos); -static int cdrom_nulldev(); -static s64 cdrom_nulldev64(); static int CdSearchFileInner(cdvdman_filetbl_entry_t *fp, const char *name, int layer); static int sceCdSearchDir(char *dirname, int layer); static int sceCdReadDir(sceCdlFILE *fp, int dsec, int index, int layer); @@ -211,34 +210,37 @@ static int g_cdvdman_iocache = 0; static unsigned int g_cdvdman_lcn_offset = 0; static unsigned int g_cdvdman_numbytes_offset = 0; static int g_cdvdman_strmerr = 0; + +IOMANX_RETURN_VALUE_IMPL(EIO); + static iop_device_ops_t g_cdvdman_cddev_ops = { - &cdrom_init, - &cdrom_deinit, - (void *)&cdrom_nulldev, - &cdrom_open, - &cdrom_close, - &cdrom_read, - (void *)&cdrom_nulldev, - &cdrom_lseek, - &cdrom_ioctl, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - &cdrom_dopen, - &cdrom_close, - &cdrom_dread, - &cdrom_getstat, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev64, - &cdrom_devctl, - (void *)&cdrom_nulldev, - (void *)&cdrom_nulldev, - &cdrom_ioctl2, + &cdrom_init, // init, + &cdrom_deinit, // deinit, + IOMANX_RETURN_VALUE(EIO), // format, + &cdrom_open, // open, + &cdrom_close, // close, + &cdrom_read, // read, + IOMANX_RETURN_VALUE(EIO), // write, + &cdrom_lseek, // lseek, + &cdrom_ioctl, // ioctl, + IOMANX_RETURN_VALUE(EIO), // remove, + IOMANX_RETURN_VALUE(EIO), // mkdir, + IOMANX_RETURN_VALUE(EIO), // rmdir, + &cdrom_dopen, // dopen, + &cdrom_close, // close, + &cdrom_dread, // dread + &cdrom_getstat, // getstat + IOMANX_RETURN_VALUE(EIO), // chstat, + IOMANX_RETURN_VALUE(EIO), // rename, + IOMANX_RETURN_VALUE(EIO), // chdir + IOMANX_RETURN_VALUE(EIO), // sync + IOMANX_RETURN_VALUE(EIO), // mount, + IOMANX_RETURN_VALUE(EIO), // umount, + IOMANX_RETURN_VALUE_S64(EIO), // lseek64, + &cdrom_devctl, // devctl, + IOMANX_RETURN_VALUE(EIO), // readdir, + IOMANX_RETURN_VALUE(EIO), // readlink, + &cdrom_ioctl2, // ioctl2, }; static iop_device_t g_cdvdman_cddev = {"cdrom", IOP_DT_FSEXT | IOP_DT_FS, 1, "CD-ROM ", &g_cdvdman_cddev_ops}; static int g_cdvdman_sync_timeout = 15000; @@ -320,7 +322,7 @@ int _start(int ac, char **av) DelDrv(g_cdvdman_cddev.name); if ( AddDrv(&g_cdvdman_cddev) ) { - cdrom_deinit(); + cdrom_deinit(&g_cdvdman_cddev); return MODULE_NO_RESIDENT_END; } g_cdvdman_ptoc = (u8 *)&g_cdvdman_fsvrbuf[0x924]; @@ -432,10 +434,12 @@ void cdvdman_termcall(int with_stop) ReleaseIntrHandler(IOP_IRQ_CDVD); } -static int cdrom_deinit() +static int cdrom_deinit(iop_device_t *dev) { unsigned int i; + (void)dev; + for ( i = 0; i < (sizeof(g_cdvdman_fhinfo) / sizeof(g_cdvdman_fhinfo[0])); i += 1 ) { g_cdvdman_fhinfo[i].m_fd_flags = 0; @@ -1893,18 +1897,6 @@ static int cdrom_lseek(iop_file_t *f, int offset, int pos) return retval; } -static int cdrom_nulldev() -{ - PRINTF("nulldev0 call\n"); - return -EIO; -} - -static s64 cdrom_nulldev64() -{ - PRINTF("nulldev0 call\n"); - return -EIO; -} - static int sync_timeout_alarm_cb(const iop_sys_clock_t *sys_clock) { KPRINTF("Cdvd Time Out %d(msec)\n", sys_clock->lo / 0x9000); diff --git a/iop/cdvd/cdvdstm/src/cdvdstm.c b/iop/cdvd/cdvdstm/src/cdvdstm.c index b9d61756a32..485c1361132 100644 --- a/iop/cdvd/cdvdstm/src/cdvdstm.c +++ b/iop/cdvd/cdvdstm/src/cdvdstm.c @@ -9,6 +9,7 @@ */ #include "irx_imports.h" +#include "iomanX.h" #include #include @@ -24,12 +25,10 @@ int cdvdstm_termcall(); static unsigned int iop_stream_handler( unsigned int posszarg1, unsigned int posszarg2, void *buffer, int cmdid, const sceCdRMode *rmode, int *error_ptr); static unsigned int iop_stream_intr_cb(void *userdata); -static int cdrom_stm_init(); -static int cdrom_stm_deinit(); +static int cdrom_stm_init(iop_device_t *device); +static int cdrom_stm_deinit(iop_device_t *device); static int cdrom_stm_devctl( iop_file_t *f, const char *name, int cmd, void *inbuf, unsigned int inbuf_len, void *outbuf, unsigned int outbuf_len); -static int cdrom_stm_nulldev(); -static s64 cdrom_stm_nulldev64(); static void ee_stream_handler_normal(cdrom_stm_devctl_t *instruct, int inbuf_len, int *outres_ptr); static unsigned int ee_stream_intr_cb_normal(void *userdata); static void ee_stream_handler_cdda(cdrom_stm_devctl_t *instruct, int inbuf_len, int *outres_ptr); @@ -61,34 +60,37 @@ static unsigned int g_cdvdstm_sectorcount = 0; static int g_cdvdstm_last_error_for_iop = 0; static int g_cdvdstm_retryerr_iop = 0; static int g_cdvdstm_retrycnt_iop = 0; + +IOMANX_RETURN_VALUE_IMPL(EIO); + static iop_device_ops_t g_cdrom_stm_dev_ops = { - &cdrom_stm_init, - &cdrom_stm_deinit, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - &cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev64, + &cdrom_stm_init, // init, + &cdrom_stm_deinit, // deinit, + IOMANX_RETURN_VALUE(EIO), // format, + IOMANX_RETURN_VALUE(EIO), // open, + IOMANX_RETURN_VALUE(EIO), // close, + IOMANX_RETURN_VALUE(EIO), // read, + IOMANX_RETURN_VALUE(EIO), // write, + IOMANX_RETURN_VALUE(EIO), // lseek, + IOMANX_RETURN_VALUE(EIO), // ioctl, + IOMANX_RETURN_VALUE(EIO), // remove, + IOMANX_RETURN_VALUE(EIO), // mkdir, + IOMANX_RETURN_VALUE(EIO), // rmdir, + IOMANX_RETURN_VALUE(EIO), // dopen, + IOMANX_RETURN_VALUE(EIO), // dclose, + IOMANX_RETURN_VALUE(EIO), // dread, + IOMANX_RETURN_VALUE(EIO), // getstat, + IOMANX_RETURN_VALUE(EIO), // chstat, + IOMANX_RETURN_VALUE(EIO), // rename, + IOMANX_RETURN_VALUE(EIO), // chdir, + IOMANX_RETURN_VALUE(EIO), // sync, + IOMANX_RETURN_VALUE(EIO), // mount, + IOMANX_RETURN_VALUE(EIO), // umount, + IOMANX_RETURN_VALUE_S64(EIO), // lseek64, &cdrom_stm_devctl, - (void *)&cdrom_stm_nulldev, - (void *)&cdrom_stm_nulldev, - &cdrom_stm_nulldev, + IOMANX_RETURN_VALUE(EIO), // symlink + IOMANX_RETURN_VALUE(EIO), // readlink + IOMANX_RETURN_VALUE(EIO), // ioctl2 }; static iop_device_t g_cdrom_stm_dev = {"cdrom_stm", IOP_DT_FSEXT | IOP_DT_FS, 1, "CD-ROM_STM ", &g_cdrom_stm_dev_ops}; static int g_cdvdstm_last_error_for_ee = 0; @@ -585,8 +587,9 @@ static unsigned int iop_stream_intr_cb(void *userdata) return 0; } -static int cdrom_stm_init() +static int cdrom_stm_init(iop_device_t *device) { + (void)device; iop_sema_t semaparam; semaparam.attr = SA_THPRI; @@ -597,8 +600,9 @@ static int cdrom_stm_init() return 0; } -static int cdrom_stm_deinit() +static int cdrom_stm_deinit(iop_device_t *device) { + (void)device; SignalSema(g_cdvdstm_semid); DeleteSema(g_cdvdstm_semid); return 0; @@ -658,18 +662,6 @@ static int cdrom_stm_devctl( return retres; } -static int cdrom_stm_nulldev() -{ - PRINTF("nulldev0 call\n"); - return -EIO; -} - -static s64 cdrom_stm_nulldev64() -{ - PRINTF("nulldev0 call\n"); - return -EIO; -} - int _start(int ac, char *av[], void *startaddr, ModuleInfo_t *mi) { int last_error; @@ -705,7 +697,7 @@ int _start(int ac, char *av[], void *startaddr, ModuleInfo_t *mi) DelDrv(g_cdrom_stm_dev.name); if ( AddDrv(&g_cdrom_stm_dev) ) { - cdrom_stm_deinit(); + cdrom_stm_deinit(&g_cdrom_stm_dev); return MODULE_NO_RESIDENT_END; } g_cdvdman_intr_efid = sceCdSC(0xFFFFFFF5, &scres_unused); diff --git a/iop/debug/iop_sbusdbg/src/main.c b/iop/debug/iop_sbusdbg/src/main.c index 4e4d66ab59a..684199fa788 100644 --- a/iop/debug/iop_sbusdbg/src/main.c +++ b/iop/debug/iop_sbusdbg/src/main.c @@ -47,8 +47,10 @@ int tid; extern void soft_break(void); -void _controller_thread(void) +void _controller_thread(void *arg) { + (void)arg; + while(1) { // printf("IOP: Controller thread going to sleep(%d)...\n", _iop_exception_state); @@ -63,7 +65,7 @@ void create_th(void) iop_thread_t param; param.attr = TH_C; - param.thread = (void *) _controller_thread; + param.thread = _controller_thread; param.priority = 9; // highest possible priority param.stacksize = 512; // tiny stack, not much is needed! param.option = 0; diff --git a/iop/debug/iop_sbusdbg/src/sbus_tty.c b/iop/debug/iop_sbusdbg/src/sbus_tty.c index 7846fa72f85..514a921e3b5 100644 --- a/iop/debug/iop_sbusdbg/src/sbus_tty.c +++ b/iop/debug/iop_sbusdbg/src/sbus_tty.c @@ -27,14 +27,16 @@ 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_init() +static int ttyfs_init(iop_device_t *device) { + (void)device; //DBG_puts("SIOTTY: FS Init()\n"); return 0; } -static int ttyfs_deinit() +static int ttyfs_deinit(iop_device_t *device) { + (void)device; //DBG_puts("SIOTTY: FS Deinit()\n"); return 0; } diff --git a/iop/debug/ppctty/src/tty.c b/iop/debug/ppctty/src/tty.c index 392748ec897..00d35d7c31c 100644 --- a/iop/debug/ppctty/src/tty.c +++ b/iop/debug/ppctty/src/tty.c @@ -26,8 +26,9 @@ static int tty_sema = -1; extern void tty_puts(const char *str); -static int ttyfs_init() +static int ttyfs_init(iop_device_t *device) { + (void)device; DPRINTF("FS Init()\n"); if ((tty_sema = CreateMutex(IOP_MUTEX_UNLOCKED)) < 0) { @@ -37,8 +38,9 @@ static int ttyfs_init() return 0; } -static int ttyfs_deinit() +static int ttyfs_deinit(iop_device_t *device) { + (void)device; DPRINTF("FS Deinit()\n"); DeleteSema(tty_sema); return 0; diff --git a/iop/debug/sior/src/xprintf.c b/iop/debug/sior/src/xprintf.c index 39765779cf0..910611d34d1 100644 --- a/iop/debug/sior/src/xprintf.c +++ b/iop/debug/sior/src/xprintf.c @@ -182,11 +182,11 @@ static int getdigit(long double *val, int *cnt){ ** will run. */ -int vxprintf(func,arg,format,ap) - void (*func)(char*,int,void*); - void *arg; - const char *format; - va_list ap; +int vxprintf( + void (*func)(char*,int,void*), + void *arg, + const char *format, + va_list ap) { register const char *fmt; /* The format string. */ register int c; /* Next character in the format string */ @@ -692,10 +692,10 @@ struct s_strargument { /* Describes the string being written to */ void __sout(char *, int, void *); #ifdef F___sout -void __sout(txt,amt,arg) - char *txt; - int amt; - void *arg; +void __sout( + char *txt, + int amt, + void *arg) { register char *head; register const char *t; diff --git a/iop/dev9/poweroff/src/poweroff.c b/iop/dev9/poweroff/src/poweroff.c index 92dda40942d..cd0bdc6da5e 100644 --- a/iop/dev9/poweroff/src/poweroff.c +++ b/iop/dev9/poweroff/src/poweroff.c @@ -46,7 +46,7 @@ extern struct irx_export_table _exp_poweroff; //--------------------------------------------------------------------- -static void Shutdown(); +static void Shutdown(void* data); static void SendCmd(void* data); //--------------------------------------------------------------------- @@ -200,7 +200,7 @@ void RemovePowerOffHandler(pwoffcb func) void PoweroffShutdown() { - Shutdown(0); + Shutdown(NULL); } void* poweroff_rpc_server(int fno, void *data, int size) @@ -209,7 +209,7 @@ void* poweroff_rpc_server(int fno, void *data, int size) switch(fno) { case PWROFF_SHUTDOWN: - Shutdown(0); + Shutdown(NULL); break; case PWROFF_ENABLE_AUTO_SHUTOFF: diff --git a/iop/fs/netfs/src/ps2_fio.c b/iop/fs/netfs/src/ps2_fio.c index 16ac04c465f..85f579dab96 100644 --- a/iop/fs/netfs/src/ps2_fio.c +++ b/iop/fs/netfs/src/ps2_fio.c @@ -1959,13 +1959,8 @@ static void ps2netfs_Listener(int sock) * 'ps2netfs_active' is set to 0. * Handles accepting connections and passing them onto the listener * function to handle them. - * - * status returns: - * 0 if exiting and finished. - * -1 if error starting thread. */ -int -ps2netfs_serv(void *argv) +void ps2netfs_serv(void *argv) { struct sockaddr_in server_addr; struct sockaddr_in client_addr; @@ -1988,7 +1983,6 @@ ps2netfs_serv(void *argv) while ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { DPRINTF("ps2netfs: socket creation error (%d)\n", sock); - return -1; } ret = bind(sock, (struct sockaddr *)&server_addr, @@ -1997,7 +1991,6 @@ ps2netfs_serv(void *argv) { DPRINTF("ps2netfs: bind error (%d)\n", ret); ps2netfs_close_socket(); - return -1; } ret = listen(sock, 5); @@ -2006,7 +1999,6 @@ ps2netfs_serv(void *argv) { DPRINTF("ps2netfs: listen error (%d)\n", ret); disconnect(sock); - return -1; } // Active flag kinda sux, cause it wont be checked until a new client has @@ -2057,7 +2049,6 @@ ps2netfs_serv(void *argv) disconnect(sock); ExitDeleteThread(); - return 0; } /** Init ps2netfs. @@ -2078,7 +2069,7 @@ int ps2netfs_Init(void) mythread.attr = 0x02000000; // attr mythread.option = 0; // option - mythread.thread = (void *)ps2netfs_serv; // entry + mythread.thread = ps2netfs_serv; // entry mythread.stacksize = 0x800; mythread.priority = 0x43; // just above ps2link diff --git a/iop/memorycard/mcserv/src/mcserv.c b/iop/memorycard/mcserv/src/mcserv.c index f8901c6c66d..ebb2a30c7cf 100644 --- a/iop/memorycard/mcserv/src/mcserv.c +++ b/iop/memorycard/mcserv/src/mcserv.c @@ -156,7 +156,7 @@ int _start(int argc, char *argv[], void *startaddr, ModuleInfo_t *mi) DPRINTF("starting RPC thread...\n"); thread_param.attr = TH_C; - thread_param.thread = (void *)thread_rpc_S_0400; + thread_param.thread = thread_rpc_S_0400; thread_param.priority = 0x68; thread_param.stacksize = 0x1000; thread_param.option = 0; diff --git a/iop/network/spduart/src/spduart.c b/iop/network/spduart/src/spduart.c index f078d2cd92b..0023150acb3 100644 --- a/iop/network/spduart/src/spduart.c +++ b/iop/network/spduart/src/spduart.c @@ -668,8 +668,9 @@ static void spduart_init_hw(struct spduart_internals_ *priv) } } -static void spduart_thread_proc(struct spduart_internals_ *priv) +static void spduart_thread_proc(void *arg) { + struct spduart_internals_ *priv = arg; int i; int m_cur_xfer_len; int v10; @@ -1267,7 +1268,7 @@ static int module_start(int ac, char *av[], void *startaddr, ModuleInfo_t *mi) if ( spduart_internals.spduart_ef > 0 ) { v18.attr = 0x2000000; - v18.thread = (void (*)(void *))spduart_thread_proc; + v18.thread = spduart_thread_proc; v18.option = 0; v18.priority = spduart_internals.spduart_thpri_; v18.stacksize = spduart_internals.spduart_thstack_; diff --git a/iop/sound/ahx/src/ahx_irx.c b/iop/sound/ahx/src/ahx_irx.c index 3ab00b0ce1d..0cf878e03a0 100644 --- a/iop/sound/ahx/src/ahx_irx.c +++ b/iop/sound/ahx/src/ahx_irx.c @@ -93,7 +93,7 @@ int _start(int argc, char *argv[]) (void)argv; FlushDcache(); - CpuEnableIntr(0); + CpuEnableIntr(); EnableIntr(40); // Enables SPU DMA (channel 1) interrupt. param.attr = TH_C; param.thread = AHX_Thread; diff --git a/iop/sound/audsrv/src/audsrv.c b/iop/sound/audsrv/src/audsrv.c index 0b229b42587..394b3e6d3a4 100644 --- a/iop/sound/audsrv/src/audsrv.c +++ b/iop/sound/audsrv/src/audsrv.c @@ -561,7 +561,7 @@ int _start(int argc, char *argv[]) (void)argv; FlushDcache(); - CpuEnableIntr(0); + CpuEnableIntr(); printf("greetings from version " VERSION " !\n"); diff --git a/iop/sound/audsrv/src/common.c b/iop/sound/audsrv/src/common.c index 127b8488ae4..0d7d1e515e3 100755 --- a/iop/sound/audsrv/src/common.c +++ b/iop/sound/audsrv/src/common.c @@ -31,7 +31,7 @@ * Creates a thread based on the given parameter. Upon completion, * thread is started. */ -int create_thread(void *func, int priority, void *param) +int create_thread(void (*func)(void *), int priority, void *param) { int tid; iop_thread_t thr; diff --git a/iop/sound/audsrv/src/common.h b/iop/sound/audsrv/src/common.h index 4677f60c61a..e416fb9faef 100755 --- a/iop/sound/audsrv/src/common.h +++ b/iop/sound/audsrv/src/common.h @@ -24,7 +24,7 @@ * Creates a thread based on the given parameter. Upon completion, * thread is started. */ -extern int create_thread(void *func, int priority, void *param); +extern int create_thread(void (*func)(void *), int priority, void *param); /** Helper to print buffer in hex. Useful for debugging. * @param ptr pointer to buffer diff --git a/iop/sound/ps2snd/Makefile b/iop/sound/ps2snd/Makefile index c9ab308e917..ada122a09cf 100644 --- a/iop/sound/ps2snd/Makefile +++ b/iop/sound/ps2snd/Makefile @@ -6,8 +6,6 @@ # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. -IOP_CFLAGS += -std=c99 - IOP_IMPORT_INCS += \ sound/libsd \ system/intrman \ diff --git a/iop/sound/ps2snd/src/ps2snd.c b/iop/sound/ps2snd/src/ps2snd.c index bd06ad12f8c..50306360af5 100644 --- a/iop/sound/ps2snd/src/ps2snd.c +++ b/iop/sound/ps2snd/src/ps2snd.c @@ -103,7 +103,7 @@ int _start(int argc, char *argv[]) int threadid; FlushDcache(); - CpuEnableIntr(0); + CpuEnableIntr(); if (argc>=1) { diff --git a/iop/system/modload/src/modload.c b/iop/system/modload/src/modload.c index 635a3babf56..578f8c06f91 100644 --- a/iop/system/modload/src/modload.c +++ b/iop/system/modload/src/modload.c @@ -188,12 +188,12 @@ static void linked_list_set_self(modload_ll_t *ll); static void get_updater_boot_argument(char *str, int *updater_argc, char **updater_argv, int updater_argv_count); static int spGetfsize(void *userdata, int in_fd); static int spLseek(void *userdata, int in_fd, long offset, int whence); -static int spRead(void *userdata, int in_fd, void *buffer, unsigned int read_size); -static int spBread(); -static int spSetBufSize(); +static int spRead(void *userdata, int in_fd, void *buffer, size_t read_size); +static int spBread(void *opt, int fd, size_t nbyte); +static int spSetBufSize(void *opt, int fd, size_t size); static int spClose(void *userdata, int in_fd); -static int spAfterOpen(); -static int spBeforeOpen(); +static int spAfterOpen(void *opt, int fd); +static int spBeforeOpen(void *opt, const char *filename, int flag); static int spOpen(LDfilefunc *functbl, void *userdata, const char *filename, int filemode); static void free_module_block(modload_ll_t *buf, char flags); static int load_memory_helper_cmpinner(modload_ll_t *a1, int a2, modload_ll_t *a3, modload_ll_t *a4); @@ -1799,41 +1799,57 @@ static int spOpen(LDfilefunc *functbl, void *userdata, const char *filename, int return ret_fd; } -static int spBeforeOpen() +static int spBeforeOpen(void *opt, const char *filename, int flag) { + (void)opt; + (void)filename; + (void)flag; return 0; } -static int spAfterOpen() +static int spAfterOpen(void *opt, int fd) { + (void)opt; + (void)fd; return 0; } static int spClose(void *userdata, int in_fd) { (void)userdata; + (void)in_fd; return close(in_fd); } -static int spSetBufSize() +static int spSetBufSize(void *opt, int fd, size_t size) { + (void)opt; + (void)fd; + (void)size; return 0; } -static int spBread() +static int spBread(void *opt, int fd, size_t nbyte) { + (void)opt; + (void)fd; + (void)nbyte; return 0; } -static int spRead(void *userdata, int in_fd, void *buffer, unsigned int read_size) +static int spRead(void *userdata, int in_fd, void *buffer, size_t read_size) { (void)userdata; + (void)buffer; + (void)read_size; return read(in_fd, buffer, read_size); } static int spLseek(void *userdata, int in_fd, long offset, int whence) { (void)userdata; + (void)offset; + (void)whence; return lseek(in_fd, offset, whence); } diff --git a/iop/system/mtapman/src/freemtap.c b/iop/system/mtapman/src/freemtap.c index 2b6883d1cd6..f559bc9bea4 100644 --- a/iop/system/mtapman/src/freemtap.c +++ b/iop/system/mtapman/src/freemtap.c @@ -150,8 +150,10 @@ s32 get_slot_number(u32 port, u32 retries) } -void update_slot_numbers_thread() +void update_slot_numbers_thread(void *arg) { + (void)arg; + while(1) { u32 resbits, port; diff --git a/iop/system/mtapman/src/rpcservers.c b/iop/system/mtapman/src/rpcservers.c index c0dedcb5040..d769a36f390 100644 --- a/iop/system/mtapman/src/rpcservers.c +++ b/iop/system/mtapman/src/rpcservers.c @@ -58,8 +58,10 @@ void* rpc_server_change_slot(s32 fno, u32 *data, s32 size) } -void rpc_thread_change_slot() +void rpc_thread_change_slot(void *arg) { + (void)arg; + if( sceSifCheckInit() == 0) { M_PRINTF("Sif not initialized.\n"); @@ -84,8 +86,10 @@ void* rpc_server_get_slot_number(s32 fno, u32 *data, s32 size) } -void rpc_thread_get_slot_number() +void rpc_thread_get_slot_number(void *arg) { + (void)arg; + if( sceSifCheckInit() == 0) { M_PRINTF("Sif not initialized.\n"); @@ -108,8 +112,10 @@ void* RpcServerGetConnection(s32 fno, u32 *data, s32 size) return data; } -void RpcThreadGetConnection() +void RpcThreadGetConnection(void *arg) { + (void)arg; + if( sceSifCheckInit() == 0) { M_PRINTF("Sif not initialized.\n"); @@ -132,8 +138,10 @@ void* RpcServerPortClose(s32 fno, u32 *data, s32 size) return data; } -void RpcThreadPortClose() +void RpcThreadPortClose(void *arg) { + (void)arg; + if( sceSifCheckInit() == 0) { M_PRINTF("Sif not initialized.\n"); @@ -156,8 +164,10 @@ void* RpcServerPortOpen(s32 fno, u32 *data, s32 size) return data; } -void RpcThreadPortOpen() +void RpcThreadPortOpen(void *arg) { + (void)arg; + if( sceSifCheckInit() == 0) { M_PRINTF("Sif not initialized.\n"); diff --git a/iop/system/sifman/src/sifman.c b/iop/system/sifman/src/sifman.c index d6e1f84bbd4..b6369fd3a27 100644 --- a/iop/system/sifman/src/sifman.c +++ b/iop/system/sifman/src/sifman.c @@ -311,7 +311,7 @@ static int sif_dma_setup_tag(SifDmaTransfer_t *a1) return ++sifman_internals.dmatag_index; } -static int set_dma_inner(SifDmaTransfer_t *dmat, int count, void (*func)(), void *data) +static int set_dma_inner(SifDmaTransfer_t *dmat, int count, void (*func)(void *), void *data) { u8 dmatag_index; int dma_count; @@ -380,7 +380,7 @@ int sceSifSetDma(SifDmaTransfer_t *dmat, int count) return set_dma_inner(dmat, count, 0, 0); } -unsigned int sceSifSetDmaIntr(SifDmaTransfer_t *dmat, int len, void (*func)(), void *data) +unsigned int sceSifSetDmaIntr(SifDmaTransfer_t *dmat, int len, void (*func)(void *), void *data) { return set_dma_inner(dmat, len, func, data); } diff --git a/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtol.c b/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtol.c index 699885413b7..29be516b1e5 100644 --- a/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtol.c +++ b/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtol.c @@ -76,9 +76,7 @@ * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. */ -long strtol(nptr, endptr, base) const char* nptr; -char** endptr; -int base; +long strtol(const char* nptr, char** endptr, int base) { const char* s = nptr; unsigned long acc; diff --git a/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtoul.c b/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtoul.c index af41c593d36..a9e1276eccb 100644 --- a/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtoul.c +++ b/iop/system/sysclib/src/embeddedartistry_libc/stdlib/strtoul.c @@ -76,9 +76,7 @@ * Ignores `locale' stuff. Assumes that the upper and lower case * alphabets and digits are each contiguous. */ -unsigned long strtoul(nptr, endptr, base) const char* nptr; -char** endptr; -int base; +unsigned long strtoul(const char* nptr, char** endptr, int base) { const char* s = nptr; unsigned long acc;