summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2020-10-03 16:33:41 -0400
committerGitHub <[email protected]>2020-10-03 16:33:41 -0400
commitb418a345375b3b787b4aad43a077e2f25f5f395c (patch)
tree942fd44b1f9d20de7ee8cbf473470874bf43f03c
parent79899c747970f7b7e1cd69f714e2146621727bc5 (diff)
parent6781ac00366e2c46c0a4ed18dfd60e41a3fa4ae6 (diff)
downloadxv6-labs-b418a345375b3b787b4aad43a077e2f25f5f395c.tar.gz
xv6-labs-b418a345375b3b787b4aad43a077e2f25f5f395c.tar.bz2
xv6-labs-b418a345375b3b787b4aad43a077e2f25f5f395c.zip
Merge pull request #25 from matth79/patch-1
Corrects order of UART RX/TX interrupt enable bits
-rw-r--r--kernel/uart.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/uart.c b/kernel/uart.c
index ce89615..d586ea4 100644
--- a/kernel/uart.c
+++ b/kernel/uart.c
@@ -22,8 +22,8 @@
#define RHR 0 // receive holding register (for input bytes)
#define THR 0 // transmit holding register (for output bytes)
#define IER 1 // interrupt enable register
-#define IER_TX_ENABLE (1<<0)
-#define IER_RX_ENABLE (1<<1)
+#define IER_RX_ENABLE (1<<0)
+#define IER_TX_ENABLE (1<<1)
#define FCR 2 // FIFO control register
#define FCR_FIFO_ENABLE (1<<0)
#define FCR_FIFO_CLEAR (3<<1) // clear the content of the two FIFOs