From owner-svn-src-head@FreeBSD.ORG  Tue Sep 18 08:53:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A21F8106566B;
	Tue, 18 Sep 2012 08:53:11 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D99A8FC14;
	Tue, 18 Sep 2012 08:53:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8I8rBQh059277;
	Tue, 18 Sep 2012 08:53:11 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8I8rBlQ059275;
	Tue, 18 Sep 2012 08:53:11 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201209180853.q8I8rBlQ059275@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 18 Sep 2012 08:53:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240637 - head/sys/boot/i386/loader
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Sep 2012 08:53:11 -0000

Author: avg
Date: Tue Sep 18 08:53:11 2012
New Revision: 240637
URL: http://svn.freebsd.org/changeset/base/240637

Log:
  loader/i386: replace ugly inb/outb re-implementations with cpufunc.h
  
  Use of __builtin_constant_p in a function that is only called via
  a pointer is a good example of how out-of-date it was.
  
  Suggested by:	bde
  MFC after:	1 week

Modified:
  head/sys/boot/i386/loader/main.c

Modified: head/sys/boot/i386/loader/main.c
==============================================================================
--- head/sys/boot/i386/loader/main.c	Tue Sep 18 08:28:08 2012	(r240636)
+++ head/sys/boot/i386/loader/main.c	Tue Sep 18 08:53:11 2012	(r240637)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stddef.h>
 #include <string.h>
 #include <machine/bootinfo.h>
+#include <machine/cpufunc.h>
 #include <machine/psl.h>
 #include <sys/reboot.h>
 
@@ -321,34 +322,19 @@ command_heap(int argc, char *argv[])
     return(CMD_OK);
 }
 
-/* ISA bus access functions for PnP, derived from <machine/cpufunc.h> */
+/* ISA bus access functions for PnP. */
 static int
 isa_inb(int port)
 {
-    u_char	data;
 
-    if (__builtin_constant_p(port) &&
-	(((port) & 0xffff) < 0x100) &&
-	((port) < 0x10000)) {
-	__asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port)));
-    } else {
-	__asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port));
-    }
-    return(data);
+    return (inb(port));
 }
 
 static void
 isa_outb(int port, int value)
 {
-    u_char	al = value;
 
-    if (__builtin_constant_p(port) &&
-	(((port) & 0xffff) < 0x100) &&
-	((port) < 0x10000)) {
-	__asm __volatile("outb %0,%1" : : "a" (al), "id" ((u_short)(port)));
-    } else {
-        __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port));
-    }
+    outb(port, value);
 }
 
 #ifdef LOADER_ZFS_SUPPORT