diff options
144 files changed, 370 insertions, 361 deletions
diff --git a/sys/arch/alpha/alpha/mainbus.c b/sys/arch/alpha/alpha/mainbus.c index e610c2b7f49..10f06b0b6ae 100644 --- a/sys/arch/alpha/alpha/mainbus.c +++ b/sys/arch/alpha/alpha/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.6 1996/10/30 22:38:15 niklas Exp $ */ +/* $OpenBSD: mainbus.c,v 1.7 1996/11/23 21:44:50 kstailey Exp $ */ /* $NetBSD: mainbus.c,v 1.12 1996/10/13 02:59:40 christos Exp $ */ /* @@ -44,7 +44,7 @@ struct mainbus_softc { /* Definition of the mainbus driver. */ static int mbmatch __P((struct device *, void *, void *)); static void mbattach __P((struct device *, struct device *, void *)); -static int mbprint __P((void *, /* const */ char *)); +static int mbprint __P((void *, const char *)); struct cfattach mainbus_ca = { sizeof(struct mainbus_softc), mbmatch, mbattach @@ -135,7 +135,7 @@ mbattach(parent, self, aux) static int mbprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { struct confargs *ca = aux; diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c index fee67e04274..5dfdd42262b 100644 --- a/sys/arch/alpha/pci/apecs.c +++ b/sys/arch/alpha/pci/apecs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs.c,v 1.5 1996/10/30 22:39:46 niklas Exp $ */ +/* $OpenBSD: apecs.c,v 1.6 1996/11/23 21:44:53 kstailey Exp $ */ /* $NetBSD: apecs.c,v 1.12 1996/10/13 03:00:00 christos Exp $ */ /* @@ -61,7 +61,7 @@ struct cfdriver apecs_cd = { NULL, "apecs", DV_DULL, }; -int apecsprint __P((void *, /* const */ char *pnp)); +int apecsprint __P((void *, const char *pnp)); /* There can be only one. */ int apecsfound; @@ -166,7 +166,7 @@ apecsattach(parent, self, aux) int apecsprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { register struct pcibus_attach_args *pba = aux; diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c index 8337d47c48c..c52bec93a35 100644 --- a/sys/arch/alpha/pci/cia.c +++ b/sys/arch/alpha/pci/cia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia.c,v 1.4 1996/10/30 22:39:53 niklas Exp $ */ +/* $OpenBSD: cia.c,v 1.5 1996/11/23 21:44:54 kstailey Exp $ */ /* $NetBSD: cia.c,v 1.11 1996/10/13 03:00:03 christos Exp $ */ /* @@ -60,7 +60,7 @@ struct cfdriver cia_cd = { NULL, "cia", DV_DULL, }; -int ciaprint __P((void *, /* const */ char *pnp)); +int ciaprint __P((void *, const char *pnp)); /* There can be only one. */ int ciafound; @@ -148,7 +148,7 @@ ciaattach(parent, self, aux) int ciaprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { register struct pcibus_attach_args *pba = aux; diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c index 64994855849..a0004181456 100644 --- a/sys/arch/alpha/pci/lca.c +++ b/sys/arch/alpha/pci/lca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca.c,v 1.4 1996/10/30 22:39:59 niklas Exp $ */ +/* $OpenBSD: lca.c,v 1.5 1996/11/23 21:44:54 kstailey Exp $ */ /* $NetBSD: lca.c,v 1.10 1996/10/13 03:00:07 christos Exp $ */ /* @@ -61,7 +61,7 @@ struct cfdriver lca_cd = { NULL, "lca", DV_DULL, }; -int lcaprint __P((void *, /* const */ char *pnp)); +int lcaprint __P((void *, const char *pnp)); /* There can be only one. */ int lcafound; @@ -203,7 +203,7 @@ lcaattach(parent, self, aux) int lcaprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { register struct pcibus_attach_args *pba = aux; diff --git a/sys/arch/alpha/pci/pcivga.c b/sys/arch/alpha/pci/pcivga.c index 1cbcabde789..1670af9ebb2 100644 --- a/sys/arch/alpha/pci/pcivga.c +++ b/sys/arch/alpha/pci/pcivga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcivga.c,v 1.7 1996/10/30 22:40:10 niklas Exp $ */ +/* $OpenBSD: pcivga.c,v 1.8 1996/11/23 21:44:55 kstailey Exp $ */ /* $NetBSD: pcivga.c,v 1.11 1996/10/13 03:00:13 christos Exp $ */ /* @@ -49,7 +49,7 @@ int pcivgamatch __P((struct device *, void *, void *)); void pcivgaattach __P((struct device *, struct device *, void *)); -int pcivgaprint __P((void *, /* const */ char *)); +int pcivgaprint __P((void *, const char *)); struct cfattach pcivga_ca = { sizeof(struct pcivga_softc), pcivgamatch, pcivgaattach, @@ -221,7 +221,7 @@ pcivgaattach(parent, self, aux) int pcivgaprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c index 4dfca1d5e64..021573560de 100644 --- a/sys/arch/alpha/pci/sio.c +++ b/sys/arch/alpha/pci/sio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio.c,v 1.6 1996/11/12 20:29:39 niklas Exp $ */ +/* $OpenBSD: sio.c,v 1.7 1996/11/23 21:44:56 kstailey Exp $ */ /* $NetBSD: sio.c,v 1.11 1996/10/13 03:00:18 christos Exp $ */ /* @@ -72,7 +72,7 @@ union sio_attach_args { struct eisabus_attach_args sa_eba; }; -int sioprint __P((void *, /* const */ char *pnp)); +int sioprint __P((void *, const char *pnp)); void sio_isa_attach_hook __P((struct device *, struct device *, struct isabus_attach_args *)); void sio_eisa_attach_hook __P((struct device *, struct device *, @@ -170,7 +170,7 @@ sioattach(parent, self, aux) int sioprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { register union sio_attach_args *sa = aux; diff --git a/sys/arch/alpha/pci/tga.c b/sys/arch/alpha/pci/tga.c index ac4f6d976dd..384dd7c31e8 100644 --- a/sys/arch/alpha/pci/tga.c +++ b/sys/arch/alpha/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.6 1996/11/12 20:29:41 niklas Exp $ */ +/* $OpenBSD: tga.c,v 1.7 1996/11/23 21:44:56 kstailey Exp $ */ /* $NetBSD: tga.c,v 1.10 1996/10/13 03:00:22 christos Exp $ */ /* @@ -57,7 +57,7 @@ int tgamatch __P((struct device *, void *, void *)); void tgaattach __P((struct device *, struct device *, void *)); -int tgaprint __P((void *, /* const */ char *)); +int tgaprint __P((void *, const char *)); struct cfattach tga_ca = { sizeof(struct tga_softc), tgamatch, tgaattach, @@ -312,7 +312,7 @@ tgaattach(parent, self, aux) int tgaprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index b415f314504..1e97c303117 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.4 1996/11/12 20:29:42 niklas Exp $ */ +/* $OpenBSD: cfb.c,v 1.5 1996/11/23 21:44:57 kstailey Exp $ */ /* $NetBSD: cfb.c,v 1.5 1996/10/13 03:00:27 christos Exp $ */ /* @@ -57,7 +57,7 @@ int cfbmatch __P((struct device *, void *, void *)); void cfbattach __P((struct device *, struct device *, void *)); -int cfbprint __P((void *, /* const */ char *)); +int cfbprint __P((void *, const char *)); struct cfattach cfb_ca = { sizeof(struct cfb_softc), cfbmatch, cfbattach, @@ -206,7 +206,7 @@ cfbattach(parent, self, aux) int cfbprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/alpha/tc/esp.c b/sys/arch/alpha/tc/esp.c index cb18590130c..8ef09391a31 100644 --- a/sys/arch/alpha/tc/esp.c +++ b/sys/arch/alpha/tc/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.6 1996/10/30 22:41:04 niklas Exp $ */ +/* $OpenBSD: esp.c,v 1.7 1996/11/23 21:44:59 kstailey Exp $ */ /* $NetBSD: esp.c,v 1.22 1996/10/15 21:30:19 mycroft Exp $ */ #ifdef __sparc__ @@ -109,7 +109,7 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ /*static*/ void espattach __P((struct device *, struct device *, void *)); -/*static*/ int espprint __P((void *, char *)); +/*static*/ int espprint __P((void *, const char *)); /*static*/ int espmatch __P((struct device *, void *, void *)); /*static*/ u_int esp_adapter_info __P((struct esp_softc *)); /*static*/ void espreadregs __P((struct esp_softc *)); @@ -164,7 +164,7 @@ struct scsi_device esp_dev = { int espprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("scsibus at %s", name); diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c index 37e6d1bf17d..d7a6aae03f2 100644 --- a/sys/arch/alpha/tc/ioasic.c +++ b/sys/arch/alpha/tc/ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioasic.c,v 1.4 1996/10/30 22:41:08 niklas Exp $ */ +/* $OpenBSD: ioasic.c,v 1.5 1996/11/23 21:45:00 kstailey Exp $ */ /* $NetBSD: ioasic.c,v 1.9 1996/10/13 03:00:32 christos Exp $ */ /* @@ -54,7 +54,7 @@ struct ioasic_softc { /* Definition of the driver for autoconfig. */ int ioasicmatch __P((struct device *, void *, void *)); void ioasicattach __P((struct device *, struct device *, void *)); -int ioasicprint(void *, /* const */ char *); +int ioasicprint(void *, const char *); struct cfattach ioasic_ca = { sizeof(struct ioasic_softc), ioasicmatch, ioasicattach, @@ -190,7 +190,7 @@ ioasicattach(parent, self, aux) int ioasicprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { struct ioasicdev_attach_args *d = aux; diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index 16c14521d80..7a20ad45513 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfb.c,v 1.4 1996/11/12 20:29:43 niklas Exp $ */ +/* $OpenBSD: sfb.c,v 1.5 1996/11/23 21:45:01 kstailey Exp $ */ /* $NetBSD: sfb.c,v 1.5 1996/10/13 03:00:35 christos Exp $ */ /* @@ -57,7 +57,7 @@ int sfbmatch __P((struct device *, void *, void *)); void sfbattach __P((struct device *, struct device *, void *)); -int sfbprint __P((void *, /* const */ char *)); +int sfbprint __P((void *, const char *)); struct cfattach sfb_ca = { sizeof(struct sfb_softc), sfbmatch, sfbattach, @@ -251,7 +251,7 @@ sfbattach(parent, self, aux) int sfbprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c index 6ea1615408c..208e6a78fd5 100644 --- a/sys/arch/alpha/tc/tcasic.c +++ b/sys/arch/alpha/tc/tcasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcasic.c,v 1.4 1996/10/30 22:41:24 niklas Exp $ */ +/* $OpenBSD: tcasic.c,v 1.5 1996/11/23 21:45:01 kstailey Exp $ */ /* $NetBSD: tcasic.c,v 1.10 1996/10/13 03:00:39 christos Exp $ */ /* @@ -50,7 +50,7 @@ struct cfdriver tcasic_cd = { NULL, "tcasic", DV_DULL, }; -int tcasicprint __P((void *, /* const */ char *)); +int tcasicprint __P((void *, const char *)); extern int cputype; @@ -145,7 +145,7 @@ tcasicattach(parent, self, aux) int tcasicprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { /* only TCs can attach to tcasics; easy. */ diff --git a/sys/arch/alpha/tc/tcds.c b/sys/arch/alpha/tc/tcds.c index a3cb6ae6b1b..da676fed240 100644 --- a/sys/arch/alpha/tc/tcds.c +++ b/sys/arch/alpha/tc/tcds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcds.c,v 1.5 1996/10/30 22:41:27 niklas Exp $ */ +/* $OpenBSD: tcds.c,v 1.6 1996/11/23 21:45:02 kstailey Exp $ */ /* $NetBSD: tcds.c,v 1.15 1996/10/13 03:00:41 christos Exp $ */ /* @@ -58,7 +58,7 @@ struct tcds_softc { /* Definition of the driver for autoconfig. */ int tcdsmatch __P((struct device *, void *, void *)); void tcdsattach __P((struct device *, struct device *, void *)); -int tcdsprint __P((void *, /* const */ char *)); +int tcdsprint __P((void *, const char *)); struct cfattach tcds_ca = { sizeof(struct tcds_softc), tcdsmatch, tcdsattach, @@ -204,7 +204,7 @@ tcdsattach(parent, self, aux) int tcdsprint(aux, pnp) void *aux; - /* const */ char *pnp; + const char *pnp; { struct tc_attach_args *ta = aux; diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c index f2a16d2103d..709a18c4581 100644 --- a/sys/arch/amiga/amiga/autoconf.c +++ b/sys/arch/amiga/amiga/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.6 1996/08/19 00:04:13 niklas Exp $ */ +/* $OpenBSD: autoconf.c,v 1.7 1996/11/23 21:45:03 kstailey Exp $ */ /* $NetBSD: autoconf.c,v 1.38.4.1 1996/05/26 16:23:26 is Exp $ */ /* @@ -44,7 +44,7 @@ void setroot __P((void)); void swapconf __P((void)); void mbattach __P((struct device *, struct device *, void *)); -int mbprint __P((void *, char *)); +int mbprint __P((void *, const char *)); int mbmatch __P((struct device *, void *, void *)); int cold; /* 1 if still booting */ @@ -120,7 +120,7 @@ configure() int simple_devprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { return(QUIET); } @@ -271,7 +271,7 @@ mbattach(pdp, dp, auxp) int mbprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("%s at %s", (char *)auxp, pnp); diff --git a/sys/arch/amiga/amiga/device.h b/sys/arch/amiga/amiga/device.h index 5f2344dd7db..8f472f82f9a 100644 --- a/sys/arch/amiga/amiga/device.h +++ b/sys/arch/amiga/amiga/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.2 1996/05/02 06:43:15 niklas Exp $ */ +/* $OpenBSD: device.h,v 1.3 1996/11/23 21:45:04 kstailey Exp $ */ /* $NetBSD: device.h,v 1.5 1996/04/21 21:06:57 veego Exp $ */ /* @@ -41,7 +41,7 @@ void config_console __P((void)); int amiga_config_found __P((struct cfdata *, struct device *, void *, cfprint_t )); -int simple_devprint __P((void *, char *)); +int simple_devprint __P((void *, const char *)); int matchname __P((char *, char *)); /* * false when initing for the console. diff --git a/sys/arch/amiga/dev/afsc.c b/sys/arch/amiga/dev/afsc.c index b02aff05f79..d139aa802e6 100644 --- a/sys/arch/amiga/dev/afsc.c +++ b/sys/arch/amiga/dev/afsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: afsc.c,v 1.5 1996/05/02 06:43:32 niklas Exp $ */ +/* $OpenBSD: afsc.c,v 1.6 1996/11/23 21:45:05 kstailey Exp $ */ /* $NetBSD: afsc.c,v 1.14 1996/04/21 21:10:48 veego Exp $ */ /* @@ -52,7 +52,7 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -int afscprint __P((void *auxp, char *)); +int afscprint __P((void *auxp, const char *)); void afscattach __P((struct device *, struct device *, void *)); int afscmatch __P((struct device *, void *, void *)); int afsc_dmaintr __P((void *)); @@ -179,7 +179,7 @@ afscattach(pdp, dp, auxp) int afscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/ahsc.c b/sys/arch/amiga/dev/ahsc.c index 2d40f8e8890..aa1dd49090d 100644 --- a/sys/arch/amiga/dev/ahsc.c +++ b/sys/arch/amiga/dev/ahsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahsc.c,v 1.3 1996/05/02 06:43:33 niklas Exp $ */ +/* $OpenBSD: ahsc.c,v 1.4 1996/11/23 21:45:05 kstailey Exp $ */ /* $NetBSD: ahsc.c,v 1.12 1996/04/21 21:10:49 veego Exp $ */ /* @@ -52,7 +52,7 @@ #include <amiga/dev/ahscreg.h> #include <amiga/dev/zbusvar.h> -int ahscprint __P((void *auxp, char *)); +int ahscprint __P((void *auxp, const char *)); void ahscattach __P((struct device *, struct device *, void *)); int ahscmatch __P((struct device *, void *, void *)); @@ -164,7 +164,7 @@ ahscattach(pdp, dp, auxp) int ahscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/atzsc.c b/sys/arch/amiga/dev/atzsc.c index d870992901f..fbc439a4089 100644 --- a/sys/arch/amiga/dev/atzsc.c +++ b/sys/arch/amiga/dev/atzsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atzsc.c,v 1.3 1996/05/02 06:43:34 niklas Exp $ */ +/* $OpenBSD: atzsc.c,v 1.4 1996/11/23 21:45:06 kstailey Exp $ */ /* $NetBSD: atzsc.c,v 1.16 1996/04/21 21:10:51 veego Exp $ */ /* @@ -52,7 +52,7 @@ #include <amiga/dev/atzscreg.h> #include <amiga/dev/zbusvar.h> -int atzscprint __P((void *auxp, char *)); +int atzscprint __P((void *auxp, const char *)); void atzscattach __P((struct device *, struct device *, void *)); int atzscmatch __P((struct device *, void *, void *)); @@ -188,7 +188,7 @@ atzscattach(pdp, dp, auxp) int atzscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/bzsc.c b/sys/arch/amiga/dev/bzsc.c index 972714ae3ff..997e96a7ca0 100644 --- a/sys/arch/amiga/dev/bzsc.c +++ b/sys/arch/amiga/dev/bzsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bzsc.c,v 1.3 1996/05/02 06:43:34 niklas Exp $ */ +/* $OpenBSD: bzsc.c,v 1.4 1996/11/23 21:45:06 kstailey Exp $ */ /* $NetBSD: bzsc.c,v 1.7 1996/04/21 21:10:52 veego Exp $ */ @@ -59,7 +59,7 @@ #include <amiga/dev/bzscreg.h> #include <amiga/dev/bzscvar.h> -int bzscprint __P((void *auxp, char *)); +int bzscprint __P((void *auxp, const char *)); void bzscattach __P((struct device *, struct device *, void *)); int bzscmatch __P((struct device *, void *, void *)); @@ -190,7 +190,7 @@ bzscattach(pdp, dp, auxp) int bzscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/drsc.c b/sys/arch/amiga/dev/drsc.c index e4304a6a5b4..09768e8fe91 100644 --- a/sys/arch/amiga/dev/drsc.c +++ b/sys/arch/amiga/dev/drsc.c @@ -51,7 +51,7 @@ #include <amiga/dev/siopvar.h> #include <amiga/amiga/drcustom.h> -int drscprint __P((void *auxp, char *)); +int drscprint __P((void *auxp, const char *)); void drscattach __P((struct device *, struct device *, void *)); int drscmatch __P((struct device *, void *, void *)); int drsc_dmaintr __P((struct siop_softc *)); @@ -157,7 +157,7 @@ drscattach(pdp, dp, auxp) int drscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/empsc.c b/sys/arch/amiga/dev/empsc.c index 7af2b5ab94f..a603e4d9be6 100644 --- a/sys/arch/amiga/dev/empsc.c +++ b/sys/arch/amiga/dev/empsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: empsc.c,v 1.3 1996/05/29 10:14:51 niklas Exp $ */ +/* $OpenBSD: empsc.c,v 1.4 1996/11/23 21:45:07 kstailey Exp $ */ /* $NetBSD: empsc.c,v 1.7 1996/05/10 13:02:33 is Exp $ */ /* @@ -50,7 +50,7 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -int empscprint __P((void *auxp, char *)); +int empscprint __P((void *auxp, const char *)); void empscattach __P((struct device *, struct device *, void *)); int empscmatch __P((struct device *, void *, void *)); int empsc_intr __P((void *)); @@ -159,7 +159,7 @@ empscattach(pdp, dp, auxp) int empscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/fd.c b/sys/arch/amiga/dev/fd.c index 82033875d0f..6fa601a477c 100644 --- a/sys/arch/amiga/dev/fd.c +++ b/sys/arch/amiga/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.9 1996/05/07 10:08:23 niklas Exp $ */ +/* $OpenBSD: fd.c,v 1.10 1996/11/23 21:45:08 kstailey Exp $ */ /* $NetBSD: fd.c,v 1.32 1996/05/04 04:54:00 mhitch Exp $ */ /* @@ -185,7 +185,7 @@ struct fdcargs { int fdcmatch __P((struct device *, void *, void *)); void fdcattach __P((struct device *, struct device *, void *)); -int fdcprint __P((void *, char *)); +int fdcprint __P((void *, const char *)); int fdmatch __P((struct device *, void *, void *)); void fdattach __P((struct device *, struct device *, void *)); @@ -360,7 +360,7 @@ fdcattach(pdp, dp, auxp) int fdcprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { struct fdcargs *fcp; diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c index 72b4799743d..35875d2d3d5 100644 --- a/sys/arch/amiga/dev/flsc.c +++ b/sys/arch/amiga/dev/flsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flsc.c,v 1.5 1996/10/04 23:34:50 niklas Exp $ */ +/* $OpenBSD: flsc.c,v 1.6 1996/11/23 21:45:09 kstailey Exp $ */ /* $NetBSD: flsc.c,v 1.5.4.3 1996/08/05 20:40:35 jtc Exp $ */ /* @@ -58,7 +58,7 @@ #include <amiga/dev/flscreg.h> #include <amiga/dev/flscvar.h> -int flscprint __P((void *auxp, char *)); +int flscprint __P((void *auxp, const char *)); void flscattach __P((struct device *, struct device *, void *)); int flscmatch __P((struct device *, void *, void *)); @@ -198,7 +198,7 @@ flscattach(pdp, dp, auxp) int flscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c index 07a2fac3086..2069c00a94e 100644 --- a/sys/arch/amiga/dev/grf.c +++ b/sys/arch/amiga/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.5 1996/05/29 10:14:54 niklas Exp $ */ +/* $OpenBSD: grf.c,v 1.6 1996/11/23 21:45:10 kstailey Exp $ */ /* $NetBSD: grf.c,v 1.27 1996/05/19 20:06:20 is Exp $ */ /* @@ -96,7 +96,7 @@ int grfbanked_set __P((dev_t, int)); void grfattach __P((struct device *, struct device *, void *)); int grfmatch __P((struct device *, void *, void *)); -int grfprint __P((void *, char *)); +int grfprint __P((void *, const char *)); /* * pointers to grf drivers device structs */ @@ -174,7 +174,7 @@ grfattach(pdp, dp, auxp) int grfprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("ite at %s", pnp); diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c index 28a979d4c8a..0e9e409a3c0 100644 --- a/sys/arch/amiga/dev/grf_cc.c +++ b/sys/arch/amiga/dev/grf_cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cc.c,v 1.3 1996/05/02 06:43:42 niklas Exp $ */ +/* $OpenBSD: grf_cc.c,v 1.4 1996/11/23 21:45:10 kstailey Exp $ */ /* $NetBSD: grf_cc.c,v 1.19 1996/04/21 21:11:08 veego Exp $ */ /* @@ -62,7 +62,7 @@ #include "view.h" int grfccmatch __P((struct device *, void *, void *)); -int grfccprint __P((void *, char *)); +int grfccprint __P((void *, const char *)); void grfccattach __P((struct device *, struct device *, void *)); void grf_cc_on __P((struct grf_softc *)); @@ -158,7 +158,7 @@ grfccattach(pdp, dp, auxp) int grfccprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("grf%d at %s", ((struct grf_softc *)auxp)->g_unit, diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c index 38eb6c0b1e5..c7a1e6aa06b 100644 --- a/sys/arch/amiga/dev/grf_cl.c +++ b/sys/arch/amiga/dev/grf_cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cl.c,v 1.6 1996/08/23 18:52:36 niklas Exp $ */ +/* $OpenBSD: grf_cl.c,v 1.7 1996/11/23 21:45:11 kstailey Exp $ */ /* $NetBSD: grf_cl.c,v 1.11.4.1 1996/05/27 10:50:40 is Exp $ */ /* @@ -106,7 +106,7 @@ static void RegOnpass __P((volatile caddr_t)); static void RegOffpass __P((volatile caddr_t)); void grfclattach __P((struct device *, struct device *, void *)); -int grfclprint __P((void *, char *)); +int grfclprint __P((void *, const char *)); int grfclmatch __P((struct device *, void *, void *)); void cl_memset __P((unsigned char *, unsigned char, int)); @@ -358,8 +358,8 @@ grfclattach(pdp, dp, auxp) int grfclprint(auxp, pnp) - void *auxp; - char *pnp; + void *auxp; + const char *pnp; { if (pnp) printf("ite at %s: ", pnp); diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c index a7488122b5e..d104c2891b9 100644 --- a/sys/arch/amiga/dev/grf_cv.c +++ b/sys/arch/amiga/dev/grf_cv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cv.c,v 1.11 1996/10/04 15:12:36 niklas Exp $ */ +/* $OpenBSD: grf_cv.c,v 1.12 1996/11/23 21:45:13 kstailey Exp $ */ /* $NetBSD: grf_cv.c,v 1.14 1996/05/19 21:05:27 veego Exp $ */ /* @@ -70,7 +70,7 @@ int grfcvmatch __P((struct device *, void *, void *)); void grfcvattach __P((struct device *, struct device *, void *)); -int grfcvprint __P((void *, char *)); +int grfcvprint __P((void *, const char *)); static int cv_has_4mb __P((volatile caddr_t)); static unsigned short cv_compute_clock __P((unsigned long)); @@ -413,7 +413,7 @@ grfcvattach(pdp, dp, auxp) int grfcvprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("ite at %s: ", pnp); diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c index 242c6762c31..0f48bafb3d8 100644 --- a/sys/arch/amiga/dev/grf_et.c +++ b/sys/arch/amiga/dev/grf_et.c @@ -100,7 +100,7 @@ static int et_getDACType __P((struct grf_softc *gp)); int grfetmatch __P((struct device *, void *, void *)); void grfetattach __P((struct device *, struct device *, void *)); -int grfetprint __P((void *, char *)); +int grfetprint __P((void *, const char *)); void et_memset __P((unsigned char *d, unsigned char c, int l)); /* @@ -365,8 +365,8 @@ grfetattach(pdp, dp, auxp) int grfetprint(auxp, pnp) - void *auxp; - char *pnp; + void *auxp; + const char *pnp; { if (pnp) printf("ite at %s: ", pnp); diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c index a8371eba46c..9044229085f 100644 --- a/sys/arch/amiga/dev/grf_rh.c +++ b/sys/arch/amiga/dev/grf_rh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rh.c,v 1.9 1996/10/04 23:34:53 niklas Exp $ */ +/* $OpenBSD: grf_rh.c,v 1.10 1996/11/23 21:45:15 kstailey Exp $ */ /* $NetBSD: grf_rh.c,v 1.17.4.3 1996/09/06 00:40:22 jtc Exp $ */ /* @@ -1525,7 +1525,7 @@ static struct MonDef *current_mon; /* EVIL */ int rh_mode __P((struct grf_softc *, u_long, void *, u_long, int)); void grfrhattach __P((struct device *, struct device *, void *)); -int grfrhprint __P((void *, char *)); +int grfrhprint __P((void *, const char *)); int grfrhmatch __P((struct device *, void *, void *)); struct cfattach grfrh_ca = { @@ -1620,7 +1620,7 @@ grfrhattach(pdp, dp, auxp) int grfrhprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("ite at %s", pnp); diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c index 92213360164..734a450b33b 100644 --- a/sys/arch/amiga/dev/grf_rt.c +++ b/sys/arch/amiga/dev/grf_rt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rt.c,v 1.7 1996/08/23 18:52:50 niklas Exp $ */ +/* $OpenBSD: grf_rt.c,v 1.8 1996/11/23 21:45:16 kstailey Exp $ */ /* $NetBSD: grf_rt.c,v 1.27.4.1 1996/05/26 17:26:43 is Exp $ */ /* @@ -765,7 +765,7 @@ rt_load_mon(gp, md) } void grfrtattach __P((struct device *, struct device *, void *)); -int grfrtprint __P((void *, char *)); +int grfrtprint __P((void *, const char *)); int grfrtmatch __P((struct device *, void *, void *)); int rt_mode __P((struct grf_softc *, u_long, void *, u_long, int)); @@ -892,7 +892,7 @@ grfrtattach(pdp, dp, auxp) int grfrtprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("grf%d at %s", ((struct grf_softc *)auxp)->g_unit, diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c index ba6b06d66e2..e50d8e5cbab 100644 --- a/sys/arch/amiga/dev/grf_ul.c +++ b/sys/arch/amiga/dev/grf_ul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_ul.c,v 1.9 1996/05/29 10:15:17 niklas Exp $ */ +/* $OpenBSD: grf_ul.c,v 1.10 1996/11/23 21:45:17 kstailey Exp $ */ /* $NetBSD: grf_ul.c,v 1.17 1996/05/09 20:31:25 is Exp $ */ #define UL_DEBUG @@ -440,7 +440,7 @@ ul_load_mon(gp, md) int ul_mode __P((struct grf_softc *, u_long, void *, u_long, int)); void grfulattach __P((struct device *, struct device *, void *)); -int grfulprint __P((void *, char *)); +int grfulprint __P((void *, const char *)); int grfulmatch __P((struct device *, void *, void *)); struct cfattach grful_ca = { @@ -572,7 +572,7 @@ grfulattach(pdp, dp, auxp) int grfulprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("grf%d at %s", ((struct grf_softc *)auxp)->g_unit, diff --git a/sys/arch/amiga/dev/gtsc.c b/sys/arch/amiga/dev/gtsc.c index a4b2551a3ae..7735f01765e 100644 --- a/sys/arch/amiga/dev/gtsc.c +++ b/sys/arch/amiga/dev/gtsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gtsc.c,v 1.3 1996/05/02 06:44:00 niklas Exp $ */ +/* $OpenBSD: gtsc.c,v 1.4 1996/11/23 21:45:17 kstailey Exp $ */ /* $NetBSD: gtsc.c,v 1.15 1996/04/21 21:11:34 veego Exp $ */ /* @@ -55,7 +55,7 @@ void gtscattach __P((struct device *, struct device *, void *)); int gtscmatch __P((struct device *, void *, void *)); -int gtscprint __P((void *auxp, char *)); +int gtscprint __P((void *auxp, const char *)); void gtsc_enintr __P((struct sbic_softc *)); void gtsc_dmastop __P((struct sbic_softc *)); @@ -213,7 +213,7 @@ gtscattach(pdp, dp, auxp) int gtscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/gvpbus.c b/sys/arch/amiga/dev/gvpbus.c index caa3e222354..d2536685549 100644 --- a/sys/arch/amiga/dev/gvpbus.c +++ b/sys/arch/amiga/dev/gvpbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gvpbus.c,v 1.3 1996/05/02 06:44:00 niklas Exp $ */ +/* $OpenBSD: gvpbus.c,v 1.4 1996/11/23 21:45:18 kstailey Exp $ */ /* $NetBSD: gvpbus.c,v 1.11 1996/04/21 21:11:36 veego Exp $ */ /* @@ -39,7 +39,7 @@ void gvpbusattach __P((struct device *, struct device *, void *)); int gvpbusmatch __P((struct device *, void *, void *)); -int gvpbusprint __P((void *auxp, char *)); +int gvpbusprint __P((void *auxp, const char *)); extern int sbic_no_dma; /* Kludge for A1291 - mlh */ @@ -155,7 +155,7 @@ gvpbusattach(pdp, dp, auxp) int gvpbusprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { struct gvpbus_args *gap; diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c index fe5fd3e6674..d2c90fdd65a 100644 --- a/sys/arch/amiga/dev/idesc.c +++ b/sys/arch/amiga/dev/idesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idesc.c,v 1.6 1996/08/23 18:53:01 niklas Exp $ */ +/* $OpenBSD: idesc.c,v 1.7 1996/11/23 21:45:19 kstailey Exp $ */ /* $NetBSD: idesc.c,v 1.21.4.2 1996/05/30 03:20:14 mhitch Exp $ */ /* @@ -237,7 +237,7 @@ struct idec_softc int ide_scsicmd __P((struct scsi_xfer *)); -int idescprint __P((void *auxp, char *)); +int idescprint __P((void *auxp, const char *)); void idescattach __P((struct device *, struct device *, void *)); int idescmatch __P((struct device *, void *, void *)); @@ -430,7 +430,7 @@ idescattach(pdp, dp, auxp) int idescprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/ivsc.c b/sys/arch/amiga/dev/ivsc.c index 24aeff78995..27db9e1d9ca 100644 --- a/sys/arch/amiga/dev/ivsc.c +++ b/sys/arch/amiga/dev/ivsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ivsc.c,v 1.3 1996/05/02 06:44:15 niklas Exp $ */ +/* $OpenBSD: ivsc.c,v 1.4 1996/11/23 21:45:19 kstailey Exp $ */ /* $NetBSD: ivsc.c,v 1.15 1996/04/21 21:12:04 veego Exp $ */ /* @@ -49,7 +49,7 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -int ivscprint __P((void *auxp, char *)); +int ivscprint __P((void *auxp, const char *)); void ivscattach __P((struct device *, struct device *, void *)); int ivscmatch __P((struct device *, void *, void *)); @@ -176,7 +176,7 @@ ivscattach(pdp, dp, auxp) int ivscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c index 80972f0ab7b..22d4768a2ad 100644 --- a/sys/arch/amiga/dev/mfc.c +++ b/sys/arch/amiga/dev/mfc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfc.c,v 1.8 1996/10/04 15:10:39 niklas Exp $ */ +/* $OpenBSD: mfc.c,v 1.9 1996/11/23 21:45:20 kstailey Exp $ */ /* $NetBSD: mfc.c,v 1.12.4.1 1996/06/06 04:53:16 mhitch Exp $ */ /* @@ -182,7 +182,7 @@ struct mfc_args { char unit; }; -int mfcprint __P((void *auxp, char *)); +int mfcprint __P((void *auxp, const char *)); void mfcattach __P((struct device *, struct device *, void *)); int mfcmatch __P((struct device *, void *, void *)); @@ -461,7 +461,7 @@ mfcsattach(pdp, dp, auxp) int mfcprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/mgnsc.c b/sys/arch/amiga/dev/mgnsc.c index d95b4710316..30a06f91895 100644 --- a/sys/arch/amiga/dev/mgnsc.c +++ b/sys/arch/amiga/dev/mgnsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mgnsc.c,v 1.8 1996/10/04 15:10:40 niklas Exp $ */ +/* $OpenBSD: mgnsc.c,v 1.9 1996/11/23 21:45:21 kstailey Exp $ */ /* $NetBSD: mgnsc.c,v 1.18 1996/04/21 21:12:11 veego Exp $ */ /* @@ -53,7 +53,7 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -int mgnscprint __P((void *auxp, char *)); +int mgnscprint __P((void *auxp, const char *)); void mgnscattach __P((struct device *, struct device *, void *)); int mgnscmatch __P((struct device *, void *, void *)); int mgnsc_dmaintr __P((void *)); @@ -155,7 +155,7 @@ mgnscattach(pdp, dp, auxp) int mgnscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/mlhsc.c b/sys/arch/amiga/dev/mlhsc.c index e46f75b8886..de282adee2c 100644 --- a/sys/arch/amiga/dev/mlhsc.c +++ b/sys/arch/amiga/dev/mlhsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlhsc.c,v 1.3 1996/05/02 06:44:20 niklas Exp $ */ +/* $OpenBSD: mlhsc.c,v 1.4 1996/11/23 21:45:21 kstailey Exp $ */ /* $NetBSD: mlhsc.c,v 1.10 1996/04/21 21:12:12 veego Exp $ */ /* @@ -48,7 +48,7 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -int mlhscprint __P((void *auxp, char *)); +int mlhscprint __P((void *auxp, const char *)); void mlhscattach __P((struct device *, struct device *, void *)); int mlhscmatch __P((struct device *, void *, void *)); @@ -162,7 +162,7 @@ mlhscattach(pdp, dp, auxp) int mlhscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/otgsc.c b/sys/arch/amiga/dev/otgsc.c index 2878cf47a64..a1aeeb7e5e0 100644 --- a/sys/arch/amiga/dev/otgsc.c +++ b/sys/arch/amiga/dev/otgsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: otgsc.c,v 1.3 1996/05/02 06:44:23 niklas Exp $ */ +/* $OpenBSD: otgsc.c,v 1.4 1996/11/23 21:45:22 kstailey Exp $ */ /* $NetBSD: otgsc.c,v 1.11 1996/04/21 21:12:16 veego Exp $ */ /* @@ -48,7 +48,7 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -int otgscprint __P((void *auxp, char *)); +int otgscprint __P((void *auxp, const char *)); void otgscattach __P((struct device *, struct device *, void *)); int otgscmatch __P((struct device *, void *, void *)); @@ -169,7 +169,7 @@ otgscattach(pdp, dp, auxp) int otgscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/wesc.c b/sys/arch/amiga/dev/wesc.c index 087bf5e0dd2..be70b880250 100644 --- a/sys/arch/amiga/dev/wesc.c +++ b/sys/arch/amiga/dev/wesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wesc.c,v 1.4 1996/05/02 06:44:38 niklas Exp $ */ +/* $OpenBSD: wesc.c,v 1.5 1996/11/23 21:45:23 kstailey Exp $ */ /* $NetBSD: wesc.c,v 1.13 1996/04/21 21:12:42 veego Exp $ */ /* @@ -51,7 +51,7 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -int wescprint __P((void *auxp, char *)); +int wescprint __P((void *auxp, const char *)); void wescattach __P((struct device *, struct device *, void *)); int wescmatch __P((struct device *, void *, void *)); int wesc_dmaintr __P((void *)); @@ -149,7 +149,7 @@ wescattach(pdp, dp, auxp) int wescprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/wstsc.c b/sys/arch/amiga/dev/wstsc.c index 6e63210e5a5..7ca477742a1 100644 --- a/sys/arch/amiga/dev/wstsc.c +++ b/sys/arch/amiga/dev/wstsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wstsc.c,v 1.3 1996/05/02 06:44:39 niklas Exp $ */ +/* $OpenBSD: wstsc.c,v 1.4 1996/11/23 21:45:23 kstailey Exp $ */ /* $NetBSD: wstsc.c,v 1.12 1996/04/28 06:49:35 mhitch Exp $ */ /* @@ -48,7 +48,7 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -int wstscprint __P((void *auxp, char *)); +int wstscprint __P((void *auxp, const char *)); void wstscattach __P((struct device *, struct device *, void *)); int wstscmatch __P((struct device *, void *, void *)); @@ -187,7 +187,7 @@ wstscattach(pdp, dp, auxp) int wstscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/dev/zbus.c b/sys/arch/amiga/dev/zbus.c index f068f0cad08..ab07e788297 100644 --- a/sys/arch/amiga/dev/zbus.c +++ b/sys/arch/amiga/dev/zbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zbus.c,v 1.6 1996/05/29 10:15:45 niklas Exp $ */ +/* $OpenBSD: zbus.c,v 1.7 1996/11/23 21:45:24 kstailey Exp $ */ /* $NetBSD: zbus.c,v 1.19 1996/05/19 21:06:09 veego Exp $ */ /* @@ -170,7 +170,7 @@ static int npreconfent = sizeof(preconftab) / sizeof(struct preconfdata); void zbusattach __P((struct device *, struct device *, void *)); -int zbusprint __P((void *, char *)); +int zbusprint __P((void *, const char *)); int zbusmatch __P((struct device *, void *, void *)); caddr_t zbusmap __P((caddr_t, u_int)); static char *aconflookup __P((int, int)); @@ -290,7 +290,7 @@ zbusattach(pdp, dp, auxp) int zbusprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { struct zbus_args *zap; int rv; diff --git a/sys/arch/amiga/dev/zssc.c b/sys/arch/amiga/dev/zssc.c index 9ffdf9e9413..0184d806b85 100644 --- a/sys/arch/amiga/dev/zssc.c +++ b/sys/arch/amiga/dev/zssc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zssc.c,v 1.7 1996/05/02 06:44:39 niklas Exp $ */ +/* $OpenBSD: zssc.c,v 1.8 1996/11/23 21:45:25 kstailey Exp $ */ /* $NetBSD: zssc.c,v 1.16 1996/04/21 21:12:45 veego Exp $ */ /* @@ -51,7 +51,7 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -int zsscprint __P((void *auxp, char *)); +int zsscprint __P((void *auxp, const char *)); void zsscattach __P((struct device *, struct device *, void *)); int zsscmatch __P((struct device *, void *, void *)); int zssc_dmaintr __P((void *)); @@ -154,7 +154,7 @@ zsscattach(pdp, dp, auxp) int zsscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c index 00bd72a2f25..e12500f1811 100644 --- a/sys/arch/amiga/isa/cross.c +++ b/sys/arch/amiga/isa/cross.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cross.c,v 1.6 1996/11/12 20:29:47 niklas Exp $ */ +/* $OpenBSD: cross.c,v 1.7 1996/11/23 21:45:26 kstailey Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer @@ -57,7 +57,7 @@ int crossdebug = 0; void crossattach __P((struct device *, struct device *, void *)); int crossmatch __P((struct device *, void *, void *)); -int crossprint __P((void *, char *)); +int crossprint __P((void *, const char *)); int cross_io_map __P((bus_chipset_tag_t, bus_io_addr_t, bus_io_size_t, bus_io_handle_t *)); @@ -200,7 +200,7 @@ crossattach(parent, self, aux) int crossprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(QUIET); diff --git a/sys/arch/amiga/isa/ggbus.c b/sys/arch/amiga/isa/ggbus.c index f3dd8323a55..712f4043c94 100644 --- a/sys/arch/amiga/isa/ggbus.c +++ b/sys/arch/amiga/isa/ggbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ggbus.c,v 1.6 1996/11/12 20:29:49 niklas Exp $ */ +/* $OpenBSD: ggbus.c,v 1.7 1996/11/23 21:45:26 kstailey Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Niklas Hallqvist @@ -58,7 +58,7 @@ int ggstrayints = 0; void ggbusattach __P((struct device *, struct device *, void *)); int ggbusmatch __P((struct device *, void *, void *)); -int ggbusprint __P((void *, char *)); +int ggbusprint __P((void *, const char *)); int ggbus_io_map __P((bus_chipset_tag_t, bus_io_addr_t, bus_io_size_t, bus_io_handle_t *)); @@ -231,7 +231,7 @@ ggbusattach(parent, self, aux) int ggbusprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(QUIET); diff --git a/sys/arch/arc/arc/cpu.c b/sys/arch/arc/arc/cpu.c index 2b5270d27bf..52c7c3aa7b9 100644 --- a/sys/arch/arc/arc/cpu.c +++ b/sys/arch/arc/arc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.3 1996/09/14 15:58:14 pefo Exp $ */ +/* $OpenBSD: cpu.c,v 1.4 1996/11/23 21:45:27 kstailey Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -45,7 +45,7 @@ struct cfdriver cpu_cd = { NULL, "cpu", DV_DULL, NULL, 0 }; -static int cpuprint __P((void *, char *pnp)); +static int cpuprint __P((void *, const char *pnp)); static int cpumatch(parent, cfdata, aux) diff --git a/sys/arch/arc/arc/mainbus.c b/sys/arch/arc/arc/mainbus.c index 55a2afcfc51..56d6b7c9abc 100644 --- a/sys/arch/arc/arc/mainbus.c +++ b/sys/arch/arc/arc/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.3 1996/09/19 00:30:36 imp Exp $ */ +/* $OpenBSD: mainbus.c,v 1.4 1996/11/23 21:45:28 kstailey Exp $ */ /* $NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp $ */ /* @@ -44,7 +44,7 @@ struct mainbus_softc { /* Definition of the mainbus driver. */ static int mbmatch __P((struct device *, void *, void *)); static void mbattach __P((struct device *, struct device *, void *)); -static int mbprint __P((void *, char *)); +static int mbprint __P((void *, const char *)); struct cfattach mainbus_ca = { sizeof(struct device), mbmatch, mbattach @@ -132,7 +132,7 @@ mbattach(parent, self, aux) static int mbprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/arc/dev/asc.c b/sys/arch/arc/dev/asc.c index 35de8d19872..240285177d1 100644 --- a/sys/arch/arc/dev/asc.c +++ b/sys/arch/arc/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.3 1996/09/28 10:08:03 pefo Exp $ */ +/* $OpenBSD: asc.c,v 1.4 1996/11/23 21:45:29 kstailey Exp $ */ /* $NetBSD: asc.c,v 1.10 1994/12/05 19:11:12 dean Exp $ */ /*- @@ -440,7 +440,7 @@ typedef struct asc_softc *asc_softc_t; */ int ascmatch __P((struct device *, void *, void *)); void ascattach __P((struct device *, struct device *, void *)); -int ascprint(void *, char *); +int ascprint(void *, const char *); int asc_doprobe __P((void *, int, int, struct device *)); @@ -607,7 +607,7 @@ ascattach(parent, self, aux) int ascprint(aux, name) void *aux; - char *name; + const char *name; { return -1; } diff --git a/sys/arch/arc/dev/fd.c b/sys/arch/arc/dev/fd.c index e0f69b60166..e932868c54f 100644 --- a/sys/arch/arc/dev/fd.c +++ b/sys/arch/arc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.3 1996/11/06 01:34:00 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.4 1996/11/23 21:45:30 kstailey Exp $ */ /* $NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp $ */ /*- @@ -249,7 +249,7 @@ struct fdc_attach_args { int fdprint(aux, fdc) void *aux; - char *fdc; + const char *fdc; { register struct fdc_attach_args *fa = aux; diff --git a/sys/arch/arc/dti/btl.c b/sys/arch/arc/dti/btl.c index 7c5e9480a42..ad43b29d4aa 100644 --- a/sys/arch/arc/dti/btl.c +++ b/sys/arch/arc/dti/btl.c @@ -175,7 +175,7 @@ struct scsi_device bt_dev = { int btprobe __P((struct device *, void *, void *)); void btattach __P((struct device *, struct device *, void *)); -int btprint __P((void *, char *)); +int btprint __P((void *, const char *)); struct cfattach btl_ca = { sizeof(struct bt_softc), btprobe, btattach @@ -352,7 +352,7 @@ btprobe(parent, match, aux) int btprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/arch/arc/dti/desktechbus.c b/sys/arch/arc/dti/desktechbus.c index 6a7aa4dbedc..22356ebf800 100644 --- a/sys/arch/arc/dti/desktechbus.c +++ b/sys/arch/arc/dti/desktechbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: desktechbus.c,v 1.2 1996/09/14 15:58:24 pefo Exp $ */ +/* $OpenBSD: desktechbus.c,v 1.3 1996/11/23 21:45:32 kstailey Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -51,7 +51,7 @@ struct dti_softc { /* Definition of the driver for autoconfig. */ int dtimatch(struct device *, void *, void *); void dtiattach(struct device *, struct device *, void *); -int dtiprint(void *, char *); +int dtiprint(void *, const char *); struct cfattach dti_ca = { sizeof(struct dti_softc), dtimatch, dtiattach @@ -204,7 +204,7 @@ dtiattach(parent, self, aux) int dtiprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct confargs *ca = aux; diff --git a/sys/arch/arc/isa/isabus.c b/sys/arch/arc/isa/isabus.c index 28eada12d8f..de0634cd7e3 100644 --- a/sys/arch/arc/isa/isabus.c +++ b/sys/arch/arc/isa/isabus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isabus.c,v 1.5 1996/09/20 17:12:08 pefo Exp $ */ +/* $OpenBSD: isabus.c,v 1.6 1996/11/23 21:45:33 kstailey Exp $ */ /* $NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp $ */ /*- @@ -123,7 +123,7 @@ struct isabr_softc { /* Definition of the driver for autoconfig. */ int isabrmatch(struct device *, void *, void *); void isabrattach(struct device *, struct device *, void *); -int isabrprint(void *, char *); +int isabrprint(void *, const char *); struct cfattach isabr_ca = { sizeof(struct isabr_softc), isabrmatch, isabrattach @@ -204,7 +204,7 @@ isabrattach(parent, self, aux) int isabrprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct confargs *ca = aux; diff --git a/sys/arch/arc/isa/isadma.c b/sys/arch/arc/isa/isadma.c index 95cdfbe475f..b44840270f8 100644 --- a/sys/arch/arc/isa/isadma.c +++ b/sys/arch/arc/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.1 1996/06/24 09:07:18 pefo Exp $ */ +/* $OpenBSD: isadma.c,v 1.2 1996/11/23 21:45:34 kstailey Exp $ */ /* $NetBSD: isadma.c,v 1.19 1996/04/29 20:03:26 christos Exp $ */ #include <sys/param.h> @@ -46,7 +46,7 @@ static u_int8_t dmamode[4] = { int isadmamatch __P((struct device *, void *, void *)); void isadmaattach __P((struct device *, struct device *, void *)); -int isadmaprint __P((void *, char *)); +int isadmaprint __P((void *, const char *)); struct isadma_softc { struct device sc_dev; diff --git a/sys/arch/arc/pica/picabus.c b/sys/arch/arc/pica/picabus.c index 7b43a33e204..e6170757e3c 100644 --- a/sys/arch/arc/pica/picabus.c +++ b/sys/arch/arc/pica/picabus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: picabus.c,v 1.4 1996/09/14 15:58:29 pefo Exp $ */ +/* $OpenBSD: picabus.c,v 1.5 1996/11/23 21:45:35 kstailey Exp $ */ /* $NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp $ */ /* @@ -48,7 +48,7 @@ struct pica_softc { /* Definition of the driver for autoconfig. */ int picamatch(struct device *, void *, void *); void picaattach(struct device *, struct device *, void *); -int picaprint(void *, char *); +int picaprint(void *, const char *); struct cfattach pica_ca = { sizeof(struct pica_softc), picamatch, picaattach @@ -201,7 +201,7 @@ picaattach(parent, self, aux) int picaprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct confargs *ca = aux; diff --git a/sys/arch/arm32/mainbus/fd.c b/sys/arch/arm32/mainbus/fd.c index d12e73d46b9..a5960924123 100644 --- a/sys/arch/arm32/mainbus/fd.c +++ b/sys/arch/arm32/mainbus/fd.c @@ -292,7 +292,7 @@ struct fdc_attach_args { int fdprint(aux, fdc) void *aux; - char *fdc; + const char *fdc; { register struct fdc_attach_args *fa = aux; diff --git a/sys/arch/arm32/mainbus/iic.c b/sys/arch/arm32/mainbus/iic.c index 334b6030443..b416a035104 100644 --- a/sys/arch/arm32/mainbus/iic.c +++ b/sys/arch/arm32/mainbus/iic.c @@ -262,7 +262,7 @@ iicmatch(parent, match, aux) int iicprint(aux, name) void *aux; - char *name; + const char *name; { struct iicbus_attach_args *ib = aux; diff --git a/sys/arch/arm32/mainbus/mainbus.c b/sys/arch/arm32/mainbus/mainbus.c index 7caade580dd..86556bb55f9 100644 --- a/sys/arch/arm32/mainbus/mainbus.c +++ b/sys/arch/arm32/mainbus/mainbus.c @@ -75,7 +75,7 @@ mainbusmatch(parent, match, aux) int mainbusprint(aux, mainbus) void *aux; - char *mainbus; + const char *mainbus; { struct mainbus_attach_args *mb = aux; diff --git a/sys/arch/arm32/mainbus/wd.c b/sys/arch/arm32/mainbus/wd.c index e54e2e2a127..d41c35f0c85 100644 --- a/sys/arch/arm32/mainbus/wd.c +++ b/sys/arch/arm32/mainbus/wd.c @@ -235,7 +235,7 @@ struct wdc_attach_args { int wdprint(aux, wdc) void *aux; - char *wdc; + const char *wdc; { struct wdc_attach_args *wa = aux; diff --git a/sys/arch/arm32/podulebus/asc.c b/sys/arch/arm32/podulebus/asc.c index 80f64e32d69..9514a19d44a 100644 --- a/sys/arch/arm32/podulebus/asc.c +++ b/sys/arch/arm32/podulebus/asc.c @@ -58,7 +58,7 @@ #include <arm32/podulebus/ascreg.h> #include <arm32/podulebus/ascvar.h> -int ascprint __P((void *auxp, char *)); +int ascprint __P((void *auxp, const char *)); void ascattach __P((struct device *, struct device *, void *)); int ascmatch __P((struct device *, void *, void *)); @@ -221,7 +221,7 @@ ascattach(pdp, dp, auxp) int ascprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/arm32/podulebus/oak.c b/sys/arch/arm32/podulebus/oak.c index 48922d6159e..43ef995bb90 100644 --- a/sys/arch/arm32/podulebus/oak.c +++ b/sys/arch/arm32/podulebus/oak.c @@ -90,7 +90,7 @@ struct oak_softc { int oakprobe __P(( struct device *, void *, void * )); void oakattach __P(( struct device *, struct device *, void * )); -int oakprint __P(( void *, char * )); +int oakprint __P(( void *, const char * )); void oakminphys __P(( struct buf * )); #ifdef USE_OWN_PIO_ROUTINES @@ -194,7 +194,7 @@ oakattach(parent, self, aux) int oakprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/arch/arm32/podulebus/podulebus.c b/sys/arch/arm32/podulebus/podulebus.c index 4ca0e18aa2b..6741da1701c 100644 --- a/sys/arch/arm32/podulebus/podulebus.c +++ b/sys/arch/arm32/podulebus/podulebus.c @@ -188,7 +188,7 @@ podulebusmatch(parent, match, aux) int podulebusprint(aux, podulebus) void *aux; - char *podulebus; + const char *podulebus; { struct podule_attach_args *pa = aux; diff --git a/sys/arch/arm32/podulebus/ptsc.c b/sys/arch/arm32/podulebus/ptsc.c index f13c928aada..958bba2e236 100644 --- a/sys/arch/arm32/podulebus/ptsc.c +++ b/sys/arch/arm32/podulebus/ptsc.c @@ -59,7 +59,7 @@ #include <arm32/podulebus/ptscreg.h> #include <arm32/podulebus/ptscvar.h> -int ptscprint __P((void *auxp, char *)); +int ptscprint __P((void *auxp, const char *)); void ptscattach __P((struct device *, struct device *, void *)); int ptscmatch __P((struct device *, void *, void *)); int ptsc_scsicmd __P((struct scsi_xfer *)); @@ -209,7 +209,7 @@ ptscattach(pdp, dp, auxp) int ptscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c index 1c67416f72e..152ae5243c8 100644 --- a/sys/arch/atari/atari/autoconf.c +++ b/sys/arch/atari/atari/autoconf.c @@ -43,7 +43,7 @@ void configure __P((void)); static void setroot __P((void)); void swapconf __P((void)); void mbattach __P((struct device *, struct device *, void *)); -int mbprint __P((void *, char *)); +int mbprint __P((void *, const char *)); int mbmatch __P((struct device *, struct cfdata *, void *)); extern int cold; /* 1 if still booting (locore.s) */ @@ -78,7 +78,7 @@ configure() int simple_devprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { return(QUIET); } @@ -266,7 +266,7 @@ mbattach(pdp, dp, auxp) int mbprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("%s at %s", (char *)auxp, pnp); diff --git a/sys/arch/atari/atari/device.h b/sys/arch/atari/atari/device.h index 209c2205df4..ca8652d1529 100644 --- a/sys/arch/atari/atari/device.h +++ b/sys/arch/atari/atari/device.h @@ -41,7 +41,7 @@ */ int atari_config_found __P((struct cfdata *, struct device *, void *, cfprint_t )); -int simple_devprint __P((void *, char *)); +int simple_devprint __P((void *, const char *)); int matchname __P((char *, char *)); /* * false when initing for the console. diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index e7f8dba61e1..6a9c56b68cb 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -210,7 +210,7 @@ extern __inline__ u_char read_dmastat(void) * Autoconfig stuff.... */ static int fdcmatch __P((struct device *, struct cfdata *, void *)); -static int fdcprint __P((void *, char *)); +static int fdcprint __P((void *, const char *)); static void fdcattach __P((struct device *, struct device *, void *)); struct cfdriver fdccd = { @@ -281,7 +281,7 @@ void *auxp; static int fdcprint(auxp, pnp) void *auxp; -char *pnp; +const char *pnp; { return(UNCONF); } diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index 81f78e5577b..899714c44f9 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -99,13 +99,13 @@ int grfbanked_set __P((dev_t, int)); static void grf_viewsync __P((struct grf_softc *)); static int grf_mode __P((struct grf_softc *, int, void *, int, int)); -int grfbusprint __P((void *auxp, char *)); +int grfbusprint __P((void *auxp, const char *)); int grfbusmatch __P((struct device *, struct cfdata *, void *)); void grfbusattach __P((struct device *, struct device *, void *)); void grfattach __P((struct device *, struct device *, void *)); int grfmatch __P((struct device *, struct cfdata *, void *)); -int grfprint __P((void *, char *)); +int grfprint __P((void *, const char *)); /* * pointers to grf drivers device structs */ @@ -186,8 +186,8 @@ void *auxp; int grfbusprint(auxp, name) -void *auxp; -char *name; + void *auxp; + const char *name; { if(name == NULL) return(UNCONF); @@ -287,8 +287,8 @@ void *auxp; int grfprint(auxp, pnp) -void *auxp; -char *pnp; + void *auxp; + const char *pnp; { if(pnp) printf("ite at %s", pnp); diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index a947b06dd28..03efb29712b 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -224,7 +224,7 @@ extern __inline__ void finish_req(SC_REQ *reqp) /* * Auto config stuff.... */ -int ncr_cprint __P((void *auxp, char *)); +int ncr_cprint __P((void *auxp, const char *)); void ncr_attach __P((struct device *, struct device *, void *)); int ncr_match __P((struct device *, struct cfdata *, void *)); @@ -306,7 +306,7 @@ void *auxp; int ncr_cprint(auxp, name) void *auxp; -char *name; +const char *name; { if (name == NULL) return (UNCONF); diff --git a/sys/arch/atari/dev/ramd.c b/sys/arch/atari/dev/ramd.c index 1f833c2257b..206d2fa0aa2 100644 --- a/sys/arch/atari/dev/ramd.c +++ b/sys/arch/atari/dev/ramd.c @@ -107,7 +107,7 @@ static struct disk ramd_disks[RAMD_NDEV]; /* XXX Ick. */ * Autoconfig stuff.... */ static int ramdmatch __P((struct device *, struct cfdata *, void *)); -static int ramdprint __P((void *, char *)); +static int ramdprint __P((void *, const char *)); static void ramdattach __P((struct device *, struct device *, void *)); struct cfdriver ramdcd = { @@ -162,7 +162,7 @@ void *auxp; static int ramdprint(auxp, pnp) void *auxp; -char *pnp; +const char *pnp; { return(UNCONF); } diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 73f5bcb301b..758acdc6925 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.29 1996/11/11 20:47:24 kstailey Exp $ */ +/* $OpenBSD: conf.c,v 1.30 1996/11/23 21:45:48 kstailey Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -138,7 +138,6 @@ cdev_decl(acd); #include "lpt.h" cdev_decl(lpt); #include "ch.h" -cdev_decl(ch); dev_decl(filedesc,open); #include "bpfilter.h" #include "pcmcia.h" diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c index a8b3951f0bd..3f230e1649e 100644 --- a/sys/arch/i386/i386/mainbus.c +++ b/sys/arch/i386/i386/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.6 1996/11/12 20:29:57 niklas Exp $ */ +/* $OpenBSD: mainbus.c,v 1.7 1996/11/23 21:45:49 kstailey Exp $ */ /* $NetBSD: mainbus.c,v 1.8 1996/04/11 22:13:37 cgd Exp $ */ /* @@ -62,7 +62,7 @@ struct cfdriver mainbus_cd = { NULL, "mainbus", DV_DULL }; -int mainbus_print __P((void *, char *)); +int mainbus_print __P((void *, const char *)); union mainbus_attach_args { const char *mba_busname; /* first elem of all */ @@ -137,7 +137,7 @@ mainbus_attach(parent, self, aux) int mainbus_print(aux, pnp) void *aux; - char *pnp; + const char *pnp; { union mainbus_attach_args *mba = aux; diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index f9140603b39..10cf87f9263 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -283,11 +283,11 @@ espmatch(parent, vcf, aux) #endif } -int scsiprint __P((void *, char *)); +int scsiprint __P((void *, const char *)); int scsiprint(aux, name) void *aux; - char *name; + const char *name; { return (UNCONF); } diff --git a/sys/arch/mac68k/dev/grf_subr.c b/sys/arch/mac68k/dev/grf_subr.c index 2035881511c..22ca3dcb055 100644 --- a/sys/arch/mac68k/dev/grf_subr.c +++ b/sys/arch/mac68k/dev/grf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_subr.c,v 1.2 1996/08/10 21:37:44 briggs Exp $ */ +/* $OpenBSD: grf_subr.c,v 1.3 1996/11/23 21:45:51 kstailey Exp $ */ /* $NetBSD: grf_subr.c,v 1.2 1996/08/04 06:03:56 scottr Exp $ */ /*- @@ -75,7 +75,7 @@ grf_establish(sc, sp, g_mode, g_phys) int grfbusprint(aux, name) void *aux; - char *name; + const char *name; { struct grfbus_attach_args *ga = aux; diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h index 37109c21dfa..410b22d44cc 100644 --- a/sys/arch/mac68k/dev/grfvar.h +++ b/sys/arch/mac68k/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.4 1996/08/10 21:37:44 briggs Exp $ */ +/* $OpenBSD: grfvar.h,v 1.5 1996/11/23 21:45:52 kstailey Exp $ */ /* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */ /* @@ -147,4 +147,4 @@ int grfunmap __P((dev_t dev, caddr_t addr, struct proc *p)); void grf_establish __P((struct grfbus_softc *, nubus_slot *, int (*)(struct grf_softc *, int, void *), caddr_t (*)(struct grf_softc *, vm_offset_t))); -int grfbusprint __P((void *, char *)); +int grfbusprint __P((void *, const char *)); diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index e387ccdebf5..fd25b26373e 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.9 1996/06/23 16:08:23 briggs Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.10 1996/11/23 21:45:53 kstailey Exp $ */ /* $NetBSD: ncr5380.c,v 1.31 1996/06/23 15:02:58 briggs Exp $ */ /* @@ -197,7 +197,7 @@ extern __inline__ void finish_req(SC_REQ *reqp) /* * Auto config stuff.... */ -int ncr_cprint __P((void *auxp, char *)); +int ncr_cprint __P((void *auxp, const char *)); void ncr_attach __P((struct device *, struct device *, void *)); int ncr_match __P((struct device *, void *, void *)); @@ -283,7 +283,7 @@ void *auxp; int ncr_cprint(auxp, name) void *auxp; -char *name; +const char *name; { if (name == NULL) return (UNCONF); diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index 475bfedcb53..70f28253fbb 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.5 1996/09/21 03:36:58 briggs Exp $ */ +/* $OpenBSD: nubus.c,v 1.6 1996/11/23 21:45:54 kstailey Exp $ */ /* $NetBSD: nubus.c,v 1.23 1996/05/08 15:14:53 scottr Exp $ */ /* @@ -48,7 +48,7 @@ static int nubus_debug = 0x01; #define NDB_ARITH 0x4 #endif -static int nubusprint __P((void *, char *)); +static int nubusprint __P((void *, const char *)); static int nubusmatch __P((struct device *, void *, void *)); static void nubusattach __P((struct device *, struct device *, void *)); @@ -101,8 +101,8 @@ nubusattach(parent, self, aux) static int nubusprint(aux, name) - void *aux; - char *name; + void *aux; + const char *name; { nubus_slot *fmt; diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index fc923015b92..6421fdf297b 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc.c,v 1.4 1996/10/28 14:46:22 briggs Exp $ */ +/* $OpenBSD: sbc.c,v 1.5 1996/11/23 21:45:55 kstailey Exp $ */ /* $NetBSD: sbc.c,v 1.9 1996/06/19 01:47:28 scottr Exp $ */ /* @@ -164,7 +164,7 @@ int sbc_options = SBC_PDMA; static int sbc_match __P((struct device *, void *, void *)); static void sbc_attach __P((struct device *, struct device *, void *)); -static int sbc_print __P((void *, char *)); +static int sbc_print __P((void *, const char *)); static void sbc_minphys __P((struct buf *bp)); static int sbc_wait_busy __P((struct ncr5380_softc *)); @@ -354,7 +354,7 @@ sbc_attach(parent, self, args) static int sbc_print(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/arch/mac68k/dev/scsi96.c b/sys/arch/mac68k/dev/scsi96.c index 0f86217fb20..9998b029ce7 100644 --- a/sys/arch/mac68k/dev/scsi96.c +++ b/sys/arch/mac68k/dev/scsi96.c @@ -78,7 +78,7 @@ static int ncr53c96_scsi_cmd(struct scsi_xfer * xs); static int ncr53c96_reset_target(int adapter, int target); static int ncr53c96_poll(int adapter, int timeout); static int ncr53c96_send_cmd(struct scsi_xfer * xs); -static int scsiprint __P((void *, char *)); +static int scsiprint __P((void *, const char *)); static void resetchip __P((void)); struct scsi_adapter ncr53c96_switch = { @@ -128,8 +128,8 @@ ncr96probe(parent, match, aux) static int scsiprint(auxp, name) - void *auxp; - char *name; + void *auxp; + const char *name; { if (name == NULL) return (UNCONF); diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index ee4484a62ec..20e971e25c6 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.2 1996/05/26 18:35:45 briggs Exp $ */ +/* $OpenBSD: autoconf.h,v 1.3 1996/11/23 21:45:56 kstailey Exp $ */ /* $NetBSD: autoconf.h,v 1.2 1996/05/18 18:52:48 briggs Exp $ */ /* @@ -55,7 +55,7 @@ struct confargs { /* autoconf.c */ void setconf __P((void)); int bus_scan __P((struct device *, void *, void *)); -int bus_print __P((void *, char *)); +int bus_print __P((void *, const char *)); int bus_peek __P((int, vm_offset_t, int)); char *bus_mapin __P((int, int, int)); void configure __P((void)); diff --git a/sys/arch/mac68k/mac68k/mainbus.c b/sys/arch/mac68k/mac68k/mainbus.c index 21851d676c6..3f5fb06d144 100644 --- a/sys/arch/mac68k/mac68k/mainbus.c +++ b/sys/arch/mac68k/mac68k/mainbus.c @@ -141,7 +141,7 @@ bus_scan(parent, child, aux) int bus_print(args, name) void *args; - char *name; + const char *name; { /* struct confargs *ca = args; */ diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c index b84736f65e1..a6a4279d162 100644 --- a/sys/arch/mvme68k/dev/ipic.c +++ b/sys/arch/mvme68k/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.4 1996/06/11 10:12:58 deraadt Exp $ */ +/* $OpenBSD: ipic.c,v 1.5 1996/11/23 21:45:58 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -77,7 +77,7 @@ ipicmatch(parent, cf, args) int ipicprint(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme68k/dev/mc.c b/sys/arch/mvme68k/dev/mc.c index 208ccd5b30b..384b32e1d0b 100644 --- a/sys/arch/mvme68k/dev/mc.c +++ b/sys/arch/mvme68k/dev/mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc.c,v 1.4 1996/06/11 10:15:11 deraadt Exp $ */ +/* $OpenBSD: mc.c,v 1.5 1996/11/23 21:45:59 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -93,7 +93,7 @@ mcmatch(parent, vcf, args) int mc_print(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme68k/dev/pcc.c b/sys/arch/mvme68k/dev/pcc.c index d1ae03f6092..1218babf6d4 100644 --- a/sys/arch/mvme68k/dev/pcc.c +++ b/sys/arch/mvme68k/dev/pcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcc.c,v 1.4 1996/06/11 10:15:18 deraadt Exp $ */ +/* $OpenBSD: pcc.c,v 1.5 1996/11/23 21:45:59 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -92,7 +92,7 @@ pccmatch(parent, vcf, args) int pcc_print(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme68k/dev/pcctwo.c b/sys/arch/mvme68k/dev/pcctwo.c index b24983f4363..3d6d1e7cb43 100644 --- a/sys/arch/mvme68k/dev/pcctwo.c +++ b/sys/arch/mvme68k/dev/pcctwo.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pcctwo.c,v 1.4 1996/06/11 10:15:21 deraadt Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.5 1996/11/23 21:46:00 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -95,7 +95,7 @@ pcctwomatch(parent, vcf, args) int pcctwo_print(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme68k/dev/sbicdma.c b/sys/arch/mvme68k/dev/sbicdma.c index a7f1d2a799f..e6d4c96c5fb 100644 --- a/sys/arch/mvme68k/dev/sbicdma.c +++ b/sys/arch/mvme68k/dev/sbicdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicdma.c,v 1.3 1996/04/28 11:03:28 deraadt Exp $ */ +/* $OpenBSD: sbicdma.c,v 1.4 1996/11/23 21:46:00 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -56,7 +56,7 @@ void sbicdmaattach __P((struct device *, struct device *, void *)); int sbicdmamatch __P((struct device *, void *, void *)); -int sbicdmaprint __P((void *auxp, char *)); +int sbicdmaprint __P((void *auxp, const char *)); void sbicdma_dmafree __P((struct sbic_softc *)); void sbicdma_dmastop __P((struct sbic_softc *)); @@ -160,8 +160,8 @@ sbicdmaattach(parent, self, args) */ int sbicdmaprint(auxp, pnp) - void *auxp; - char *pnp; + void *auxp; + const char *pnp; { if (pnp == NULL) return (UNCONF); diff --git a/sys/arch/mvme68k/dev/siopdma.c b/sys/arch/mvme68k/dev/siopdma.c index 6200b96d1c8..f5df9bf4036 100644 --- a/sys/arch/mvme68k/dev/siopdma.c +++ b/sys/arch/mvme68k/dev/siopdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siopdma.c,v 1.4 1996/05/29 17:54:12 chuck Exp $ */ +/* $OpenBSD: siopdma.c,v 1.5 1996/11/23 21:46:01 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,7 +60,7 @@ int afscmatch __P((struct device *, void *, void *)); void afscattach __P((struct device *, struct device *, void *)); -int afscprint __P((void *auxp, char *)); +int afscprint __P((void *auxp, const char *)); int siopintr __P((struct siop_softc *)); int afsc_dmaintr __P((struct siop_softc *)); @@ -188,7 +188,7 @@ afscattach(parent, self, auxp) int afscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return (UNCONF); diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c index b9227904f3e..446bc4ff811 100644 --- a/sys/arch/mvme68k/dev/vme.c +++ b/sys/arch/mvme68k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.4 1996/06/11 10:15:26 deraadt Exp $ */ +/* $OpenBSD: vme.c,v 1.5 1996/11/23 21:46:02 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -254,7 +254,7 @@ vmerw(sc, uio, flags, bus) int vmeprint(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c index f0aa7912023..936262e871e 100644 --- a/sys/arch/mvme68k/dev/wdsc.c +++ b/sys/arch/mvme68k/dev/wdsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdsc.c,v 1.3 1996/05/29 17:54:13 chuck Exp $ */ +/* $OpenBSD: wdsc.c,v 1.4 1996/11/23 21:46:02 kstailey Exp $ */ /* * Copyright (c) 1996 Steve Woodford @@ -48,7 +48,7 @@ #include <machine/autoconf.h> #include <mvme68k/dev/pccreg.h> -int wdscprint __P((void *auxp, char *)); +int wdscprint __P((void *auxp, const char *)); void wdscattach __P((struct device *, struct device *, void *)); int wdscmatch __P((struct device *, struct cfdata *, void *)); @@ -190,7 +190,7 @@ wdscattach(pdp, dp, auxp) int wdscprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp == NULL) return(UNCONF); diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c index 76218732d02..94396eed3c4 100644 --- a/sys/arch/mvme68k/mvme68k/autoconf.c +++ b/sys/arch/mvme68k/mvme68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.9 1996/11/06 01:45:34 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.10 1996/11/23 21:46:04 kstailey Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -133,7 +133,7 @@ mainbus_match(parent, cf, args) int mainbus_print(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/mvme88k/dev/mb.c b/sys/arch/mvme88k/dev/mb.c index 2cf934de61f..fda18a1502f 100644 --- a/sys/arch/mvme88k/dev/mb.c +++ b/sys/arch/mvme88k/dev/mb.c @@ -7,7 +7,7 @@ #include <machine/cpu.h> void mbattach __P((struct device *, struct device *, void *)); -int mbprint __P((void *, char *)); +int mbprint __P((void *, const char *)); int mbmatch __P((struct device *, struct cfdata *, void *)); int submatch( struct device *parent, struct cfdata *self, void *aux); @@ -54,7 +54,7 @@ mbattach(pdp, dp, auxp) mbprint(auxp, pnp) void *auxp; - char *pnp; + const char *pnp; { if (pnp) printf("%s at %s", (char *)auxp, pnp); diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c index be4fc02be6a..bdb07c82294 100644 --- a/sys/arch/mvme88k/dev/pcctwo.c +++ b/sys/arch/mvme88k/dev/pcctwo.c @@ -97,7 +97,7 @@ pcctwomatch(parent, vcf, args) int pcctwo_print(args, bus) void *args; - char *bus; + const char *bus; { struct confargs *ca = args; diff --git a/sys/arch/pc532/dev/ncr5380.c b/sys/arch/pc532/dev/ncr5380.c index 51f3ad04ce8..d243a444f02 100644 --- a/sys/arch/pc532/dev/ncr5380.c +++ b/sys/arch/pc532/dev/ncr5380.c @@ -207,7 +207,7 @@ extern __inline__ void finish_req(SC_REQ *reqp) /* * Auto config stuff.... */ -int ncr_cprint __P((void *auxp, char *)); +int ncr_cprint __P((void *auxp, const char *)); void ncr_attach __P((struct device *, struct device *, void *)); int ncr_match __P((struct device *, struct cfdata *, void *)); @@ -289,7 +289,7 @@ void *auxp; int ncr_cprint(auxp, name) void *auxp; -char *name; +const char *name; { if (name == NULL) return (UNCONF); diff --git a/sys/arch/pmax/dev/sii.c b/sys/arch/pmax/dev/sii.c index e0d310d8f1a..f170f614ee6 100644 --- a/sys/arch/pmax/dev/sii.c +++ b/sys/arch/pmax/dev/sii.c @@ -112,7 +112,7 @@ struct siisoftc { */ int siimatch __P((struct device * parent, void *cfdata, void *aux)); void siiattach __P((struct device *parent, struct device *self, void *aux)); -int siiprint(void*, char*); +int siiprint(void*, const char*); int sii_doprobe __P((void *addr, int unit, int flags, int pri, struct device *self)); diff --git a/sys/arch/pmax/pmax/cpu.c b/sys/arch/pmax/pmax/cpu.c index fb01b0a071d..7d1ea548b56 100644 --- a/sys/arch/pmax/pmax/cpu.c +++ b/sys/arch/pmax/pmax/cpu.c @@ -83,7 +83,7 @@ cpuattach(parent, dev, aux) static int cpuprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { register struct confargs *ca = aux; diff --git a/sys/arch/pmax/pmax/mainbus.c b/sys/arch/pmax/pmax/mainbus.c index cd4c9118b56..7d409bacd1a 100644 --- a/sys/arch/pmax/pmax/mainbus.c +++ b/sys/arch/pmax/pmax/mainbus.c @@ -54,7 +54,7 @@ struct mainbus_softc { /* Definition of the mainbus driver. */ static int mbmatch __P((struct device *, void *, void *)); static void mbattach __P((struct device *, struct device *, void *)); -static int mbprint __P((void *, char *)); +static int mbprint __P((void *, const char *)); struct cfattach mainbus_ca = { sizeof (struct mainbus_softc), mbmatch, mbattach @@ -238,7 +238,7 @@ dev slot > number of slots for %s", static int mbprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { if (pnp) diff --git a/sys/arch/pmax/tc/asic.c b/sys/arch/pmax/tc/asic.c index 35322ff97ab..98e89b22af4 100644 --- a/sys/arch/pmax/tc/asic.c +++ b/sys/arch/pmax/tc/asic.c @@ -69,7 +69,7 @@ struct asic_softc { /* Definition of the driver for autoconfig. */ int asicmatch __P((struct device *, void *, void *)); void asicattach __P((struct device *, struct device *, void *)); -int asicprint(void *, char *); +int asicprint(void *, const char *); /* Device locators. */ #define ioasiccf_offset cf_loc[0] /* offset */ @@ -248,7 +248,7 @@ asicattach(parent, self, aux) int asicprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct ioasicdev_attach_args *d = aux; diff --git a/sys/arch/pmax/tc/tc.c b/sys/arch/pmax/tc/tc.c index 5286817d781..5b209e7df01 100644 --- a/sys/arch/pmax/tc/tc.c +++ b/sys/arch/pmax/tc/tc.c @@ -68,7 +68,7 @@ extern struct tc_attach_args * cpu_tcdesc __P ((int cputype)); /* Definition of the driver for autoconfig. */ int tcmatch(struct device *, void *, void *); void tcattach(struct device *, struct device *, void *); -int tcprint(void *, char *); +int tcprint(void *, const char *); void tc_ds_intr_establish __P((struct device *, void *, tc_intrlevel_t, intr_handler_t handler, intr_arg_t arg)); diff --git a/sys/arch/pmax/tc/tc_subr.c b/sys/arch/pmax/tc/tc_subr.c index e566b739d5e..7666184df16 100644 --- a/sys/arch/pmax/tc/tc_subr.c +++ b/sys/arch/pmax/tc/tc_subr.c @@ -35,7 +35,7 @@ extern struct tcbus_attach_args * cpu_tcdesc __P ((int cputype)); /* Definition of the driver for autoconfig. */ int tcmatch(struct device *, void *, void *); void tcattach(struct device *, struct device *, void *); -int tcprint(void *, char *); +int tcprint(void *, const char *); void tc_ds_intr_establish __P((struct device *, void *, tc_intrlevel_t, intr_handler_t handler, intr_arg_t arg)); diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index ee40392c0fe..4c961cac690 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -54,7 +54,7 @@ #include <sparc/dev/espreg.h> #include <sparc/dev/espvar.h> -int dmaprint __P((void *, char *)); +int dmaprint __P((void *, const char *)); void dmaattach __P((struct device *, struct device *, void *)); int dmamatch __P((struct device *, void *, void *)); void dma_reset __P((struct dma_softc *)); @@ -85,7 +85,7 @@ struct cfdriver ledma_cd = { int dmaprint(aux, name) void *aux; - char *name; + const char *name; { register struct confargs *ca = aux; diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 840ca8100d0..5cb9d216931 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -68,7 +68,7 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ /*static*/ void espattach __P((struct device *, struct device *, void *)); /*static*/ int espmatch __P((struct device *, void *, void *)); -/*static*/ int espprint __P((void *, char *)); +/*static*/ int espprint __P((void *, const char *)); /*static*/ u_int esp_adapter_info __P((struct esp_softc *)); /*static*/ void espreadregs __P((struct esp_softc *)); /*static*/ void espselect __P((struct esp_softc *, @@ -114,7 +114,7 @@ struct scsi_device esp_dev = { int espprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index 2af99ae3fbc..8cd44256037 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.10 1996/11/06 01:33:58 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.11 1996/11/23 21:46:16 kstailey Exp $ */ /* $NetBSD: fd.c,v 1.33.4.1 1996/06/12 20:52:25 pk Exp $ */ /*- @@ -220,7 +220,7 @@ void fdgetdisklabel __P((dev_t)); int fd_get_parms __P((struct fd_softc *)); void fdstrategy __P((struct buf *)); void fdstart __P((struct fd_softc *)); -int fdprint __P((void *, char *)); +int fdprint __P((void *, const char *)); struct dkdriver fddkdriver = { fdstrategy }; @@ -312,7 +312,7 @@ struct fdc_attach_args { int fdprint(aux, fdc) void *aux; - char *fdc; + const char *fdc; { register struct fdc_attach_args *fa = aux; diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c index 37cf369fe48..2787aa91c01 100644 --- a/sys/arch/sparc/dev/obio.c +++ b/sys/arch/sparc/dev/obio.c @@ -66,7 +66,7 @@ static void obioattach __P((struct device *, struct device *, void *)); static void vmesattach __P((struct device *, struct device *, void *)); static void vmelattach __P((struct device *, struct device *, void *)); -int busprint __P((void *, char *)); +int busprint __P((void *, const char *)); static int busattach __P((struct device *, void *, void *, int)); void * bus_map __P((struct rom_reg *, int, int)); int obio_scan __P((struct device *, void *, void *)); @@ -122,7 +122,7 @@ busmatch(parent, vcf, aux) int busprint(args, obio) void *args; - char *obio; + const char *obio; { register struct confargs *ca = args; diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c index 32e52e31533..0f7ceff3bbf 100644 --- a/sys/arch/sparc/dev/sbus.c +++ b/sys/arch/sparc/dev/sbus.c @@ -57,7 +57,7 @@ #include <sparc/dev/sbusreg.h> #include <sparc/dev/sbusvar.h> -int sbus_print __P((void *, char *)); +int sbus_print __P((void *, const char *)); void sbusreset __P((int)); /* autoconfiguration driver */ @@ -81,7 +81,7 @@ struct cfdriver sbus_cd = { int sbus_print(args, sbus) void *args; - char *sbus; + const char *sbus; { register struct confargs *ca = args; diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 7908739ae4d..f95279046e9 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -201,7 +201,7 @@ static void si_attach __P((struct device *, struct device *, void *)); static int si_intr __P((void *)); static void si_reset_adapter __P((struct ncr5380_softc *)); static void si_minphys __P((struct buf *)); -static int si_print __P((void *, char *)); +static int si_print __P((void *, const char *)); void si_dma_alloc __P((struct ncr5380_softc *)); void si_dma_free __P((struct ncr5380_softc *)); @@ -261,7 +261,7 @@ struct cfdriver sw_cd = { static int si_print(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 91294914f85..2c7101908c9 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -108,7 +108,7 @@ static char *str2hex __P((char *, int *)); static int getstr __P((char *, int)); static int findblkmajor __P((struct device *)); static struct device *getdisk __P((char *, int, int, dev_t *)); -static int mbprint __P((void *, char *)); +static int mbprint __P((void *, const char *)); static void crazymap __P((char *, int *)); int st_crazymap __P((int)); void swapconf __P((void)); @@ -956,7 +956,7 @@ clockfreq(freq) static int mbprint(aux, name) void *aux; - char *name; + const char *name; { register struct confargs *ca = aux; diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 7a0457f6b65..765bca78d17 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -61,7 +61,7 @@ int has_iocache; /* autoconfiguration driver */ -int iommu_print __P((void *, char *)); +int iommu_print __P((void *, const char *)); void iommu_attach __P((struct device *, struct device *, void *)); int iommu_match __P((struct device *, void *, void *)); @@ -82,7 +82,7 @@ struct cfdriver iommu_cd = { int iommu_print(args, iommu) void *args; - char *iommu; + const char *iommu; { register struct confargs *ca = args; diff --git a/sys/arch/sun3/dev/kd.c b/sys/arch/sun3/dev/kd.c index c3326cc689a..dee1cb64a30 100644 --- a/sys/arch/sun3/dev/kd.c +++ b/sys/arch/sun3/dev/kd.c @@ -64,8 +64,6 @@ #define KDMAJOR 1 #define PUT_WSIZE 64 -cdev_decl(kd); /* open, close, read, write, ioctl, stop, ... */ - struct kd_softc { struct device kd_dev; /* required first: base device */ struct tty *kd_tty; diff --git a/sys/arch/sun3/dev/memerr.c b/sys/arch/sun3/dev/memerr.c index 676aef73f96..212a1f16dd4 100644 --- a/sys/arch/sun3/dev/memerr.c +++ b/sys/arch/sun3/dev/memerr.c @@ -198,6 +198,9 @@ memerr_interrupt(arg) */ if (sc->sc_type == ME_PAR) { if (csr & ME_PAR_EMASK) { + /* true for Sun3/60, probably some others too */ + printf("probably should replace SIMM %d\n", + pa / 1048576 + 1); /* Parity errors are fatal. */ goto die; } diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c index 5dce4bfc940..c95f1100f90 100644 --- a/sys/arch/sun3/sun3/conf.c +++ b/sys/arch/sun3/sun3/conf.c @@ -52,6 +52,7 @@ int ttselect __P((dev_t, int, struct proc *)); #include "ccd.h" #include "cd.h" #include "kbd.h" +#include "ms.h" #include "pty.h" #include "rd.h" #include "sd.h" diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c index 01a40b19c06..17ea88af639 100644 --- a/sys/arch/vax/mba/mba.c +++ b/sys/arch/vax/mba/mba.c @@ -72,7 +72,7 @@ struct mbaunit mbaunit[] = { int mbamatch __P((struct device *, void *, void *)); void mbaattach __P((struct device *, struct device *, void *)); void mbaintr __P((int)); -int mbaprint __P((void *, char *)); +int mbaprint __P((void *, const char *)); void mbaqueue __P((struct mba_device *)); void mbastart __P((struct mba_softc *)); void mbamapregs __P((struct mba_softc *)); @@ -238,8 +238,8 @@ mbaintr(mba) int mbaprint(aux, mbaname) - void *aux; - char *mbaname; + void *aux; + const char *mbaname; { struct mba_attach_args *ma = aux; diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c index 7444fc60d88..2018c4a60bd 100644 --- a/sys/arch/vax/uba/uba.c +++ b/sys/arch/vax/uba/uba.c @@ -73,7 +73,7 @@ volatile int rbr,rcvec; int uba_match __P((struct device *, void *, void *)); void uba_attach __P((struct device *, struct device *, void *)); void ubascan __P((struct device *, void *)); -int ubaprint __P((void *, char *)); +int ubaprint __P((void *, const char *)); void uba_dw780int __P((int)); void ubaerror __P((int, struct uba_softc *, int *, int *, struct uba_regs *)); @@ -1267,7 +1267,7 @@ ubasetvec(dev, vec, func) int ubaprint(aux, uba) void *aux; - char *uba; + const char *uba; { struct uba_attach_args *ua = aux; diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c index e71716a7af1..78b42be263c 100644 --- a/sys/arch/vax/vax/autoconf.c +++ b/sys/arch/vax/vax/autoconf.c @@ -187,13 +187,13 @@ configure() mtpr(GC_CCF, PR_TXDB); /* Clear cold start flag in cpu */ } -int printut __P((void *, char *)); +int printut __P((void *, const char *)); int backplane_match __P((struct device *, void *, void *)); void backplane_attach __P((struct device *, struct device *, void *)); int printut(aux, hej) void *aux; - char *hej; + const char *hej; { struct bp_conf *bp = aux; if (hej) diff --git a/sys/arch/vax/vax/sbi.c b/sys/arch/vax/vax/sbi.c index 2ded418713a..486acc3399b 100644 --- a/sys/arch/vax/vax/sbi.c +++ b/sys/arch/vax/vax/sbi.c @@ -43,7 +43,7 @@ struct nexus *nexus; -static int sbi_print __P((void *, char *)); +static int sbi_print __P((void *, const char *)); int sbi_match __P((struct device *, void *, void *)); void sbi_attach __P((struct device *, struct device *, void*)); @@ -57,7 +57,7 @@ struct bp_conf { int sbi_print(aux, name) void *aux; - char *name; + const char *name; { struct sbi_attach_args *sa = (struct sbi_attach_args *)aux; int unsupp = 0; diff --git a/sys/dev/atapi/atapiconf.c b/sys/dev/atapi/atapiconf.c index 79654704b9f..efe377df068 100644 --- a/sys/dev/atapi/atapiconf.c +++ b/sys/dev/atapi/atapiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atapiconf.c,v 1.11 1996/09/12 02:36:10 downsj Exp $ */ +/* $OpenBSD: atapiconf.c,v 1.12 1996/11/23 21:46:29 kstailey Exp $ */ /* * Copyright (c) 1996 Manuel Bouyer. All rights reserved. @@ -68,7 +68,7 @@ void at_print_addr __P((struct at_dev_link *, u_int8_t)); int atapibusmatch __P((struct device *, void *, void *)); void atapibusattach __P((struct device *, struct device *, void *)); void atapi_fixquirk __P((struct at_dev_link *)); -int atapiprint __P((void *, char *)); +int atapiprint __P((void *, const char *)); struct cfattach atapibus_ca = { sizeof(struct atapibus_softc), atapibusmatch, atapibusattach @@ -169,7 +169,7 @@ atapi_fixquirk(ad_link) int atapiprint(aux, bus) void *aux; - char *bus; + const char *bus; { struct at_dev_link *ad_link = aux; struct atapi_identify *id = &ad_link->id; diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index 0052eb1825b..beb94e6b059 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.12 1996/11/12 20:30:07 niklas Exp $ */ +/* $OpenBSD: aha1742.c,v 1.13 1996/11/23 21:46:30 kstailey Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -294,7 +294,7 @@ int ahb_scsi_cmd __P((struct scsi_xfer *)); void ahb_timeout __P((void *)); void ahb_print_ecb __P((struct ahb_ecb *)); void ahb_print_active_ecb __P((struct ahb_softc *)); -int ahbprint __P((void *, char *)); +int ahbprint __P((void *, const char *)); #define MAX_SLOTS 15 int ahb_debug = 0; @@ -457,7 +457,7 @@ ahbmatch(parent, match, aux) int ahbprint(aux, name) void *aux; - char *name; + const char *name; { return UNCONF; } diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c index d774725cd31..e62ff898dd8 100644 --- a/sys/dev/eisa/eisa.c +++ b/sys/dev/eisa/eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa.c,v 1.4 1996/11/12 20:30:09 niklas Exp $ */ +/* $OpenBSD: eisa.c,v 1.5 1996/11/23 21:46:31 kstailey Exp $ */ /* $NetBSD: eisa.c,v 1.11 1996/04/09 22:46:11 cgd Exp $ */ /* @@ -61,7 +61,7 @@ struct cfdriver eisa_cd = { }; int eisasubmatch __P((struct device *, void *, void *)); -int eisaprint __P((void *, char *)); +int eisaprint __P((void *, const char *)); void eisa_devinfo __P((const char *, char *)); int @@ -83,7 +83,7 @@ eisamatch(parent, match, aux) int eisaprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { register struct eisa_attach_args *ea = aux; char devinfo[256]; diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 82c1d5bbaf9..0e70cd8be6f 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx.c,v 1.12 1996/11/12 20:30:15 niklas Exp $ */ +/* $OpenBSD: aic7xxx.c,v 1.13 1996/11/23 21:46:33 kstailey Exp $ */ /* * Generic driver for the aic7xxx based adaptec SCSI controllers @@ -577,12 +577,12 @@ ahc_scsirate(ahc, scsirate, period, offset, channel, target ) } #if defined(__NetBSD__) || defined(__OpenBSD__) -int ahcprint __P((void *, char *)); +int ahcprint __P((void *, const char *)); int ahcprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 69781e00ed3..2368691d303 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.26 1996/10/16 12:29:48 deraadt Exp $ */ +/* $OpenBSD: aha.c,v 1.27 1996/11/23 21:46:35 kstailey Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -172,7 +172,7 @@ struct scsi_device aha_dev = { int ahaprobe __P((struct device *, void *, void *)); void ahaattach __P((struct device *, struct device *, void *)); -int ahaprint __P((void *, char *)); +int ahaprint __P((void *, const char *)); struct cfattach aha_ca = { sizeof(struct aha_softc), ahaprobe, ahaattach @@ -357,7 +357,7 @@ ahaprobe(parent, match, aux) int ahaprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c index 9ce8e590f43..203c32051ee 100644 --- a/sys/dev/isa/aic6360.c +++ b/sys/dev/isa/aic6360.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360.c,v 1.9 1996/05/26 00:27:11 deraadt Exp $ */ +/* $OpenBSD: aic6360.c,v 1.10 1996/11/23 21:46:36 kstailey Exp $ */ /* $NetBSD: aic6360.c,v 1.46 1996/05/12 23:51:37 mycroft Exp $ */ #define integrate static inline @@ -582,7 +582,7 @@ int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */ int aicprobe __P((struct device *, void *, void *)); void aicattach __P((struct device *, struct device *, void *)); -int aicprint __P((void *, char *)); +int aicprint __P((void *, const char *)); void aic_minphys __P((struct buf *)); int aicintr __P((void *)); void aic_init __P((struct aic_softc *)); @@ -756,7 +756,7 @@ aic_find(sc) int aicprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c index 2353dd42e60..f4411947118 100644 --- a/sys/dev/isa/ast.c +++ b/sys/dev/isa/ast.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ast.c,v 1.13 1996/11/12 20:30:25 niklas Exp $ */ +/* $OpenBSD: ast.c,v 1.14 1996/11/23 21:46:37 kstailey Exp $ */ /* $NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $ */ /* @@ -63,7 +63,7 @@ struct ast_softc { int astprobe __P((struct device *, void *, void *)); void astattach __P((struct device *, struct device *, void *)); int astintr __P((void *)); -int astprint __P((void *, char *)); +int astprint __P((void *, const char *)); struct cfattach ast_ca = { sizeof(struct ast_softc), astprobe, astattach @@ -128,7 +128,7 @@ out: int astprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct commulti_attach_args *ca = aux; diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c index 1f868b8e133..6760e5ac5f8 100644 --- a/sys/dev/isa/boca.c +++ b/sys/dev/isa/boca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boca.c,v 1.11 1996/11/12 20:30:26 niklas Exp $ */ +/* $OpenBSD: boca.c,v 1.12 1996/11/23 21:46:38 kstailey Exp $ */ /* $NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $ */ /* @@ -63,7 +63,7 @@ struct boca_softc { int bocaprobe __P((struct device *, void *, void *)); void bocaattach __P((struct device *, struct device *, void *)); int bocaintr __P((void *)); -int bocaprint __P((void *, char *)); +int bocaprint __P((void *, const char *)); struct cfattach boca_ca = { sizeof(struct boca_softc), bocaprobe, bocaattach, @@ -128,7 +128,7 @@ out: int bocaprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct commulti_attach_args *ca = aux; diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c index 67c162527fe..222bdf4a446 100644 --- a/sys/dev/isa/bt.c +++ b/sys/dev/isa/bt.c @@ -168,7 +168,7 @@ struct scsi_device bt_dev = { int btprobe __P((struct device *, void *, void *)); void btattach __P((struct device *, struct device *, void *)); -int btprint __P((void *, char *)); +int btprint __P((void *, const char *)); struct cfattach bt_ca = { sizeof(struct bt_softc), btprobe, btattach @@ -345,7 +345,7 @@ btprobe(parent, match, aux) int btprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c index 876bd7ed0a8..a53d72e2c49 100644 --- a/sys/dev/isa/fdc.c +++ b/sys/dev/isa/fdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc.c,v 1.6 1996/11/12 20:30:32 niklas Exp $ */ +/* $OpenBSD: fdc.c,v 1.7 1996/11/23 21:46:40 kstailey Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -96,7 +96,7 @@ struct cfdriver fdc_cd = { NULL, "fdc", DV_DULL }; -int fddprint __P((void *, char *)); +int fddprint __P((void *, const char *)); int fdcintr __P((void *)); int @@ -242,7 +242,7 @@ fdcattach(parent, self, aux) int fddprint(aux, fdc) void *aux; - char *fdc; + const char *fdc; { register struct fdc_attach_args *fa = aux; diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 23f05025c4a..9401e9f064d 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.18 1996/10/31 01:05:08 niklas Exp $ */ +/* $OpenBSD: isa.c,v 1.19 1996/11/23 21:46:41 kstailey Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /*- @@ -107,7 +107,7 @@ isaattach(parent, self, aux) int isaprint(aux, isa) void *aux; - char *isa; + const char *isa; { struct isa_attach_args *ia = aux; diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 6ca10a1095b..9eb0b6f030c 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.8 1996/10/16 12:32:36 deraadt Exp $ */ +/* $OpenBSD: isadma.c,v 1.9 1996/11/23 21:46:41 kstailey Exp $ */ /* $NetBSD: isadma.c,v 1.19 1996/04/29 20:03:26 christos Exp $ */ #include <sys/param.h> @@ -45,7 +45,7 @@ static u_int8_t dmamode[4] = { int isadmamatch __P((struct device *, void *, void *)); void isadmaattach __P((struct device *, struct device *, void *)); -int isadmaprint __P((void *, char *)); +int isadmaprint __P((void *, const char *)); struct cfattach isadma_ca = { sizeof(struct device), isadmamatch, isadmaattach diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c index 66c00e1a6d4..e7d43f8aa72 100644 --- a/sys/dev/isa/isapnp.c +++ b/sys/dev/isa/isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp.c,v 1.7 1996/11/12 20:30:39 niklas Exp $ */ +/* $OpenBSD: isapnp.c,v 1.8 1996/11/23 21:46:42 kstailey Exp $ */ /* * Copyright (c) 1996, Shawn Hsiao <shawn@alpha.secc.fju.edu.tw> @@ -74,7 +74,7 @@ int isapnpmatch __P((struct device *, void *, void *)); void isapnpattach __P((struct device *, struct device *, void *)); -int isapnpprint __P((void *aux, char *pnp)); +int isapnpprint __P((void *aux, const char *pnp)); int isapnpsubmatch __P((struct device *parent, void *match, void *aux)); struct isapnp_softc { @@ -226,7 +226,7 @@ postisapnpattach(parent, self, aux) int isapnpprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { register struct isa_attach_args *ia = aux; unsigned char info[4]; diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index 61137d1945a..1a79d7e9f84 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isavar.h,v 1.18 1996/11/12 20:30:40 niklas Exp $ */ +/* $OpenBSD: isavar.h,v 1.19 1996/11/23 21:46:43 kstailey Exp $ */ /* $NetBSD: isavar.h,v 1.23 1996/05/08 23:32:31 thorpej Exp $ */ /* @@ -185,7 +185,7 @@ struct isa_softc { char *isa_intr_typename __P((int type)); void isascan __P((struct device *parent, void *match)); -int isaprint __P((void *, char *)); +int isaprint __P((void *, const char *)); #ifdef NEWCONFIG /* diff --git a/sys/dev/isa/pcmcia_isa.c b/sys/dev/isa/pcmcia_isa.c index da4d0d5ffa1..34b7cabb122 100644 --- a/sys/dev/isa/pcmcia_isa.c +++ b/sys/dev/isa/pcmcia_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia_isa.c,v 1.7 1996/10/18 15:43:06 deraadt Exp $ */ +/* $OpenBSD: pcmcia_isa.c,v 1.8 1996/11/23 21:46:44 kstailey Exp $ */ /* * Copyright (c) 1995,1996 John T. Kohl. All rights reserved. * Copyright (c) 1994 Stefan Grefen. All rights reserved. @@ -158,7 +158,7 @@ pcmcia_isa_probe(parent, match, aux, pc_link) #endif if ((probe == NULL ? (*cf->cf_attach->ca_match)(parent, dev, &ia) : (*probe)(parent, dev, &ia, pc_link)) > 0) { - extern int isaprint __P((void *, char *)); + extern int isaprint __P((void *, const char *)); config_attach(parent, dev, &ia, isaprint); #ifdef PCMCIA_ISA_DEBUG diff --git a/sys/dev/isa/pcmcia_pcic.c b/sys/dev/isa/pcmcia_pcic.c index 5e0bfeb98ee..1170e16795d 100644 --- a/sys/dev/isa/pcmcia_pcic.c +++ b/sys/dev/isa/pcmcia_pcic.c @@ -1,4 +1,4 @@ -/* $Id: pcmcia_pcic.c,v 1.8 1996/10/23 16:41:58 deraadt Exp $ */ +/* $Id: pcmcia_pcic.c,v 1.9 1996/11/23 21:46:44 kstailey Exp $ */ /* * Copyright (c) 1995, 1996 John T. Kohl * All rights reserved. @@ -133,11 +133,11 @@ static struct pcmcia_funcs pcic_funcs = { int pcic_probe __P((struct device *, void *, void *)); void pcic_attach __P((struct device *, struct device *, void *)); -int pcic_print __P((void *, char *)); +int pcic_print __P((void *, const char *)); int pcicmaster_probe __P((struct device *, void *, void *)); void pcicmaster_attach __P((struct device *, struct device *, void *)); -int pcicmaster_print __P((void *, char *)); +int pcicmaster_print __P((void *, const char *)); extern struct pcmciabus_link pcmcia_isa_link; @@ -345,7 +345,7 @@ pcic_intr __P((void *)); int pcic_print(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: pcmciabus ", name); @@ -1053,7 +1053,7 @@ pcicmaster_attach(parent, self, aux) int pcicmaster_print(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: master controller ", name); diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c index d1ff59cdf8c..d8e87928a33 100644 --- a/sys/dev/isa/rtfps.c +++ b/sys/dev/isa/rtfps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtfps.c,v 1.12 1996/11/12 20:30:42 niklas Exp $ */ +/* $OpenBSD: rtfps.c,v 1.13 1996/11/23 21:46:45 kstailey Exp $ */ /* $NetBSD: rtfps.c,v 1.23 1996/05/12 23:53:29 mycroft Exp $ */ /* @@ -65,7 +65,7 @@ struct rtfps_softc { int rtfpsprobe __P((struct device *, void *, void *)); void rtfpsattach __P((struct device *, struct device *, void *)); int rtfpsintr __P((void *)); -int rtfpsprint __P((void *, char *)); +int rtfpsprint __P((void *, const char *)); struct cfattach rtfps_ca = { sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach @@ -130,7 +130,7 @@ out: int rtfpsprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct commulti_attach_args *ca = aux; diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index add9c513f09..0f90e391bb4 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -304,7 +304,7 @@ struct scsi_device sea_dev = { int seaprobe __P((struct device *, void *, void *)); void seaattach __P((struct device *, struct device *, void *)); -int seaprint __P((void *, char *)); +int seaprint __P((void *, const char *)); struct cfattach sea_ca = { sizeof(struct sea_softc), seaprobe, seaattach @@ -411,7 +411,7 @@ seaprobe(parent, match, aux) int seaprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c index 50e604c301b..3b8a340243d 100644 --- a/sys/dev/isa/ultra14f.c +++ b/sys/dev/isa/ultra14f.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultra14f.c,v 1.15 1996/05/26 00:27:30 deraadt Exp $ */ +/* $OpenBSD: ultra14f.c,v 1.16 1996/11/23 21:46:47 kstailey Exp $ */ /* $NetBSD: ultra14f.c,v 1.66 1996/05/12 23:53:54 mycroft Exp $ */ /* @@ -330,7 +330,7 @@ struct scsi_device uha_dev = { int uhaprobe __P((struct device *, void *, void *)); void uhaattach __P((struct device *, struct device *, void *)); -int uhaprint __P((void *, char *)); +int uhaprint __P((void *, const char *)); struct cfattach uha_ca = { sizeof(struct uha_softc), uhaprobe, uhaattach @@ -578,7 +578,7 @@ uhaprobe(parent, match, aux) int uhaprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) printf("%s: scsibus ", name); diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c index 1bcb02de03e..810b6412091 100644 --- a/sys/dev/isa/wd.c +++ b/sys/dev/isa/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.20 1996/11/12 20:30:43 niklas Exp $ */ +/* $OpenBSD: wd.c,v 1.21 1996/11/23 21:46:48 kstailey Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -82,7 +82,7 @@ struct wd_softc { int wdprobe __P((struct device *, void *, void *)); void wdattach __P((struct device *, struct device *, void *)); -int wdprint __P((void *, char *)); +int wdprint __P((void *, const char *)); struct cfattach wd_ca = { sizeof(struct wd_softc), wdprobe, wdattach diff --git a/sys/dev/isa/wdc.c b/sys/dev/isa/wdc.c index 00a513b79d2..687edb41343 100644 --- a/sys/dev/isa/wdc.c +++ b/sys/dev/isa/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.14 1996/11/12 20:30:45 niklas Exp $ */ +/* $OpenBSD: wdc.c,v 1.15 1996/11/23 21:46:49 kstailey Exp $ */ /* $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */ /* @@ -85,7 +85,7 @@ LIST_HEAD(xfer_free_list, wdc_xfer) xfer_free_list; int wdcprobe __P((struct device *, void *, void *)); -int wdcprint __P((void *, char *)); +int wdcprint __P((void *, const char *)); void wdcattach __P((struct device *, struct device *, void *)); int wdcintr __P((void *)); @@ -198,7 +198,7 @@ wdcprobe(parent, match, aux) int wdcprint(aux, wdc) void *aux; - char *wdc; + const char *wdc; { struct wd_link *d_link = aux; diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index 603a5efd42c..fb67adbebaf 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.9 1996/11/12 20:30:46 niklas Exp $ */ +/* $OpenBSD: wds.c,v 1.10 1996/11/23 21:46:49 kstailey Exp $ */ /* $NetBSD: wds.c,v 1.7 1996/05/12 23:54:09 mycroft Exp $ */ #undef WDSDIAG @@ -185,7 +185,7 @@ struct scsi_device wds_dev = { int wdsprobe __P((struct device *, void *, void *)); void wdsattach __P((struct device *, struct device *, void *)); -int wdsprint __P((void *, char *)); +int wdsprint __P((void *, const char *)); struct cfattach wds_ca = { sizeof(struct wds_softc), wdsprobe, wdsattach @@ -262,7 +262,7 @@ wdsprobe(parent, match, aux) int wdsprint(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 0cf2491fed0..f6043155c43 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.18 1996/11/12 20:30:57 niklas Exp $ */ +/* $OpenBSD: ncr.c,v 1.19 1996/11/23 21:47:04 kstailey Exp $ */ /* $NetBSD: ncr.c,v 1.35.4.1 1996/06/03 20:32:17 cgd Exp $ */ /************************************************************************** @@ -3356,12 +3356,12 @@ static char* ncr_probe (pcici_t tag, pcidi_t type) #if defined(__NetBSD__) || defined(__OpenBSD__) -int ncr_print __P((void *, char *)); +int ncr_print __P((void *, const char *)); int ncr_print(aux, name) void *aux; - char *name; + const char *name; { if (name != NULL) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index e88e710b1d3..0d2f6061d0b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.3 1996/05/07 07:38:49 deraadt Exp $ */ +/* $OpenBSD: pci.c,v 1.4 1996/11/23 21:47:05 kstailey Exp $ */ /* $NetBSD: pci.c,v 1.19 1996/05/03 17:33:49 christos Exp $ */ /* @@ -53,7 +53,7 @@ struct cfdriver pci_cd = { NULL, "pci", DV_DULL }; -int pciprint __P((void *, char *)); +int pciprint __P((void *, const char *)); int pcisubmatch __P((struct device *, void *, void *)); int @@ -161,7 +161,7 @@ pciattach(parent, self, aux) int pciprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { register struct pci_attach_args *pa = aux; char devinfo[256]; diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 87a6b1c0eeb..09a8b969cec 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.3 1996/05/07 07:38:51 deraadt Exp $ */ +/* $OpenBSD: ppb.c,v 1.4 1996/11/23 21:47:06 kstailey Exp $ */ /* $NetBSD: ppb.c,v 1.8 1996/05/03 17:33:51 christos Exp $ */ /* @@ -61,7 +61,7 @@ struct cfdriver ppb_cd = { NULL, "ppb", DV_DULL }; -int ppbprint __P((void *, char *pnp)); +int ppbprint __P((void *, const char *pnp)); int ppbmatch(parent, match, aux) @@ -132,7 +132,7 @@ ppbattach(parent, self, aux) int ppbprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct pcibus_attach_args *pba = aux; diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c index 16a5df7f413..572bf77726c 100644 --- a/sys/dev/pcmcia/pcmcia.c +++ b/sys/dev/pcmcia/pcmcia.c @@ -1,4 +1,4 @@ -/* $Id: pcmcia.c,v 1.6 1996/10/16 12:36:54 deraadt Exp $ */ +/* $Id: pcmcia.c,v 1.7 1996/11/23 21:47:07 kstailey Exp $ */ /* * Copyright (c) 1996 John T. Kohl. All rights reserved. * Copyright (c) 1994 Stefan Grefen. All rights reserved. @@ -101,7 +101,7 @@ int pcmcia_mapcard_and_configure __P((struct pcmcia_link *, int, int pcmcia_unconfigure __P((struct pcmcia_link *)); int pcmcia_unmapcard __P((struct pcmcia_link *)); -int pcmcia_print __P((void *, char *)); +int pcmcia_print __P((void *, const char *)); int pcmcia_submatch __P((struct device *, void *, void *)); void pcmcia_probe_link __P((struct pcmcia_link *)); @@ -1317,7 +1317,7 @@ pcmciadumpcf(cf) int pcmcia_print(aux, pnp) void *aux; - char *pnp; + const char *pnp; { #if 0 struct pcmcia_attach_args *paa = aux; diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index 3e9c5939be0..16086da694a 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -461,7 +461,7 @@ extern u_long asc_iomem; */ int ascmatch __P((struct device * parent, void *cfdata, void *aux)); void ascattach __P((struct device *parent, struct device *self, void *aux)); -int ascprint(void*, char*); +int ascprint(void*, const char*); struct cfattach asc_ca = { sizeof(struct asc_softc), ascmatch, ascattach @@ -692,7 +692,7 @@ ascattach(parent, self, aux) int ascprint(aux, name) void *aux; - char *name; + const char *name; { return -1; } diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index 5474b1c9bed..dc1d61f37eb 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc.c,v 1.7 1996/10/31 01:05:13 niklas Exp $ */ +/* $OpenBSD: tc.c,v 1.8 1996/11/23 21:47:10 kstailey Exp $ */ /* $NetBSD: tc.c,v 1.16 1996/05/17 23:39:19 cgd Exp $ */ /* @@ -62,7 +62,7 @@ struct cfdriver tc_cd = { NULL, "tc", DV_DULL }; -int tcprint __P((void *, char *)); +int tcprint __P((void *, const char *)); int tcsubmatch __P((struct device *, void *, void *)); int tc_checkslot __P((tc_addr_t, char *)); void tc_devinfo __P((const char *, char *)); @@ -194,7 +194,7 @@ tcattach(parent, self, aux) int tcprint(aux, pnp) void *aux; - char *pnp; + const char *pnp; { struct tc_attach_args *ta = aux; char devinfo[256]; diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index 7e6d70b0cbd..d68f6ab39f9 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.4 1996/11/04 03:31:15 deraadt Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.5 1996/11/23 21:47:11 kstailey Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -707,9 +707,13 @@ int spec_advlock(v) void *v; { +#ifdef NFSSERVER extern int ufs_advlock __P((void *v)); return (ufs_advlock(v)); +#else + return (EOPNOTSUPP); +#endif } /* diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 7e6d70b0cbd..d68f6ab39f9 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.4 1996/11/04 03:31:15 deraadt Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.5 1996/11/23 21:47:11 kstailey Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -707,9 +707,13 @@ int spec_advlock(v) void *v; { +#ifdef NFSSERVER extern int ufs_advlock __P((void *v)); return (ufs_advlock(v)); +#else + return (EOPNOTSUPP); +#endif } /* diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 6619894c78f..e3dbba643af 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.15 1996/10/20 01:07:04 millert Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.16 1996/11/23 21:47:12 kstailey Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -96,7 +96,7 @@ struct cfdriver scsibus_cd = { NULL, "scsibus", DV_DULL }; -int scsibusprint __P((void *, char *)); +int scsibusprint __P((void *, const char *)); int scsibusmatch(parent, match, aux) @@ -403,8 +403,8 @@ struct scsi_quirk_inquiry_pattern scsi_quirk_patterns[] = { */ int scsibusprint(aux, pnp) - void *aux; - char *pnp; + void *aux; + const char *pnp; { struct scsibus_attach_args *sa = aux; struct scsi_inquiry_data *inqbuf; diff --git a/sys/sys/device.h b/sys/sys/device.h index bd92e73cc6d..f8a08ad392e 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.9 1996/11/21 12:47:17 mickey Exp $ */ +/* $OpenBSD: device.h,v 1.10 1996/11/23 21:47:13 kstailey Exp $ */ /* $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $ */ /* @@ -144,7 +144,7 @@ struct cfdriver { * of the parent device. The return value is ignored if the device was * configured, so most functions can return UNCONF unconditionally. */ -typedef int (*cfprint_t) __P((void *, char *)); +typedef int (*cfprint_t) __P((void *, const char *)); #define QUIET 0 /* print nothing */ #define UNCONF 1 /* print " not configured\n" */ #define UNSUPP 2 /* print " not supported\n" */ |