drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[Mammoth] Move most classes to the mmth namespace.

Browse source
This commit is contained in:
Drew Galbraith 2023-11-22 14:59:41 -08:00
parent 5f8d577948
commit 8d730c67c1
42 changed files with 130 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys/yellowstone/hw/gpt.cpp
View file

@ -64,8 +64,8 @@ glcr::ErrorCode GptReader::ParsePartitionTables() {
req.set_size(2);
ReadResponse resp;
RET_ERR(denali_->Read(req, resp));
OwnedMemoryRegion lba_1_and_2 =
OwnedMemoryRegion::FromCapability(resp.memory());
mmth::OwnedMemoryRegion lba_1_and_2 =
mmth::OwnedMemoryRegion::FromCapability(resp.memory());
uint16_t* mbr_sig = reinterpret_cast<uint16_t*>(lba_1_and_2.vaddr() + 0x1FE);
if (*mbr_sig != 0xAA55) {
dbgln("Invalid MBR Sig: {x}", *mbr_sig);
@ -106,8 +106,8 @@ glcr::ErrorCode GptReader::ParsePartitionTables() {
req.set_lba(header->lba_partition_entries);
req.set_size(num_blocks);
RET_ERR(denali_->Read(req, resp));
OwnedMemoryRegion part_table =
OwnedMemoryRegion::FromCapability(resp.memory());
mmth::OwnedMemoryRegion part_table =
mmth::OwnedMemoryRegion::FromCapability(resp.memory());
for (uint64_t i = 0; i < num_partitions; i++) {
PartitionEntry* entry = reinterpret_cast<PartitionEntry*>(
part_table.vaddr() + (i * entry_size));

9
sys/yellowstone/yellowstone.cpp
View file

@ -12,8 +12,9 @@
#include "yellowstone_server.h"
glcr::ErrorCode SpawnProcess(z_cap_t vmmo_cap, z_cap_t yellowstone_cap) {
OwnedMemoryRegion region = OwnedMemoryRegion::FromCapability(vmmo_cap);
return SpawnProcessFromElfRegion(region.vaddr(), yellowstone_cap);
mmth::OwnedMemoryRegion region =
mmth::OwnedMemoryRegion::FromCapability(vmmo_cap);
return mmth::SpawnProcessFromElfRegion(region.vaddr(), yellowstone_cap);
}
uint64_t main(uint64_t port_cap) {
@ -41,8 +42,8 @@ uint64_t main(uint64_t port_cap) {
OpenFileResponse response;
check(vfs_client->OpenFile(request, response));
OwnedMemoryRegion filemem =
OwnedMemoryRegion::FromCapability(response.memory());
mmth::OwnedMemoryRegion filemem =
mmth::OwnedMemoryRegion::FromCapability(response.memory());
glcr::String file(reinterpret_cast<const char*>(filemem.vaddr()),
response.size());

4
sys/yellowstone/yellowstone_server.cpp
View file

@ -51,8 +51,8 @@ glcr::ErrorCode YellowstoneServer::HandleGetAhciInfo(const Empty&,
glcr::ErrorCode YellowstoneServer::HandleGetFramebufferInfo(
const Empty&, FramebufferInfo& info) {
// FIXME: Don't do this for each request.
OwnedMemoryRegion region =
OwnedMemoryRegion::FromCapability(gBootFramebufferVmmoCap);
mmth::OwnedMemoryRegion region =
mmth::OwnedMemoryRegion::FromCapability(gBootFramebufferVmmoCap);
ZFramebufferInfo* fb = reinterpret_cast<ZFramebufferInfo*>(region.vaddr());
info.set_address_phys(fb->address_phys);

4
sys/yellowstone/yellowstone_server.h
View file

@ -37,8 +37,8 @@ class YellowstoneServer : public YellowstoneServerBase {
PciReader pci_reader_;
Semaphore has_denali_semaphore_;
Semaphore has_victoriafalls_semaphore_;
mmth::Semaphore has_denali_semaphore_;
mmth::Semaphore has_victoriafalls_semaphore_;
YellowstoneServer(z_cap_t endpoint_cap);
};