Page MenuHomeFreeBSD

D28207.id82411.diff
No OneTemporary

D28207.id82411.diff

diff --git a/usr/src/cmd/bhyve/pci_lpc.c b/usr/src/cmd/bhyve/pci_lpc.c
--- a/usr/src/cmd/bhyve/pci_lpc.c
+++ b/usr/src/cmd/bhyve/pci_lpc.c
@@ -72,7 +72,7 @@
static const char *romfile;
-#define LPC_UART_NUM 2
+#define LPC_UART_NUM 4
static struct lpc_uart_softc {
struct uart_softc *uart_softc;
const char *opts;
@@ -81,7 +81,7 @@
int enabled;
} lpc_uart_softc[LPC_UART_NUM];
-static const char *lpc_uart_names[LPC_UART_NUM] = { "COM1", "COM2" };
+static const char *lpc_uart_names[LPC_UART_NUM] = { "COM1", "COM2", "COM3", "COM4" };
/*
* LPC device configuration is in the following form:
diff --git a/usr/src/cmd/bhyve/uart_emul.c b/usr/src/cmd/bhyve/uart_emul.c
--- a/usr/src/cmd/bhyve/uart_emul.c
+++ b/usr/src/cmd/bhyve/uart_emul.c
@@ -77,6 +77,10 @@
#define COM1_IRQ 4
#define COM2_BASE 0x2F8
#define COM2_IRQ 3
+#define COM3_BASE 0x3E8
+#define COM3_IRQ 4
+#define COM4_BASE 0x2E8
+#define COM4_IRQ 3
#define DEFAULT_RCLK 1843200
#define DEFAULT_BAUD 9600
@@ -104,6 +108,8 @@
} uart_lres[] = {
{ COM1_BASE, COM1_IRQ, false},
{ COM2_BASE, COM2_IRQ, false},
+ { COM3_BASE, COM3_IRQ, false},
+ { COM4_BASE, COM4_IRQ, false},
};
#define UART_NLDEVS (sizeof(uart_lres) / sizeof(uart_lres[0]))

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 21, 1:33 AM (4 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37017111
Default Alt Text
D28207.id82411.diff (1 KB)

Event Timeline