Skip to content

X
xv6-public
提交 930810d3 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Tweaks for real hardware serial ports.

上级 8a620c2e
显示空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 20 行删除
console.c
浏览文件 @ 930810d3
...@@ -60,10 +60,19 @@ consputc(int c) ...@@ -60,10 +60,19 @@ consputc(int c)
; ;
} }
if(c == BACKSPACE){ switch(c) {
uartputc('\b'); uartputc(' '); uartputc('\b'); case BACKSPACE:
} else uartputc('\b');
uartputc(' ');
uartputc('\b');
break;
case '\n':
uartputc('\r');
// fall through
default:
uartputc(c); uartputc(c);
}
cgaputc(c); cgaputc(c);
} }
......
traps.h
浏览文件 @ 930810d3
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#define IRQ_TIMER 0 #define IRQ_TIMER 0
#define IRQ_KBD 1 #define IRQ_KBD 1
#define IRQ_COM2 3
#define IRQ_COM1 4 #define IRQ_COM1 4
#define IRQ_IDE 14 #define IRQ_IDE 14
#define IRQ_ERROR 19 #define IRQ_ERROR 19
......
uart.c
浏览文件 @ 930810d3
// Intel 8250 serial port (UART). // Intel 8250 serial port (UART).
// http://en.wikibooks.org/wiki/Serial_Programming/8250_UART_Programming
#include "types.h" #include "types.h"
#include "kernel.h" #include "kernel.h"
#include "amd64.h" #include "amd64.h"
#include "traps.h" #include "traps.h"
#define COM2 0x2f8
#define COM1 0x3f8 #define COM1 0x3f8
#define COM COM2
#define IRQ_COM IRQ_COM2
static int uart; // is there a uart? static int uart; // is there a uart?
void void
...@@ -15,9 +20,9 @@ uartputc(char c) ...@@ -15,9 +20,9 @@ uartputc(char c)
if(!uart) if(!uart)
return; return;
for(i = 0; i < 128 && !(inb(COM1+5) & 0x20); i++) for(i = 0; i < 128 && !(inb(COM+5) & 0x20); i++)
microdelay(10); microdelay(10);
outb(COM1+0, c); outb(COM+0, c);
} }
static int static int
...@@ -25,9 +30,9 @@ uartgetc(void) ...@@ -25,9 +30,9 @@ uartgetc(void)
{ {
if(!uart) if(!uart)
return -1; return -1;
if(!(inb(COM1+5) & 0x01)) if(!(inb(COM+5) & 0x01))
return -1; return -1;
return inb(COM1+0); return inb(COM+0);
} }
void void
...@@ -42,27 +47,29 @@ inituart(void) ...@@ -42,27 +47,29 @@ inituart(void)
char *p; char *p;
// Turn off the FIFO // Turn off the FIFO
outb(COM1+2, 0); outb(COM+2, 0);
// 9600 baud, 8 data bits, 1 stop bit, parity off. // 19200 baud
outb(COM1+3, 0x80); // Unlock divisor outb(COM+3, 0x80); // Unlock divisor
outb(COM1+0, 115200/9600); outb(COM+0, 115200/19200);
outb(COM1+1, 0); outb(COM+1, 0);
outb(COM1+3, 0x03); // Lock divisor, 8 data bits. // 8 bits, one stop bit, no parity
outb(COM1+4, 0); outb(COM+3, 0x03); // Lock divisor, 8 data bits.
outb(COM1+1, 0x01); // Enable receive interrupts. outb(COM+1, 0x01); // Enable receive interrupts.
// Data terminal ready
outb(COM+4, 0x0);
// If status is 0xFF, no serial port. // If status is 0xFF, no serial port.
if(inb(COM1+5) == 0xFF) if(inb(COM+5) == 0xFF)
return; return;
uart = 1; uart = 1;
// Acknowledge pre-existing interrupt conditions; // Acknowledge pre-existing interrupt conditions;
// enable interrupts. // enable interrupts.
inb(COM1+2); inb(COM+2);
inb(COM1+0); inb(COM+0);
picenable(IRQ_COM1); picenable(IRQ_COM);
ioapicenable(IRQ_COM1, 0); ioapicenable(IRQ_COM, 0);
// Announce that we're here. // Announce that we're here.
for(p="uart..\n"; *p; p++) for(p="uart..\n"; *p; p++)
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论