Skip to content

Commit

Permalink
add generic stub for unsupported ops on ioman(x)
Browse files Browse the repository at this point in the history 
- improves readability (IMO)
- unified return value for unsupported ops (`-ENOTSUP`) making it clear from EE side that the operation that just failed is simply stubbed on the IOP
  • Loading branch information
@israpps
israpps committed May 30, 2024
1 parent 3bd4bf9 commit 52c3fcf
Show file tree
Hide file tree
Showing 27 changed files with 443 additions and 508 deletions.
26 changes: 11 additions & 15 deletions iop/arcade/accdvd/src/cddrv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,27 @@ static int cddrv_read(iop_file_t *io, void *buf, int cnt);
static int cddrv_write(iop_file_t *io, void *buf, int cnt);
static int cddrv_lseek(iop_file_t *io, int offset, int whence);
static int cddrv_ioctl(iop_file_t *io, int cmd, void *arg);
static int cddrv_dummy();
DECL_NOT_SUPPORTED_OP()

static iop_device_ops_t Cddrv_ops = {
&cddrv_adddrv,
&cddrv_deldrv,
&cddrv_dummy,
NOT_SUPPORTED,
&cddrv_open,
&cddrv_close,
&cddrv_read,
&cddrv_write,
&cddrv_lseek,
&cddrv_ioctl,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy,
&cddrv_dummy};
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED
};

static iop_device_t Cddrv = {"cdrom", 16u, 0u, "ATAPI_C/DVD-ROM", &Cddrv_ops};

Expand Down Expand Up @@ -158,11 +159,6 @@ static int cddrv_ioctl(iop_file_t *io, int cmd, void *arg)
return -22;
}

static int cddrv_dummy()
{
return -22;
}

int cddrv_module_start(int argc, char **argv)
{
int v2;
Expand Down
17 changes: 7 additions & 10 deletions iop/cdvd/cdfs/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,29 +417,26 @@ static int fio_getstat(iop_file_t *fd, const char *name, io_stat_t *stat)
return ret;
}

static int cdfs_dummy() {
DPRINTF("CDFS: dummy function called\n\n");
return -5;
}
DECL_NOT_SUPPORTED_OP()

static iop_device_ops_t fio_ops = {
&fio_init,
&fio_deinit,
(void *)&cdfs_dummy,
NOT_SUPPORTED,
&fio_open,
&fio_close,
&fio_read,
&fio_write,
&fio_lseek,
(void *)&cdfs_dummy,
(void *)&cdfs_dummy,
(void *)&cdfs_dummy,
(void *)&cdfs_dummy,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
&fio_openDir,
&fio_closeDir,
&fio_dread,
&fio_getstat,
(void *)&cdfs_dummy,
NOT_SUPPORTED,
};

static iop_device_t fio_driver = {
Expand Down
50 changes: 23 additions & 27 deletions iop/cdvd/xesdrv/src/xesdrv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ static int esdrv_df_devctl(
iomanX_iop_file_t *f, const char *name, int cmd, void *arg, unsigned int arglen, void *buf, unsigned int buflen);
static int
esdrv_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int arglen, void *buf, unsigned int buflen);
static int esdrv_df_null();
static s64 esdrv_df_null_long();
static int
esioctl2_func_1(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int arglen, void *buf, unsigned int buflen);
Expand Down Expand Up @@ -220,33 +219,35 @@ struct DevctlCmdTbl_t
{0x5473, &esioctl2_func_10},
};

DECL_NOT_SUPPORTED_OP()

static iomanX_iop_device_ops_t DvrFuncTbl = {
&esdrv_df_init,
&esdrv_df_exit,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
&esdrv_df_ioctl,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
(void *)&esdrv_df_null_long,
&esdrv_df_devctl,
(void *)&esdrv_df_null,
(void *)&esdrv_df_null,
NOT_SUPPORTED,
NOT_SUPPORTED,
&esdrv_df_ioctl2,
};
static iomanX_iop_device_t ESDRV = {
Expand Down Expand Up @@ -372,11 +373,6 @@ esdrv_df_ioctl2(iomanX_iop_file_t *f, int cmd, void *arg, unsigned int arglen, v
return -EINVAL;
}

static int esdrv_df_null()
{
return -48;
}

static s64 esdrv_df_null_long()
{
return -48;
Expand Down
25 changes: 13 additions & 12 deletions iop/debug/iop_sbusdbg/src/sbus_tty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ 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_init()
{
//DBG_puts("SIOTTY: FS Init()\n");
Expand Down Expand Up @@ -93,25 +91,28 @@ static int ttyfs_write(iop_file_t *file, void *ptr, int size) {
return(bCount);
}


DECL_NOT_SUPPORTED_OP() // NOT_SUPPORTED

static iop_device_ops_t fsd_ops =
{
&ttyfs_init,
&ttyfs_deinit,
(void *)&ttyfs_error,
NOT_SUPPORTED,
&ttyfs_open,
&ttyfs_close,
(void *)&ttyfs_error,
NOT_SUPPORTED,
&ttyfs_write,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
&ttyfs_dopen,
&ttyfs_close,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
};

static iop_device_t tty_fsd =
Expand Down
23 changes: 11 additions & 12 deletions iop/debug/ppctty/src/tty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ static int tty_sema = -1;

extern void tty_puts(const char *str);

static int ttyfs_error() { return -1; }

static int ttyfs_init()
{
DPRINTF("FS Init()\n");
Expand Down Expand Up @@ -99,26 +97,27 @@ static int ttyfs_write(iop_file_t *file, void *ptr, int size) {

return(bCount);
}
DECL_NOT_SUPPORTED_OP()

static iop_device_ops_t fsd_ops =
{
&ttyfs_init,
&ttyfs_deinit,
(void *)&ttyfs_error,
NOT_SUPPORTED,
&ttyfs_open,
&ttyfs_close,
(void *)&ttyfs_error,
NOT_SUPPORTED,
&ttyfs_write,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
&ttyfs_dopen,
&ttyfs_close,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
(void *)&ttyfs_error,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
};

static iop_device_t tty_fsd =
Expand Down
60 changes: 29 additions & 31 deletions iop/dev9/dev9/src/ps2dev9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ static int expbay_init(int sema_attr);

extern struct irx_export_table _exp_dev9;

static int dev9x_dummy(void)
{
return 0;
}

static int dev9x_devctl(iop_file_t *f, const char *name, int cmd, void *args, unsigned int arglen, void *buf, unsigned int buflen)
{
(void)f;
Expand All @@ -151,35 +146,38 @@ static int dev9x_devctl(iop_file_t *f, const char *name, int cmd, void *args, un
}
}

DECL_NOT_SUPPORTED_OP()


static iop_device_ops_t dev9x_ops =
{
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
&dev9x_devctl,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
(void *)&dev9x_dummy,
NOT_SUPPORTED,
NOT_SUPPORTED,
NOT_SUPPORTED,
};

static iop_device_t dev9x_device =
Expand Down
Loading

0 comments on commit 52c3fcf

Please sign in to comment.