[src/trunk]: src/sys/dev/cardbus make this compile again (shadow and const wa...

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

details:   https://anonhg.NetBSD.org/src/rev/509f8329f6ab
branches:  trunk
changeset: 584113:509f8329f6ab
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Sep 09 13:48:10 2005 +0000

description:
make this compile again (shadow and const warnings)
I doubt this serves any useful purpose.

diffstat:

 sys/dev/cardbus/rbus_ppb.c |  50 +++++++++++++++------------------------------
 1 files changed, 17 insertions(+), 33 deletions(-)

diffs (96 lines):

diff -r 75bb922446c6 -r 509f8329f6ab sys/dev/cardbus/rbus_ppb.c
--- a/sys/dev/cardbus/rbus_ppb.c        Fri Sep 09 13:45:41 2005 +0000
+++ b/sys/dev/cardbus/rbus_ppb.c        Fri Sep 09 13:48:10 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_ppb.c,v 1.15 2005/02/27 00:26:59 perry Exp $      */
+/*     $NetBSD: rbus_ppb.c,v 1.16 2005/09/09 13:48:10 drochner Exp $   */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.15 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.16 2005/09/09 13:48:10 drochner Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,38 +89,22 @@
 /*static*/ void ppb_cardbus_setup(struct ppb_softc * sc);
 /*static*/ int  ppb_cardbus_enable(struct ppb_softc * sc);
 /*static*/ void ppb_cardbus_disable(struct ppb_softc * sc);
-static int  ppb_activate(struct device *self, enum devact act);
-int rppbprint(void *aux, const char *pnp);
-int rbus_intr_fixup(pci_chipset_tag_t pc, int minbus,
-                         int maxbus, int line);
-void rbus_do_header_fixup(pci_chipset_tag_t pc, pcitag_t tag,
-                             void *context);
+static int  ppb_activate(struct device *, enum devact);
+int rppbprint(void *, const char *);
+int rbus_intr_fixup(pci_chipset_tag_t, int, int, int);
+void rbus_do_header_fixup(pci_chipset_tag_t, pcitag_t, void *);
 
-static void rbus_pci_phys_allocate(pci_chipset_tag_t pc,
-                                       pcitag_t tag,
-                                       void *context);
+static void rbus_pci_phys_allocate(pci_chipset_tag_t, pcitag_t, void *);
 
-static int rbus_do_phys_allocate(pci_chipset_tag_t pc,
-                                     pcitag_t tag,
-                                     int mapreg,
-                                     void *ctx,
-                                     int type,
-                                     bus_addr_t *addr,
-                                     bus_size_t size);
+static int rbus_do_phys_allocate(pci_chipset_tag_t, pcitag_t, int,
+                                void *, int, bus_addr_t *, bus_size_t);
+
+static void rbus_pci_phys_countspace(pci_chipset_tag_t, pcitag_t, void *);
 
-static void rbus_pci_phys_countspace(pci_chipset_tag_t pc,
-                                         pcitag_t tag,
-                                         void *context);
+static int rbus_do_phys_countspace(pci_chipset_tag_t, pcitag_t, int,
+                                  void *, int, bus_addr_t *, bus_size_t);
 
-static int rbus_do_phys_countspace(pci_chipset_tag_t pc,
-                                       pcitag_t tag,
-                                       int mapreg,
-                                       void *ctx,
-                                       int type,
-                                       bus_addr_t *addr,
-                                       bus_size_t size);
-
-unsigned int rbus_round_up(unsigned int size, unsigned int min);
+unsigned int rbus_round_up(unsigned int, unsigned int);
 
 
 struct ppb_cardbus_softc {
@@ -242,7 +226,7 @@
 };
 
 unsigned int
-rbus_round_up(unsigned int size, unsigned int min)
+rbus_round_up(unsigned int size, unsigned int minval)
 {
   unsigned int power2;
 
@@ -250,7 +234,7 @@
     return 0;
   }
 
-  power2=min;
+  power2=minval;
 
   while(power2 < (1 << 31) &&
        power2 < size) {
@@ -589,7 +573,7 @@
        bus_space_handle_t handle;
        int busflags = 0;
        int flags    = 0;
-       char *bustype;
+       const char *bustype;
        int bus, device, function;
 
        pci_decompose_tag(pc, tag, &bus, &device, &function);