Skip to content

Apply needed fixes for GCC 15.1 #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uyjulian merged 1 commit into from
May 14, 2025
Merged

Apply needed fixes for GCC 15.1 #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 36 additions & 44 deletions iop/cdvd/cdvdman/src/cdvdman.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

#include "irx_imports.h"
#include "iomanX.h"

#include <cdvdman.h>

Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
82 changes: 37 additions & 45 deletions iop/cdvd/cdvdstm/src/cdvdstm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

#include "irx_imports.h"
#include "iomanX.h"

#include <cdvd-ioctl.h>
#include <errno.h>
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions iop/debug/iop_sbusdbg/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions iop/debug/iop_sbusdbg/src/sbus_tty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 4 additions & 2 deletions iop/debug/ppctty/src/tty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions iop/debug/sior/src/xprintf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions iop/dev9/poweroff/src/poweroff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extern struct irx_export_table _exp_poweroff;

//---------------------------------------------------------------------

static void Shutdown();
static void Shutdown(void* data);
static void SendCmd(void* data);

//---------------------------------------------------------------------
Expand Down Expand Up @@ -200,7 +200,7 @@ void RemovePowerOffHandler(pwoffcb func)

void PoweroffShutdown()
{
Shutdown(0);
Shutdown(NULL);
}

void* poweroff_rpc_server(int fno, void *data, int size)
Expand All @@ -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:
Expand Down
Loading