Changeset e2650d3 in mainline for kernel/generic/include/macros.h

Timestamp:

2010-07-20T13:53:36Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4738d84

Parents:

4d0f97d

Message:

rename PA_overlaps to PA_OVERLAPS
be more tolerant about some cases of overlapping zones (when it is actually not an issue)

File:

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

kernel/generic/include/macros.h

@@ -47 +47 @@
  * @param s2  Start address of the second interval.
  * @param sz2 Size of the second interval.
+ *
  */
 NO_TRACE static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2,
@@ -55 +56 @@
         
         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(uintptr_t s1, size_t sz1, uintptr_t s2,
+    size_t sz2)
+{
+        uintptr_t e1 = s1 + sz1;
+        uintptr_t e2 = s2 + sz2;
+        
+        return ((s1 <= s2) && (e1 >= e2));
 }
 
@@ -74 +92 @@
 
 /* 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))