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

6
zion/boot/acpi.cpp
View file

@ -255,12 +255,10 @@ void ProbeRsdp() {
#endif
}
z_err_t GetPciExtendedConfiguration(uint64_t* base, uint64_t* offset) {
glcr::ErrorOr<PcieConfiguration> GetPciExtendedConfiguration() {
if (gPcieEcSize == 0) {
return glcr::NOT_FOUND;
}
*base = gPcieEcBase;
*offset = gPcieEcSize;
return glcr::OK;
return PcieConfiguration{gPcieEcBase, gPcieEcSize};
}

7
zion/boot/acpi.h
View file

@ -1,9 +1,14 @@
#pragma once
#include <glacier/status/error_or.h>
#include <stdint.h>
#include "include/ztypes.h"
void ProbeRsdp();
z_err_t GetPciExtendedConfiguration(uint64_t* base, uint64_t* offset);
struct PcieConfiguration {
uint64_t base;
uint64_t offset;
};
glcr::ErrorOr<PcieConfiguration> GetPciExtendedConfiguration();