Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
he 2005-06-04 14:35:53 +00:00
parent dfaf8269a3
commit 5cfd2bfc98
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/arch/atari/atari/autoconf.c
View File

@ -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 @@ cpu_configure()
atari_realconfig = 1;
if (config_rootfound("mainbus", "mainbus") == NULL)
if (config_rootfound("mainbus", __UNCONST("mainbus")) == NULL)
panic("no mainbus found");
}
@ -139,7 +139,7 @@ config_console()
/*
* 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 @@ config_console()
* 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 @@ mbattach(pdp, dp, auxp)
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