summaryrefslogtreecommitdiffstats
path: root/sys/dev/pccard
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-10-26 00:51:40 +0000
committerimp <imp@FreeBSD.org>2003-10-26 00:51:40 +0000
commit7a210cb6a4653fdcefebefafbef3dc1b339d7a76 (patch)
tree84ad679c7b73676d90148df14067c3ee1c9bb12a /sys/dev/pccard
parentf5b54933f14c8e48ce25af340e1aba5a4d0ac571 (diff)
downloadFreeBSD-src-7a210cb6a4653fdcefebefafbef3dc1b339d7a76.zip
FreeBSD-src-7a210cb6a4653fdcefebefafbef3dc1b339d7a76.tar.gz
Const poison string accessor functions.
Diffstat (limited to 'sys/dev/pccard')
-rw-r--r--sys/dev/pccard/pccard.c7
-rw-r--r--sys/dev/pccard/pccardvar.h8
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 7c54b6f..4194275 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -151,7 +151,8 @@ pccard_ccr_write(struct pccard_function *pf, int ccr, int val)
static int
pccard_set_default_descr(device_t dev)
{
- char *vendorstr, *prodstr, *str;
+ const char *vendorstr, *prodstr;
+ char *str;
if (pccard_get_vendor_str(dev, &vendorstr))
return (0);
@@ -324,8 +325,8 @@ pccard_do_product_lookup(device_t bus, device_t dev,
u_int32_t fcn;
u_int32_t vendor;
u_int32_t prod;
- char *vendorstr;
- char *prodstr;
+ const char *vendorstr;
+ const char *prodstr;
#ifdef DIAGNOSTIC
if (sizeof *ent > ent_size)
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 0289a3f..7a20f48 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -349,10 +349,10 @@ PCCARD_ACCESSOR(product, PRODUCT, uint32_t)
PCCARD_ACCESSOR(prodext, PRODEXT, uint16_t)
PCCARD_ACCESSOR(function_number,FUNCTION_NUMBER, uint32_t)
PCCARD_ACCESSOR(function, FUNCTION, uint32_t)
-PCCARD_ACCESSOR(vendor_str, VENDOR_STR, char *)
-PCCARD_ACCESSOR(product_str, PRODUCT_STR, char *)
-PCCARD_ACCESSOR(cis3_str, CIS3_STR, char *)
-PCCARD_ACCESSOR(cis4_str, CIS4_STR, char *)
+PCCARD_ACCESSOR(vendor_str, VENDOR_STR, const char *)
+PCCARD_ACCESSOR(product_str, PRODUCT_STR, const char *)
+PCCARD_ACCESSOR(cis3_str, CIS3_STR, const char *)
+PCCARD_ACCESSOR(cis4_str, CIS4_STR, const char *)
/* shared memory flags */
enum {
OpenPOWER on IntegriCloud