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

Don't use not-in-user-namespace variable names that newer versions of 

GCC doesn't like very much.
This commit is contained in:
thorpej 2000-05-08 18:23:36 +00:00
parent d611fd596a
commit 79cbea8cc3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/cardbus/cardbus_exrom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cardbus_exrom.c,v 1.4 2000/02/03 06:47:31 thorpej Exp $ */ /* $NetBSD: cardbus_exrom.c,v 1.5 2000/05/08 18:23:36 thorpej Exp $ */
/* /*
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -92,7 +92,7 @@ cardbus_read_exrom(romt, romh, head)
bus_space_handle_t romh; bus_space_handle_t romh;
struct cardbus_rom_image_head *head; struct cardbus_rom_image_head *head;
{ {
static const char __func__[] = "cardbus_read_exrom"; static const char thisfunc[] = "cardbus_read_exrom";
size_t addr = 0; /* offset of current rom image */ size_t addr = 0; /* offset of current rom image */
size_t dataptr; size_t dataptr;
@ -107,7 +107,7 @@ cardbus_read_exrom(romt, romh, head)
val = READ_INT16(romt, romh, addr + CARDBUS_EXROM_SIGNATURE); val = READ_INT16(romt, romh, addr + CARDBUS_EXROM_SIGNATURE);
if(val != 0xaa55) { if(val != 0xaa55) {
printf("%s: bad header signature in ROM image %u: 0x%04x\n", printf("%s: bad header signature in ROM image %u: 0x%04x\n",
__func__, rom_image, val); thisfunc, rom_image, val);
return 1; return 1;
} }
dataptr = addr + READ_INT16(romt, romh, addr + CARDBUS_EXROM_DATA_PTR); dataptr = addr + READ_INT16(romt, romh, addr + CARDBUS_EXROM_DATA_PTR);
@ -121,7 +121,7 @@ cardbus_read_exrom(romt, romh, head)
image_size <<= 9; image_size <<= 9;
image = malloc(sizeof(*image), M_DEVBUF, M_NOWAIT); image = malloc(sizeof(*image), M_DEVBUF, M_NOWAIT);
if(image == NULL) { if(image == NULL) {
printf("%s: out of memory\n", __func__); printf("%s: out of memory\n", thisfunc);
return 1; return 1;
} }
image->rom_image = rom_image; image->rom_image = rom_image;
@ -129,7 +129,7 @@ cardbus_read_exrom(romt, romh, head)
image->romt = romt; image->romt = romt;
if(bus_space_subregion(romt, romh, addr, if(bus_space_subregion(romt, romh, addr,
image_size, &image->romh)) { image_size, &image->romh)) {
printf("%s: bus_space_subregion failed", __func__); printf("%s: bus_space_subregion failed", thisfunc);
free(image, M_DEVBUF); free(image, M_DEVBUF);
return 1; return 1;
} }

6
sys/dev/cardbus/if_fxp_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fxp_cardbus.c,v 1.11 2000/03/22 00:17:46 thorpej Exp $ */ /* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */
/* /*
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -141,7 +141,7 @@ fxp_cardbus_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {
static const char __func__[] = "fxp_cardbus_attach"; static const char thisfunc[] = "fxp_cardbus_attach";
struct fxp_softc *sc = (struct fxp_softc *) self; struct fxp_softc *sc = (struct fxp_softc *) self;
struct fxp_cardbus_softc *csc = (struct fxp_cardbus_softc *) self; struct fxp_cardbus_softc *csc = (struct fxp_cardbus_softc *) self;
@ -171,7 +171,7 @@ fxp_cardbus_attach(parent, self, aux)
sc->sc_sh = memh; sc->sc_sh = memh;
csc->size = size; csc->size = size;
} else } else
panic("%s: failed to allocate mem and io space", __func__); panic("%s: failed to allocate mem and io space", thisfunc);
if (ca->ca_cis.cis1_info[0] && ca->ca_cis.cis1_info[1]) if (ca->ca_cis.cis1_info[0] && ca->ca_cis.cis1_info[1])