[src/trunk]: src/sys/arch/amiga/amiga add PCMCIA initialization

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

details:   https://anonhg.NetBSD.org/src/rev/98e8425c0318
branches:  trunk
changeset: 481140:98e8425c0318
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Sun Jan 23 21:08:16 2000 +0000

description:
add PCMCIA initialization

diffstat:

 sys/arch/amiga/amiga/amiga_init.c |   5 +++--
 sys/arch/amiga/amiga/autoconf.c   |  14 +++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (86 lines):

diff -r 88ed9673704c -r 98e8425c0318 sys/arch/amiga/amiga/amiga_init.c
--- a/sys/arch/amiga/amiga/amiga_init.c Sun Jan 23 21:06:12 2000 +0000
+++ b/sys/arch/amiga/amiga/amiga_init.c Sun Jan 23 21:08:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amiga_init.c,v 1.68 1999/10/20 06:40:26 is Exp $       */
+/*     $NetBSD: amiga_init.c,v 1.69 2000/01/23 21:08:16 aymeric Exp $  */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -60,6 +60,7 @@
 #include <amiga/amiga/custom.h>
 #include <amiga/amiga/cfdev.h>
 #include <amiga/amiga/drcustom.h>
+#include <amiga/amiga/gayle.h>
 #include <amiga/amiga/memlist.h>
 #include <amiga/dev/zbusvar.h>
 
@@ -380,7 +381,7 @@
        } else
 #endif
        ptextra = NCHIPMEMPG + NCIAPG + NZTWOROMPG + RELOC(NZTWOMEMPG, u_int) +
-           btoc(RELOC(ZBUSAVAIL, u_int));
+           btoc(RELOC(ZBUSAVAIL, u_int)) + NPCMCIAPG;
        /*
         * if kernel shadow mapping will overlap any initial mapping
         * of Zorro I/O space or the page table map, we need to
diff -r 88ed9673704c -r 98e8425c0318 sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c   Sun Jan 23 21:06:12 2000 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c   Sun Jan 23 21:08:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.66 1999/09/17 19:59:37 thorpej Exp $    */
+/*     $NetBSD: autoconf.c,v 1.67 2000/01/23 21:08:17 aymeric Exp $    */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -207,6 +207,7 @@
        if (!(is_draco()))
 #endif
                amiga_config_found(cf, NULL, "grfcc", NULL);
+
        /*
         * zbus knows when its not for real and will
         * only configure the appropriate hardware
@@ -274,10 +275,14 @@
        }
        if (is_a4000() || is_a1200())
                config_found(dp, "idesc", simple_devprint);
+       if (is_a1200())
+               config_found(dp, "wdc", simple_devprint);
        if (is_a4000())                 /* Try to configure A4000T SCSI */
                config_found(dp, "afsc", simple_devprint);
        if (is_a3000())
                config_found(dp, "ahsc", simple_devprint);
+       if (/*is_a600() || */is_a1200())
+               config_found(dp, "pccard", simple_devprint);
 #ifdef DRACO
        if (!is_draco())
 #endif
@@ -309,6 +314,7 @@
 #include "fd.h"
 #include "sd.h"
 #include "cd.h"
+#include "wd.h"
 
 #if NFD > 0
 extern  struct cfdriver fd_cd;
@@ -319,6 +325,9 @@
 #if NCD > 0
 extern  struct cfdriver cd_cd;
 #endif
+#if NWD > 0
+extern struct cfdriver wd_cd;
+#endif
 
 struct cfdriver *genericconf[] = {
 #if NFD > 0
@@ -330,6 +339,9 @@
 #if NCD > 0
        &cd_cd,
 #endif
+#if NWD > 0
+       &wd_cd,
+#endif
        NULL,
 };