[src/trunk]: src/sys/arch/atari/atari Add use of __UNCONST() when passing a c...

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

details:   https://anonhg.NetBSD.org/src/rev/bce75b2292d2
branches:  trunk
changeset: 581739:bce75b2292d2
user:      he <he%NetBSD.org@localhost>
date:      Sat Jun 04 14:35:53 2005 +0000

description:
Add use of __UNCONST() when passing a constant string to some of the
general autoconf functions which typically take a "void*".  There may
be reason to revisit this later if the signature for the autoconf
functions can be adapted, but for now this gets the code building.

diffstat:

 sys/arch/atari/atari/autoconf.c |  40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diffs (82 lines):

diff -r c035f937c8e9 -r bce75b2292d2 sys/arch/atari/atari/autoconf.c
--- a/sys/arch/atari/atari/autoconf.c   Sat Jun 04 14:31:15 2005 +0000
+++ b/sys/arch/atari/atari/autoconf.c   Sat Jun 04 14:35:53 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.48 2004/12/13 02:14:13 chs Exp $        */
+/*     $NetBSD: autoconf.c,v 1.49 2005/06/04 14:35:53 he Exp $ */
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.48 2004/12/13 02:14:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.49 2005/06/04 14:35:53 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +63,7 @@
        
        atari_realconfig = 1;
 
-       if (config_rootfound("mainbus", "mainbus") == NULL)
+       if (config_rootfound("mainbus", __UNCONST("mainbus")) == NULL)
                panic("no mainbus found");
 }
 
@@ -139,7 +139,7 @@
        /*
         * we need mainbus' cfdata.
         */
-       cf = config_rootsearch(NULL, "mainbus", "mainbus");
+       cf = config_rootsearch(NULL, "mainbus", __UNCONST("mainbus"));
        if (cf == NULL)
                panic("no mainbus");
 
@@ -149,9 +149,9 @@
         * some setup for the 'grf-side'. This make it possible to use
         * a PCI card for both wscons and grfabs.
         */
-       atari_config_found(cf, NULL, "pcib"  , NULL);
-       atari_config_found(cf, NULL, "isab"  , NULL);
-       atari_config_found(cf, NULL, "grfbus", NULL);
+       atari_config_found(cf, NULL, __UNCONST("pcib")  , NULL);
+       atari_config_found(cf, NULL, __UNCONST("isab")  , NULL);
+       atari_config_found(cf, NULL, __UNCONST("grfbus"), NULL);
 }
 
 /*
@@ -287,19 +287,19 @@
        mb_attached = 1;
 
        printf ("\n");
-       config_found(dp, "clock"   , simple_devprint);
-       config_found(dp, "grfbus"  , simple_devprint);
-       config_found(dp, "kbd"     , simple_devprint);
-       config_found(dp, "fdc"     , simple_devprint);
-       config_found(dp, "ser"     , simple_devprint);
-       config_found(dp, "zs"      , simple_devprint);
-       config_found(dp, "ncrscsi" , simple_devprint);
-       config_found(dp, "nvr"     , simple_devprint);
-       config_found(dp, "lpt"     , simple_devprint);
-       config_found(dp, "wdc"     , simple_devprint);
-       config_found(dp, "isab"    , simple_devprint);
-       config_found(dp, "pcib"    , simple_devprint);
-       config_found(dp, "avmebus" , simple_devprint);
+       config_found(dp, __UNCONST("clock")   , simple_devprint);
+       config_found(dp, __UNCONST("grfbus")  , simple_devprint);
+       config_found(dp, __UNCONST("kbd")     , simple_devprint);
+       config_found(dp, __UNCONST("fdc")     , simple_devprint);
+       config_found(dp, __UNCONST("ser")     , simple_devprint);
+       config_found(dp, __UNCONST("zs")      , simple_devprint);
+       config_found(dp, __UNCONST("ncrscsi") , simple_devprint);
+       config_found(dp, __UNCONST("nvr")     , simple_devprint);
+       config_found(dp, __UNCONST("lpt")     , simple_devprint);
+       config_found(dp, __UNCONST("wdc")     , simple_devprint);
+       config_found(dp, __UNCONST("isab")    , simple_devprint);
+       config_found(dp, __UNCONST("pcib")    , simple_devprint);
+       config_found(dp, __UNCONST("avmebus") , simple_devprint);
 }
 
 int