Skip to content

Commit acd41fe

Browse files
fjtrujyfjtrujy
committed
Apply needed fixes for GCC 15.1
1 parent 654b026 commit acd41fe

File tree

22 files changed

+156
-152
lines changed

22 files changed

+156
-152
lines changed

‎iop/cdvd/cdvdman/src/cdvdman.c‎

Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
#include "irx_imports.h"
12+
#include "iomanX.h"
1213

1314
#include <cdvdman.h>
1415

@@ -155,7 +156,7 @@ typedef struct iso9660_dirent_
155156

156157
static int cdrom_init(iop_device_t *dev);
157158
void cdvdman_termcall(int with_stop);
158-
static int cdrom_deinit();
159+
static int cdrom_deinit(iop_device_t *dev);
159160
static int cdrom_dopen(iop_file_t *f, const char *dirname);
160161
static int cdrom_getstat(iop_file_t *f, const char *name, iox_stat_t *buf);
161162
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
167168
static int
168169
cdrom_devctl(iop_file_t *f, const char *, int cmd, void *argp, unsigned int arglen, void *bufp, unsigned int buflen);
169170
static int cdrom_lseek(iop_file_t *f, int offset, int pos);
170-
static int cdrom_nulldev();
171-
static s64 cdrom_nulldev64();
172171
static int CdSearchFileInner(cdvdman_filetbl_entry_t *fp, const char *name, int layer);
173172
static int sceCdSearchDir(char *dirname, int layer);
174173
static int sceCdReadDir(sceCdlFILE *fp, int dsec, int index, int layer);
@@ -211,34 +210,37 @@ static int g_cdvdman_iocache = 0;
211210
static unsigned int g_cdvdman_lcn_offset = 0;
212211
static unsigned int g_cdvdman_numbytes_offset = 0;
213212
static int g_cdvdman_strmerr = 0;
213+
214+
IOMANX_RETURN_VALUE_IMPL(EIO);
215+
214216
static iop_device_ops_t g_cdvdman_cddev_ops = {
215-
&cdrom_init,
216-
&cdrom_deinit,
217-
(void *)&cdrom_nulldev,
218-
&cdrom_open,
219-
&cdrom_close,
220-
&cdrom_read,
221-
(void *)&cdrom_nulldev,
222-
&cdrom_lseek,
223-
&cdrom_ioctl,
224-
(void *)&cdrom_nulldev,
225-
(void *)&cdrom_nulldev,
226-
(void *)&cdrom_nulldev,
227-
&cdrom_dopen,
228-
&cdrom_close,
229-
&cdrom_dread,
230-
&cdrom_getstat,
231-
(void *)&cdrom_nulldev,
232-
(void *)&cdrom_nulldev,
233-
(void *)&cdrom_nulldev,
234-
(void *)&cdrom_nulldev,
235-
(void *)&cdrom_nulldev,
236-
(void *)&cdrom_nulldev,
237-
(void *)&cdrom_nulldev64,
238-
&cdrom_devctl,
239-
(void *)&cdrom_nulldev,
240-
(void *)&cdrom_nulldev,
241-
&cdrom_ioctl2,
217+
&cdrom_init, // init,
218+
&cdrom_deinit, // deinit,
219+
IOMANX_RETURN_VALUE(EIO), // format,
220+
&cdrom_open, // open,
221+
&cdrom_close, // close,
222+
&cdrom_read, // read,
223+
IOMANX_RETURN_VALUE(EIO), // write,
224+
&cdrom_lseek, // lseek,
225+
&cdrom_ioctl, // ioctl,
226+
IOMANX_RETURN_VALUE(EIO), // remove,
227+
IOMANX_RETURN_VALUE(EIO), // mkdir,
228+
IOMANX_RETURN_VALUE(EIO), // rmdir,
229+
&cdrom_dopen, // dopen,
230+
&cdrom_close, // close,
231+
&cdrom_dread, // dread
232+
&cdrom_getstat, // getstat
233+
IOMANX_RETURN_VALUE(EIO), // chstat,
234+
IOMANX_RETURN_VALUE(EIO), // rename,
235+
IOMANX_RETURN_VALUE(EIO), // chdir
236+
IOMANX_RETURN_VALUE(EIO), // sync
237+
IOMANX_RETURN_VALUE(EIO), // mount,
238+
IOMANX_RETURN_VALUE(EIO), // umount,
239+
IOMANX_RETURN_VALUE_S64(EIO), // lseek64,
240+
&cdrom_devctl, // devctl,
241+
IOMANX_RETURN_VALUE(EIO), // readdir,
242+
IOMANX_RETURN_VALUE(EIO), // readlink,
243+
&cdrom_ioctl2, // ioctl2,
242244
};
243245
static iop_device_t g_cdvdman_cddev = {"cdrom", IOP_DT_FSEXT | IOP_DT_FS, 1, "CD-ROM ", &g_cdvdman_cddev_ops};
244246
static int g_cdvdman_sync_timeout = 15000;
@@ -320,7 +322,7 @@ int _start(int ac, char **av)
320322
DelDrv(g_cdvdman_cddev.name);
321323
if ( AddDrv(&g_cdvdman_cddev) )
322324
{
323-
cdrom_deinit();
325+
cdrom_deinit(&g_cdvdman_cddev);
324326
return MODULE_NO_RESIDENT_END;
325327
}
326328
g_cdvdman_ptoc = (u8 *)&g_cdvdman_fsvrbuf[0x924];
@@ -432,10 +434,12 @@ void cdvdman_termcall(int with_stop)
432434
ReleaseIntrHandler(IOP_IRQ_CDVD);
433435
}
434436

435-
static int cdrom_deinit()
437+
static int cdrom_deinit(iop_device_t *dev)
436438
{
437439
unsigned int i;
438440

441+
(void)dev;
442+
439443
for ( i = 0; i < (sizeof(g_cdvdman_fhinfo) / sizeof(g_cdvdman_fhinfo[0])); i += 1 )
440444
{
441445
g_cdvdman_fhinfo[i].m_fd_flags = 0;
@@ -1893,18 +1897,6 @@ static int cdrom_lseek(iop_file_t *f, int offset, int pos)
18931897
return retval;
18941898
}
18951899

1896-
static int cdrom_nulldev()
1897-
{
1898-
PRINTF("nulldev0 call\n");
1899-
return -EIO;
1900-
}
1901-
1902-
static s64 cdrom_nulldev64()
1903-
{
1904-
PRINTF("nulldev0 call\n");
1905-
return -EIO;
1906-
}
1907-
19081900
static int sync_timeout_alarm_cb(const iop_sys_clock_t *sys_clock)
19091901
{
19101902
KPRINTF("Cdvd Time Out %d(msec)\n", sys_clock->lo / 0x9000);

‎iop/cdvd/cdvdstm/src/cdvdstm.c‎

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
#include "irx_imports.h"
12+
#include "iomanX.h"
1213

1314
#include <cdvd-ioctl.h>
1415
#include <errno.h>
@@ -24,12 +25,10 @@ int cdvdstm_termcall();
2425
static unsigned int iop_stream_handler(
2526
unsigned int posszarg1, unsigned int posszarg2, void *buffer, int cmdid, const sceCdRMode *rmode, int *error_ptr);
2627
static unsigned int iop_stream_intr_cb(void *userdata);
27-
static int cdrom_stm_init();
28-
static int cdrom_stm_deinit();
28+
static int cdrom_stm_init(iop_device_t *device);
29+
static int cdrom_stm_deinit(iop_device_t *device);
2930
static int cdrom_stm_devctl(
3031
iop_file_t *f, const char *name, int cmd, void *inbuf, unsigned int inbuf_len, void *outbuf, unsigned int outbuf_len);
31-
static int cdrom_stm_nulldev();
32-
static s64 cdrom_stm_nulldev64();
3332
static void ee_stream_handler_normal(cdrom_stm_devctl_t *instruct, int inbuf_len, int *outres_ptr);
3433
static unsigned int ee_stream_intr_cb_normal(void *userdata);
3534
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;
6160
static int g_cdvdstm_last_error_for_iop = 0;
6261
static int g_cdvdstm_retryerr_iop = 0;
6362
static int g_cdvdstm_retrycnt_iop = 0;
63+
64+
IOMANX_RETURN_VALUE_IMPL(EIO);
65+
6466
static iop_device_ops_t g_cdrom_stm_dev_ops = {
65-
&cdrom_stm_init,
66-
&cdrom_stm_deinit,
67-
(void *)&cdrom_stm_nulldev,
68-
(void *)&cdrom_stm_nulldev,
69-
(void *)&cdrom_stm_nulldev,
70-
(void *)&cdrom_stm_nulldev,
71-
(void *)&cdrom_stm_nulldev,
72-
(void *)&cdrom_stm_nulldev,
73-
&cdrom_stm_nulldev,
74-
(void *)&cdrom_stm_nulldev,
75-
(void *)&cdrom_stm_nulldev,
76-
(void *)&cdrom_stm_nulldev,
77-
(void *)&cdrom_stm_nulldev,
78-
(void *)&cdrom_stm_nulldev,
79-
(void *)&cdrom_stm_nulldev,
80-
(void *)&cdrom_stm_nulldev,
81-
(void *)&cdrom_stm_nulldev,
82-
(void *)&cdrom_stm_nulldev,
83-
(void *)&cdrom_stm_nulldev,
84-
(void *)&cdrom_stm_nulldev,
85-
(void *)&cdrom_stm_nulldev,
86-
(void *)&cdrom_stm_nulldev,
87-
(void *)&cdrom_stm_nulldev64,
67+
&cdrom_stm_init, // init,
68+
&cdrom_stm_deinit, // deinit,
69+
IOMANX_RETURN_VALUE(EIO), // format,
70+
IOMANX_RETURN_VALUE(EIO), // open,
71+
IOMANX_RETURN_VALUE(EIO), // close,
72+
IOMANX_RETURN_VALUE(EIO), // read,
73+
IOMANX_RETURN_VALUE(EIO), // write,
74+
IOMANX_RETURN_VALUE(EIO), // lseek,
75+
IOMANX_RETURN_VALUE(EIO), // ioctl,
76+
IOMANX_RETURN_VALUE(EIO), // remove,
77+
IOMANX_RETURN_VALUE(EIO), // mkdir,
78+
IOMANX_RETURN_VALUE(EIO), // rmdir,
79+
IOMANX_RETURN_VALUE(EIO), // dopen,
80+
IOMANX_RETURN_VALUE(EIO), // dclose,
81+
IOMANX_RETURN_VALUE(EIO), // dread,
82+
IOMANX_RETURN_VALUE(EIO), // getstat,
83+
IOMANX_RETURN_VALUE(EIO), // chstat,
84+
IOMANX_RETURN_VALUE(EIO), // rename,
85+
IOMANX_RETURN_VALUE(EIO), // chdir,
86+
IOMANX_RETURN_VALUE(EIO), // sync,
87+
IOMANX_RETURN_VALUE(EIO), // mount,
88+
IOMANX_RETURN_VALUE(EIO), // umount,
89+
IOMANX_RETURN_VALUE_S64(EIO), // lseek64,
8890
&cdrom_stm_devctl,
89-
(void *)&cdrom_stm_nulldev,
90-
(void *)&cdrom_stm_nulldev,
91-
&cdrom_stm_nulldev,
91+
IOMANX_RETURN_VALUE(EIO), // symlink
92+
IOMANX_RETURN_VALUE(EIO), // readlink
93+
IOMANX_RETURN_VALUE(EIO), // ioctl2
9294
};
9395
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};
9496
static int g_cdvdstm_last_error_for_ee = 0;
@@ -585,8 +587,9 @@ static unsigned int iop_stream_intr_cb(void *userdata)
585587
return 0;
586588
}
587589

588-
static int cdrom_stm_init()
590+
static int cdrom_stm_init(iop_device_t *device)
589591
{
592+
(void)device;
590593
iop_sema_t semaparam;
591594

592595
semaparam.attr = SA_THPRI;
@@ -597,8 +600,9 @@ static int cdrom_stm_init()
597600
return 0;
598601
}
599602

600-
static int cdrom_stm_deinit()
603+
static int cdrom_stm_deinit(iop_device_t *device)
601604
{
605+
(void)device;
602606
SignalSema(g_cdvdstm_semid);
603607
DeleteSema(g_cdvdstm_semid);
604608
return 0;
@@ -658,18 +662,6 @@ static int cdrom_stm_devctl(
658662
return retres;
659663
}
660664

661-
static int cdrom_stm_nulldev()
662-
{
663-
PRINTF("nulldev0 call\n");
664-
return -EIO;
665-
}
666-
667-
static s64 cdrom_stm_nulldev64()
668-
{
669-
PRINTF("nulldev0 call\n");
670-
return -EIO;
671-
}
672-
673665
int _start(int ac, char *av[], void *startaddr, ModuleInfo_t *mi)
674666
{
675667
int last_error;
@@ -705,7 +697,7 @@ int _start(int ac, char *av[], void *startaddr, ModuleInfo_t *mi)
705697
DelDrv(g_cdrom_stm_dev.name);
706698
if ( AddDrv(&g_cdrom_stm_dev) )
707699
{
708-
cdrom_stm_deinit();
700+
cdrom_stm_deinit(&g_cdrom_stm_dev);
709701
return MODULE_NO_RESIDENT_END;
710702
}
711703
g_cdvdman_intr_efid = sceCdSC(0xFFFFFFF5, &scres_unused);

‎iop/debug/iop_sbusdbg/src/main.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ int tid;
4747

4848
extern void soft_break(void);
4949

50-
void _controller_thread(void)
50+
void _controller_thread(void *arg)
5151
{
52+
(void)arg;
53+
5254
while(1)
5355
{
5456
// printf("IOP: Controller thread going to sleep(%d)...\n", _iop_exception_state);
@@ -63,7 +65,7 @@ void create_th(void)
6365
iop_thread_t param;
6466

6567
param.attr = TH_C;
66-
param.thread = (void *) _controller_thread;
68+
param.thread = _controller_thread;
6769
param.priority = 9; // highest possible priority
6870
param.stacksize = 512; // tiny stack, not much is needed!
6971
param.option = 0;

‎iop/debug/iop_sbusdbg/src/sbus_tty.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ Of course this requires that the EE-side code accept this command and output the
2727

2828
extern void sbus_tty_puts(const char *str);
2929

30-
static int ttyfs_init()
30+
static int ttyfs_init(iop_device_t *device)
3131
{
32+
(void)device;
3233
//DBG_puts("SIOTTY: FS Init()\n");
3334
return 0;
3435
}
3536

36-
static int ttyfs_deinit()
37+
static int ttyfs_deinit(iop_device_t *device)
3738
{
39+
(void)device;
3840
//DBG_puts("SIOTTY: FS Deinit()\n");
3941
return 0;
4042
}

‎iop/debug/ppctty/src/tty.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ static int tty_sema = -1;
2626

2727
extern void tty_puts(const char *str);
2828

29-
static int ttyfs_init()
29+
static int ttyfs_init(iop_device_t *device)
3030
{
31+
(void)device;
3132
DPRINTF("FS Init()\n");
3233
if ((tty_sema = CreateMutex(IOP_MUTEX_UNLOCKED)) < 0)
3334
{
@@ -37,8 +38,9 @@ static int ttyfs_init()
3738
return 0;
3839
}
3940

40-
static int ttyfs_deinit()
41+
static int ttyfs_deinit(iop_device_t *device)
4142
{
43+
(void)device;
4244
DPRINTF("FS Deinit()\n");
4345
DeleteSema(tty_sema);
4446
return 0;

‎iop/debug/sior/src/xprintf.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ static int getdigit(long double *val, int *cnt){
182182
** will run.
183183
*/
184184

185-
int vxprintf(func,arg,format,ap)
186-
void (*func)(char*,int,void*);
187-
void *arg;
188-
const char *format;
189-
va_list ap;
185+
int vxprintf(
186+
void (*func)(char*,int,void*),
187+
void *arg,
188+
const char *format,
189+
va_list ap)
190190
{
191191
register const char *fmt; /* The format string. */
192192
register int c; /* Next character in the format string */
@@ -692,10 +692,10 @@ struct s_strargument { /* Describes the string being written to */
692692

693693
void __sout(char *, int, void *);
694694
#ifdef F___sout
695-
void __sout(txt,amt,arg)
696-
char *txt;
697-
int amt;
698-
void *arg;
695+
void __sout(
696+
char *txt,
697+
int amt,
698+
void *arg)
699699
{
700700
register char *head;
701701
register const char *t;

‎iop/dev9/poweroff/src/poweroff.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern struct irx_export_table _exp_poweroff;
4646

4747
//---------------------------------------------------------------------
4848

49-
static void Shutdown();
49+
static void Shutdown(void* data);
5050
static void SendCmd(void* data);
5151

5252
//---------------------------------------------------------------------
@@ -200,7 +200,7 @@ void RemovePowerOffHandler(pwoffcb func)
200200

201201
void PoweroffShutdown()
202202
{
203-
Shutdown(0);
203+
Shutdown(NULL);
204204
}
205205

206206
void* poweroff_rpc_server(int fno, void *data, int size)
@@ -209,7 +209,7 @@ void* poweroff_rpc_server(int fno, void *data, int size)
209209

210210
switch(fno) {
211211
case PWROFF_SHUTDOWN:
212-
Shutdown(0);
212+
Shutdown(NULL);
213213
break;
214214

215215
case PWROFF_ENABLE_AUTO_SHUTOFF:

0 commit comments

Comments
 (0)