diff --git a/sys/dev/ieee1394/fwcrom.c b/sys/dev/ieee1394/fwcrom.c index 4c9acdfd4376..9eba0aa4673c 100644 --- a/sys/dev/ieee1394/fwcrom.c +++ b/sys/dev/ieee1394/fwcrom.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwcrom.c,v 1.6 2007/12/11 11:34:08 lukem Exp $ */ +/* $NetBSD: fwcrom.c,v 1.7 2008/05/02 19:50:04 xtraeme Exp $ */ /*- * Copyright (c) 2002-2003 * Hidetoshi Shimokawa. All rights reserved. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.6 2007/12/11 11:34:08 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.7 2008/05/02 19:50:04 xtraeme Exp $"); #ifdef __FreeBSD__ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwcrom.c,v 1.14 2006/02/04 21:37:39 imp Exp $"); #endif @@ -264,7 +264,7 @@ crom_crc(uint32_t *ptr, int len) static void crom_desc_specver(uint32_t spec, uint32_t ver, char *buf, int len) { - char *s = NULL; + const char *s = NULL; if (spec == CSRVAL_ANSIT10 || spec == 0) { switch (ver) { @@ -314,12 +314,12 @@ crom_desc_specver(uint32_t spec, uint32_t ver, char *buf, int len) snprintf(buf, len, "%s", s); } -char * +const char * crom_desc(struct crom_context *cc, char *buf, int len) { struct csrreg *reg; struct csrdirectory *dir; - char *desc; + const char *desc; uint16_t crc; reg = crom_get(cc); diff --git a/sys/dev/ieee1394/iec13213.h b/sys/dev/ieee1394/iec13213.h index 23cf3c7ac35b..bcae4ffdf1c8 100644 --- a/sys/dev/ieee1394/iec13213.h +++ b/sys/dev/ieee1394/iec13213.h @@ -1,4 +1,4 @@ -/* $NetBSD: iec13213.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */ +/* $NetBSD: iec13213.h,v 1.3 2008/05/02 19:50:04 xtraeme Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -219,7 +219,7 @@ struct csrreg *crom_search_key(struct crom_context *, uint8_t); int crom_has_specver(uint32_t *, uint32_t, uint32_t); #ifndef _KERNEL -char *crom_desc(struct crom_context *, char *, int); +const char *crom_desc(struct crom_context *, char *, int); #endif /* For CROM build */