[src/trunk]: src/sys/arch/x86/include Good-bye bus.h. Don't install <machine...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/35787f5ca857
branches:  trunk
changeset: 767395:35787f5ca857
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Jul 17 23:38:32 2011 +0000

description:
Good-bye bus.h.  Don't install <machine/bus.h>.

diffstat:

 sys/arch/x86/include/Makefile |    4 +-
 sys/arch/x86/include/bus.h    |  145 ------------------------------------------
 2 files changed, 2 insertions(+), 147 deletions(-)

diffs (164 lines):

diff -r 477a01e721b1 -r 35787f5ca857 sys/arch/x86/include/Makefile
--- a/sys/arch/x86/include/Makefile     Sun Jul 17 23:37:32 2011 +0000
+++ b/sys/arch/x86/include/Makefile     Sun Jul 17 23:38:32 2011 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.15 2010/12/20 04:29:56 christos Exp $
+#      $NetBSD: Makefile,v 1.16 2011/07/17 23:38:32 dyoung Exp $
 
 INCSDIR=/usr/include/x86
 
 INCS=  aout_machdep.h \
-       bootinfo.h bus.h \
+       bootinfo.h \
        cacheinfo.h \
        cpu.h \
        cputypes.h \
diff -r 477a01e721b1 -r 35787f5ca857 sys/arch/x86/include/bus.h
--- a/sys/arch/x86/include/bus.h        Sun Jul 17 23:37:32 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*     $NetBSD: bus.h,v 1.20 2010/04/28 19:17:04 dyoung Exp $  */
-
-/*-
- * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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 THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 THE FOUNDATION 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.
- */
-
-/*
- * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou.  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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *     for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
- */
-
-#ifndef _X86_BUS_H_
-#define _X86_BUS_H_
-
-#include <x86/busdefs.h>
-
-#ifdef BUS_SPACE_DEBUG 
-#define        BUS_SPACE_ALIGNED_ADDRESS(p, t)                         \
-       ((((u_long)(p)) & (sizeof(t)-1)) == 0)
-#define BUS_SPACE_ALIGNED_POINTER(p, t) BUS_SPACE_ALIGNED_ADDRESS(p, t)
-#else
-#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
-#endif /* BUS_SPACE_DEBUG */
-
-/*
- * Bus address and size types
- */
-typedef paddr_t bus_addr_t;
-typedef size_t bus_size_t;
-
-struct bus_space_tag {
-       int bst_type;
-};
-
-typedef        struct bus_space_tag *bus_space_tag_t;
-typedef        vaddr_t bus_space_handle_t;
-
-extern bus_space_tag_t x86_bus_space_mem;
-extern bus_space_tag_t x86_bus_space_io;
-
-bool   bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
-
-int    _x86_memio_map(bus_space_tag_t t, bus_addr_t addr,
-           bus_size_t size, int flags, bus_space_handle_t *bshp);
-void   _x86_memio_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
-           bus_size_t size, bus_addr_t *);
-
-typedef struct x86_bus_dma_tag         *bus_dma_tag_t;
-typedef struct x86_bus_dmamap          *bus_dmamap_t;
-
-#define BUS_DMA_TAG_VALID(__t)    ((__t) != NULL)
-
-/*
- *     bus_dma_segment_t
- *
- *     Describes a single contiguous DMA transaction.  Values
- *     are suitable for programming into DMA registers.
- */
-typedef struct x86_bus_dma_segment {
-       bus_addr_t      ds_addr;        /* DMA address */
-       bus_size_t      ds_len;         /* length of transfer */
-} bus_dma_segment_t;
-
-/*
- *     bus_dmamap_t
- *
- *     Describes a DMA mapping.  XXX exposing structure to LKM.
- */
-struct x86_bus_dmamap {
-       /*
-        * PRIVATE MEMBERS: not for use by machine-independent code.
-        */
-       bus_size_t      _dm_size;       /* largest DMA transfer mappable */
-       int             _dm_segcnt;     /* number of segs this map can map */
-       bus_size_t      _dm_maxmaxsegsz; /* fixed largest possible segment */
-       bus_size_t      _dm_boundary;   /* don't cross this */
-       bus_addr_t      _dm_bounce_thresh; /* bounce threshold; see tag */
-       int             _dm_flags;      /* misc. flags */
-
-       void            *_dm_cookie;    /* cookie for bus-specific functions */
-
-       /*
-        * PUBLIC MEMBERS: these are used by machine-independent code.
-        */
-       bus_size_t      dm_maxsegsz;    /* largest possible segment */
-       bus_size_t      dm_mapsize;     /* size of the mapping */
-       int             dm_nsegs;       /* # valid segments in mapping */
-       bus_dma_segment_t dm_segs[1];   /* segments; variable length */
-};
-
-#include <sys/bus_proto.h>
-
-#endif /* _X86_BUS_H_ */