Changeset 6a44ee4 in mainline for kernel/arch/mips64/include/interrupt.h

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/arch/mips64/include/interrupt.h (moved) (moved from kernel/arch/sparc64/include/drivers/fhc.h ) (3 diffs)

kernel/arch/mips64/include/interrupt.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2003-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup mips64
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_sparc64_FHC_H_
-#define KERN_sparc64_FHC_H_
+#ifndef KERN_mips64_INTERRUPT_H_
+#define KERN_mips64_INTERRUPT_H_
 
 #include <typedefs.h>
-#include <genarch/ofw/ofw_tree.h>
+#include <arch/exception.h>
 
-typedef struct {
-        volatile uint32_t *uart_imap;
-} fhc_t;
+#define IVT_ITEMS  32
+#define IVT_FIRST  0
 
-extern fhc_t *central_fhc;
+#define VECTOR_TLB_SHOOTDOWN_IPI  EXC_Int
 
-extern fhc_t *fhc_init(ofw_tree_node_t *);
-extern void fhc_enable_interrupt(fhc_t *, int);
-extern void fhc_clear_interrupt(void *, int);
+extern function virtual_timer_fnc;
+extern uint32_t count_hi;
+
+extern void interrupt_init(void);
 
 #endif