[src/netbsd-1-5]: src/sys/arch/alpha Update from trunk:

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

details:   https://anonhg.NetBSD.org/src/rev/2d493ad2ad70
branches:  netbsd-1-5
changeset: 488290:2d493ad2ad70
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jun 27 19:32:48 2000 +0000

description:
Update from trunk:
For systems which have different systypes but share a common
support module, make consistent with other systems which options
you must enable for it to work.  Treat ``Lynx'' (2100A_A500) like
``Sable'' (2100_A500).

diffstat:

 sys/arch/alpha/alpha/cpuconf.c   |  27 ++++++++++++++++++++++-----
 sys/arch/alpha/alpha/dec_1000a.c |   8 ++++----
 sys/arch/alpha/conf/files.alpha  |   7 ++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

diffs (138 lines):

diff -r 491df45861f7 -r 2d493ad2ad70 sys/arch/alpha/alpha/cpuconf.c
--- a/sys/arch/alpha/alpha/cpuconf.c    Tue Jun 27 19:28:19 2000 +0000
+++ b/sys/arch/alpha/alpha/cpuconf.c    Tue Jun 27 19:32:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.c,v 1.25 2000/06/11 21:19:23 thorpej Exp $ */
+/* $NetBSD: cpuconf.c,v 1.25.2.1 2000/06/27 19:32:48 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -152,10 +152,18 @@
 #include "opt_dec_1000.h"
 #include "opt_dec_1000a.h"
 #if defined(DEC_1000) || defined(DEC_1000A)
-extern void dec_1000a_init __P((void));
+extern void _dec_1000a_init __P((void));
+#endif
+#ifdef DEC_1000A
+#define        dec_1000a_init          _dec_1000a_init
 #else
 #define        dec_1000a_init          platform_not_configured
 #endif
+#ifdef DEC_1000
+#define        dec_1000_init           _dec_1000a_init
+#else
+#define        dec_1000_init           platform_not_configured
+#endif
 
 #include "opt_dec_alphabook1.h"
 #ifdef DEC_ALPHABOOK1
@@ -179,11 +187,20 @@
 #endif
 
 #include "opt_dec_2100_a500.h"
+#include "opt_dec_2100a_a500.h"
+#if defined(DEC_2100_A500) || defined(DEC_2100A_A500)
+extern void _dec_2100_a500_init __P((void));
+#endif
 #ifdef DEC_2100_A500
-extern void dec_2100_a500_init __P((void));
+#define        dec_2100_a500_init      _dec_2100_a500_init
 #else
 #define        dec_2100_a500_init      platform_not_configured
 #endif
+#ifdef DEC_2100A_A500
+#define        dec_2100a_a500_init     _dec_2100_a500_init
+#else
+#define        dec_2100a_a500_init     platform_not_configured
+#endif
 
 #include "opt_api_up1000.h"
 #ifdef API_UP1000
@@ -214,13 +231,13 @@
        cpu_init(ST_DEC_2100_A50, dec_2100_a50_init, "DEC_2100_A50"),
        cpu_notsupp(ST_DEC_MUSTANG, "Mustang"),
        cpu_init(ST_DEC_KN20AA, dec_kn20aa_init, "DEC_KN20AA"),
-       cpu_init(ST_DEC_1000, dec_1000a_init, "DEC_1000"),
+       cpu_init(ST_DEC_1000, dec_1000_init, "DEC_1000"),
        cpu_init(ST_EB66, dec_eb66_init, "DEC_EB66"),
        cpu_init(ST_EB64P, dec_eb64plus_init, "DEC_EB64PLUS"),
        cpu_init(ST_ALPHABOOK1, dec_alphabook1_init, "DEC_ALPHABOOK1"),
        cpu_init(ST_DEC_4100, dec_kn300_init, "DEC_KN300"),
        cpu_notsupp(ST_DEC_EV45_PBP, "EV45 Passive Backplane Board"),
-       cpu_notsupp(ST_DEC_2100A_A500, "DEC 2100A/A500 (``Lynx'')"),
+       cpu_init(ST_DEC_2100A_A500, dec_2100a_a500_init, "DEC_2100A_A500"),
        cpu_init(ST_EB164, dec_eb164_init, "DEC_EB164"),
        cpu_init(ST_DEC_1000A, dec_1000a_init, "DEC_1000A"),
        cpu_notsupp(ST_DEC_ALPHAVME_224, "AlphaVME 224"),
diff -r 491df45861f7 -r 2d493ad2ad70 sys/arch/alpha/alpha/dec_1000a.c
--- a/sys/arch/alpha/alpha/dec_1000a.c  Tue Jun 27 19:28:19 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_1000a.c  Tue Jun 27 19:32:48 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.8 2000/06/09 04:58:32 soda Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.8.2.1 2000/06/27 19:32:49 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.8 2000/06/09 04:58:32 soda Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.8.2.1 2000/06/27 19:32:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,7 +109,7 @@
 #endif
 static int comcnrate = CONSPEED;
 
-void dec_1000a_init __P((void));
+void _dec_1000a_init __P((void));
 static void dec_1000a_cons_init __P((void));
 static void dec_1000a_device_register __P((struct device *, void *));
 
@@ -124,7 +124,7 @@
 };
 
 void
-dec_1000a_init()
+_dec_1000a_init()
 {
        u_int64_t variation;
 
diff -r 491df45861f7 -r 2d493ad2ad70 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha   Tue Jun 27 19:28:19 2000 +0000
+++ b/sys/arch/alpha/conf/files.alpha   Tue Jun 27 19:32:48 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.118 2000/06/11 22:45:44 thorpej Exp $
+# $NetBSD: files.alpha,v 1.118.2.1 2000/06/27 19:32:51 thorpej Exp $
 #
 # alpha-specific configuration info
 
@@ -11,6 +11,7 @@
 defopt DEC_2000_300    # "Jensen":     2000/300 (DECpc AXP 150)
 defopt DEC_2100_A50    # Avanti etc:   AlphaStation 400, 200, etc.
 defopt DEC_2100_A500   # Sable etc:    AlphaServer 2100
+defopt DEC_2100A_A500  # Lynx etc:     AlphaServer 2100A
 defopt DEC_3000_300    # Pelican etc:  3000/300*
 defopt DEC_3000_500    # Flamingo etc: 3000/[4-9]00*
 defopt DEC_550         # Miata:        Personal Workstation (550)
@@ -376,7 +377,7 @@
 # CPU support files
 file   arch/alpha/alpha/dec_2000_300.c dec_2000_300
 file   arch/alpha/pci/pci_2100_a50.c   dec_2100_a50
-file   arch/alpha/pci/pci_2100_a500.c  dec_2100_a500
+file   arch/alpha/pci/pci_2100_a500.c  dec_2100_a500 | dec_2100a_a500
 file   arch/alpha/pci/pci_up1000.c     api_up1000
 file   arch/alpha/pci/pci_a12.c        avalon_a12
 file   arch/alpha/pci/pci_alphabook1.c dec_alphabook1
@@ -484,7 +485,7 @@
 
 # CPU support
 file   arch/alpha/alpha/dec_2100_a50.c         dec_2100_a50
-file   arch/alpha/alpha/dec_2100_a500.c        dec_2100_a500
+file   arch/alpha/alpha/dec_2100_a500.c        dec_2100_a500 | dec_2100a_a500
 file   arch/alpha/alpha/dec_3000_300.c         dec_3000_300
 file   arch/alpha/alpha/dec_3000_500.c         dec_3000_500
 file   arch/alpha/alpha/dec_550.c              dec_550