diff options
Diffstat (limited to 'dev/Mod')
| -rw-r--r-- | dev/Mod/ACPI/ACPIFactoryInterface.h | 7 | ||||
| -rw-r--r-- | dev/Mod/AHCI/AHCI.h | 4 | ||||
| -rw-r--r-- | dev/Mod/Pwr/PowerFactory.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/dev/Mod/ACPI/ACPIFactoryInterface.h b/dev/Mod/ACPI/ACPIFactoryInterface.h index eb8d7353..d398b2b7 100644 --- a/dev/Mod/ACPI/ACPIFactoryInterface.h +++ b/dev/Mod/ACPI/ACPIFactoryInterface.h @@ -21,7 +21,7 @@ namespace NeOS typedef ACPIFactoryInterface PowerFactoryInterface; - class ACPIFactoryInterface final : public PowerFactory + class ACPIFactoryInterface final NE_POWER_FACTORY { public: explicit ACPIFactoryInterface(voidPtr rsp_ptr); @@ -47,10 +47,7 @@ namespace NeOS bool Checksum(const Char* checksum, SSizeT len); // watch for collides! public: - ErrorOr<voidPtr> operator[](const Char* signature) - { - return this->Find(signature); - } + ErrorOr<voidPtr> operator[](const Char* signature); private: VoidPtr fRsdp{nullptr}; // pointer to root descriptor. diff --git a/dev/Mod/AHCI/AHCI.h b/dev/Mod/AHCI/AHCI.h index d729b456..11f2346a 100644 --- a/dev/Mod/AHCI/AHCI.h +++ b/dev/Mod/AHCI/AHCI.h @@ -283,10 +283,12 @@ typedef struct HbaCmdHeader final NeOS::UInt8 Pmp : 4; // Port multiplier port NeOS::UInt16 Prdtl; // Physical region descriptor table length in entries - volatile NeOS::UInt32 Prdbc; // Physical region descriptor byte count transferred + NeOS::UInt32 Prdbc; // Physical region descriptor byte count transferred NeOS::UInt32 Ctba; // Command table descriptor base address NeOS::UInt32 Ctbau; // Command table descriptor base address upper 32 bits + + NeOS::UInt32 Rscv[4]; } HbaCmdHeader; typedef struct HbaFis final diff --git a/dev/Mod/Pwr/PowerFactory.h b/dev/Mod/Pwr/PowerFactory.h index 2992fac1..15548198 100644 --- a/dev/Mod/Pwr/PowerFactory.h +++ b/dev/Mod/Pwr/PowerFactory.h @@ -12,6 +12,8 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> +#define NE_POWER_FACTORY : public PowerFactory + namespace NeOS { class PowerFactory; |