X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_intr.h;h=44de7dbbe56fa8d296be4c486807471e92fc5c17;hp=2f3596dba59ef3bdbf8a8b7bb3f043278d34fa29;hb=888c2dd8a3914f9a08e2b0e006ff96c5cc5cd792;hpb=28b1d0ae6db40cb3e1f5a9b3596b625d2f2af0e4

diff --git a/palacios/include/palacios/vmm_intr.h b/palacios/include/palacios/vmm_intr.h
index 2f3596d..44de7db 100644
--- a/palacios/include/palacios/vmm_intr.h
+++ b/palacios/include/palacios/vmm_intr.h
@@ -1,65 +1,118 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #ifndef __VMM_INTR_H_
 #define __VMM_INTR_H_
 
-#include <palacios/vmm_intr.h>
+
+#ifdef __V3VEE__
+
 #include <palacios/vmm_types.h>
+#include <palacios/vmm_list.h>
+#include <palacios/vmm_lock.h>
 
-#define DE_EXCEPTION          0x00  
-#define DB_EXCEPTION          0x01
-#define NMI_EXCEPTION         0x02
-#define BP_EXCEPTION          0x03
-#define OF_EXCEPTION          0x04
-#define BR_EXCEPTION          0x05
-#define UD_EXCEPTION          0x06
-#define NM_EXCEPTION          0x07
-#define DF_EXCEPTION          0x08
-#define TS_EXCEPTION          0x0a
-#define NP_EXCEPTION          0x0b
-#define SS_EXCEPTION          0x0c
-#define GPF_EXCEPTION         0x0d
-#define PF_EXCEPTION          0x0e
-#define MF_EXCEPTION          0x10
-#define AC_EXCEPTION          0x11
-#define MC_EXCEPTION          0x12
-#define XF_EXCEPTION          0x13
-#define SX_EXCEPTION          0x1e
-
-
-typedef enum {INVALID_INTR, EXTERNAL_IRQ, NMI, EXCEPTION, SOFTWARE, VIRTUAL} intr_types_t;
+
+typedef enum {V3_INVALID_INTR, V3_EXTERNAL_IRQ, V3_VIRTUAL_IRQ, V3_NMI, V3_SOFTWARE_INTR} v3_intr_type_t;
 
 struct guest_info;
+struct v3_interrupt;
 
-struct vm_intr {
-  uint_t excp_pending;
-  uint_t excp_num;
-  uint_t excp_error_code;
-  
-  struct intr_ctrl_ops * controller;
-  void * controller_state;
 
-  /* some way to get the [A]PIC intr */
 
+struct v3_irq_hook {
+    int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data);
+    void * priv_data;
+};
+
+#define MAX_IRQ 256
+
+
+
+
+struct v3_intr_state {
+
+    struct list_head controller_list;
+
+    uint_t irq_pending;
+    uint_t irq_started;
+    uint_t irq_vector;
+
+    uint8_t virq_map[MAX_IRQ / 8];
+
+    v3_lock_t irq_lock;
+
+    /* some way to get the [A]PIC intr */
+    struct v3_irq_hook * hooks[256];
+  
 };
 
 
-int raise_irq(struct guest_info * info, int irq, int error_code);
-int hook_irq(struct guest_info * info, int irq);
+
+void v3_init_interrupt_state(struct guest_info * info);
+
+
+int v3_raise_virq(struct guest_info * info, int irq);
+int v3_lower_virq(struct guest_info * info, int irq);
+
+int v3_raise_irq(struct guest_info * info, int irq);
+int v3_lower_irq(struct guest_info * info, int irq);
+
+
 
 struct intr_ctrl_ops {
-  int (*intr_pending)(void * private_data);
-  int (*get_intr_number)(void * private_data);
-  int (*raise_intr)(void * private_data, int irq, int error_code);
+    int (*intr_pending)(struct guest_info * info, void * private_data);
+    int (*get_intr_number)(struct guest_info * info, void * private_data);
+    int (*raise_intr)(struct guest_info * info, void * private_data, int irq);
+    int (*lower_intr)(struct guest_info * info, void * private_data, int irq);
+    int (*begin_irq)(struct guest_info * info, void * private_data, int irq);
 };
 
 
+void v3_clear_pending_intr(struct guest_info * core);
+
+void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+
+v3_intr_type_t v3_intr_pending(struct guest_info * info);
+uint32_t v3_get_intr(struct guest_info * info);
+
+//intr_type_t v3_get_intr_type(struct guest_info * info);
+
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type);
+
+/*
+  int start_irq(struct vm_intr * intr);
+  int end_irq(struct vm_intr * intr, int irq);
+*/
+
+
+
+int v3_hook_irq(struct guest_info * info, 
+		uint_t irq,
+		int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+		void  * priv_data);
+
+int v3_hook_passthrough_irq(struct guest_info *info, uint_t irq);
+
+
 
-void init_interrupt_state(struct guest_info * info);
-void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state);
+#endif // !__V3VEE__
 
-int raise_exception(struct guest_info * info, uint_t excp);
 
-int intr_pending(struct vm_intr * intr);
-uint_t get_intr_number(struct vm_intr * intr);
-intr_types_t get_intr_type(struct vm_intr * intr);
 
 #endif