From Jérôme Duval <jerome.duval@xxxxxxxxx>:
Jérôme Duval has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/2411 ;)
Change subject: AreaKeeper.h: move to headers/private/kernel
......................................................................
AreaKeeper.h: move to headers/private/kernel
---
D headers/private/graphics/radeon_hd/AreaKeeper.h
R headers/private/kernel/AreaKeeper.h
M src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
M src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp
D src/add-ons/kernel/drivers/power/pch_thermal/AreaKeeper.h
M src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp
6 files changed, 3 insertions(+), 154 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/11/2411/1
diff --git a/headers/private/graphics/radeon_hd/AreaKeeper.h
b/headers/private/graphics/radeon_hd/AreaKeeper.h
deleted file mode 100644
index d604bb4..0000000
--- 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@xxxxxxxxxxxxxxxx
- */
-#ifndef AREA_KEEPER_H
-#define AREA_KEEPER_H
-
-
-#include <KernelExport.h>
-#include <OS.h>
-
-#include <util/kernel_cpp.h>
-
-
-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 eff7062..1136cd1 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 <unistd.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <AreaKeeper.h>
#include <boot_item.h>
#include <driver_settings.h>
#include <util/kernel_cpp.h>
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 44218b6..eeb76d2 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 <string.h>
#include <errno.h>
+#include <AreaKeeper.h>
#include <boot_item.h>
#include <driver_settings.h>
#include <util/kernel_cpp.h>
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 8386139..0000000
--- 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@xxxxxxxxxxxxxxxx
- */
-#ifndef AREA_KEEPER_H
-#define AREA_KEEPER_H
-
-
-#include <KernelExport.h>
-#include <OS.h>
-
-#include <util/kernel_cpp.h>
-
-
-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 c61fc07..3d990f1 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 <AreaKeeper.h>
#include <Drivers.h>
#include <Errors.h>
#include <KernelExport.h>
@@ -17,7 +18,6 @@
#include <stdlib.h>
#include <string.h>
-#include "AreaKeeper.h"
#include "pch_thermal.h"
--
To view, visit https://review.haiku-os.org/c/haiku/+/2411
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I9ae2b9a6243809a618c0520a26e064ce3c5be2b4
Gerrit-Change-Number: 2411
Gerrit-PatchSet: 1
Gerrit-Owner: Jérôme Duval <jerome.duval@xxxxxxxxx>
Gerrit-MessageType: newchange
