From owner-svn-soc-all@FreeBSD.ORG  Sat Jul 13 12:55:38 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4CE2187B
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 12:55:38 +0000 (UTC)
 (envelope-from zcore@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 3ECD91F5C
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 12:55:38 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6DCtbNn022039
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 12:55:37 GMT
 (envelope-from zcore@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6DCtbA0022034
 for svn-soc-all@FreeBSD.org; Sat, 13 Jul 2013 12:55:37 GMT
 (envelope-from zcore@FreeBSD.org)
Date: Sat, 13 Jul 2013 12:55:37 GMT
Message-Id: <201307131255.r6DCtbA0022034@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zcore@FreeBSD.org using -f
From: zcore@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254752 - soc2013/zcore/head/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 12:55:38 -0000

Author: zcore
Date: Sat Jul 13 12:55:37 2013
New Revision: 254752
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254752

Log:
  use BAR(5)

Modified:
  soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c

Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sat Jul 13 11:19:21 2013	(r254751)
+++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c	Sat Jul 13 12:55:37 2013	(r254752)
@@ -130,7 +130,7 @@
 
 	pci_emul_add_msicap(pi, 1);
 	
-	pci_emul_alloc_bar(pi, 0, PCIBAR_IO, AHCI_REGSZ);
+	pci_emul_alloc_bar(pi, 5, PCIBAR_IO, AHCI_REGSZ);
 
 	return (0);
 }
@@ -140,7 +140,7 @@
 		int baridx, uint64_t offset, int size, uint64_t value)
 {
 
-	assert(baridx == 0);
+	assert(baridx == 5);
 
 	switch (offset) {
 	default:
@@ -156,7 +156,7 @@
 {
 	uint32_t value;
 
-	assert(baridx == 0);
+	assert(baridx == 5);
 
 	switch (offset) {
 	case AHCI_CAP: