Module Name: src
Committed By: dyoung
Date: Fri Aug 12 22:22:49 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.alpha
src/sys/arch/alpha/include: Makefile bus_defs.h pio.h sysarch.h
Log Message:
Pull the bus_space(9) definitions needed by alpha userland into
bus_user.h and include that from pio.h, sysarch.h, bus_defs.h. Fixes
the alpha build.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/comp/md.alpha
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/include/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/include/bus_defs.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/pio.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/include/sysarch.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.alpha
diff -u src/distrib/sets/lists/comp/md.alpha:1.62 src/distrib/sets/lists/comp/md.alpha:1.63
--- src/distrib/sets/lists/comp/md.alpha:1.62 Sun Aug 7 02:18:56 2011
+++ src/distrib/sets/lists/comp/md.alpha Fri Aug 12 22:22:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.62 2011/08/07 02:18:56 mrg Exp $
+# $NetBSD: md.alpha,v 1.63 2011/08/12 22:22:49 dyoung Exp $
./usr/include/alpha comp-c-include
./usr/include/alpha/_G_config.h comp-obsolete obsolete
./usr/include/alpha/alpha_cpu.h comp-c-include
@@ -9,6 +9,7 @@
./usr/include/alpha/autoconf.h comp-c-include
./usr/include/alpha/bswap.h comp-c-include
./usr/include/alpha/bus.h comp-c-include obsolete
+./usr/include/alpha/bus_user.h comp-c-include
./usr/include/alpha/bwx.h comp-c-include
./usr/include/alpha/cdefs.h comp-c-include
./usr/include/alpha/cfbreg.h comp-c-include
Index: src/sys/arch/alpha/include/Makefile
diff -u src/sys/arch/alpha/include/Makefile:1.31 src/sys/arch/alpha/include/Makefile:1.32
--- src/sys/arch/alpha/include/Makefile:1.31 Sun Jul 17 20:54:36 2011
+++ src/sys/arch/alpha/include/Makefile Fri Aug 12 22:22:49 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2011/07/17 20:54:36 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2011/08/12 22:22:49 dyoung Exp $
INCSDIR= /usr/include/alpha
INCS= alpha_cpu.h ansi.h aout_machdep.h asm.h autoconf.h \
- bswap.h bwx.h \
+ bus_user.h bswap.h bwx.h \
cdefs.h cfbreg.h cpu.h cpuconf.h \
disklabel.h \
ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/alpha/include/bus_defs.h
diff -u src/sys/arch/alpha/include/bus_defs.h:1.1 src/sys/arch/alpha/include/bus_defs.h:1.2
--- src/sys/arch/alpha/include/bus_defs.h:1.1 Fri Jul 1 17:09:58 2011
+++ src/sys/arch/alpha/include/bus_defs.h Fri Aug 12 22:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
+/* $NetBSD: bus_defs.h,v 1.2 2011/08/12 22:22:49 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -61,17 +61,13 @@
#define _ALPHA_BUS_DEFS_H_
#include <sys/types.h>
+#include <machine/bus_user.h>
+
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <stdbool.h>
#endif
#include <sys/stdint.h>
-/*
- * Addresses (in bus space).
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
#ifdef _KERNEL
/*
@@ -243,25 +239,7 @@
bus_space_handle_t, bus_size_t, bus_size_t);
};
-/*
- * Translation of an Alpha bus address; INTERNAL USE ONLY.
- */
-struct alpha_bus_space_translation {
- bus_addr_t abst_bus_start; /* start of bus window */
- bus_addr_t abst_bus_end; /* end of bus window */
- paddr_t abst_sys_start; /* start of sysBus window */
- paddr_t abst_sys_end; /* end of sysBus window */
- int abst_addr_shift;/* address shift */
- int abst_size_shift;/* size shift */
- int abst_flags; /* flags; see below */
-};
-
-#define ABST_BWX 0x01 /* use BWX to access the bus */
-#define ABST_DENSE 0x02 /* space is dense */
-
#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-#define BUS_SPACE_MAP_PREFETCHABLE 0x04
#ifdef _KERNEL
Index: src/sys/arch/alpha/include/pio.h
diff -u src/sys/arch/alpha/include/pio.h:1.8 src/sys/arch/alpha/include/pio.h:1.9
--- src/sys/arch/alpha/include/pio.h:1.8 Wed Jul 13 04:47:16 2011
+++ src/sys/arch/alpha/include/pio.h Fri Aug 12 22:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pio.h,v 1.8 2011/07/13 04:47:16 dyoung Exp $ */
+/* $NetBSD: pio.h,v 1.9 2011/08/12 22:22:49 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _ALPHA_PIO_H_
#include <sys/cdefs.h>
-#include <machine/bus_defs.h>
+#include <machine/bus_user.h>
#ifdef _KERNEL
#error This file is for userspace only.
Index: src/sys/arch/alpha/include/sysarch.h
diff -u src/sys/arch/alpha/include/sysarch.h:1.18 src/sys/arch/alpha/include/sysarch.h:1.19
--- src/sys/arch/alpha/include/sysarch.h:1.18 Tue Aug 2 04:45:10 2011
+++ src/sys/arch/alpha/include/sysarch.h Fri Aug 12 22:22:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.18 2011/08/02 04:45:10 uebayasi Exp $ */
+/* $NetBSD: sysarch.h,v 1.19 2011/08/12 22:22:49 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _ALPHA_SYSARCH_H_
#define _ALPHA_SYSARCH_H_
-#include <machine/bus_defs.h>
+#include <machine/bus_user.h>
#include <machine/ieeefp.h>
/*
