Changeset 371bd7d in mainline for kernel/arch/sparc64/include/drivers

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/arch/sparc64/include/drivers

Files:

• fhc.h (modified) (1 diff)
• kbd.h (modified) (1 diff)
• niagara.h (added)
• pci.h (modified) (1 diff)
• scr.h (modified) (1 diff)
• sgcn.h (modified) (1 diff)
• tick.h (modified) (1 diff)

kernel/arch/sparc64/include/drivers/fhc.h

@@ -36 +36 @@
 #define KERN_sparc64_FHC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 

kernel/arch/sparc64/include/drivers/kbd.h

@@ -36 +36 @@
 #define KERN_sparc64_KBD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 

kernel/arch/sparc64/include/drivers/pci.h

@@ -36 +36 @@
 #define KERN_sparc64_PCI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/arch.h>

kernel/arch/sparc64/include/drivers/scr.h

@@ -36 +36 @@
 #define KERN_sparc64_SCR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 

kernel/arch/sparc64/include/drivers/sgcn.h

@@ -36 +36 @@
 #define KERN_sparc64_SGCN_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 #include <proc/thread.h>

kernel/arch/sparc64/include/drivers/tick.h

@@ -36 +36 @@
 #define KERN_sparc64_TICK_H_
 
+#include <arch/asm.h>
 #include <arch/interrupt.h>
+
+/* mask of the "counter" field of the Tick register */
+#define TICK_COUNTER_MASK       (~(1l << 63))
 
 extern void tick_init(void);
 extern void tick_interrupt(int n, istate_t *istate);
+
+/**
+ * Reads the Tick register counter.
+ */
+static inline uint64_t tick_counter_read(void)
+{
+        return TICK_COUNTER_MASK & tick_read();
+}
 
 #endif