summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/pci
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
commit06e29584d413606b21c240635e12d7500b385ae5 (patch)
tree5e6f8a395a9c0030fc223059bb7a1b39529330c5 /sys/arch/macppc/pci
parentc647754eb2c6d41408fe754bf7167383562e01b1 (diff)
Constify the what/name parameter of pci_intr_establish().
Tested by myself, sthen, oga, kettenis, and jasper. Input from sthen and jasper. ok kettenis (Manpage follows shortly.)
Diffstat (limited to 'sys/arch/macppc/pci')
-rw-r--r--sys/arch/macppc/pci/ht.c6
-rw-r--r--sys/arch/macppc/pci/macobio.c8
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/macppc/pci/ht.c b/sys/arch/macppc/pci/ht.c
index 39735bcbe2f..5dfbc851b54 100644
--- a/sys/arch/macppc/pci/ht.c
+++ b/sys/arch/macppc/pci/ht.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ht.c,v 1.12 2009/03/29 22:58:31 kettenis Exp $ */
+/* $OpenBSD: ht.c,v 1.13 2009/08/22 02:54:50 mk Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -45,7 +45,7 @@ int ht_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
const char *ht_intr_string(void *, pci_intr_handle_t);
int ht_intr_line(void *, pci_intr_handle_t);
void *ht_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *),
- void *, char *);
+ void *, const char *);
void ht_intr_disestablish(void *, void *);
int ht_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
@@ -353,7 +353,7 @@ ht_intr_line(void *cpv, pci_intr_handle_t ih)
void *
ht_intr_establish(void *cpv, pci_intr_handle_t ih, int level,
- int (*func)(void *), void *arg, char *name)
+ int (*func)(void *), void *arg, const char *name)
{
return (*intr_establish_func)(cpv, ih, IST_LEVEL, level, func, arg,
name);
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index b73d41cb901..b335c558866 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macobio.c,v 1.17 2006/06/19 22:42:35 miod Exp $ */
+/* $OpenBSD: macobio.c,v 1.18 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $ */
/*-
@@ -52,7 +52,7 @@ int macobio_print(void *, const char *);
void macobio_modem_power(int enable);
void *undef_mac_establish(void * lcv, int irq, int type, int level,
- int (*ih_fun)(void *), void *ih_arg, char *name);
+ int (*ih_fun)(void *), void *ih_arg, const char *name);
void mac_intr_disestab(void *lcp, void *arg);
struct macobio_softc {
@@ -229,7 +229,7 @@ macobio_print(void *aux, const char *macobio)
void *
undef_mac_establish(void * lcv, int irq, int type, int level,
- int (*ih_fun)(void *), void *ih_arg, char *name)
+ int (*ih_fun)(void *), void *ih_arg, const char *name)
{
printf("mac_intr_establish called, not yet inited\n");
return 0;
@@ -246,7 +246,7 @@ intr_disestablish_t *mac_intr_disestablish_func = mac_intr_disestab;
void *
mac_intr_establish(void * lcv, int irq, int type, int level,
- int (*ih_fun)(void *), void *ih_arg, char *name)
+ int (*ih_fun)(void *), void *ih_arg, const char *name)
{
return (*mac_intr_establish_func)(lcv, irq, type, level, ih_fun,
ih_arg, name);
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index ed27df753ae..2b89fabe80e 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.39 2009/05/03 21:30:09 kettenis Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.40 2009/08/22 02:54:50 mk Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -68,7 +68,7 @@ int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
const char *mpc_intr_string(void *, pci_intr_handle_t);
int mpc_intr_line(void *, pci_intr_handle_t);
void *mpc_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void mpc_intr_disestablish(void *, void *);
int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
u_int32_t mpc_gen_config_reg(void *cpv, pcitag_t tag, int offset);
@@ -907,7 +907,7 @@ mpc_intr_line(void *lcv, pci_intr_handle_t ih)
void *
mpc_intr_establish(void *lcv, pci_intr_handle_t ih, int level,
- int (*func)(void *), void *arg, char *name)
+ int (*func)(void *), void *arg, const char *name)
{
return (*intr_establish_func)(lcv, ih, IST_LEVEL, level, func, arg,
name);