[src/trunk]: src/sys/arch/hpcarm oops. two cookies are too much. use pcictag_...

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

details:   https://anonhg.NetBSD.org/src/rev/cb150becbce6
branches:  trunk
changeset: 512592:cb150becbce6
user:      toshii <toshii%NetBSD.org@localhost>
date:      Tue Jul 10 17:35:15 2001 +0000

description:
oops. two cookies are too much. use pcictag_cookie.

diffstat:

 sys/arch/hpcarm/dev/ipaq_pcic.c         |  11 +++++------
 sys/arch/hpcarm/sa11x0/sa11xx_pcicvar.h |   3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r ce4b37912bd1 -r cb150becbce6 sys/arch/hpcarm/dev/ipaq_pcic.c
--- a/sys/arch/hpcarm/dev/ipaq_pcic.c   Tue Jul 10 17:24:35 2001 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_pcic.c   Tue Jul 10 17:35:15 2001 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ipaq_pcic.c,v 1.2 2001/07/10 17:23:18 ichiro Exp $        */
+/*      $NetBSD: ipaq_pcic.c,v 1.3 2001/07/10 17:35:15 toshii Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -126,8 +126,7 @@
        for(i = 0; i < 2; i++) {
                sc->sc_socket[i].sc = (struct sapcic_softc *)sc;
                sc->sc_socket[i].socket = i;
-               sc->sc_socket[i].sapcic_cookie = psc;
-               sc->sc_socket[i].pcictag_cookie = NULL;
+               sc->sc_socket[i].pcictag_cookie = psc;
                sc->sc_socket[i].pcictag = &ipaqpcic_functions;
                sc->sc_socket[i].event_thread = NULL;
                sc->sc_socket[i].event = 0;
@@ -240,7 +239,7 @@
        int arg;
 {
        int value, s;
-       struct ipaqpcic_softc *sc = so->sapcic_cookie;
+       struct ipaqpcic_softc *sc = so->pcictag_cookie;
 
        s = splbio();
        switch (arg) {
@@ -277,7 +276,7 @@
        int irq;
 
        irq = so->socket ? IRQ_IRQ0 : IRQ_IRQ1;
-       return (sa11x0_intr_establish((sa11x0_chipset_tag_t)so->sapcic_cookie,
+       return (sa11x0_intr_establish((sa11x0_chipset_tag_t)so->pcictag_cookie,
                                    irq-16, 1, level, ih_fun, ih_arg));
 }
 
@@ -286,5 +285,5 @@
        struct sapcic_socket *so;
        void *ih;
 {
-       sa11x0_intr_disestablish((sa11x0_chipset_tag_t)so->sapcic_cookie, ih);
+       sa11x0_intr_disestablish((sa11x0_chipset_tag_t)so->pcictag_cookie, ih);
 }
diff -r ce4b37912bd1 -r cb150becbce6 sys/arch/hpcarm/sa11x0/sa11xx_pcicvar.h
--- a/sys/arch/hpcarm/sa11x0/sa11xx_pcicvar.h   Tue Jul 10 17:24:35 2001 +0000
+++ b/sys/arch/hpcarm/sa11x0/sa11xx_pcicvar.h   Tue Jul 10 17:35:15 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sa11xx_pcicvar.h,v 1.7 2001/07/10 17:22:04 ichiro Exp $        */
+/*     $NetBSD: sa11xx_pcicvar.h,v 1.8 2001/07/10 17:35:15 toshii Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@
 
        int power_capability;
 
-       void *sapcic_cookie;
        void *pcictag_cookie;   /* opaque data for pcictag functions */
 };