Prepare to remove serial receive path.

[pintos-anon] / src / devices / 16550a.h

diff --git a/src/devices/16550a.h b/src/devices/16550a.h
index bce26f33c5e66d54461e86d9d386953d021bffc3..99b7e578ad23478e13e06ed96c443c35cf9aabae 100644 (file)
--- a/src/devices/16550a.h
+++ b/src/devices/16550a.h
@@ -1,9 +1,9 @@
-#ifndef HEADER_16550A_H
-#define HEADER_16550A_H 1
+#ifndef DEVICES_16550A_H
+#define DEVICES_16550A_H
 
+#include <debug.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "debug.h"
 
 /* Register definitions for the 16550A UART used in PCs.  This is
    a full definition of all the registers and their bits.  We
@@ -78,7 +78,7 @@ make_lcr (int bits, enum parity_type parity, int stop, bool send_break,
     case EVEN: lcr |= 0x18; break;
     case MARK: lcr |= 0x28; break;
     case SPACE: lcr |= 0x38; break;
-    default: panic ("bad parity %d", (int) parity); 
+    default: PANIC ("bad parity %d", (int) parity); 
     }
 
   ASSERT (stop == 1 || stop == 2);
@@ -120,4 +120,4 @@ make_lcr (int bits, enum parity_type parity, int stop, bool send_break,
 #define MSR_RI   0x40           /* Ring Indicator. */
 #define MSR_DCD  0x80           /* Data Carrier Detect. */
 
-#endif /* 16550a.h */
+#endif /* devices/16550a.h */