From bed01fe356073cdf7b4a160c896ed906347b2d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 23 Mar 2020 16:47:28 +0100 Subject: [PATCH] AreaKeeper.h: move to headers/private/kernel Change-Id: I9ae2b9a6243809a618c0520a26e064ce3c5be2b4 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2410 Reviewed-by: waddlesplash --- .../private/graphics/radeon_hd/AreaKeeper.h | 75 ------------------ .../intel_extreme => kernel}/AreaKeeper.h | 0 .../graphics/intel_extreme/intel_extreme.cpp | 2 +- .../drivers/graphics/radeon_hd/radeon_hd.cpp | 2 +- .../drivers/power/pch_thermal/AreaKeeper.h | 76 ------------------- .../drivers/power/pch_thermal/pch_thermal.cpp | 2 +- 6 files changed, 3 insertions(+), 154 deletions(-) delete mode 100644 headers/private/graphics/radeon_hd/AreaKeeper.h rename headers/private/{graphics/intel_extreme => kernel}/AreaKeeper.h (100%) delete mode 100644 src/add-ons/kernel/drivers/power/pch_thermal/AreaKeeper.h diff --git a/headers/private/graphics/radeon_hd/AreaKeeper.h b/headers/private/graphics/radeon_hd/AreaKeeper.h deleted file mode 100644 index d604bb45cb..0000000000 --- a/headers/private/graphics/radeon_hd/AreaKeeper.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2006-2008, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - * - * Authors: - * Axel Dörfler, axeld@pinc-software.de - */ -#ifndef AREA_KEEPER_H -#define AREA_KEEPER_H - - -#include -#include - -#include - - -class AreaKeeper { - public: - AreaKeeper(); - ~AreaKeeper(); - - area_id Create(const char *name, void **_virtualAddress, uint32 spec, - size_t size, uint32 lock, uint32 protection); - area_id Map(const char *name, addr_t physicalAddress, size_t numBytes, - uint32 spec, uint32 protection, void **_virtualAddress); - - status_t InitCheck() { return fArea < B_OK ? (status_t)fArea : B_OK; } - void Detach(); - - private: - area_id fArea; -}; - - -AreaKeeper::AreaKeeper() - : - fArea(-1) -{ -} - - -AreaKeeper::~AreaKeeper() -{ - if (fArea >= B_OK) - delete_area(fArea); -} - - -area_id -AreaKeeper::Create(const char *name, void **_virtualAddress, uint32 spec, - size_t size, uint32 lock, uint32 protection) -{ - fArea = create_area(name, _virtualAddress, spec, size, lock, protection); - return fArea; -} - - -area_id -AreaKeeper::Map(const char *name, addr_t physicalAddress, size_t numBytes, - uint32 spec, uint32 protection, void **_virtualAddress) -{ - fArea = map_physical_memory(name, physicalAddress, numBytes, spec, - protection, _virtualAddress); - return fArea; -} - - -void -AreaKeeper::Detach() -{ - fArea = -1; -} - -#endif // AREA_KEEPER_H diff --git a/headers/private/graphics/intel_extreme/AreaKeeper.h b/headers/private/kernel/AreaKeeper.h similarity index 100% rename from headers/private/graphics/intel_extreme/AreaKeeper.h rename to headers/private/kernel/AreaKeeper.h diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp index eff706275f..1136cd1aba 100644 --- a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp +++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp @@ -11,12 +11,12 @@ #include "intel_extreme.h" -#include "AreaKeeper.h" #include #include #include #include +#include #include #include #include diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp index 44218b6cbc..eeb76d228a 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp @@ -13,7 +13,6 @@ #include "radeon_hd.h" #include "sensors.h" -#include "AreaKeeper.h" #include "driver.h" #include "utility.h" @@ -22,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/src/add-ons/kernel/drivers/power/pch_thermal/AreaKeeper.h b/src/add-ons/kernel/drivers/power/pch_thermal/AreaKeeper.h deleted file mode 100644 index 83861397f2..0000000000 --- a/src/add-ons/kernel/drivers/power/pch_thermal/AreaKeeper.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2006-2008, Haiku, Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - * - * Authors: - * Axel Dörfler, axeld@pinc-software.de - */ -#ifndef AREA_KEEPER_H -#define AREA_KEEPER_H - - -#include -#include - -#include - - -class AreaKeeper { - public: - AreaKeeper(); - ~AreaKeeper(); - - area_id Create(const char *name, void **_virtualAddress, uint32 spec, - size_t size, uint32 lock, uint32 protection); - area_id Map(const char *name, phys_addr_t physicalAddress, - size_t numBytes, uint32 spec, uint32 protection, - void **_virtualAddress); - - status_t InitCheck() { return fArea < B_OK ? (status_t)fArea : B_OK; } - void Detach(); - - private: - area_id fArea; -}; - - -AreaKeeper::AreaKeeper() - : - fArea(-1) -{ -} - - -AreaKeeper::~AreaKeeper() -{ - if (fArea >= B_OK) - delete_area(fArea); -} - - -area_id -AreaKeeper::Create(const char *name, void **_virtualAddress, uint32 spec, - size_t size, uint32 lock, uint32 protection) -{ - fArea = create_area(name, _virtualAddress, spec, size, lock, protection); - return fArea; -} - - -area_id -AreaKeeper::Map(const char *name, phys_addr_t physicalAddress, size_t numBytes, - uint32 spec, uint32 protection, void **_virtualAddress) -{ - fArea = map_physical_memory(name, physicalAddress, numBytes, spec, - protection, _virtualAddress); - return fArea; -} - - -void -AreaKeeper::Detach() -{ - fArea = -1; -} - -#endif // AREA_KEEPER_H diff --git a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp index c61fc074f3..3d990f1ef0 100644 --- a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp +++ b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp @@ -7,6 +7,7 @@ */ +#include #include #include #include @@ -17,7 +18,6 @@ #include #include -#include "AreaKeeper.h" #include "pch_thermal.h"