[src/trunk]: src/sys/arch/hp700 Change some structure and structure member na...

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

details:   https://anonhg.NetBSD.org/src/rev/22b1e102df59
branches:  trunk
changeset: 761573:22b1e102df59
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Feb 01 18:33:24 2011 +0000

description:
Change some structure and structure member names to better suit my eye.

No functional change.

Same code before and after.

diffstat:

 sys/arch/hp700/dev/apic.c        |    6 +-
 sys/arch/hp700/dev/asp.c         |   18 +-
 sys/arch/hp700/dev/cpu.c         |    8 +-
 sys/arch/hp700/dev/dino.c        |   25 ++--
 sys/arch/hp700/dev/lasi.c        |   18 +-
 sys/arch/hp700/dev/mongoose.c    |    6 +-
 sys/arch/hp700/dev/siop_sgc.c    |    8 +-
 sys/arch/hp700/dev/wax.c         |   18 +-
 sys/arch/hp700/gsc/com_gsc.c     |    6 +-
 sys/arch/hp700/gsc/gscbus.c      |   10 +-
 sys/arch/hp700/gsc/gscbusvar.h   |    4 +-
 sys/arch/hp700/gsc/gsckbc.c      |    6 +-
 sys/arch/hp700/gsc/harmony.c     |    4 +-
 sys/arch/hp700/gsc/if_ie_gsc.c   |    6 +-
 sys/arch/hp700/gsc/if_iee_gsc.c  |    6 +-
 sys/arch/hp700/gsc/lpt_gsc.c     |    6 +-
 sys/arch/hp700/gsc/oosiop_gsc.c  |    6 +-
 sys/arch/hp700/gsc/osiop_gsc.c   |    6 +-
 sys/arch/hp700/gsc/siop_gsc.c    |    6 +-
 sys/arch/hp700/hp700/genassym.cf |   10 +-
 sys/arch/hp700/hp700/intr.c      |  187 +++++++++++++++++++-------------------
 sys/arch/hp700/hp700/intr.h      |   51 +++++-----
 sys/arch/hp700/hp700/locore.S    |   18 +-
 23 files changed, 221 insertions(+), 218 deletions(-)

diffs (truncated from 1253 to 300 lines):

diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/apic.c
--- a/sys/arch/hp700/dev/apic.c Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/apic.c Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apic.c,v 1.10 2011/01/27 13:57:39 skrll Exp $  */
+/*     $NetBSD: apic.c,v 1.11 2011/02/01 18:33:24 skrll Exp $  */
 
 /*     $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $    */
 
@@ -139,7 +139,7 @@
 #endif
        line = PCI_INTERRUPT_LINE(reg);
        if (sc->sc_irq[line] == 0)
-               sc->sc_irq[line] = hp700_intr_allocate_bit(&int_reg_cpu);
+               sc->sc_irq[line] = hp700_intr_allocate_bit(&ir_cpu);
        *ihp = (line << APIC_INT_LINE_SHIFT) | sc->sc_irq[line];
        return (APIC_INT_IRQ(*ihp) == 0);
 }
@@ -203,7 +203,7 @@
                return arg;
        }
 
-       iv = hp700_intr_establish(pri, apic_intr, aiv, &int_reg_cpu, irq);
+       iv = hp700_intr_establish(pri, apic_intr, aiv, &ir_cpu, irq);
        if (iv) {
                ent0 = (31 - irq) & APIC_ENT0_VEC;
                ent0 |= apic_get_int_ent0(sc, line);
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/asp.c
--- a/sys/arch/hp700/dev/asp.c  Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/asp.c  Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asp.c,v 1.17 2010/12/11 19:32:05 skrll Exp $   */
+/*     $NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $   */
 
 /*     $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $  */
 
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.17 2010/12/11 19:32:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,7 +125,7 @@
 struct asp_softc {
        device_t sc_dev;
 
-       struct hp700_int_reg sc_int_reg;
+       struct hp700_interrupt_register sc_ir;
 
        volatile struct asp_hwr *sc_hw;
        volatile struct asp_trs *sc_trs;
@@ -174,7 +174,7 @@
 
        /* Make sure we have an IRQ. */
        if (ca->ca_irq == HP700CF_IRQ_UNDEF)
-               ca->ca_irq = hp700_intr_allocate_bit(&int_reg_cpu);
+               ca->ca_irq = hp700_intr_allocate_bit(&ir_cpu);
 
        /*
         * Forcibly mask the HPA down to the start of the ASP
@@ -251,10 +251,10 @@
            sc->sc_trs->asp_lan, sc->sc_trs->asp_scsi);
 
        /* Establish the interrupt register. */
-       hp700_intr_reg_establish(&sc->sc_int_reg);
-       sc->sc_int_reg.int_reg_name = device_xname(self);
-       sc->sc_int_reg.int_reg_mask = &sc->sc_trs->asp_imr;
-       sc->sc_int_reg.int_reg_req = &sc->sc_trs->asp_irr;
+       hp700_interrupt_register_establish(&sc->sc_ir);
+       sc->sc_ir.ir_name = device_xname(self);
+       sc->sc_ir.ir_mask = &sc->sc_trs->asp_imr;
+       sc->sc_ir.ir_req = &sc->sc_trs->asp_irr;
 
        /* Attach the GSC bus. */
        ga.ga_ca = *ca; /* clone from us */
@@ -269,7 +269,7 @@
        }
 
        ga.ga_name = "gsc";
-       ga.ga_int_reg = &sc->sc_int_reg;
+       ga.ga_ir = &sc->sc_ir;
        ga.ga_fix_args = asp_fix_args;
        ga.ga_fix_args_cookie = sc;
        ga.ga_scsi_target = sc->sc_trs->asp_scsi;
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/cpu.c
--- a/sys/arch/hp700/dev/cpu.c  Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/cpu.c  Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.18 2011/01/31 14:11:02 skrll Exp $   */
+/*     $NetBSD: cpu.c,v 1.19 2011/02/01 18:33:24 skrll Exp $   */
 
 /*     $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $   */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18 2011/01/31 14:11:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.19 2011/02/01 18:33:24 skrll Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -175,7 +175,7 @@
        }
        
        sc->sc_ih = hp700_intr_establish(IPL_CLOCK, clock_intr,
-           NULL /*clockframe*/, &int_reg_cpu, 31);
+           NULL /*clockframe*/, &ir_cpu, 31);
 
 #ifdef MULTIPROCESSOR
 
@@ -214,7 +214,7 @@
         * ASP doesn't seem to like to use interrupt bits above 28
         * or below 27.
         */
-       int_reg_cpu.int_reg_allocatable_bits =
+       ir_cpu.ir_bits =
                (1 << 28) | (1 << 27) | (1 << 26);
 }
 
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/dino.c
--- a/sys/arch/hp700/dev/dino.c Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/dino.c Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.28 2011/01/13 21:15:13 skrll Exp $ */
+/*     $NetBSD: dino.c,v 1.29 2011/02/01 18:33:24 skrll Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.28 2011/01/13 21:15:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.29 2011/02/01 18:33:24 skrll Exp $");
 
 /* #include "cardbus.h" */
 
@@ -118,7 +118,7 @@
 
        int sc_ver;
        void *sc_ih;
-       struct hp700_int_reg sc_int_reg;
+       struct hp700_interrupt_register sc_ir;
        bus_space_tag_t sc_bt;
        bus_space_handle_t sc_bh;
        bus_dma_tag_t sc_dmat;
@@ -406,7 +406,7 @@
 {
        struct dino_softc *sc = v;
 
-       return hp700_intr_establish(pri, handler, arg, &sc->sc_int_reg, ih);
+       return hp700_intr_establish(pri, handler, arg, &sc->sc_ir, ih);
 }
 
 void
@@ -1596,7 +1596,7 @@
 
        /* Make sure we have an IRQ. */
        if (ca->ca_irq == HP700CF_IRQ_UNDEF)
-               ca->ca_irq = hp700_intr_allocate_bit(&int_reg_cpu);
+               ca->ca_irq = hp700_intr_allocate_bit(&ir_cpu);
 
        return 1;
 }
@@ -1658,15 +1658,16 @@
        r->iar0 = cpu_gethpa(0) | (31 - ca->ca_irq);
        splx(s);
        /* Establish the interrupt register. */
-       hp700_intr_reg_establish(&sc->sc_int_reg);
-       sc->sc_int_reg.int_reg_name = device_xname(self);
-       sc->sc_int_reg.int_reg_mask = &r->imr;
-       sc->sc_int_reg.int_reg_req = &r->irr0;
-       sc->sc_int_reg.int_reg_level = &r->ilr;
+       hp700_interrupt_register_establish(&sc->sc_ir);
+       sc->sc_ir.ir_name = device_xname(self);
+       sc->sc_ir.ir_mask = &r->imr;
+       sc->sc_ir.ir_req = &r->irr0;
+       sc->sc_ir.ir_level = &r->ilr;
        /* Add the I/O interrupt register. */
 
-       sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, &sc->sc_int_reg,
-           &int_reg_cpu, ca->ca_irq);
+       sc->sc_ih = hp700_intr_establish(IPL_NONE, NULL, &sc->sc_ir,
+           &ir_cpu, ca->ca_irq);
+
 
        /* TODO establish the bus error interrupt */
 
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/lasi.c
--- a/sys/arch/hp700/dev/lasi.c Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/lasi.c Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lasi.c,v 1.19 2011/01/13 21:15:13 skrll Exp $  */
+/*     $NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $  */
 
 /*     $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.19 2011/01/13 21:15:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $");
 
 #undef LASIDEBUG
 
@@ -71,7 +71,7 @@
 struct lasi_softc {
        device_t sc_dev;
        
-       struct hp700_int_reg sc_int_reg;
+       struct hp700_interrupt_register sc_ir;
 
        struct lasi_hwr volatile *sc_hw;
        struct lasi_trs volatile *sc_trs;
@@ -134,7 +134,7 @@
 
        /* Make sure we have an IRQ. */
        if (ca->ca_irq == HP700CF_IRQ_UNDEF)
-               ca->ca_irq = hp700_intr_allocate_bit(&int_reg_cpu);
+               ca->ca_irq = hp700_intr_allocate_bit(&ir_cpu);
 
        /*
         * Forcibly mask the HPA down to the start of the LASI
@@ -190,16 +190,16 @@
        splx(s);
 
        /* Establish the interrupt register. */
-       hp700_intr_reg_establish(&sc->sc_int_reg);
-       sc->sc_int_reg.int_reg_name = device_xname(self);
-       sc->sc_int_reg.int_reg_mask = &sc->sc_trs->lasi_imr;
-       sc->sc_int_reg.int_reg_req = &sc->sc_trs->lasi_irr;
+       hp700_interrupt_register_establish(&sc->sc_ir);
+       sc->sc_ir.ir_name = device_xname(self);
+       sc->sc_ir.ir_mask = &sc->sc_trs->lasi_imr;
+       sc->sc_ir.ir_req = &sc->sc_trs->lasi_irr;
 
        /* Attach the GSC bus. */
        ga.ga_ca = *ca; /* clone from us */
 
        ga.ga_name = "gsc";
-       ga.ga_int_reg = &sc->sc_int_reg;
+       ga.ga_ir = &sc->sc_ir;
        ga.ga_fix_args = lasi_fix_args;
        ga.ga_fix_args_cookie = sc;
        ga.ga_scsi_target = 7; /* XXX */
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/mongoose.c
--- a/sys/arch/hp700/dev/mongoose.c     Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/mongoose.c     Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mongoose.c,v 1.20 2010/12/05 12:19:09 skrll Exp $      */
+/*     $NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $      */
 
 /*     $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $  */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.20 2010/12/05 12:19:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $");
 
 #define MONGOOSE_DEBUG 9
 
@@ -709,6 +709,6 @@
 #undef R
 
        /* attach interrupt */
-       sc->sc_ih = hp700_intr_establish(IPL_NONE, mg_intr, sc, &int_reg_cpu,
+       sc->sc_ih = hp700_intr_establish(IPL_NONE, mg_intr, sc, &ir_cpu,
            ca->ca_irq);
 }
diff -r dacc8f4dea18 -r 22b1e102df59 sys/arch/hp700/dev/siop_sgc.c
--- a/sys/arch/hp700/dev/siop_sgc.c     Tue Feb 01 18:12:10 2011 +0000
+++ b/sys/arch/hp700/dev/siop_sgc.c     Tue Feb 01 18:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop_sgc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $       */
+/*     $NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $       */
 
 /*     $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $   */
 
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.6 2010/12/05 12:19:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -77,7 +77,7 @@
 
        /* Make sure we have an IRQ. */
        if (ca->ca_irq == HP700CF_IRQ_UNDEF)
-               ca->ca_irq = hp700_intr_allocate_bit(&int_reg_cpu);
+               ca->ca_irq = hp700_intr_allocate_bit(&ir_cpu);