From owner-svn-src-all@FreeBSD.ORG  Mon Dec 10 23:33:04 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E9CA0E34;
 Mon, 10 Dec 2012 23:33:04 +0000 (UTC)
 (envelope-from carl.r.delsey@intel.com)
Received: from mga14.intel.com (mga14.intel.com [143.182.124.37])
 by mx1.freebsd.org (Postfix) with ESMTP id 901988FC13;
 Mon, 10 Dec 2012 23:33:04 +0000 (UTC)
Received: from azsmga002.ch.intel.com ([10.2.17.35])
 by azsmga102.ch.intel.com with ESMTP; 10 Dec 2012 15:32:58 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.84,254,1355126400"; d="scan'208";a="179153612"
Received: from crdelsey-fbsd.ch.intel.com (HELO [10.2.105.127])
 ([10.2.105.127])
 by AZSMGA002.ch.intel.com with ESMTP; 10 Dec 2012 15:32:57 -0800
Message-ID: <50C67129.6090704@intel.com>
Date: Mon, 10 Dec 2012 16:32:57 -0700
From: Carl Delsey <carl.r.delsey@intel.com>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:13.0) Gecko/20120724 Thunderbird/13.0.1
MIME-Version: 1.0
To: Niclas Zeising <zeising@freebsd.org>
Subject: Re: svn commit: r243960 - in head/sys: amd64/include i386/include
 x86/include
References: <201212062233.qB6MXWpP046167@svn.freebsd.org>
 <50C66E2E.5040302@freebsd.org>
In-Reply-To: <50C66E2E.5040302@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, Jim Harris <jimharris@FreeBSD.org>,
 svn-src-all@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 23:33:05 -0000

On 12/10/12 16:20, Niclas Zeising wrote:
> On 12/06/12 23:33, Jim Harris wrote:
>> Author: jimharris
>> Date: Thu Dec  6 22:33:31 2012
>> New Revision: 243960
>> URL: http://svnweb.freebsd.org/changeset/base/243960
>>
>> Log:
>>    Add amd64 implementations for 8-byte bus_space routines.
>>    
>> +#include <sys/systm.h>
>>   #include <x86/bus.h>
>> +
>> +#define KASSERT_BUS_SPACE_MEM_ONLY(tag)                     \
>> +	KASSERT((tag) == X86_BUS_SPACE_MEM,                 \
>> +	    ("%s: can only handle mem space", __func__))
>> +
>> +static __inline uint64_t
>> +bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t bsh,
>> +    bus_size_t ofs)
>> +{
>> +
>> +	KASSERT_BUS_SPACE_MEM_ONLY(tag);
>> +
>> +	return (*(volatile uint64_t *)(bsh + ofs));
>> +}
> Hi!
> Can the include of <sys/systm.h> and the added KASSERTs please be hidden
> under #ifdef _KERNEL or something similar?  devel/libpciaccess from the
> experimental xorg-dev tree
> (http://trillian.chruetertee.ch/ports/browser/trunk/devel/libpciaccess)
> uses machine/bus.h on amd64 and i386 to be able to read/write to the pci
> bus, and this change breaks the compile of devel/libpciaccess.
> It is probably so that libpciaccess is wrong in using <machine/bus.h>
> but I have no idea how to fix it.  If you have a better suggestion on
> how to fix libpciaccess I am all ears.
> Regards!
Does libpciaccess make use of the bus_space_read/write_* routines in 
these files, or does it just use some constants and types from them?