diff --git a/share/sysdefs/devctl.h b/share/sysdefs/devctl.h index 22acb9b..658ce0e 100644 --- a/share/sysdefs/devctl.h +++ b/share/sysdefs/devctl.h @@ -1,10 +1,12 @@ #ifndef SHARE_SYSDEFS_DEVCTL_H_ #define SHARE_SYSDEFS_DEVCTL_H_ -enum { - DEVCTL_GET_HANDLE = 100, -}; +#define DEVCTL_GET_HANDLE 100 + +#if !defined(__ASSEMBLER__) typedef uint64_t Dev_t; +#endif + #endif // SHARE_SYSDEFS_DEVCTL_H_ diff --git a/share/sysdefs/ioctl.h b/share/sysdefs/ioctl.h index 1e03e54..eba827a 100644 --- a/share/sysdefs/ioctl.h +++ b/share/sysdefs/ioctl.h @@ -1,30 +1,26 @@ #ifndef SHARE_SYSDEFS_IOCTL_H_ #define SHARE_SYSDEFS_IOCTL_H_ -#include -#include - #define IOCTL_NOHANDLE (-1) -enum { - IOCTL_OPENF = 0, - IOCTL_CLOSEF = 1, - IOCTL_READ = 2, - IOCTL_STAT = 3, - IOCTL_WRITE = 4, - IOCTL_FETCHDIRENT = 5, -}; +#define IOCTL_OPENF 0 +#define IOCTL_CLOSEF 1 +#define IOCTL_READ 2 +#define IOCTL_STAT 3 +#define IOCTL_WRITE 4 +#define IOCTL_FETCHDIRENT 5 -enum { - IOCTL_F_READ = 1<<0, - IOCTL_F_WRITE = 1<<1, - IOCTL_F_MAKE = 1<<2, -}; +#define IOCTL_F_READ (1<<0) +#define IOCTL_F_WRITE (1<<1) +#define IOCTL_F_MAKE (1<<2) -enum { - IOCTLSTAT_DIR = 0, - IOCTLSTAT_FILE = 1, -}; +#define IOCTLSTAT_DIR 0 +#define IOCTLSTAT_FILE 1 + +#if !defined(__ASSEMBLER__) + +#include +#include typedef struct IoctlStat { size_t size; @@ -38,4 +34,6 @@ typedef struct IoctlDirent { typedef int32_t IOH; +#endif + #endif // SHARE_SYSDEFS_IOCTL_H_ diff --git a/share/sysdefs/ipcpipe.h b/share/sysdefs/ipcpipe.h index b98c09f..c8ba754 100644 --- a/share/sysdefs/ipcpipe.h +++ b/share/sysdefs/ipcpipe.h @@ -9,13 +9,11 @@ #define IPCPIPE_OUT (0) #define IPCPIPE_IN (1) -enum { - IPCPIPE_MAKE = 0, - IPCPIPE_READ = 1, - IPCPIPE_WRITE = 2, - IPCPIPE_ADD_BCAST = 3, - IPCPIPE_REPLACE = 4, - IPCPIPE_DELETE = 5, -}; +#define IPCPIPE_MAKE 0 +#define IPCPIPE_READ 1 +#define IPCPIPE_WRITE 2 +#define IPCPIPE_ADD_BCAST 3 +#define IPCPIPE_REPLACE 4 +#define IPCPIPE_DELETE 5 #endif // SHARE_SYSDEFS_IPCPIPE_H_ diff --git a/share/sysdefs/mman.h b/share/sysdefs/mman.h index 1fd42ff..e473183 100644 --- a/share/sysdefs/mman.h +++ b/share/sysdefs/mman.h @@ -1,12 +1,8 @@ #ifndef SHARE_SYSDEFS_MMAN_H_ #define SHARE_SYSDEFS_MMAN_H_ -enum { - MMAN_MAP_PF_RW = (1<<0), -}; +#define MMAN_MAP_PF_RW (1<<0) -enum { - MMAN_MAP_F_FIXED = (1<<0), -}; +#define MMAN_MAP_F_FIXED (1<<0) #endif // SHARE_SYSDEFS_MMAN_H_ diff --git a/share/sysdefs/processctl.h b/share/sysdefs/processctl.h index 95db039..8abe4c1 100644 --- a/share/sysdefs/processctl.h +++ b/share/sysdefs/processctl.h @@ -3,17 +3,17 @@ #define PROC_ARG_MAX 128 -enum { - PCTL_KILL = 0, - PCTL_SPAWN = 1, - PCTL_POLLSTATE = 2, - PCTL_RUN = 3, - PCTL_GETPID = 4, - PCTL_ARGLEN = 5, - PCTL_ARGV = 6, - PCTL_PLS_SZ = 7, - PCTL_PLS_STAT = 8, -}; +#define PCTL_KILL 0 +#define PCTL_SPAWN 1 +#define PCTL_POLLSTATE 2 +#define PCTL_RUN 3 +#define PCTL_GETPID 4 +#define PCTL_ARGLEN 5 +#define PCTL_ARGV 6 +#define PCTL_PLS_SZ 7 +#define PCTL_PLS_STAT 8 + +#if !defined(__ASSEMBLER__) typedef struct { uint64_t pid; @@ -24,4 +24,6 @@ typedef struct { typedef uint64_t PID_t; +#endif + #endif // SHARE_HDRS_PROCESSCTL_H_ diff --git a/share/sysdefs/syscall.h b/share/sysdefs/syscall.h index c547489..89286fa 100644 --- a/share/sysdefs/syscall.h +++ b/share/sysdefs/syscall.h @@ -1,15 +1,13 @@ #ifndef SHARE_HDRS_SYSCALL_H_ #define SHARE_HDRS_SYSCALL_H_ -enum { - SYS_DEBUGPRINT = 1, - SYS_PROCESSCTL = 2, - SYS_IOCTL = 3, - SYS_IPCPIPE = 4, - SYS_MMAN_MAP = 5, - SYS_MMAN_UNMAP = 6, - SYS_SCHEDRELEASE = 7, - SYS_DEVCTL = 8, -}; +#define SYS_DEBUGPRINT 1 +#define SYS_PROCESSCTL 2 +#define SYS_IOCTL 3 +#define SYS_IPCPIPE 4 +#define SYS_MMAN_MAP 5 +#define SYS_MMAN_UNMAP 6 +#define SYS_SCHEDRELEASE 7 +#define SYS_DEVCTL 8 #endif // SHARE_HDRS_SYSCALL_H_