usb.patch, with conflicts and some warnings fixed

[pintos-anon] / src / threads / interrupt.h

diff --git a/src/threads/interrupt.h b/src/threads/interrupt.h
index b805671e626d6891f1b43aa06de64674f15a91d6..79d63e71282db18aaa5a11ff7997c7a1d5fc514a 100644 (file)
--- a/src/threads/interrupt.h
+++ b/src/threads/interrupt.h
@@ -58,12 +58,18 @@ struct intr_frame
 typedef void intr_handler_func (struct intr_frame *);
 
 void intr_init (void);
-void intr_register (uint8_t vec, int dpl, enum intr_level, intr_handler_func *,
-                    const char *name);
+void intr_register_ext (uint8_t vec, intr_handler_func *, const char *name);
+void intr_register_int (uint8_t vec, int dpl, enum intr_level,
+                        intr_handler_func *, const char *name);
 bool intr_context (void);
 void intr_yield_on_return (void);
 
 void intr_dump_frame (const struct intr_frame *);
 const char *intr_name (uint8_t vec);
 
+void intr_irq_mask(int irq);
+void intr_irq_unmask(int irq);
+
+bool intr_is_registered ( uint8_t vec );
+
 #endif /* threads/interrupt.h */