Changeset 20235a3 in mainline for kernel/generic/include/macros.h

Timestamp:

2010-09-02T20:55:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/include/macros.h (modified) (2 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,
-    size_t sz2)
+NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
 {
-        uintptr_t e1 = s1 + sz1;
-        uintptr_t e2 = s2 + sz2;
+        uint64_t e1 = s1 + sz1;
+        uint64_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));
 }
 
@@ -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))