D28207.id82429.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28207.id82429.diff
View Options

	Index: usr.sbin/bhyve/pci_lpc.c
	===================================================================
	--- usr.sbin/bhyve/pci_lpc.c
	+++ usr.sbin/bhyve/pci_lpc.c
	@@ -70,7 +70,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;
	@@ -79,7 +79,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" };

	static bool pctestdev_present;

	Index: usr.sbin/bhyve/uart_emul.c
	===================================================================
	--- usr.sbin/bhyve/uart_emul.c
	+++ usr.sbin/bhyve/uart_emul.c
	@@ -62,6 +62,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
	@@ -89,6 +93,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]))