clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-08-25 15:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm: Fix magic numbers in 8250 support

Browse Source 
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Pekka Enberg
2011-01-08 22:51:10 +02:00
committed by Will Deacon
parent 46aa8d6918
commit 9a7428ddbb
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
early_printk.c
+13 -15
View File
@@ -23,21 +23,15 @@
/* Interrupt identification register */
#define IIR 2
#define UART_IIR_NO_INT 0x01
/* 16550 FIFO Control Register */
#define FCR 2
/* Line control register */
#define LCR 3
enum {
DLAB = 1 << 7, /* Divisor latch access bit (DLAB) */
/* bit 7 - set break enable */
PM2 = 1 << 5,
PM1 = 1 << 4,
PM0 = 1 << 3,
STB = 1 << 2,
WLS1 = 1 << 1,
WLS0 = 1 << 0,
};
#define UART_LCR_DLAB 0x80
/* Modem control register */
#define MCR 4
@@ -45,9 +39,13 @@ enum {
/* Line status register */
#define LSR 5
#define UART_LSR_THRE 0x20
/* Modem status register */
#define MSR 6
#define UART_MSR_CTS 0x10
/* Scratch register */
#define SCR 7
@@ -70,7 +68,7 @@ static bool serial8250_out(struct kvm *self, uint16_t port, void *data, int size
{
uint16_t offset = port - device.iobase;
if (device.lcr & DLAB) {
if (device.lcr & UART_LCR_DLAB) {
switch (offset) {
case DLL:
device.dll = ioport__read8(data);
@@ -127,7 +125,7 @@ static bool serial8250_in(struct kvm *self, uint16_t port, void *data, int size,
{
uint16_t offset = port - device.iobase;
if (device.lcr & DLAB)
if (device.lcr & UART_LCR_DLAB)
return false;
switch (offset) {
@@ -138,7 +136,7 @@ static bool serial8250_in(struct kvm *self, uint16_t port, void *data, int size,
ioport__write8(data, device.ier);
break;
case IIR:
ioport__write8(data, 0x01); /* no interrupt pending */
ioport__write8(data, UART_IIR_NO_INT);
break;
case LCR:
ioport__write8(data, device.lcr);
@@ -147,10 +145,10 @@ static bool serial8250_in(struct kvm *self, uint16_t port, void *data, int size,
ioport__write8(data, device.mcr);
break;
case LSR:
ioport__write8(data, 0x20); /* XMTRDY */
ioport__write8(data, UART_LSR_THRE);
break;
case MSR:
ioport__write8(data, 0x01); /* clear to send */
ioport__write8(data, UART_MSR_CTS);
break;
case SCR:
ioport__write8(data, device.scr);