summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2023-02-06 12:32:50 +0000
committerMichael Brown <mcb30@ipxe.org>2023-02-06 12:34:21 +0000
commitef0a6f47920a4fb245f35f1b2e4bcaa7305819cd (patch)
tree124cecf39755fd260f03a4240f0f7409c9027eb4
parentc6901792f009cfd824707724b687e99edd4c8ecd (diff)
downloadqemu-ipxe-ef0a6f47920a4fb245f35f1b2e4bcaa7305819cd.tar.gz
[ioapi] Move PAGE_SHIFT to bits/io.h
The PAGE_SHIFT definition is an architectural property, rather than an aspect of a particular I/O API implementation (of which, in theory, there may be more than one per architecture). Reflect this by moving the definition to the top-level bits/io.h for each architecture. Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/arch/arm/include/bits/io.h3
-rw-r--r--src/arch/arm/include/ipxe/arm_io.h3
-rw-r--r--src/arch/x86/include/bits/io.h3
-rw-r--r--src/arch/x86/include/ipxe/x86_io.h3
4 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm/include/bits/io.h b/src/arch/arm/include/bits/io.h
index 90f6455e..272ec12b 100644
--- a/src/arch/arm/include/bits/io.h
+++ b/src/arch/arm/include/bits/io.h
@@ -9,6 +9,9 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+/** Page shift */
+#define PAGE_SHIFT 12
+
#include <ipxe/arm_io.h>
#endif /* _BITS_IO_H */
diff --git a/src/arch/arm/include/ipxe/arm_io.h b/src/arch/arm/include/ipxe/arm_io.h
index 105f22bf..046cbdb0 100644
--- a/src/arch/arm/include/ipxe/arm_io.h
+++ b/src/arch/arm/include/ipxe/arm_io.h
@@ -20,9 +20,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*
*/
-/** Page shift */
-#define PAGE_SHIFT 12
-
/*
* Physical<->Bus address mappings
*
diff --git a/src/arch/x86/include/bits/io.h b/src/arch/x86/include/bits/io.h
index 60c2e3ed..95673ad8 100644
--- a/src/arch/x86/include/bits/io.h
+++ b/src/arch/x86/include/bits/io.h
@@ -9,6 +9,9 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+/** Page shift */
+#define PAGE_SHIFT 12
+
#include <ipxe/x86_io.h>
#endif /* _BITS_IO_H */
diff --git a/src/arch/x86/include/ipxe/x86_io.h b/src/arch/x86/include/ipxe/x86_io.h
index a6ebe1f4..eeb3f845 100644
--- a/src/arch/x86/include/ipxe/x86_io.h
+++ b/src/arch/x86/include/ipxe/x86_io.h
@@ -28,9 +28,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*
*/
-/** Page shift */
-#define PAGE_SHIFT 12
-
/*
* Physical<->Bus address mappings
*