[Mammoth] Move remaining classes to a shared folder.

2023-11-22 14:39:27 -08:00 · 2023-11-22 14:39:27 -08:00 · 5f8d577948
commit 5f8d577948
parent c42fb858ba
39 changed files with 55 additions and 56 deletions
--- a/sys/denali/ahci/ahci_device.cpp
+++ b/sys/denali/ahci/ahci_device.cpp
@ -1,7 +1,7 @@
 #include "ahci/ahci_device.h"

 #include <glacier/status/error.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <string.h>
 #include <zcall.h>

--- a/sys/denali/ahci/ahci_device.h
+++ b/sys/denali/ahci/ahci_device.h
@ -1,7 +1,7 @@
 #pragma once

 #include <glacier/status/error.h>
-#include <mammoth/memory_region.h>
+#include <mammoth/util/memory_region.h>
 #include <ztypes.h>

 #include "ahci/ahci.h"
--- a/sys/denali/ahci/ahci_driver.cpp
+++ b/sys/denali/ahci/ahci_driver.cpp
@ -2,7 +2,7 @@

 #include <glacier/status/error.h>
 #include <glacier/status/error_or.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <stdint.h>
 #include <zcall.h>

--- a/sys/denali/denali.cpp
+++ b/sys/denali/denali.cpp
@ -1,6 +1,6 @@

-#include <mammoth/debug.h>
-#include <mammoth/init.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
 #include <stdint.h>
 #include <yellowstone/yellowstone.yunq.client.h>

--- a/sys/denali/denali_server.cpp
+++ b/sys/denali/denali_server.cpp
@ -2,7 +2,7 @@

 #include <glacier/memory/move.h>
 #include <glacier/status/error.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <zcall.h>

 glcr::ErrorOr<glcr::UniquePtr<DenaliServer>> DenaliServer::Create(
--- a/sys/denali/lib/denali/denali.yunq.server.cpp
+++ b/sys/denali/lib/denali/denali.yunq.server.cpp
@ -1,7 +1,7 @@
 // Generated file -- DO NOT MODIFY.
 #include "denali.yunq.server.h"

-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <zcall.h>

 namespace {
--- a/sys/teton/framebuffer/console.cpp
+++ b/sys/teton/framebuffer/console.cpp
@ -1,6 +1,6 @@
 #include "framebuffer/console.h"

-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>

 void Console::WriteChar(char c) {
  if (c == '\n') {
--- a/sys/teton/framebuffer/framebuffer.h
+++ b/sys/teton/framebuffer/framebuffer.h
@ -1,6 +1,6 @@
 #pragma once

-#include <mammoth/memory_region.h>
+#include <mammoth/util/memory_region.h>
 #include <yellowstone/yellowstone.yunq.h>

 class Framebuffer {
--- a/sys/teton/framebuffer/psf.cpp
+++ b/sys/teton/framebuffer/psf.cpp
@ -1,7 +1,7 @@
 #include "framebuffer/psf.h"

 #include <glacier/memory/move.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>

 namespace {

--- a/sys/teton/framebuffer/psf.h
+++ b/sys/teton/framebuffer/psf.h
@ -1,6 +1,6 @@
 #pragma once

-#include <mammoth/memory_region.h>
+#include <mammoth/util/memory_region.h>

 struct PsfHeader {
  uint32_t magic;         /* magic bytes to identify PSF */
--- a/sys/teton/teton.cpp
+++ b/sys/teton/teton.cpp
@ -1,5 +1,5 @@
-#include <mammoth/debug.h>
-#include <mammoth/init.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
 #include <victoriafalls/victoriafalls.yunq.client.h>
 #include <yellowstone/yellowstone.yunq.client.h>

--- a/sys/victoriafalls/fs/ext2/ext2_block_reader.cpp
+++ b/sys/victoriafalls/fs/ext2/ext2_block_reader.cpp
@ -1,6 +1,6 @@
 #include "fs/ext2/ext2_block_reader.h"

-#include "mammoth/debug.h"
+#include <mammoth/util/debug.h>

 glcr::ErrorOr<glcr::SharedPtr<Ext2BlockReader>> Ext2BlockReader::Init(
    const DenaliInfo& denali_info) {
--- a/sys/victoriafalls/fs/ext2/ext2_block_reader.h
+++ b/sys/victoriafalls/fs/ext2/ext2_block_reader.h
@ -3,7 +3,7 @@
 #include <denali/denali.yunq.client.h>
 #include <glacier/memory/shared_ptr.h>
 #include <glacier/status/error_or.h>
-#include <mammoth/memory_region.h>
+#include <mammoth/util/memory_region.h>
 #include <yellowstone/yellowstone.yunq.h>

 #include "fs/ext2/ext2.h"
--- a/sys/victoriafalls/fs/ext2/ext2_driver.cpp
+++ b/sys/victoriafalls/fs/ext2/ext2_driver.cpp
@ -1,7 +1,7 @@
 #include "fs/ext2/ext2_driver.h"

 #include <glacier/string/string.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>

 glcr::ErrorOr<Ext2Driver> Ext2Driver::Init(const DenaliInfo& denali_info) {
  ASSIGN_OR_RETURN(glcr::SharedPtr<Ext2BlockReader> reader,
--- a/sys/victoriafalls/fs/ext2/inode_table.cpp
+++ b/sys/victoriafalls/fs/ext2/inode_table.cpp
@ -1,7 +1,5 @@
 #include "fs/ext2/inode_table.h"

-#include <mammoth/debug.h>
-
 InodeTable::InodeTable(const glcr::SharedPtr<Ext2BlockReader>& reader,
                       OwnedMemoryRegion&& bgdt_region)
    : ext2_reader_(reader),
--- a/sys/victoriafalls/fs/ext2/inode_table.h
+++ b/sys/victoriafalls/fs/ext2/inode_table.h
@ -1,6 +1,7 @@
 #pragma once

 #include <glacier/container/vector.h>
+#include <mammoth/util/memory_region.h>
 #include <stdint.h>

 #include "fs/ext2/ext2_block_reader.h"
--- a/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.cpp
+++ b/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.cpp
@ -1,7 +1,7 @@
 // Generated file -- DO NOT MODIFY.
 #include "victoriafalls.yunq.server.h"

-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <zcall.h>

 namespace {
--- a/sys/victoriafalls/victoriafalls.cpp
+++ b/sys/victoriafalls/victoriafalls.cpp
@ -1,5 +1,5 @@
-#include <mammoth/debug.h>
-#include <mammoth/init.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
 #include <yellowstone/yellowstone.yunq.client.h>

 #include "fs/ext2/ext2_driver.h"
--- a/sys/victoriafalls/victoriafalls_server.cpp
+++ b/sys/victoriafalls/victoriafalls_server.cpp
@ -1,7 +1,7 @@
 #include "victoriafalls_server.h"

 #include <glacier/string/str_split.h>
-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <zcall.h>

 glcr::ErrorOr<glcr::UniquePtr<VFSServer>> VFSServer::Create(
--- a/sys/yellowstone/hw/gpt.cpp
+++ b/sys/yellowstone/hw/gpt.cpp
@ -2,8 +2,8 @@

 #include <glacier/memory/move.h>
 #include <glacier/status/error.h>
-#include <mammoth/debug.h>
-#include <mammoth/memory_region.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/memory_region.h>
 #include <zcall.h>
 #include <zglobal.h>

--- a/sys/yellowstone/hw/pcie.cpp
+++ b/sys/yellowstone/hw/pcie.cpp
@ -1,7 +1,7 @@
 #include "hw/pcie.h"

-#include <mammoth/debug.h>
-#include <mammoth/init.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
 #include <zcall.h>

 #define PCI_DEBUG 0
--- a/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
+++ b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
@ -1,7 +1,7 @@
 // Generated file -- DO NOT MODIFY.
 #include "yellowstone.yunq.server.h"

-#include <mammoth/debug.h>
+#include <mammoth/util/debug.h>
 #include <zcall.h>

 namespace {
--- a/sys/yellowstone/yellowstone.cpp
+++ b/sys/yellowstone/yellowstone.cpp
@ -1,9 +1,9 @@
 #include <glacier/string/str_format.h>
 #include <glacier/string/str_split.h>
-#include <mammoth/debug.h>
-#include <mammoth/init.h>
-#include <mammoth/memory_region.h>
 #include <mammoth/proc/process.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
+#include <mammoth/util/memory_region.h>
 #include <zcall.h>
 #include <ztypes.h>

--- a/sys/yellowstone/yellowstone_server.cpp
+++ b/sys/yellowstone/yellowstone_server.cpp
@ -2,9 +2,9 @@

 #include <denali/denali.yunq.client.h>
 #include <glacier/string/string.h>
-#include <mammoth/debug.h>
-#include <mammoth/init.h>
-#include <mammoth/memory_region.h>
+#include <mammoth/util/debug.h>
+#include <mammoth/util/init.h>
+#include <mammoth/util/memory_region.h>
 #include <stdlib.h>
 #include <zcall.h>