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 d43e06d90831f76d54e04c4693765565f96ded7c..79d63e71282db18aaa5a11ff7997c7a1d5fc514a 100644 (file)
--- a/src/threads/interrupt.h
+++ b/src/threads/interrupt.h
@@ -67,4 +67,9 @@ 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 */