Flatten 'lib' directory into main 'src' tree

28 files changed, 16 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 5d30384..0c695bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 /.zig-*/
 /hwi
 /hwi.o
-/src/lib/cfg/init
+/src/cfg/init
diff --git a/README.md b/README.md
index 349f792..3930240 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ zig build -Dplatform=<PLATFORM>
 
 Replace `<PLATFORM>` with the platform you want to build for.
 Supported options include `qemu` and `lpi4a`.
-See the `src/lib/cfg/platform` directory for the full list.
+See the `src/cfg/platform` directory for the full list.
 
 You can also use any other Zig build mode, e.g. `--release=fast`.
 
@@ -59,7 +59,7 @@ You may `strip(1)` this file if you want to.
 ### init executable
 
 The init executable is expected to be a statically linked ELF
-(with program headers) at `src/lib/cfg/init`. It is embedded in the kernel
+(with program headers) at `src/cfg/init`. It is embedded in the kernel
 binary to avoid running (filesystem) drivers in S-mode, meaning that a kernel
 rebuild is required to apply modifications.
 
@@ -283,14 +283,14 @@ You can use the `hwi(1)` command to convert from the textual representation
 to the binary representation:
 
 ```
-hwi < src/lib/cfg/platform/<PLATFORM>.txt > src/lib/cfg/platform/<PLATFORM>.hwi
+hwi < src/cfg/platform/<PLATFORM>.txt > src/cfg/platform/<PLATFORM>.hwi
 ```
 
 Omitting the stdin pipe allows you to type out the textual representation
 manually:
 
 ```
-hwi > src/lib/cfg/platform/<PLATFORM>.hwi
+hwi > src/cfg/platform/<PLATFORM>.hwi
 ```
 
 Press Control+D after finishing the last line (and pressing Enter)
diff --git a/src/lib/Console.zig b/src/Console.zig
index 8a64406..8a64406 100644
--- a/src/lib/Console.zig
+++ b/src/Console.zig
diff --git a/src/lib/TrapFrame.zig b/src/TrapFrame.zig
index 71556ed..71556ed 100644
--- a/src/lib/TrapFrame.zig
+++ b/src/TrapFrame.zig
diff --git a/src/lib/cfg/platform/lpi4a.hwi b/src/cfg/platform/lpi4a.hwi
index f52d767..f52d767 100644
--- a/src/lib/cfg/platform/lpi4a.hwi
+++ b/src/cfg/platform/lpi4a.hwi
diff --git a/src/lib/cfg/platform/lpi4a.hwi.license b/src/cfg/platform/lpi4a.hwi.license
index b2d2485..b2d2485 100644
--- a/src/lib/cfg/platform/lpi4a.hwi.license
+++ b/src/cfg/platform/lpi4a.hwi.license
diff --git a/src/lib/cfg/platform/lpi4a.txt b/src/cfg/platform/lpi4a.txt
index 6213698..6213698 100644
--- a/src/lib/cfg/platform/lpi4a.txt
+++ b/src/cfg/platform/lpi4a.txt
diff --git a/src/lib/cfg/platform/lpi4a.txt.license b/src/cfg/platform/lpi4a.txt.license
index b2d2485..b2d2485 100644
--- a/src/lib/cfg/platform/lpi4a.txt.license
+++ b/src/cfg/platform/lpi4a.txt.license
diff --git a/src/lib/cfg/platform/qemu.hwi b/src/cfg/platform/qemu.hwi
index a951898..a951898 100644
--- a/src/lib/cfg/platform/qemu.hwi
+++ b/src/cfg/platform/qemu.hwi
diff --git a/src/lib/cfg/platform/qemu.hwi.license b/src/cfg/platform/qemu.hwi.license
index b2d2485..b2d2485 100644
--- a/src/lib/cfg/platform/qemu.hwi.license
+++ b/src/cfg/platform/qemu.hwi.license
diff --git a/src/lib/cfg/platform/qemu.txt b/src/cfg/platform/qemu.txt
index 352e5d4..352e5d4 100644
--- a/src/lib/cfg/platform/qemu.txt
+++ b/src/cfg/platform/qemu.txt
diff --git a/src/lib/cfg/platform/qemu.txt.license b/src/cfg/platform/qemu.txt.license
index b2d2485..b2d2485 100644
--- a/src/lib/cfg/platform/qemu.txt.license
+++ b/src/cfg/platform/qemu.txt.license
diff --git a/src/lib/channel.zig b/src/channel.zig
index 7687afa..7687afa 100644
--- a/src/lib/channel.zig
+++ b/src/channel.zig
diff --git a/src/hwi.zig b/src/hwi.zig
index b8736bb..8157edc 100644
--- a/src/hwi.zig
+++ b/src/hwi.zig
@@ -4,7 +4,7 @@
 
 const builtin = @import("builtin");
 const std = @import("std");
-const hwinfo = @import("lib/hwinfo.zig");
+const hwinfo = @import("hwinfo.zig");
 
 pub fn main() !void {
     const stdin = std.io.getStdIn();
diff --git a/src/lib/hwinfo.zig b/src/hwinfo.zig
index 62eacf2..62eacf2 100644
--- a/src/lib/hwinfo.zig
+++ b/src/hwinfo.zig
diff --git a/src/lib/interrupts.zig b/src/interrupts.zig
index 66c8acd..66c8acd 100644
--- a/src/lib/interrupts.zig
+++ b/src/interrupts.zig
diff --git a/src/kernel.zig b/src/kernel.zig
index b415d17..41ef9a6 100644
--- a/src/kernel.zig
+++ b/src/kernel.zig
@@ -3,16 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 const std = @import("std");
-const Console = @import("lib/Console.zig");
-const hwinfo = @import("lib/hwinfo.zig");
-const interrupts = @import("lib/interrupts.zig");
-const mem = @import("lib/mem.zig");
-const paging = @import("lib/paging.zig");
-const plic = @import("lib/plic.zig");
-const process = @import("lib/process.zig");
-const riscv = @import("lib/riscv.zig");
-
-const init = @embedFile("lib/cfg/init");
+const Console = @import("Console.zig");
+const hwinfo = @import("hwinfo.zig");
+const interrupts = @import("interrupts.zig");
+const mem = @import("mem.zig");
+const paging = @import("paging.zig");
+const plic = @import("plic.zig");
+const process = @import("process.zig");
+const riscv = @import("riscv.zig");
+
+const init = @embedFile("cfg/init");
 
 const Error = error{
     HartIdOutOfRange,
diff --git a/src/lib/mem.zig b/src/mem.zig
index eefa452..eefa452 100644
--- a/src/lib/mem.zig
+++ b/src/mem.zig
diff --git a/src/lib/paging.zig b/src/paging.zig
index dfe44cc..dfe44cc 100644
--- a/src/lib/paging.zig
+++ b/src/paging.zig
diff --git a/src/lib/plic.zig b/src/plic.zig
index 7e54992..7e54992 100644
--- a/src/lib/plic.zig
+++ b/src/plic.zig
diff --git a/src/lib/process.zig b/src/process.zig
index b5afade..b5afade 100644
--- a/src/lib/process.zig
+++ b/src/process.zig
diff --git a/src/lib/riscv.zig b/src/riscv.zig
index e68b3fb..e68b3fb 100644
--- a/src/lib/riscv.zig
+++ b/src/riscv.zig
diff --git a/src/lib/sbi.zig b/src/sbi.zig
index fc8afde..fc8afde 100644
--- a/src/lib/sbi.zig
+++ b/src/sbi.zig
diff --git a/src/lib/sbi/debug_console.zig b/src/sbi/debug_console.zig
index 2bcc097..2bcc097 100644
--- a/src/lib/sbi/debug_console.zig
+++ b/src/sbi/debug_console.zig
diff --git a/src/lib/sbi/legacy.zig b/src/sbi/legacy.zig
index 858899c..858899c 100644
--- a/src/lib/sbi/legacy.zig
+++ b/src/sbi/legacy.zig
diff --git a/src/lib/sbi/sys_reset.zig b/src/sbi/sys_reset.zig
index 9a3d62b..9a3d62b 100644
--- a/src/lib/sbi/sys_reset.zig
+++ b/src/sbi/sys_reset.zig
diff --git a/src/lib/sbi/time.zig b/src/sbi/time.zig
index eed5324..eed5324 100644
--- a/src/lib/sbi/time.zig
+++ b/src/sbi/time.zig
diff --git a/src/lib/syscall.zig b/src/syscall.zig
index 6b94e16..6b94e16 100644
--- a/src/lib/syscall.zig
+++ b/src/syscall.zig