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

[zion] Use ErrorOr in PciConfiguration

Browse source
This commit is contained in:
Drew Galbraith 2023-06-21 18:46:06 -07:00
parent 3a3ab8717b
commit c2dfe17363
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zion/syscall/memory_object.cpp
View file

@ -32,11 +32,11 @@ z_err_t MemoryObjectCreateContiguous(ZMemoryObjectCreateContiguousReq* req) {
z_err_t TempPcieConfigObjectCreate(ZTempPcieConfigObjectCreateReq* req) {
auto& curr_proc = gScheduler->CurrentProcess();
uint64_t pci_base, pci_size;
RET_ERR(GetPciExtendedConfiguration(&pci_base, &pci_size));
auto vmmo_ref = glcr::MakeRefCounted<FixedMemoryObject>(pci_base, pci_size);
ASSIGN_OR_RETURN(PcieConfiguration config, GetPciExtendedConfiguration());
auto vmmo_ref =
glcr::MakeRefCounted<FixedMemoryObject>(config.base, config.offset);
*req->vmmo_cap = curr_proc.AddNewCapability(
StaticCastRefPtr<MemoryObject>(vmmo_ref), ZC_WRITE);
*req->vmmo_size = pci_size;
*req->vmmo_size = config.offset;
return glcr::OK;
}