commit bd2993116fcb017e6797e8db2f62c96f445eac22
parent 698bf6b1753e29a6823b5813fb27d41fa2543878
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Wed, 16 Sep 2020 20:51:02 +0200
os9: Rename include/9os
The new name is os9 and these files should represent
the new name.
Change-Id: Ifd7be7b786d73b32a8c1526b9dbf6b7f915f6849
Diffstat:
31 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/README b/README
@@ -25,7 +25,7 @@ Launch the FVP model with the following options:
#!/bin/sh
-os=<path to 9os binary>
+os=<path to os9 binary>
uart0=<path to uart0 log>
uart3=<path to uart1 log>
bl31=<path to bl31.bin>
diff --git a/include/libk.h b/include/libk.h
@@ -1,7 +1,7 @@
#include <stdarg.h>
#include <stddef.h>
-#include <9os/io.h>
+#include <os9/io.h>
#include "features.h"
diff --git a/include/9os/io.h b/include/os9/io.h
diff --git a/include/9os/9os.h b/include/os9/os9.h
diff --git a/src/lib9p/closedir.c b/src/lib9p/closedir.c
@@ -1,8 +1,8 @@
#include <errno.h>
#include <string.h>
-#include <9os/io.h>
-#include <9os/9os.h>
+#include <os9/io.h>
+#include <os9/os9.h>
int
closedir(DIR *dir)
diff --git a/src/lib9p/dirstat.c b/src/lib9p/dirstat.c
@@ -1,5 +1,5 @@
#include <errno.h>
-#include <9os/io.h>
+#include <os9/io.h>
int
dirstat(char *name, Dir *dir)
diff --git a/src/lib9p/dirtop9.c b/src/lib9p/dirtop9.c
@@ -1,7 +1,7 @@
#include <assert.h>
#include <serialize.h>
-#include <9os/io.h>
+#include <os9/io.h>
int
dirtop9(Dir *dp, unsigned char *buf, int n)
diff --git a/src/lib9p/opendir.c b/src/lib9p/opendir.c
@@ -1,8 +1,8 @@
#include <errno.h>
#include <string.h>
-#include <9os/io.h>
-#include <9os/9os.h>
+#include <os9/io.h>
+#include <os9/os9.h>
#define NR_DIRS 2
diff --git a/src/lib9p/p9todir.c b/src/lib9p/p9todir.c
@@ -3,7 +3,7 @@
#include <errno.h>
#include <stddef.h>
-#include <9os/io.h>
+#include <os9/io.h>
#define USED(x) ((void) x)
#define USERLEN 20
diff --git a/src/lib9p/readdir.c b/src/lib9p/readdir.c
@@ -1,8 +1,8 @@
#include <errno.h>
#include <string.h>
-#include <9os/io.h>
-#include <9os/9os.h>
+#include <os9/io.h>
+#include <os9/os9.h>
int
readdir(DIR *dir, struct dirent *ent)
diff --git a/src/libk/kstd.c b/src/libk/kstd.c
@@ -1,3 +1,3 @@
-#include <9os/io.h>
+#include <os9/io.h>
int kin, kout, kerr;
diff --git a/src/libk/loadimg.c b/src/libk/loadimg.c
@@ -2,7 +2,7 @@
#include <libk.h>
#include <limits.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
int
loadimg(char *name, void *dst, long *n)
diff --git a/src/os9/arch/arm64/cache.c b/src/os9/arch/arm64/cache.c
@@ -1,4 +1,4 @@
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "sysreg.h"
#include "arch.h"
diff --git a/src/os9/arch/arm64/main.c b/src/os9/arch/arm64/main.c
@@ -4,7 +4,7 @@
#include <libk.h>
#include <limits.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "version.h"
#include "sysreg.h"
diff --git a/src/os9/arch/arm64/svc.c b/src/os9/arch/arm64/svc.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include <libk.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "ec.h"
diff --git a/src/os9/dev/dev.c b/src/os9/dev/dev.c
@@ -2,8 +2,8 @@
#include <errno.h>
#include <string.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
diff --git a/src/os9/dev/devar.c b/src/os9/dev/devar.c
@@ -3,8 +3,8 @@
#include <stdlib.h>
#include <string.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
diff --git a/src/os9/dev/devblk.c b/src/os9/dev/devblk.c
@@ -3,8 +3,8 @@
#include <stdlib.h>
#include <string.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
#include "blk.h"
diff --git a/src/os9/dev/devcons.c b/src/os9/dev/devcons.c
@@ -1,6 +1,6 @@
#include <assert.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include <ctype.h>
#include <errno.h>
#include <libk.h>
diff --git a/src/os9/dev/devfip.c b/src/os9/dev/devfip.c
@@ -5,8 +5,8 @@
#include <stdlib.h>
#include <string.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
#include "fip.h"
diff --git a/src/os9/dev/devproc.c b/src/os9/dev/devproc.c
@@ -1,5 +1,5 @@
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include <libk.h>
#include "dev.h"
diff --git a/src/os9/dev/devroot.c b/src/os9/dev/devroot.c
@@ -1,5 +1,5 @@
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include <libk.h>
#include "dev.h"
diff --git a/src/os9/dev/devuart.c b/src/os9/dev/devuart.c
@@ -1,5 +1,5 @@
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include <ctype.h>
#include <errno.h>
#include <libk.h>
diff --git a/src/os9/dev/dummyblk.c b/src/os9/dev/dummyblk.c
@@ -1,7 +1,7 @@
#include <stdio.h>
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "../src/libc/syscall.h"
#include "dev.h"
diff --git a/src/os9/dev/dummyuart.c b/src/os9/dev/dummyuart.c
@@ -1,5 +1,5 @@
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
#include "uart.h"
diff --git a/src/os9/dev/pl011.c b/src/os9/dev/pl011.c
@@ -1,5 +1,5 @@
-#include <9os/9os.h>
-#include <9os/io.h>
+#include <os9/os9.h>
+#include <os9/io.h>
#include "dev.h"
#include "uart.h"
diff --git a/src/os9/dlang.c b/src/os9/dlang.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <libk.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "dlang.h"
diff --git a/src/os9/hosted/arch.c b/src/os9/hosted/arch.c
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "hosted.h"
diff --git a/src/os9/hosted/lock.c b/src/os9/hosted/lock.c
@@ -1,4 +1,4 @@
-#include <9os/9os.h>
+#include <os9/os9.h>
void
lock(mutex_t *mutex)
diff --git a/src/os9/hosted/main.c b/src/os9/hosted/main.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <libk.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
#include "hosted.h"
diff --git a/src/os9/panic.c b/src/os9/panic.c
@@ -1,5 +1,5 @@
#include <libk.h>
-#include <9os/9os.h>
+#include <os9/os9.h>
const char *const regnames[] = {
[X0] = "x0",