From f220c315bb8f35ab12593d4f51075c59c67ebb7f Mon Sep 17 00:00:00 2001
From: grehan <grehan@FreeBSD.org>
Date: Fri, 5 Apr 2013 22:19:02 +0000
Subject: [PATCH] Remove dangling ISA uart stubs.

Obtained from:	NetApp
---
 usr.sbin/bhyve/Makefile |  2 +-
 usr.sbin/bhyve/uart.c   | 60 -----------------------------------------
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 usr.sbin/bhyve/uart.c

diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index ef3907972775..e6aa8b2748c9 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -9,7 +9,7 @@ DEBUG_FLAGS= -g -O0
 SRCS=	acpi.c atpic.c bhyverun.c consport.c dbgport.c elcr.c inout.c 
 SRCS+=  ioapic.c mem.c mevent.c mptbl.c
 SRCS+=	pci_emul.c pci_hostbridge.c pci_passthru.c pci_virtio_block.c
-SRCS+=	pci_virtio_net.c pci_uart.c pit_8254.c pmtmr.c post.c rtc.c uart.c
+SRCS+=	pci_virtio_net.c pci_uart.c pit_8254.c pmtmr.c post.c rtc.c
 SRCS+=	xmsr.c spinup_ap.c
 
 .PATH:	${.CURDIR}/../../sys/amd64/vmm
diff --git a/usr.sbin/bhyve/uart.c b/usr.sbin/bhyve/uart.c
deleted file mode 100644
index 640f3bf0f70d..000000000000
--- a/usr.sbin/bhyve/uart.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2011 NetApp, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <assert.h>
-
-#include "inout.h"
-
-#define	COM1		0x3F8
-#define	COM2		0x2F8
-
-#define	REG_IIR		2
-
-static int
-com_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
-	    uint32_t *eax, void *arg)
-{
-	assert(in);
-
-	if (bytes != 1)
-		return (-1);
-
-	/*
-	 * COM port is not implemented so we return 0xFF for all registers
-	 */
-	*eax = 0xFF;
-
-	return (0);
-}
-
-INOUT_PORT(uart, COM1 + REG_IIR, IOPORT_F_IN, com_handler);
-INOUT_PORT(uart, COM2 + REG_IIR, IOPORT_F_IN, com_handler);