Changes in kernel/generic/include/macros.h [4738d84:d99c1d2] in mainline

File:

• kernel/generic/include/macros.h (modified) (3 diffs)

kernel/generic/include/macros.h

@@ -39 +39 @@
 
 #include <typedefs.h>
-#include <trace.h>
 
 /** Return true if the intervals overlap.
@@ -47 +46 @@
  * @param s2  Start address of the second interval.
  * @param sz2 Size of the second interval.
- *
  */
-NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
-    uint64_t sz2)
+static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
-        uint64_t e1 = s1 + sz1;
-        uint64_t e2 = s2 + sz2;
+        uintptr_t e1 = s1 + sz1;
+        uintptr_t e2 = s2 + sz2;
         
         return ((s1 < e2) && (s2 < e1));
-}
-
-/** Return true if the second interval is within the first interval.
- *
- * @param s1  Start address of the first interval.
- * @param sz1 Size of the first interval.
- * @param s2  Start address of the second interval.
- * @param sz2 Size of the second interval.
- *
- */
-NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
-    uint64_t sz2)
-{
-        uint64_t e1 = s1 + sz1;
-        uint64_t e2 = s2 + sz2;
-        
-        return ((s1 <= s2) && (e1 >= e2));
 }
 
@@ -92 +72 @@
 
 /* Compute overlapping of physical addresses */
-#define PA_OVERLAPS(x, szx, y, szy) \
+#define PA_overlaps(x, szx, y, szy) \
         overlaps(KA2PA((x)), (szx), KA2PA((y)), (szy))