Thu Jul 28 20:30:07 2011 UTC ()
Put libalpha back.


(dyoung)
diff -r1.39 -r1.40 src/distrib/sets/lists/base/md.alpha
diff -r1.60 -r1.61 src/distrib/sets/lists/comp/md.alpha
diff -r1.23 -r1.24 src/lib/libarch/Makefile
diff -r1.16 -r1.17 src/sys/arch/alpha/include/sysarch.h
cvs diff -r1.39 -r1.40 src/distrib/sets/lists/base/md.alpha (expand / switch to unified diff)

--- src/distrib/sets/lists/base/md.alpha 2011/07/17 01:13:22 1.39
+++ src/distrib/sets/lists/base/md.alpha 2011/07/28 20:30:07 1.40
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: md.alpha,v 1.39 2011/07/17 01:13:22 dyoung Exp $ 1# $NetBSD: md.alpha,v 1.40 2011/07/28 20:30:07 dyoung Exp $
2./usr/bin/fdformat base-util-bin 2./usr/bin/fdformat base-util-bin
3./usr/lib/libalpha.so base-obsolete obsolete 3./usr/lib/libalpha.so base-sys-shlib
4./usr/lib/libalpha.so.0 base-obsolete obsolete 4./usr/lib/libalpha.so.0 base-sys-shlib
5./usr/lib/libalpha.so.0.0 base-obsolete obsolete 5./usr/lib/libalpha.so.0.0 base-sys-shlib
6./usr/lkm/dummy_pci.o base-obsolete obsolete 6./usr/lkm/dummy_pci.o base-obsolete obsolete
7./usr/lkm/wi_pcmcia.o base-obsolete obsolete 7./usr/lkm/wi_pcmcia.o base-obsolete obsolete
8./usr/mdec/boot base-sysutil-bin 8./usr/mdec/boot base-sysutil-bin
9./usr/mdec/bootxx base-obsolete obsolete 9./usr/mdec/bootxx base-obsolete obsolete
10./usr/mdec/bootxx.old base-obsolete obsolete 10./usr/mdec/bootxx.old base-obsolete obsolete
11./usr/mdec/bootxx_cd9660 base-sysutil-bin 11./usr/mdec/bootxx_cd9660 base-sysutil-bin
12./usr/mdec/bootxx_ffs base-sysutil-bin 12./usr/mdec/bootxx_ffs base-sysutil-bin
13./usr/mdec/bootxx_ffsv2 base-sysutil-bin 13./usr/mdec/bootxx_ffsv2 base-sysutil-bin
14./usr/mdec/bootxx_lfs base-sysutil-bin 14./usr/mdec/bootxx_lfs base-sysutil-bin
15./usr/mdec/installboot base-obsolete obsolete 15./usr/mdec/installboot base-obsolete obsolete
16./usr/mdec/installboot.old base-obsolete obsolete 16./usr/mdec/installboot.old base-obsolete obsolete
17./usr/mdec/mkbootimage base-sysutil-bin 17./usr/mdec/mkbootimage base-sysutil-bin
18./usr/mdec/netboot base-sysutil-bin 18./usr/mdec/netboot base-sysutil-bin
cvs diff -r1.60 -r1.61 src/distrib/sets/lists/comp/md.alpha (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/md.alpha 2011/07/17 20:54:31 1.60
+++ src/distrib/sets/lists/comp/md.alpha 2011/07/28 20:30:07 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: md.alpha,v 1.60 2011/07/17 20:54:31 joerg Exp $ 1# $NetBSD: md.alpha,v 1.61 2011/07/28 20:30:07 dyoung Exp $
2./usr/include/alpha comp-c-include 2./usr/include/alpha comp-c-include
3./usr/include/alpha/_G_config.h comp-obsolete obsolete 3./usr/include/alpha/_G_config.h comp-obsolete obsolete
4./usr/include/alpha/alpha_cpu.h comp-c-include 4./usr/include/alpha/alpha_cpu.h comp-c-include
5./usr/include/alpha/ansi.h comp-c-include 5./usr/include/alpha/ansi.h comp-c-include
6./usr/include/alpha/aout_machdep.h comp-c-include 6./usr/include/alpha/aout_machdep.h comp-c-include
7./usr/include/alpha/asm.h comp-c-include 7./usr/include/alpha/asm.h comp-c-include
8./usr/include/alpha/atomic.h comp-obsolete obsolete 8./usr/include/alpha/atomic.h comp-obsolete obsolete
9./usr/include/alpha/autoconf.h comp-c-include 9./usr/include/alpha/autoconf.h comp-c-include
10./usr/include/alpha/bswap.h comp-c-include 10./usr/include/alpha/bswap.h comp-c-include
11./usr/include/alpha/bus.h comp-c-include obsolete 11./usr/include/alpha/bus.h comp-c-include obsolete
12./usr/include/alpha/bwx.h comp-c-include 12./usr/include/alpha/bwx.h comp-c-include
13./usr/include/alpha/cdefs.h comp-c-include 13./usr/include/alpha/cdefs.h comp-c-include
14./usr/include/alpha/cfbreg.h comp-c-include 14./usr/include/alpha/cfbreg.h comp-c-include
@@ -60,22 +60,22 @@ @@ -60,22 +60,22 @@
60./usr/include/alpha/setjmp.h comp-c-include 60./usr/include/alpha/setjmp.h comp-c-include
61./usr/include/alpha/signal.h comp-c-include 61./usr/include/alpha/signal.h comp-c-include
62./usr/include/alpha/stdarg.h comp-obsolete obsolete 62./usr/include/alpha/stdarg.h comp-obsolete obsolete
63./usr/include/alpha/sysarch.h comp-c-include 63./usr/include/alpha/sysarch.h comp-c-include
64./usr/include/alpha/types.h comp-c-include 64./usr/include/alpha/types.h comp-c-include
65./usr/include/alpha/varargs.h comp-obsolete obsolete 65./usr/include/alpha/varargs.h comp-obsolete obsolete
66./usr/include/alpha/vmparam.h comp-c-include 66./usr/include/alpha/vmparam.h comp-c-include
67./usr/include/alpha/vuid_event.h comp-c-include 67./usr/include/alpha/vuid_event.h comp-c-include
68./usr/include/alpha/wchar_limits.h comp-c-include 68./usr/include/alpha/wchar_limits.h comp-c-include
69./usr/include/alpha/wsconsio.h comp-obsolete obsolete 69./usr/include/alpha/wsconsio.h comp-obsolete obsolete
70./usr/include/alpha/z8530var.h comp-c-include 70./usr/include/alpha/z8530var.h comp-c-include
71./usr/include/ieeefp.h comp-c-include 71./usr/include/ieeefp.h comp-c-include
72./usr/lib/crtfm.o comp-c-lib 72./usr/lib/crtfm.o comp-c-lib
73./usr/lib/libalpha.a comp-obsolete obsolete 73./usr/lib/libalpha.a comp-c-lib
74./usr/lib/libalpha_p.a comp-obsolete obsolete 74./usr/lib/libalpha_p.a comp-c-proflib profile
75./usr/lib/libalpha_pic.a comp-obsolete obsolete 75./usr/lib/libalpha_pic.a comp-c-piclib
76./usr/libdata/lint/llib-lalpha.ln comp-obsolete obsolete 76./usr/libdata/lint/llib-lalpha.ln comp-c-lintlib lint
77./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug 77./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
78./usr/libdata/debug/usr/lib/libalpha.so.0.0.debug comp-obsolete obsolete 78./usr/libdata/debug/usr/lib/libalpha.so.0.0.debug comp-sys-debug debug
79./usr/libdata/debug/usr/mdec/mkbootimage.debug comp-sysutil-debug debug 79./usr/libdata/debug/usr/mdec/mkbootimage.debug comp-sysutil-debug debug
80./usr/libdata/debug/usr/mdec/setnetbootinfo.debug comp-sysutil-debug debug 80./usr/libdata/debug/usr/mdec/setnetbootinfo.debug comp-sysutil-debug debug
81./usr/libdata/debug/usr/sbin/bad144.debug comp-sysutil-debug debug 81./usr/libdata/debug/usr/sbin/bad144.debug comp-sysutil-debug debug
cvs diff -r1.23 -r1.24 src/lib/libarch/Makefile (expand / switch to unified diff)

--- src/lib/libarch/Makefile 2011/07/17 01:09:00 1.23
+++ src/lib/libarch/Makefile 2011/07/28 20:30:07 1.24
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2011/07/17 01:09:00 dyoung Exp $ 1# $NetBSD: Makefile,v 1.24 2011/07/28 20:30:07 dyoung Exp $
2 2
3# These should always be a MACHINE_CPU value 3# These should always be a MACHINE_CPU value
4ARCHDIRS= arm i386 m68k sparc x86_64 4ARCHDIRS= alpha arm i386 m68k sparc x86_64
5 5
6.for arch in ${ARCHDIRS} 6.for arch in ${ARCHDIRS}
7.include "${.CURDIR}/${arch}/Makefile.inc" 7.include "${.CURDIR}/${arch}/Makefile.inc"
8.PATH: ${.CURDIR}/${arch} 8.PATH: ${.CURDIR}/${arch}
9.endfor 9.endfor
10 10
11OBJS+= ${ASM} 11OBJS+= ${ASM}
12POBJS+= ${ASM:.o=.po} 12POBJS+= ${ASM:.o=.po}
13CLEANFILES+= ${ASM} ${POBJS} 13CLEANFILES+= ${ASM} ${POBJS}
14 14
15# Build the library if SRCS is now defined ... 15# Build the library if SRCS is now defined ...
16.if defined(SRCS) 16.if defined(SRCS)
17.if defined(MLIBDIR) && ${MLIBDIR} != "none" 17.if defined(MLIBDIR) && ${MLIBDIR} != "none"
cvs diff -r1.16 -r1.17 src/sys/arch/alpha/include/sysarch.h (expand / switch to unified diff)

--- src/sys/arch/alpha/include/sysarch.h 2011/07/17 04:30:56 1.16
+++ src/sys/arch/alpha/include/sysarch.h 2011/07/28 20:30:06 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sysarch.h,v 1.16 2011/07/17 04:30:56 dyoung Exp $ */ 1/* $NetBSD: sysarch.h,v 1.17 2011/07/28 20:30:06 dyoung Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jason R. Thorpe. 8 * by Jason R. Thorpe.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -22,80 +22,103 @@ @@ -22,80 +22,103 @@
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _ALPHA_SYSARCH_H_ 32#ifndef _ALPHA_SYSARCH_H_
33#define _ALPHA_SYSARCH_H_ 33#define _ALPHA_SYSARCH_H_
34 34
35#include <sys/types.h> 35#include <machine/bus_defs.h>
36#include <sys/stdint.h> 
37 
38#include <machine/ieeefp.h> 36#include <machine/ieeefp.h>
39 37
40/* 38/*
41 * Architecture specific syscalls (ALPHA) 39 * Architecture specific syscalls (ALPHA)
42 */ 40 */
43 41
44#define ALPHA_FPGETMASK 0 42#define ALPHA_FPGETMASK 0
45#define ALPHA_FPSETMASK 1 43#define ALPHA_FPSETMASK 1
46#define ALPHA_FPSETSTICKY 2 44#define ALPHA_FPSETSTICKY 2
 45#define ALPHA_BUS_GET_WINDOW_COUNT 3
 46#define ALPHA_BUS_GET_WINDOW 4
 47#define ALPHA_PCI_CONF_READWRITE 5
47#define ALPHA_FPGETSTICKY 6 48#define ALPHA_FPGETSTICKY 6
48#define ALPHA_GET_FP_C 7 49#define ALPHA_GET_FP_C 7
49#define ALPHA_SET_FP_C 8 50#define ALPHA_SET_FP_C 8
50 51
51struct alpha_fp_except_args { 52struct alpha_fp_except_args {
52 fp_except mask; 53 fp_except mask;
53}; 54};
54 55
55struct alpha_fp_c_args { 56struct alpha_fp_c_args {
56 uint64_t fp_c; 57 uint64_t fp_c;
57}; 58};
58 59
59#ifdef _KERNEL 
60#include <machine/bus_defs.h> 
61 
62#define ALPHA_BUS_GET_WINDOW_COUNT 3 
63#define ALPHA_BUS_GET_WINDOW 4 
64#define ALPHA_PCI_CONF_READWRITE 5 
65struct alpha_bus_get_window_count_args { 60struct alpha_bus_get_window_count_args {
66 u_int type; 61 u_int type;
67 u_int count; /* output */ 62 u_int count; /* output */
68}; 63};
69 64
70struct alpha_bus_get_window_args { 65struct alpha_bus_get_window_args {
71 u_int type; 66 u_int type;
72 u_int window; 67 u_int window;
73 struct alpha_bus_space_translation *translation; /* output */ 68 struct alpha_bus_space_translation *translation; /* output */
74}; 69};
75 70
76#define ALPHA_BUS_TYPE_PCI_IO 0 71#define ALPHA_BUS_TYPE_PCI_IO 0
77#define ALPHA_BUS_TYPE_PCI_MEM 1 72#define ALPHA_BUS_TYPE_PCI_MEM 1
78#define ALPHA_BUS_TYPE_MAX 1 73#define ALPHA_BUS_TYPE_MAX 1
79 74
80struct alpha_pci_conf_readwrite_args { 75struct alpha_pci_conf_readwrite_args {
81 int write; 76 int write;
82 u_int bus; 77 u_int bus;
83 u_int device; 78 u_int device;
84 u_int function; 79 u_int function;
85 u_int reg; 80 u_int reg;
86 u_int32_t val; 81 u_int32_t val;
87}; 82};
88 83
 84struct alpha_pci_conf_readwrite_args {
 85 int write;
 86 u_int bus;
 87 u_int device;
 88 u_int function;
 89 u_int reg;
 90 u_int32_t val;
 91};
 92
 93#ifdef _KERNEL
89extern u_int alpha_bus_window_count[]; 94extern u_int alpha_bus_window_count[];
90extern int (*alpha_bus_get_window)(int, int, 95extern int (*alpha_bus_get_window)(int, int,
91 struct alpha_bus_space_translation *); 96 struct alpha_bus_space_translation *);
92extern struct alpha_pci_chipset *alpha_pci_chipset; 97extern struct alpha_pci_chipset *alpha_pci_chipset;
93#else 98#else
94#include <sys/cdefs.h> 99#include <sys/cdefs.h>
95 100
 101struct alpha_bus_window {
 102 void * abw_addr;
 103 size_t abw_size;
 104 struct alpha_bus_space_translation abw_abst;
 105};
 106
96__BEGIN_DECLS 107__BEGIN_DECLS
 108int alpha_bus_getwindows(int, struct alpha_bus_window **);
 109int alpha_bus_mapwindow(struct alpha_bus_window *);
 110void alpha_bus_unmapwindow(struct alpha_bus_window *);
 111
 112void *alpha_pci_mem_map(bus_addr_t, bus_size_t, int,
 113 struct alpha_bus_space_translation *);
 114void alpha_pci_mem_unmap(struct alpha_bus_space_translation *,
 115 void *addr, bus_size_t);
 116
 117u_int32_t alpha_pci_conf_read(u_int, u_int, u_int, u_int);
 118void alpha_pci_conf_write(u_int, u_int, u_int, u_int, u_int32_t);
 119
97int sysarch(int, void *); 120int sysarch(int, void *);
98__END_DECLS 121__END_DECLS
99#endif /* _KERNEL */ 122#endif /* _KERNEL */
100 123
101#endif /* !_ALPHA_SYSARCH_H_ */ 124#endif /* !_ALPHA_SYSARCH_H_ */