Module Name: src
Committed By: dyoung
Date: Thu Jul 28 20:30:07 UTC 2011
Modified Files:
src/distrib/sets/lists/base: md.alpha
src/distrib/sets/lists/comp: md.alpha
src/lib/libarch: Makefile
src/sys/arch/alpha/include: sysarch.h
Log Message:
Put libalpha back.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/base/md.alpha
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/md.alpha
cvs rdiff -u -r1.23 -r1.24 src/lib/libarch/Makefile
cvs rdiff -u -r1.16 -r1.17 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/base/md.alpha
diff -u src/distrib/sets/lists/base/md.alpha:1.39 src/distrib/sets/lists/base/md.alpha:1.40
--- src/distrib/sets/lists/base/md.alpha:1.39 Sun Jul 17 01:13:22 2011
+++ src/distrib/sets/lists/base/md.alpha Thu Jul 28 20:30:07 2011
@@ -1,8 +1,8 @@
-# $NetBSD: md.alpha,v 1.39 2011/07/17 01:13:22 dyoung Exp $
+# $NetBSD: md.alpha,v 1.40 2011/07/28 20:30:07 dyoung Exp $
./usr/bin/fdformat base-util-bin
-./usr/lib/libalpha.so base-obsolete obsolete
-./usr/lib/libalpha.so.0 base-obsolete obsolete
-./usr/lib/libalpha.so.0.0 base-obsolete obsolete
+./usr/lib/libalpha.so base-sys-shlib
+./usr/lib/libalpha.so.0 base-sys-shlib
+./usr/lib/libalpha.so.0.0 base-sys-shlib
./usr/lkm/dummy_pci.o base-obsolete obsolete
./usr/lkm/wi_pcmcia.o base-obsolete obsolete
./usr/mdec/boot base-sysutil-bin
Index: src/distrib/sets/lists/comp/md.alpha
diff -u src/distrib/sets/lists/comp/md.alpha:1.60 src/distrib/sets/lists/comp/md.alpha:1.61
--- src/distrib/sets/lists/comp/md.alpha:1.60 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.alpha Thu Jul 28 20:30:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.60 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.alpha,v 1.61 2011/07/28 20:30:07 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
@@ -70,12 +70,12 @@
./usr/include/alpha/z8530var.h comp-c-include
./usr/include/ieeefp.h comp-c-include
./usr/lib/crtfm.o comp-c-lib
-./usr/lib/libalpha.a comp-obsolete obsolete
-./usr/lib/libalpha_p.a comp-obsolete obsolete
-./usr/lib/libalpha_pic.a comp-obsolete obsolete
-./usr/libdata/lint/llib-lalpha.ln comp-obsolete obsolete
+./usr/lib/libalpha.a comp-c-lib
+./usr/lib/libalpha_p.a comp-c-proflib profile
+./usr/lib/libalpha_pic.a comp-c-piclib
+./usr/libdata/lint/llib-lalpha.ln comp-c-lintlib lint
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
-./usr/libdata/debug/usr/lib/libalpha.so.0.0.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/lib/libalpha.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/mdec/mkbootimage.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/mdec/setnetbootinfo.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/bad144.debug comp-sysutil-debug debug
Index: src/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.23 src/lib/libarch/Makefile:1.24
--- src/lib/libarch/Makefile:1.23 Sun Jul 17 01:09:00 2011
+++ src/lib/libarch/Makefile Thu Jul 28 20:30:07 2011
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/07/17 01:09:00 dyoung Exp $
+# $NetBSD: Makefile,v 1.24 2011/07/28 20:30:07 dyoung Exp $
# These should always be a MACHINE_CPU value
-ARCHDIRS= arm i386 m68k sparc x86_64
+ARCHDIRS= alpha arm i386 m68k sparc x86_64
.for arch in ${ARCHDIRS}
.include "${.CURDIR}/${arch}/Makefile.inc"
Index: src/sys/arch/alpha/include/sysarch.h
diff -u src/sys/arch/alpha/include/sysarch.h:1.16 src/sys/arch/alpha/include/sysarch.h:1.17
--- src/sys/arch/alpha/include/sysarch.h:1.16 Sun Jul 17 04:30:56 2011
+++ src/sys/arch/alpha/include/sysarch.h Thu Jul 28 20:30:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.16 2011/07/17 04:30:56 dyoung Exp $ */
+/* $NetBSD: sysarch.h,v 1.17 2011/07/28 20:30:06 dyoung Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,9 +32,7 @@
#ifndef _ALPHA_SYSARCH_H_
#define _ALPHA_SYSARCH_H_
-#include <sys/types.h>
-#include <sys/stdint.h>
-
+#include <machine/bus_defs.h>
#include <machine/ieeefp.h>
/*
@@ -44,6 +42,9 @@
#define ALPHA_FPGETMASK 0
#define ALPHA_FPSETMASK 1
#define ALPHA_FPSETSTICKY 2
+#define ALPHA_BUS_GET_WINDOW_COUNT 3
+#define ALPHA_BUS_GET_WINDOW 4
+#define ALPHA_PCI_CONF_READWRITE 5
#define ALPHA_FPGETSTICKY 6
#define ALPHA_GET_FP_C 7
#define ALPHA_SET_FP_C 8
@@ -56,12 +57,6 @@
uint64_t fp_c;
};
-#ifdef _KERNEL
-#include <machine/bus_defs.h>
-
-#define ALPHA_BUS_GET_WINDOW_COUNT 3
-#define ALPHA_BUS_GET_WINDOW 4
-#define ALPHA_PCI_CONF_READWRITE 5
struct alpha_bus_get_window_count_args {
u_int type;
u_int count; /* output */
@@ -86,6 +81,16 @@
u_int32_t val;
};
+struct alpha_pci_conf_readwrite_args {
+ int write;
+ u_int bus;
+ u_int device;
+ u_int function;
+ u_int reg;
+ u_int32_t val;
+};
+
+#ifdef _KERNEL
extern u_int alpha_bus_window_count[];
extern int (*alpha_bus_get_window)(int, int,
struct alpha_bus_space_translation *);
@@ -93,7 +98,25 @@
#else
#include <sys/cdefs.h>
+struct alpha_bus_window {
+ void * abw_addr;
+ size_t abw_size;
+ struct alpha_bus_space_translation abw_abst;
+};
+
__BEGIN_DECLS
+int alpha_bus_getwindows(int, struct alpha_bus_window **);
+int alpha_bus_mapwindow(struct alpha_bus_window *);
+void alpha_bus_unmapwindow(struct alpha_bus_window *);
+
+void *alpha_pci_mem_map(bus_addr_t, bus_size_t, int,
+ struct alpha_bus_space_translation *);
+void alpha_pci_mem_unmap(struct alpha_bus_space_translation *,
+ void *addr, bus_size_t);
+
+u_int32_t alpha_pci_conf_read(u_int, u_int, u_int, u_int);
+void alpha_pci_conf_write(u_int, u_int, u_int, u_int, u_int32_t);
+
int sysarch(int, void *);
__END_DECLS
#endif /* _KERNEL */
