[src/trunk]: src/sys/dev/ic Avoid silly namespace collision w/ some Alpha sig...

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

details:   https://anonhg.NetBSD.org/src/rev/c32f66a75122
branches:  trunk
changeset: 476952:c32f66a75122
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Oct 04 23:57:32 1999 +0000

description:
Avoid silly namespace collision w/ some Alpha signal-related variables.

diffstat:

 sys/dev/ic/dpt.c    |  11 ++++++-----
 sys/dev/ic/dptvar.h |   4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 20462dedcebf -r c32f66a75122 sys/dev/ic/dpt.c
--- a/sys/dev/ic/dpt.c  Mon Oct 04 23:26:59 1999 +0000
+++ b/sys/dev/ic/dpt.c  Mon Oct 04 23:57:32 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dpt.c,v 1.7 1999/10/01 12:20:12 ad Exp $       */
+/*     $NetBSD: dpt.c,v 1.8 1999/10/04 23:57:32 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.7 1999/10/01 12:20:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.8 1999/10/04 23:57:32 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -160,7 +160,7 @@
        int more;
 
        sc = xxx_sc;
-       sp = sc->sc_sp;
+       sp = sc->sc_statpack;
        more = 0;
 
 #ifdef DEBUG
@@ -293,11 +293,12 @@
                return;
        }
 
-       sc->sc_sp = (struct eata_sp *)((caddr_t)sc->sc_ccbs + sc->sc_spoff);
+       sc->sc_statpack = (struct eata_sp *)((caddr_t)sc->sc_ccbs +
+           sc->sc_spoff);
        sc->sc_sppa = sc->sc_dmamap_ccb->dm_segs[0].ds_addr + sc->sc_spoff;
        sc->sc_scr = (caddr_t)sc->sc_ccbs + sc->sc_scroff;
        sc->sc_scrpa = sc->sc_dmamap_ccb->dm_segs[0].ds_addr + sc->sc_scroff;
-       sc->sc_sp->sp_ccbid = -1;
+       sc->sc_statpack->sp_ccbid = -1;
 
        /* Initialize the CCBs */
        TAILQ_INIT(&sc->sc_free_ccb);
diff -r 20462dedcebf -r c32f66a75122 sys/dev/ic/dptvar.h
--- a/sys/dev/ic/dptvar.h       Mon Oct 04 23:26:59 1999 +0000
+++ b/sys/dev/ic/dptvar.h       Mon Oct 04 23:57:32 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dptvar.h,v 1.3 1999/09/29 17:33:02 ad Exp $    */
+/*     $NetBSD: dptvar.h,v 1.4 1999/10/04 23:57:32 thorpej Exp $       */
 
 /*
  * Copyright (c) 1999 Andy Doran <ad%NetBSD.org@localhost>
@@ -66,7 +66,7 @@
        void            *sc_ih;         /* interrupt handler cookie */
        void            *sc_sdh;        /* shutdown hook */
        struct dpt_ccb  *sc_ccbs;       /* all our CCBs */
-       struct eata_sp  *sc_sp;         /* EATA status packet */
+       struct eata_sp  *sc_statpack;   /* EATA status packet */
        int             sc_spoff;       /* status packet offset in dmamap */
        u_int32_t       sc_sppa;        /* status packet physical address */
        caddr_t         sc_scr;         /* scratch area */