From owner-freebsd-arch Sun Jun 27 8:34:41 1999 Delivered-To: freebsd-arch@freebsd.org Received: from ns1.yes.no (ns1.yes.no [195.204.136.10]) by hub.freebsd.org (Postfix) with ESMTP id 6A42B14C34 for ; Sun, 27 Jun 1999 08:34:38 -0700 (PDT) (envelope-from eivind@bitbox.follo.net) Received: from bitbox.follo.net (bitbox.follo.net [195.204.143.218]) by ns1.yes.no (8.9.1a/8.9.1) with ESMTP id RAA27111 for ; Sun, 27 Jun 1999 17:34:37 +0200 (CEST) Received: (from eivind@localhost) by bitbox.follo.net (8.8.8/8.8.6) id RAA42310 for freebsd-arch@freebsd.org; Sun, 27 Jun 1999 17:34:36 +0200 (MET DST) Received: from rover.village.org (rover.village.org [204.144.255.49]) by hub.freebsd.org (Postfix) with ESMTP id 1BDBD14DAF for ; Sat, 26 Jun 1999 21:05:30 -0700 (PDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.9.3/8.9.3) with ESMTP id WAA88445 for ; Sat, 26 Jun 1999 22:05:26 -0600 (MDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.3/8.8.3) with ESMTP id WAA08216 for ; Sat, 26 Jun 1999 22:03:31 -0600 (MDT) Message-Id: <199906270403.WAA08216@harmony.village.org> To: arch@freebsd.org Subject: Comments on the following change to bus space (machine/bus.h) Date: Sat, 26 Jun 1999 22:03:31 -0600 From: Warner Losh Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I'd like to increase the compatibility of FreeBSD's machine/bus.h (not to be confused with sys/bus.h) with NetBSD/OpenBSD's. I'm in the process of porting several newconfig drivers and ran into this (and other) issues. I've included the change for i386, and a similar change can be made to alpha. What this does is say that if the driver writer has given no hints about programmed I/O vs memory mapped I/O, then include both. This brings it back to being at least compatible enough with NetBSD for many drivers which use this to port over w/o major hassle in this area. Comments? Warner Index: bus.h =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/sys/i386/include/bus.h,v retrieving revision 1.4 diff -u -r1.4 bus.h --- bus.h 1998/09/29 09:06:00 1.4 +++ bus.h 1999/06/27 01:07:20 @@ -75,6 +75,15 @@ #include /* + * To remain compatible with NetBSD's interface, default to both memio and + * pio when neither of them is defined. + */ +#if !defined(_I386_BUS_PIO_H_) && !defined(_I386_BUS_MEMIO_H_) +#define _I386_BUS_PIO_H_ +#define _I386_BUS_MEMIO_H_ +#endif + +/* * Values for the i386 bus space tag, not to be used directly by MI code. */ #define I386_BUS_SPACE_IO 0 /* space is i/o space */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message From owner-freebsd-arch Sun Jun 27 8:37:45 1999 Delivered-To: freebsd-arch@freebsd.org Received: from ns1.yes.no (ns1.yes.no [195.204.136.10]) by hub.freebsd.org (Postfix) with ESMTP id 3A69014C34 for ; Sun, 27 Jun 1999 08:37:40 -0700 (PDT) (envelope-from eivind@bitbox.follo.net) Received: from bitbox.follo.net (bitbox.follo.net [195.204.143.218]) by ns1.yes.no (8.9.1a/8.9.1) with ESMTP id RAA27125 for ; Sun, 27 Jun 1999 17:37:39 +0200 (CEST) Received: (from eivind@localhost) by bitbox.follo.net (8.8.8/8.8.6) id RAA42334 for freebsd-arch@freebsd.org; Sun, 27 Jun 1999 17:37:39 +0200 (MET DST) Received: from rover.village.org (rover.village.org [204.144.255.49]) by hub.freebsd.org (Postfix) with ESMTP id 560DA14C89 for ; Sat, 26 Jun 1999 21:08:49 -0700 (PDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.9.3/8.9.3) with ESMTP id WAA88449 for ; Sat, 26 Jun 1999 22:08:49 -0600 (MDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.3/8.8.3) with ESMTP id WAA08237 for ; Sat, 26 Jun 1999 22:06:53 -0600 (MDT) Message-Id: <199906270406.WAA08237@harmony.village.org> To: arch@freebsd.org Subject: Directory layouts revisited Date: Sat, 26 Jun 1999 22:06:53 -0600 From: Warner Losh Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I posted the following to -committers and realized that this is a more appropriate forum for such discussions. I'll redirect any discussions there to this list. In general, yes, I am trying to minimize the trivial differences between the various *BSD oses, at least when it comes to some aspects of driver code. I'm working on a newconfig shim, which if successful, will allow any driver to be imported from NetBSD/OpenBSD with, hopefully, no or very few changes. Warner To: committers@freebsd.org Subject: Moving isa to dev/isa Date: Sat, 26 Jun 1999 19:00:07 -0600 From: Warner Losh What are the objections to moving isa -> dev/isa and pci -> dev/pci. As I see it there is very little down side (some extra junk in the attic), while on the positive side it makes it easier to import new config style drivers if we have the same hierarchy as other systems. I think this will outweigh the minor inconvenience in the repository move. I ask this because I'm finding that importing newconfig drivers in the pccard work I'm doing needlessly complicated by the current directory structure. Since I really want to have a set of working sims within newbus for new-config based drivers, I see this as an issue that I must raise. The exact consequences of this are a need to place a lot of ugly #ifdef __FreeBSD__ around the includes of dev/isa/* and dev/pci/* in all .c or .h files that I'm trying to bring in. I've done that in my tree, but I'd like to minimize trivial differences like this if I can at all avoid them. Comments? Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message