drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[Zion/Mammoth] Move init cap decls to mammoth. 

They no longer need to be independent now that we have removed the libc.
This commit is contained in:
Drew Galbraith 2023-12-01 10:42:26 -08:00
parent c209925a3c
commit 642fc4d80d
7 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mammoth/file/file.cpp
View File

@ -1,10 +1,10 @@
#include "file/file.h" #include "file/file.h"
#include <glacier/string/str_split.h> #include <glacier/string/str_split.h>
#include <mammoth/util/init.h>
#include <victoriafalls/victoriafalls.yunq.client.h> #include <victoriafalls/victoriafalls.yunq.client.h>
#include <yellowstone/yellowstone.yunq.client.h> #include <yellowstone/yellowstone.yunq.client.h>
#include <zcall.h> #include <zcall.h>
#include <zglobal.h>
#include "util/debug.h" #include "util/debug.h"

2
lib/mammoth/input/keyboard.cpp
View File

@ -1,8 +1,8 @@
#include "input/keyboard.h" #include "input/keyboard.h"
#include <mammoth/util/init.h>
#include <voyageurs/voyageurs.yunq.client.h> #include <voyageurs/voyageurs.yunq.client.h>
#include <yellowstone/yellowstone.yunq.client.h> #include <yellowstone/yellowstone.yunq.client.h>
#include <zglobal.h>
#include "util/debug.h" #include "util/debug.h"

11
lib/mammoth/util/init.h
View File

@ -1,7 +1,16 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <zglobal.h>
#include <ztypes.h> #include <ztypes.h>
extern uint64_t gSelfProcCap;
extern uint64_t gSelfVmasCap;
extern uint64_t gInitEndpointCap;
extern uint64_t gBootDenaliVmmoCap;
extern uint64_t gBootVictoriaFallsVmmoCap;
extern uint64_t gBootPciVmmoCap;
extern uint64_t gBootFramebufferVmmoCap;
z_err_t ParseInitPort(uint64_t init_port_cap); z_err_t ParseInitPort(uint64_t init_port_cap);

2
lib/mammoth/util/new.cpp
View File

@ -1,8 +1,8 @@
#include <glacier/container/intrusive_list.h> #include <glacier/container/intrusive_list.h>
#include <glacier/string/str_format.h> #include <glacier/string/str_format.h>
#include <mammoth/util/init.h>
#include <stdint.h> #include <stdint.h>
#include <zcall.h> #include <zcall.h>
#include <zglobal.h>
#include "util/debug.h" #include "util/debug.h"

2
sys/teton/terminal.cpp
View File

@ -4,7 +4,7 @@
#include <glacier/string/str_split.h> #include <glacier/string/str_split.h>
#include <mammoth/file/file.h> #include <mammoth/file/file.h>
#include <mammoth/proc/process.h> #include <mammoth/proc/process.h>
#include <zglobal.h> #include <mammoth/util/init.h>
void Terminal::HandleCharacter(char c) { void Terminal::HandleCharacter(char c) {
console_.WriteChar(c); console_.WriteChar(c);

1
sys/yellowstone/hw/gpt.cpp
View File

@ -5,7 +5,6 @@
#include <mammoth/util/debug.h> #include <mammoth/util/debug.h>
#include <mammoth/util/memory_region.h> #include <mammoth/util/memory_region.h>
#include <zcall.h> #include <zcall.h>
#include <zglobal.h>
#define GPT_DEBUG 0 #define GPT_DEBUG 0

13
zion/include/zglobal.h
View File

@ -1,13 +0,0 @@
#pragma once
#include <stdint.h>
extern uint64_t gSelfProcCap;
extern uint64_t gSelfVmasCap;
extern uint64_t gInitEndpointCap;
extern uint64_t gBootDenaliVmmoCap;
extern uint64_t gBootVictoriaFallsVmmoCap;
extern uint64_t gBootPciVmmoCap;
extern uint64_t gBootFramebufferVmmoCap;