From fa2db8ed4b361d0fc5c1bb546a1caf74fe61e74e Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Wed, 12 Jul 2023 05:22:44 +0300
Subject: [PATCH] Fixed compilation errors

---
 orbis-kernel/include/orbis/sys/sysproto.hpp   | 36 ++++++++++---------
 .../include/orbis/thread/ProcessOps.hpp       |  3 +-
 orbis-kernel/src/sys/sys_generic.cpp          |  2 +-
 orbis-kernel/src/sys/sys_p1003_1b.cpp         |  5 ++-
 orbis-kernel/src/sys/sys_sig.cpp              |  2 +-
 orbis-kernel/src/sys/sys_thr.cpp              |  2 +-
 orbis-kernel/src/sys/sys_time.cpp             | 10 +++---
 orbis-kernel/src/sys/sys_uipc_mqueue.cpp      | 16 ++++-----
 orbis-kernel/src/sys/sys_uipc_sem.cpp         |  2 +-
 orbis-kernel/src/sys/sys_vfs_aio.cpp          |  4 +--
 rpcsx-os/ops.cpp                              |  4 +--
 11 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/orbis-kernel/include/orbis/sys/sysproto.hpp b/orbis-kernel/include/orbis/sys/sysproto.hpp
index 385eb36d8..74dba9436 100644
--- a/orbis-kernel/include/orbis/sys/sysproto.hpp
+++ b/orbis-kernel/include/orbis/sys/sysproto.hpp
@@ -13,6 +13,8 @@ using SceKernelModule = ModuleHandle;
 
 struct ModuleInfo;
 struct ModuleInfoEx;
+struct KEvent;
+struct timespec;
 
 struct stack_t;
 
@@ -211,11 +213,11 @@ SysResult sys_shmat(Thread *thread, sint shmid, ptr<const void> shmaddr,
 SysResult sys_shmdt(Thread *thread, ptr<const void> shmaddr);
 SysResult sys_shmget(Thread *thread, key_t key, size_t size, sint shmflg);
 SysResult sys_clock_gettime(Thread *thread, clockid_t clock_id,
-                            ptr<struct timespec> tp);
+                            ptr<timespec> tp);
 SysResult sys_clock_settime(Thread *thread, clockid_t clock_id,
-                            ptr<const struct timespec> tp);
+                            ptr<const timespec> tp);
 SysResult sys_clock_getres(Thread *thread, clockid_t clock_id,
-                           ptr<struct timespec> tp);
+                           ptr<timespec> tp);
 SysResult sys_ktimer_create(Thread *thread, clockid_t clock_id,
                             ptr<struct sigevent> evp, ptr<sint> timerid);
 SysResult sys_ktimer_delete(Thread *thread, sint timerid);
@@ -225,8 +227,8 @@ SysResult sys_ktimer_settime(Thread *thread, sint timerid, sint flags,
 SysResult sys_ktimer_gettime(Thread *thread, sint timerid,
                              ptr<struct itimerspec> value);
 SysResult sys_ktimer_getoverrun(Thread *thread, sint timerid);
-SysResult sys_nanosleep(Thread *thread, ptr<const struct timespec> rqtp,
-                        ptr<struct timespec> rmtp);
+SysResult sys_nanosleep(Thread *thread, ptr<const timespec> rqtp,
+                        ptr<timespec> rmtp);
 SysResult sys_ntp_gettime(Thread *thread, ptr<struct ntptimeval> ntvp);
 SysResult sys_minherit(Thread *thread, ptr<void> addr, size_t len,
                        sint inherit);
@@ -270,7 +272,7 @@ SysResult sys_setresuid(Thread *thread, uid_t ruid, uid_t euid, uid_t suid);
 SysResult sys_setresgid(Thread *thread, gid_t rgid, gid_t egid, gid_t sgid);
 SysResult sys_aio_return(Thread *thread, ptr<struct aiocb> aiocbp);
 SysResult sys_aio_suspend(Thread *thread, ptr<struct aiocb> aiocbp, sint nent,
-                          ptr<const struct timespec> timeout);
+                          ptr<const timespec> timeout);
 SysResult sys_aio_cancel(Thread *thread, sint fd, ptr<struct aiocb> aiocbp);
 SysResult sys_aio_error(Thread *thread, ptr<struct aiocb> aiocbp);
 SysResult sys_oaio_read(Thread *thread, ptr<struct aiocb> aiocbp);
@@ -293,7 +295,7 @@ SysResult sys_sched_yield(Thread *thread);
 SysResult sys_sched_get_priority_max(Thread *thread, sint policy);
 SysResult sys_sched_get_priority_min(Thread *thread, sint policy);
 SysResult sys_sched_rr_get_interval(Thread *thread, pid_t pid,
-                                    ptr<struct timespec> interval);
+                                    ptr<timespec> interval);
 SysResult sys_utrace(Thread *thread, ptr<const void> addr, size_t len);
 SysResult sys_kldsym(Thread *thread, sint fileid, sint cmd, ptr<void> data);
 SysResult sys_jail(Thread *thread, ptr<struct jail> jail);
@@ -306,7 +308,7 @@ SysResult sys_sigsuspend(Thread *thread, ptr<const struct sigset> set);
 SysResult sys_sigpending(Thread *thread, ptr<struct sigset> set);
 SysResult sys_sigtimedwait(Thread *thread, ptr<const struct sigset> set,
                            ptr<struct siginfo> info,
-                           ptr<const struct timespec> timeout);
+                           ptr<const timespec> timeout);
 SysResult sys_sigwaitinfo(Thread *thread, ptr<const struct sigset> set,
                           ptr<struct siginfo> info);
 SysResult sys___acl_get_file(Thread *thread, ptr<char> path, acl_type_t type,
@@ -336,15 +338,15 @@ SysResult sys_extattr_get_file(Thread *thread, ptr<char> path,
 SysResult sys_extattr_delete_file(Thread *thread, ptr<char> path,
                                   sint attrnamespace, ptr<const char> attrname);
 SysResult sys_aio_waitcomplete(Thread *thread, ptr<ptr<struct aiocb>> aiocbp,
-                               ptr<struct timespec> timeout);
+                               ptr<timespec> timeout);
 SysResult sys_getresuid(Thread *thread, ptr<uid_t> ruid, ptr<uid_t> euid,
                         ptr<uid_t> suid);
 SysResult sys_getresgid(Thread *thread, ptr<gid_t> rgid, ptr<gid_t> egid,
                         ptr<gid_t> sgid);
 SysResult sys_kqueue(Thread *thread);
-SysResult sys_kevent(Thread *thread, sint fd, ptr<struct kevent> changelist,
-                     sint nchanges, ptr<struct kevent> eventlist, sint nevents,
-                     ptr<const struct timespec> timeout);
+SysResult sys_kevent(Thread *thread, sint fd, ptr<KEvent> changelist,
+                     sint nchanges, ptr<KEvent> eventlist, sint nevents,
+                     ptr<const timespec> timeout);
 SysResult sys_extattr_set_fd(Thread *thread, sint fd, sint attrnamespace,
                              ptr<const char> attrname, ptr<void> data,
                              size_t nbytes);
@@ -443,8 +445,8 @@ SysResult sys_extattr_list_link(Thread *thread, ptr<const char> path,
                                 sint attrnamespace, ptr<void> data,
                                 size_t nbytes);
 SysResult sys_ksem_timedwait(Thread *thread, semid_t id,
-                             ptr<const struct timespec> abstime);
-SysResult sys_thr_suspend(Thread *thread, ptr<const struct timespec> timeout);
+                             ptr<const timespec> abstime);
+SysResult sys_thr_suspend(Thread *thread, ptr<const timespec> timeout);
 SysResult sys_thr_wake(Thread *thread, slong id);
 SysResult sys_kldunloadf(Thread *thread, slong fileid, sint flags);
 SysResult sys_audit(Thread *thread, ptr<const void> record, uint length);
@@ -473,10 +475,10 @@ SysResult sys_kmq_setattr(Thread *thread, sint mqd,
 SysResult sys_kmq_timedreceive(Thread *thread, sint mqd,
                                ptr<const char> msg_ptr, size_t msg_len,
                                ptr<uint> msg_prio,
-                               ptr<const struct timespec> abstimeout);
+                               ptr<const timespec> abstimeout);
 SysResult sys_kmq_timedsend(Thread *thread, sint mqd, ptr<char> msg_ptr,
                             size_t msg_len, ptr<uint> msg_prio,
-                            ptr<const struct timespec> abstimeout);
+                            ptr<const timespec> abstimeout);
 SysResult sys_kmq_notify(Thread *thread, sint mqd,
                          ptr<const struct sigevent> sigev);
 SysResult sys_kmq_unlink(Thread *thread, ptr<const char> path);
@@ -575,7 +577,7 @@ SysResult sys_pdfork(Thread *thread, ptr<sint> fdp, sint flags);
 SysResult sys_pdkill(Thread *thread, sint fd, sint signum);
 SysResult sys_pdgetpid(Thread *thread, sint fd, ptr<pid_t> pidp);
 SysResult sys_pselect(Thread *thread, sint nd, ptr<fd_set> in, ptr<fd_set> ou,
-                      ptr<fd_set> ex, ptr<const struct timespec> ts,
+                      ptr<fd_set> ex, ptr<const timespec> ts,
                       ptr<const sigset_t> sm);
 SysResult sys_getloginclass(Thread *thread, ptr<char> namebuf, size_t namelen);
 SysResult sys_setloginclass(Thread *thread, ptr<char> namebuf);
diff --git a/orbis-kernel/include/orbis/thread/ProcessOps.hpp b/orbis-kernel/include/orbis/thread/ProcessOps.hpp
index dee7cd513..964b6eef2 100644
--- a/orbis-kernel/include/orbis/thread/ProcessOps.hpp
+++ b/orbis-kernel/include/orbis/thread/ProcessOps.hpp
@@ -7,6 +7,7 @@
 namespace orbis {
 struct Thread;
 struct Module;
+struct timespec;
 
 struct ProcessOps {
   SysResult (*mmap)(Thread *thread, caddr_t addr, size_t len, sint prot,
@@ -57,7 +58,7 @@ struct ProcessOps {
   SysResult (*thr_exit)(Thread *thread, ptr<slong> state);
   SysResult (*thr_kill)(Thread *thread, slong id, sint sig);
   SysResult (*thr_kill2)(Thread *thread, pid_t pid, slong id, sint sig);
-  SysResult (*thr_suspend)(Thread *thread, ptr<const struct timespec> timeout);
+  SysResult (*thr_suspend)(Thread *thread, ptr<const timespec> timeout);
   SysResult (*thr_wake)(Thread *thread, slong id);
   SysResult (*thr_set_name)(Thread *thread, slong id, ptr<const char> name);
 
diff --git a/orbis-kernel/src/sys/sys_generic.cpp b/orbis-kernel/src/sys/sys_generic.cpp
index 5ab5eb3fe..e9eb0d54f 100644
--- a/orbis-kernel/src/sys/sys_generic.cpp
+++ b/orbis-kernel/src/sys/sys_generic.cpp
@@ -78,7 +78,7 @@ orbis::SysResult orbis::sys_ioctl(Thread *thread, sint fd, ulong com,
 }
 orbis::SysResult orbis::sys_pselect(Thread *thread, sint nd, ptr<fd_set> in,
                                     ptr<fd_set> ou, ptr<fd_set> ex,
-                                    ptr<const struct timespec> ts,
+                                    ptr<const timespec> ts,
                                     ptr<const sigset_t> sm) {
   return ErrorCode::NOSYS;
 }
diff --git a/orbis-kernel/src/sys/sys_p1003_1b.cpp b/orbis-kernel/src/sys/sys_p1003_1b.cpp
index 600574458..e54ef6522 100644
--- a/orbis-kernel/src/sys/sys_p1003_1b.cpp
+++ b/orbis-kernel/src/sys/sys_p1003_1b.cpp
@@ -30,8 +30,7 @@ orbis::SysResult orbis::sys_sched_get_priority_min(Thread *thread,
                                                    sint policy) {
   return ErrorCode::NOSYS;
 }
-orbis::SysResult
-orbis::sys_sched_rr_get_interval(Thread *thread, pid_t pid,
-                                 ptr<struct timespec> interval) {
+orbis::SysResult orbis::sys_sched_rr_get_interval(Thread *thread, pid_t pid,
+                                                  ptr<timespec> interval) {
   return ErrorCode::NOSYS;
 }
diff --git a/orbis-kernel/src/sys/sys_sig.cpp b/orbis-kernel/src/sys/sys_sig.cpp
index 28fd09137..c2e759d52 100644
--- a/orbis-kernel/src/sys/sys_sig.cpp
+++ b/orbis-kernel/src/sys/sys_sig.cpp
@@ -44,7 +44,7 @@ orbis::SysResult orbis::sys_sigwait(Thread *thread,
 orbis::SysResult orbis::sys_sigtimedwait(Thread *thread,
                                          ptr<const struct sigset> set,
                                          ptr<struct siginfo> info,
-                                         ptr<const struct timespec> timeout) {
+                                         ptr<const timespec> timeout) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_sigwaitinfo(Thread *thread,
diff --git a/orbis-kernel/src/sys/sys_thr.cpp b/orbis-kernel/src/sys/sys_thr.cpp
index be47310ca..d377f4b50 100644
--- a/orbis-kernel/src/sys/sys_thr.cpp
+++ b/orbis-kernel/src/sys/sys_thr.cpp
@@ -48,7 +48,7 @@ orbis::SysResult orbis::sys_thr_kill2(Thread *thread, pid_t pid, slong id,
 }
 
 orbis::SysResult orbis::sys_thr_suspend(Thread *thread,
-                                        ptr<const struct timespec> timeout) {
+                                        ptr<const timespec> timeout) {
   if (auto thr_suspend = thread->tproc->ops->thr_suspend) {
     return thr_suspend(thread, timeout);
   }
diff --git a/orbis-kernel/src/sys/sys_time.cpp b/orbis-kernel/src/sys/sys_time.cpp
index c32aa5cbe..e1f3ae9c3 100644
--- a/orbis-kernel/src/sys/sys_time.cpp
+++ b/orbis-kernel/src/sys/sys_time.cpp
@@ -1,4 +1,5 @@
 #include "sys/sysproto.hpp"
+#include "time.hpp"
 #include "utils/Logs.hpp"
 #include <ctime>
 
@@ -100,16 +101,15 @@ orbis::SysResult orbis::sys_clock_gettime(Thread *, clockid_t clock_id,
   return uwrite(tp, result);
 }
 orbis::SysResult orbis::sys_clock_settime(Thread *thread, clockid_t clock_id,
-                                          ptr<const struct timespec> tp) {
+                                          ptr<const timespec> tp) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_clock_getres(Thread *thread, clockid_t clock_id,
-                                         ptr<struct timespec> tp) {
+                                         ptr<timespec> tp) {
   return ErrorCode::NOSYS;
 }
-orbis::SysResult orbis::sys_nanosleep(Thread *thread,
-                                      ptr<const struct timespec> rqtp,
-                                      ptr<struct timespec> rmtp) {
+orbis::SysResult orbis::sys_nanosleep(Thread *thread, ptr<const timespec> rqtp,
+                                      ptr<timespec> rmtp) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_gettimeofday(Thread *thread, ptr<struct timeval> tp,
diff --git a/orbis-kernel/src/sys/sys_uipc_mqueue.cpp b/orbis-kernel/src/sys/sys_uipc_mqueue.cpp
index 7a21dee07..7ab4b965a 100644
--- a/orbis-kernel/src/sys/sys_uipc_mqueue.cpp
+++ b/orbis-kernel/src/sys/sys_uipc_mqueue.cpp
@@ -13,16 +13,16 @@ orbis::SysResult orbis::sys_kmq_setattr(Thread *thread, sint mqd,
                                         ptr<struct mq_attr> oattr) {
   return ErrorCode::NOSYS;
 }
-orbis::SysResult
-orbis::sys_kmq_timedreceive(Thread *thread, sint mqd, ptr<const char> msg_ptr,
-                            size_t msg_len, ptr<uint> msg_prio,
-                            ptr<const struct timespec> abstimeout) {
+orbis::SysResult orbis::sys_kmq_timedreceive(Thread *thread, sint mqd,
+                                             ptr<const char> msg_ptr,
+                                             size_t msg_len, ptr<uint> msg_prio,
+                                             ptr<const timespec> abstimeout) {
   return ErrorCode::NOSYS;
 }
-orbis::SysResult
-orbis::sys_kmq_timedsend(Thread *thread, sint mqd, ptr<char> msg_ptr,
-                         size_t msg_len, ptr<uint> msg_prio,
-                         ptr<const struct timespec> abstimeout) {
+orbis::SysResult orbis::sys_kmq_timedsend(Thread *thread, sint mqd,
+                                          ptr<char> msg_ptr, size_t msg_len,
+                                          ptr<uint> msg_prio,
+                                          ptr<const timespec> abstimeout) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_kmq_notify(Thread *thread, sint mqd,
diff --git a/orbis-kernel/src/sys/sys_uipc_sem.cpp b/orbis-kernel/src/sys/sys_uipc_sem.cpp
index fa38bac80..1ecc4e946 100644
--- a/orbis-kernel/src/sys/sys_uipc_sem.cpp
+++ b/orbis-kernel/src/sys/sys_uipc_sem.cpp
@@ -22,7 +22,7 @@ orbis::SysResult orbis::sys_ksem_wait(Thread *thread, semid_t id) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_ksem_timedwait(Thread *thread, semid_t id,
-                                           ptr<const struct timespec> abstime) {
+                                           ptr<const timespec> abstime) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_ksem_trywait(Thread *thread, semid_t id) {
diff --git a/orbis-kernel/src/sys/sys_vfs_aio.cpp b/orbis-kernel/src/sys/sys_vfs_aio.cpp
index b8bc7e260..74c40292f 100644
--- a/orbis-kernel/src/sys/sys_vfs_aio.cpp
+++ b/orbis-kernel/src/sys/sys_vfs_aio.cpp
@@ -6,7 +6,7 @@ orbis::SysResult orbis::sys_aio_return(Thread *thread,
 }
 orbis::SysResult orbis::sys_aio_suspend(Thread *thread,
                                         ptr<struct aiocb> aiocbp, sint nent,
-                                        ptr<const struct timespec> timeout) {
+                                        ptr<const timespec> timeout) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_aio_cancel(Thread *thread, sint fd,
@@ -44,7 +44,7 @@ orbis::SysResult orbis::sys_lio_listio(Thread *thread, sint mode,
 }
 orbis::SysResult orbis::sys_aio_waitcomplete(Thread *thread,
                                              ptr<ptr<struct aiocb>> aiocbp,
-                                             ptr<struct timespec> timeout) {
+                                             ptr<timespec> timeout) {
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_aio_fsync(Thread *thread, sint op,
diff --git a/rpcsx-os/ops.cpp b/rpcsx-os/ops.cpp
index 9d3f582f0..f370e1e3a 100644
--- a/rpcsx-os/ops.cpp
+++ b/rpcsx-os/ops.cpp
@@ -135,7 +135,7 @@ orbis::SysResult close(orbis::Thread *thread, orbis::sint fd) {
 #define IOC_DIRMASK (IOC_VOID | IOC_OUT | IOC_IN)
 
 #define _IOC(inout, group, num, len)                                           \
-  ((unsigned long)((inout) | (((len)&IOCPARM_MASK) << 16) | ((group) << 8) |   \
+  ((unsigned long)((inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | \
                    (num)))
 #define _IO(g, n) _IOC(IOC_VOID, (g), (n), 0)
 #define _IOWINT(g, n) _IOC(IOC_VOID, (g), (n), sizeof(int))
@@ -498,7 +498,7 @@ SysResult thr_kill2(orbis::Thread *thread, orbis::pid_t pid, orbis::slong id,
   return ErrorCode::NOTSUP;
 }
 SysResult thr_suspend(orbis::Thread *thread,
-                      orbis::ptr<const timespec> timeout) {
+                      orbis::ptr<const orbis::timespec> timeout) {
   return ErrorCode::NOTSUP;
 }
 SysResult thr_wake(orbis::Thread *thread, orbis::slong id) {