Skip to content

Commit e1ab8e1

Browse files
uyjulianuyjulian
committed
refactor: Propagate changed SIF definitions
1 parent af21262 commit e1ab8e1

File tree

59 files changed

+538
-538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+538
-538
lines changed

‎ee/debug/samples/helloworld/helloworld.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
int main(int argc, char *argv[])
1818
{
19-
SifInitRpc(0);
19+
sceSifInitRpc(0);
2020
init_scr();
2121

2222
scr_printf("Hello, World!\n");

‎ee/elf-loader/src/elf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int LoadELFFromFileWithPartition(const char *filename, const char *partition, in
9494
}
9595

9696
/* Let's go. */
97-
SifExitRpc();
97+
sceSifExitRpc();
9898
FlushCache(0);
9999
FlushCache(2);
100100

‎ee/elf-loader/src/loader/src/loader.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
105105
SET_GS_BGCOLOUR(CYAN_BG);
106106

107107
// Initialize
108-
SifInitRpc(0);
108+
sceSifInitRpc(0);
109109
wipeUserMem();
110110

111111
//Writeback data cache before loading ELF.
@@ -124,14 +124,14 @@ int main(int argc, char *argv[])
124124

125125
SET_GS_BGCOLOUR(ORANGE_BG);
126126

127-
SifInitRpc(0);
127+
sceSifInitRpc(0);
128128
// Load modules.
129129
SifLoadFileInit();
130130
SifLoadModule("rom0:SIO2MAN", 0, NULL);
131131
SifLoadModule("rom0:MCMAN", 0, NULL);
132132
SifLoadModule("rom0:MCSERV", 0, NULL);
133133
SifLoadFileExit();
134-
SifExitRpc();
134+
sceSifExitRpc();
135135

136136
SET_GS_BGCOLOUR(BROWN_BG);
137137

@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
143143
return ExecPS2((void *)elfdata.epc, (void *)elfdata.gp, argc-1, new_argv);
144144
} else {
145145
SET_GS_BGCOLOUR(MAGENTA_BG);
146-
SifExitRpc();
146+
sceSifExitRpc();
147147
return -ENOENT;
148148
}
149149
}

‎ee/iopreboot/src/SifIopRebootBuffer.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ int SifIopRebootBufferEncrypted(const void *udnl, int size)
7474
void **imgdrv_img;
7575
SifDmaTransfer_t dmat[3];
7676

77-
SifInitRpc(0);
78-
SifExitRpc();
77+
sceSifInitRpc(0);
78+
sceSifExitRpc();
7979

8080
SifIopReset("", 0);
8181
while (!SifIopSync()) {};
@@ -112,22 +112,22 @@ int SifIopRebootBufferEncrypted(const void *udnl, int size)
112112
imgdrv_img_size[0] = size;
113113
imgdrv_img_size[1] = iopbtconf_img_size;
114114
FlushCache(0);
115-
SifSetDma(dmat, 3);
115+
sceSifSetDma(dmat, 3);
116116

117117
sbv_patch_enable_lmb();
118118

119119
SifLoadModule("rom0:SYSCLIB", 0, NULL);
120120
SifLoadModuleBuffer(imgdrv_iop, 0, NULL);
121121
SifLoadModuleEncryptedSpecial("img0:", 0, NULL, 1);
122122

123-
SifExitRpc();
123+
sceSifExitRpc();
124124
SifLoadFileExit();
125125

126-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_SIFINIT);
127-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_CMDINIT);
128-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_BOOTEND);
129-
SifSetReg(SIF_SYSREG_RPCINIT, 0);
130-
SifSetReg(SIF_SYSREG_SUBADDR, 0);
126+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_SIFINIT);
127+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_CMDINIT);
128+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_BOOTEND);
129+
sceSifSetReg(SIF_SYSREG_RPCINIT, 0);
130+
sceSifSetReg(SIF_SYSREG_SUBADDR, 0);
131131

132132
_iop_reboot_count++; // Not originally here: increment to allow RPC clients to detect unbinding.
133133

@@ -146,8 +146,8 @@ int SifIopRebootBuffer(const void *ioprp, int size)
146146
void **imgdrv_img;
147147
SifDmaTransfer_t dmat[3];
148148

149-
SifInitRpc(0);
150-
SifExitRpc();
149+
sceSifInitRpc(0);
150+
sceSifExitRpc();
151151

152152
SifIopReset("", 0);
153153
while (!SifIopSync()) {};
@@ -184,22 +184,22 @@ int SifIopRebootBuffer(const void *ioprp, int size)
184184
imgdrv_img_size[0] = size;
185185
imgdrv_img_size[1] = iopbtconf_img_size;
186186
FlushCache(0);
187-
SifSetDma(dmat, 3);
187+
sceSifSetDma(dmat, 3);
188188

189189
sbv_patch_enable_lmb();
190190

191191
SifLoadModule("rom0:SYSCLIB", 0, NULL);
192192
SifLoadModuleBuffer(imgdrv_iop, 0, NULL);
193193
SifLoadModuleSpecial("rom0:UDNL", 11, "img0:\0img1:", 1);
194194

195-
SifExitRpc();
195+
sceSifExitRpc();
196196
SifLoadFileExit();
197197

198-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_SIFINIT);
199-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_CMDINIT);
200-
SifSetReg(SIF_REG_SMFLAG, SIF_STAT_BOOTEND);
201-
SifSetReg(SIF_SYSREG_RPCINIT, 0);
202-
SifSetReg(SIF_SYSREG_SUBADDR, 0);
198+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_SIFINIT);
199+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_CMDINIT);
200+
sceSifSetReg(SIF_REG_SMFLAG, SIF_STAT_BOOTEND);
201+
sceSifSetReg(SIF_SYSREG_RPCINIT, 0);
202+
sceSifSetReg(SIF_SYSREG_SUBADDR, 0);
203203

204204
_iop_reboot_count++; // Not originally here: increment to allow RPC clients to detect unbinding.
205205

‎ee/kernel/src/fileio.c‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ int fioInit(void)
6363
if (_fio_init)
6464
return 0;
6565

66-
SifInitRpc(0);
66+
sceSifInitRpc(0);
6767

68-
while (((res = SifBindRpc(&_fio_cd, 0x80000001, 0)) >= 0) &&
68+
while (((res = sceSifBindRpc(&_fio_cd, 0x80000001, 0)) >= 0) &&
6969
(_fio_cd.server == NULL))
7070
nopdelay();
7171

@@ -180,10 +180,10 @@ int fioOpen(const char *name, int mode)
180180
strncpy(arg.name, name, FIO_PATH_MAX - 1);
181181
arg.name[FIO_PATH_MAX - 1] = 0;
182182

183-
if ((res = SifCallRpc(&_fio_cd, FIO_F_OPEN, _fio_block_mode, &arg, sizeof arg,
183+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_OPEN, _fio_block_mode, &arg, sizeof arg,
184184
_fio_recv_data, 4, (void *)_fio_intr, NULL)) >= 0) {
185185
result = (_fio_block_mode == FIO_NOWAIT) ? 0 : _fio_recv_data[0];
186-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
186+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
187187
SignalSema(_fio_completion_sema);
188188
result = res;
189189
}
@@ -212,10 +212,10 @@ int fioClose(int fd)
212212

213213
arg.fd = fd;
214214

215-
if ((res = SifCallRpc(&_fio_cd, FIO_F_CLOSE, 0, &arg, 4, &arg, 4,
215+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_CLOSE, 0, &arg, 4, &arg, 4,
216216
(void *)_fio_intr, NULL)) >= 0) {
217217
result = arg.result;
218-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
218+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
219219
SignalSema(_fio_completion_sema);
220220
result = res;
221221
}
@@ -261,12 +261,12 @@ int fioRead(int fd, void *ptr, int size)
261261
arg.read_data = (struct _fio_read_data *)_fio_intr_data;
262262

263263
if (!IS_UNCACHED_SEG(ptr))
264-
SifWriteBackDCache(ptr, size);
264+
sceSifWriteBackDCache(ptr, size);
265265

266-
if ((res = SifCallRpc(&_fio_cd, FIO_F_READ, _fio_block_mode, &arg, sizeof arg,
266+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_READ, _fio_block_mode, &arg, sizeof arg,
267267
_fio_recv_data, 4, (void *)_fio_read_intr, _fio_intr_data)) >= 0) {
268268
result = (_fio_block_mode == FIO_NOWAIT) ? 0 : _fio_recv_data[0];
269-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
269+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
270270
SignalSema(_fio_completion_sema);
271271
result = res;
272272
}
@@ -306,12 +306,12 @@ int fioWrite(int fd, const void *ptr, int size)
306306
memcpy(arg.aligned, ptr, mis);
307307

308308
if (!IS_UNCACHED_SEG(ptr))
309-
SifWriteBackDCache((void *)ptr, size);
309+
sceSifWriteBackDCache((void *)ptr, size);
310310

311-
if ((res = SifCallRpc(&_fio_cd, FIO_F_WRITE, _fio_block_mode, &arg, sizeof arg,
311+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_WRITE, _fio_block_mode, &arg, sizeof arg,
312312
_fio_recv_data, 4, (void *)_fio_intr, NULL)) >= 0) {
313313
result = (_fio_block_mode == FIO_NOWAIT) ? 0 : _fio_recv_data[0];
314-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
314+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
315315
SignalSema(_fio_completion_sema);
316316
result = res;
317317
}
@@ -338,10 +338,10 @@ int fioLseek(int fd, int offset, int whence)
338338
arg.offset = offset;
339339
arg.whence = whence;
340340

341-
if ((res = SifCallRpc(&_fio_cd, FIO_F_LSEEK, 0, &arg, sizeof arg,
341+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_LSEEK, 0, &arg, sizeof arg,
342342
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
343343
result = arg.p.result;
344-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
344+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
345345
SignalSema(_fio_completion_sema);
346346
result = res;
347347
}
@@ -370,10 +370,10 @@ int fioIoctl(int fd, int request, void *data)
370370
if (data != NULL)
371371
memcpy(arg.data, data, 1024);
372372

373-
if ((res = SifCallRpc(&_fio_cd, FIO_F_IOCTL, 0, &arg, sizeof arg,
373+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_IOCTL, 0, &arg, sizeof arg,
374374
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
375375
result = arg.p.result;
376-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
376+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
377377
SignalSema(_fio_completion_sema);
378378
result = res;
379379
}
@@ -403,10 +403,10 @@ int fioRemove(const char *name)
403403
strncpy(arg.path, name, FIO_PATH_MAX - 1);
404404
arg.path[FIO_PATH_MAX - 1] = 0;
405405

406-
if ((res = SifCallRpc(&_fio_cd, FIO_F_REMOVE, 0, &arg, sizeof arg,
406+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_REMOVE, 0, &arg, sizeof arg,
407407
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
408408
result = arg.result;
409-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
409+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
410410
SignalSema(_fio_completion_sema);
411411
result = res;
412412
}
@@ -436,10 +436,10 @@ int fioMkdir(const char *path)
436436
strncpy(arg.path, path, FIO_PATH_MAX - 1);
437437
arg.path[FIO_PATH_MAX - 1] = 0;
438438

439-
if ((res = SifCallRpc(&_fio_cd, FIO_F_MKDIR, 0, &arg, sizeof arg,
439+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_MKDIR, 0, &arg, sizeof arg,
440440
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
441441
result = arg.result;
442-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
442+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
443443
SignalSema(_fio_completion_sema);
444444
result = res;
445445
}
@@ -469,10 +469,10 @@ int fioRmdir(const char *dirname)
469469
strncpy(arg.path, dirname, FIO_PATH_MAX - 1);
470470
arg.path[FIO_PATH_MAX - 1] = 0;
471471

472-
if ((res = SifCallRpc(&_fio_cd, FIO_F_RMDIR, 0, &arg, sizeof arg,
472+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_RMDIR, 0, &arg, sizeof arg,
473473
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
474474
result = arg.result;
475-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
475+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
476476
SignalSema(_fio_completion_sema);
477477
result = res;
478478
}
@@ -546,10 +546,10 @@ int fioDopen(const char *name)
546546
strncpy(arg.name, name, FIO_PATH_MAX - 1);
547547
arg.name[FIO_PATH_MAX - 1] = 0;
548548

549-
if ((res = SifCallRpc(&_fio_cd, FIO_F_DOPEN, 0, &arg, sizeof arg,
549+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_DOPEN, 0, &arg, sizeof arg,
550550
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
551551
result = arg.result;
552-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
552+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
553553
SignalSema(_fio_completion_sema);
554554
result = res;
555555
}
@@ -578,10 +578,10 @@ int fioDclose(int fd)
578578

579579
arg.fd = fd;
580580

581-
if ((res = SifCallRpc(&_fio_cd, FIO_F_DCLOSE, 0, &arg, sizeof arg,
581+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_DCLOSE, 0, &arg, sizeof arg,
582582
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
583583
result = arg.result;
584-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
584+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
585585
SignalSema(_fio_completion_sema);
586586
result = res;
587587
}
@@ -608,12 +608,12 @@ int fioDread(int fd, io_dirent_t *buf)
608608
arg.buf = buf;
609609

610610
if (!IS_UNCACHED_SEG(buf))
611-
SifWriteBackDCache(buf, sizeof(io_dirent_t));
611+
sceSifWriteBackDCache(buf, sizeof(io_dirent_t));
612612

613-
if ((res = SifCallRpc(&_fio_cd, FIO_F_DREAD, 0, &arg, sizeof arg,
613+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_DREAD, 0, &arg, sizeof arg,
614614
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
615615
result = arg.p.result;
616-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
616+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
617617
SignalSema(_fio_completion_sema);
618618
result = res;
619619
}
@@ -641,12 +641,12 @@ int fioGetstat(const char *name, io_stat_t *buf)
641641
arg.name[FIO_PATH_MAX - 1] = 0;
642642

643643
if (!IS_UNCACHED_SEG(buf))
644-
SifWriteBackDCache(buf, sizeof(io_stat_t));
644+
sceSifWriteBackDCache(buf, sizeof(io_stat_t));
645645

646-
if ((res = SifCallRpc(&_fio_cd, FIO_F_GETSTAT, 0, &arg, sizeof arg,
646+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_GETSTAT, 0, &arg, sizeof arg,
647647
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
648648
result = arg.p.result;
649-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
649+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
650650
SignalSema(_fio_completion_sema);
651651
result = res;
652652
}
@@ -674,10 +674,10 @@ int fioChstat(const char *name, io_stat_t *buf, u32 cbit)
674674
strncpy(arg.name, name, FIO_PATH_MAX - 1);
675675
arg.name[FIO_PATH_MAX - 1] = 0;
676676

677-
if ((res = SifCallRpc(&_fio_cd, FIO_F_CHSTAT, 0, &arg, sizeof arg,
677+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_CHSTAT, 0, &arg, sizeof arg,
678678
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
679679
result = arg.p.result;
680-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
680+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
681681
SignalSema(_fio_completion_sema);
682682
result = res;
683683
}
@@ -707,10 +707,10 @@ int fioFormat(const char *name)
707707
strncpy(arg.path, name, FIO_PATH_MAX - 1);
708708
arg.path[FIO_PATH_MAX - 1] = 0;
709709

710-
if ((res = SifCallRpc(&_fio_cd, FIO_F_FORMAT, 0, &arg, sizeof arg,
710+
if ((res = sceSifCallRpc(&_fio_cd, FIO_F_FORMAT, 0, &arg, sizeof arg,
711711
&arg, 4, (void *)_fio_intr, NULL)) >= 0) {
712712
result = arg.result;
713-
} else { // Signal semaphore to avoid a deadlock if SifCallRpc fails.
713+
} else { // Signal semaphore to avoid a deadlock if sceSifCallRpc fails.
714714
SignalSema(_fio_completion_sema);
715715
result = res;
716716
}

0 commit comments

Comments
 (0)