[src/trunk]: src/sys/arch/amiga/amiga Constify

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

details:   https://anonhg.NetBSD.org/src/rev/ca8303cbd662
branches:  trunk
changeset: 582022:ca8303cbd662
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jun 13 20:44:11 2005 +0000

description:
Constify

diffstat:

 sys/arch/amiga/amiga/autoconf.c |  57 ++++++++++++++++++++--------------------
 1 files changed, 28 insertions(+), 29 deletions(-)

diffs (139 lines):

diff -r 31dc8fc50b72 -r ca8303cbd662 sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c   Mon Jun 13 20:43:16 2005 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c   Mon Jun 13 20:44:11 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.94 2005/06/12 16:31:42 jandberg Exp $   */
+/*     $NetBSD: autoconf.c,v 1.95 2005/06/13 20:44:11 jmc Exp $        */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.94 2005/06/12 16:31:42 jandberg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.95 2005/06/13 20:44:11 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -81,7 +81,7 @@
        custom.intena = INTF_INTEN;
        s = splhigh();
 
-       if (config_rootfound("mainbus", "mainbus") == NULL)
+       if (config_rootfound("mainbus", NULL) == NULL)
                panic("no mainbus found");
 
 #ifdef DEBUG_KERNEL_START
@@ -206,14 +206,14 @@
        /*
         * we need mainbus' cfdata.
         */
-       cf = config_rootsearch(NULL, "mainbus", "mainbus");
+       cf = config_rootsearch(NULL, "mainbus", NULL);
        if (cf == NULL) {
                panic("no mainbus");
        }
        /*
         * delay clock calibration.
         */
-       amiga_config_found(cf, NULL, "clock", NULL);
+       amiga_config_found(cf, NULL, __UNCONST("clock"), NULL);
 
        /*
         * internal grf.
@@ -221,13 +221,13 @@
 #ifdef DRACO
        if (!(is_draco()))
 #endif
-               amiga_config_found(cf, NULL, "grfcc", NULL);
+               amiga_config_found(cf, NULL, __UNCONST("grfcc"), NULL);
 
        /*
         * zbus knows when its not for real and will
         * only configure the appropriate hardware
         */
-       amiga_config_found(cf, NULL, "zbus", NULL);
+       amiga_config_found(cf, NULL, __UNCONST("zbus"), NULL);
 }
 
 /*
@@ -266,49 +266,49 @@
        void *auxp;
 {
        printf("\n");
-       config_found(dp, "clock", simple_devprint);
+       config_found(dp, __UNCONST("clock"), simple_devprint);
        if (is_a3000() || is_a4000()) {
-               config_found(dp, "a34kbbc", simple_devprint);
+               config_found(dp, __UNCONST("a34kbbc"), simple_devprint);
        } else
 #ifdef DRACO
        if (!is_draco())
 #endif
        {
-               config_found(dp, "a2kbbc", simple_devprint);
+               config_found(dp, __UNCONST("a2kbbc"), simple_devprint);
        }
 #ifdef DRACO
        if (is_draco()) {
-               config_found(dp, "drbbc", simple_devprint);
-               config_found(dp, "kbd", simple_devprint);
-               config_found(dp, "drsc", simple_devprint);
-               config_found(dp, "drsupio", simple_devprint);
+               config_found(dp, __UNCONST("drbbc"), simple_devprint);
+               config_found(dp, __UNCONST("kbd"), simple_devprint);
+               config_found(dp, __UNCONST("drsc"), simple_devprint);
+               config_found(dp, __UNCONST("drsupio"), simple_devprint);
        } else
 #endif
        {
-               config_found(dp, "ser", simple_devprint);
-               config_found(dp, "par", simple_devprint);
-               config_found(dp, "kbd", simple_devprint);
-               config_found(dp, "ms", simple_devprint);
-               config_found(dp, "grfcc", simple_devprint);
-               config_found(dp, "amidisplaycc", simple_devprint);
-               config_found(dp, "fdc", simple_devprint);
+               config_found(dp, __UNCONST("ser"), simple_devprint);
+               config_found(dp, __UNCONST("par"), simple_devprint);
+               config_found(dp, __UNCONST("kbd"), simple_devprint);
+               config_found(dp, __UNCONST("ms"), simple_devprint);
+               config_found(dp, __UNCONST("grfcc"), simple_devprint);
+               config_found(dp, __UNCONST("amidisplaycc"), simple_devprint);
+               config_found(dp, __UNCONST("fdc"), simple_devprint);
        }
        if (is_a4000() || is_a1200()) {
-               config_found(dp, "wdc", simple_devprint);
-               config_found(dp, "idesc", simple_devprint);
+               config_found(dp, __UNCONST("wdc"), simple_devprint);
+               config_found(dp, __UNCONST("idesc"), simple_devprint);
        }
        if (is_a4000())                 /* Try to configure A4000T SCSI */
-               config_found(dp, "afsc", simple_devprint);
+               config_found(dp, __UNCONST("afsc"), simple_devprint);
        if (is_a3000())
-               config_found(dp, "ahsc", simple_devprint);
+               config_found(dp, __UNCONST("ahsc"), simple_devprint);
        if (/*is_a600() || */is_a1200())
-               config_found(dp, "pccard", simple_devprint);
+               config_found(dp, __UNCONST("pccard"), simple_devprint);
 #ifdef DRACO
        if (!is_draco())
 #endif
-               config_found(dp, "aucc", simple_devprint);
+               config_found(dp, __UNCONST("aucc"), simple_devprint);
 
-       config_found(dp, "zbus", simple_devprint);
+       config_found(dp, __UNCONST("zbus"), simple_devprint);
 }
 
 int
@@ -387,7 +387,6 @@
        printf("Boot partition offset is %ld\n", boot_partition);
 #endif
        if (boot_partition != 0) {
-               int i;
 
                for (unit = 0; unit < sd_cd.cd_ndevs; ++unit) {
 #ifdef DEBUG_KERNEL_START