summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/eisa/eisa_machdep.h4
-rw-r--r--sys/arch/alpha/isa/isa_machdep.h4
-rw-r--r--sys/arch/alpha/pci/pci_1000.c6
-rw-r--r--sys/arch/alpha/pci/pci_1000a.c6
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c6
-rw-r--r--sys/arch/alpha/pci/pci_550.c6
-rw-r--r--sys/arch/alpha/pci/pci_6600.c6
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c6
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c6
-rw-r--r--sys/arch/alpha/pci/pci_eb64plus.c6
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c6
-rw-r--r--sys/arch/alpha/pci/pci_kn300.c6
-rw-r--r--sys/arch/alpha/pci/pci_machdep.h4
-rw-r--r--sys/arch/alpha/pci/pci_up1000.c6
-rw-r--r--sys/arch/alpha/pci/sio_pic.c4
-rw-r--r--sys/arch/alpha/pci/siovar.h4
16 files changed, 43 insertions, 43 deletions
diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h
index bdbc10b7012..729d3ec4ca1 100644
--- a/sys/arch/alpha/eisa/eisa_machdep.h
+++ b/sys/arch/alpha/eisa/eisa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eisa_machdep.h,v 1.7 2008/07/25 21:11:14 miod Exp $ */
+/* $OpenBSD: eisa_machdep.h,v 1.8 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $ */
/*
@@ -44,7 +44,7 @@ struct alpha_eisa_chipset {
eisa_intr_handle_t *);
const char *(*ec_intr_string)(void *, eisa_intr_handle_t);
void *(*ec_intr_establish)(void *, eisa_intr_handle_t,
- int, int, int (*)(void *), void *, char *);
+ int, int, int (*)(void *), void *, const char *);
void (*ec_intr_disestablish)(void *, void *);
};
diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h
index 55181455db8..c72c63b93ba 100644
--- a/sys/arch/alpha/isa/isa_machdep.h
+++ b/sys/arch/alpha/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.12 2002/03/14 03:15:50 millert Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.13 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: isa_machdep.h,v 1.3 1996/11/19 04:53:07 cgd Exp $ */
/*
@@ -39,7 +39,7 @@ struct alpha_isa_chipset {
void (*ic_attach_hook)(struct device *, struct device *,
struct isabus_attach_args *);
void *(*ic_intr_establish)(void *, int, int, int,
- int (*)(void *), void *, char *);
+ int (*)(void *), void *, const char *);
void (*ic_intr_disestablish)(void *, void *);
int (*ic_intr_alloc)(isa_chipset_tag_t *, int, int, int *);
};
diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index 0edcb89b8af..5a88e95e7b5 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000.c,v 1.8 2008/07/22 18:45:50 miod Exp $ */
+/* $OpenBSD: pci_1000.c,v 1.9 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */
/*
@@ -88,7 +88,7 @@ int dec_1000_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_1000_intr_string(void *, pci_intr_handle_t);
int dec_1000_intr_line(void *, pci_intr_handle_t);
void *dec_1000_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_1000_intr_disestablish(void *, void *);
#define PCI_NIRQ 16
@@ -206,7 +206,7 @@ dec_1000_intr_establish(ccv, ih, level, func, arg, name)
int level;
int (*func)(void *);
void *arg;
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 22115d0c1fa..c1a467eea2b 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000a.c,v 1.10 2008/07/22 18:47:24 miod Exp $ */
+/* $OpenBSD: pci_1000a.c,v 1.11 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */
/*
@@ -95,7 +95,7 @@ int dec_1000a_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_1000a_intr_string(void *, pci_intr_handle_t);
int dec_1000a_intr_line(void *, pci_intr_handle_t);
void *dec_1000a_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_1000a_intr_disestablish(void *, void *);
struct alpha_shared_intr *dec_1000a_pci_intr;
@@ -266,7 +266,7 @@ dec_1000a_intr_establish(ccv, ih, level, func, arg, name)
int level;
int (*func)(void *);
void *arg;
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 2ebaa224f30..53e8bbca5a0 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_2100_a50.c,v 1.21 2008/07/22 18:45:50 miod Exp $ */
+/* $OpenBSD: pci_2100_a50.c,v 1.22 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -56,7 +56,7 @@ int dec_2100_a50_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t);
int dec_2100_a50_intr_line(void *, pci_intr_handle_t);
void *dec_2100_a50_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_2100_a50_intr_disestablish(void *, void *);
#define APECS_SIO_DEVICE 7 /* XXX */
@@ -233,7 +233,7 @@ dec_2100_a50_intr_establish(acv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
arg, name);
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 32515925ad3..11be1487938 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.19 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_550.c,v 1.20 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
/*-
@@ -91,7 +91,7 @@ int dec_550_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_550_intr_string(void *, pci_intr_handle_t);
int dec_550_intr_line(void *, pci_intr_handle_t);
void *dec_550_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_550_intr_disestablish(void *, void *);
void *dec_550_pciide_compat_intr_establish(void *, struct device *,
@@ -288,7 +288,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
#if 0
struct cia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 1cc504bc778..6a1c9f7f78b 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.17 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.18 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -78,7 +78,7 @@ static struct tsp_config *sioprimary;
void dec_6600_intr_disestablish(void *, void *);
void *dec_6600_intr_establish(void *, pci_intr_handle_t, int,
- int (*func)(void *), void *, char *);
+ int (*func)(void *), void *, const char *);
const char *dec_6600_intr_string(void *, pci_intr_handle_t);
int dec_6600_intr_line(void *, pci_intr_handle_t);
int dec_6600_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
@@ -219,7 +219,7 @@ dec_6600_intr_establish(acv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index bf1db3a9764..b2b50af7d4c 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_axppci_33.c,v 1.19 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_axppci_33.c,v 1.20 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -56,7 +56,7 @@ int dec_axppci_33_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t);
int dec_axppci_33_intr_line(void *, pci_intr_handle_t);
void *dec_axppci_33_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_axppci_33_intr_disestablish(void *, void *);
#define LCA_SIO_DEVICE 7 /* XXX */
@@ -232,7 +232,7 @@ dec_axppci_33_intr_establish(lcv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
arg, name);
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 7478689b39c..89b7b325722 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.22 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.23 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -91,7 +91,7 @@ int dec_eb164_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_eb164_intr_string(void *, pci_intr_handle_t);
int dec_eb164_intr_line(void *, pci_intr_handle_t);
void *dec_eb164_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_eb164_intr_disestablish(void *, void *);
void *dec_eb164_pciide_compat_intr_establish(void *, struct device *,
@@ -259,7 +259,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
#if 0
struct cia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index 02a1a1eeef2..a6f5ec46d19 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb64plus.c,v 1.11 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_eb64plus.c,v 1.12 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */
/*-
@@ -87,7 +87,7 @@
int dec_eb64plus_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t);
void *dec_eb64plus_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_eb64plus_intr_disestablish(void *, void *);
#define EB64PLUS_MAX_IRQ 32
@@ -196,7 +196,7 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg, name)
int level;
int (*func)(void *);
void *arg;
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 0409b4ea141..e087913cf43 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn20aa.c,v 1.23 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_kn20aa.c,v 1.24 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */
/*
@@ -58,7 +58,7 @@ int dec_kn20aa_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t);
int dec_kn20aa_intr_line(void *, pci_intr_handle_t);
void *dec_kn20aa_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_kn20aa_intr_disestablish(void *, void *);
#define KN20AA_PCEB_IRQ 31
@@ -195,7 +195,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func)(void *);
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 72b2a9bd9ae..fc1de6cddbd 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn300.c,v 1.2 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_kn300.c,v 1.3 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */
/*
@@ -63,7 +63,7 @@ int dec_kn300_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *dec_kn300_intr_string(void *, pci_intr_handle_t);
void *dec_kn300_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void dec_kn300_intr_disestablish(void *, void *);
#define KN300_PCEB_IRQ 16
@@ -194,7 +194,7 @@ dec_kn300_intr_establish(ccv, ih, level, func, arg, name)
pci_intr_handle_t ih;
int level;
int (*func) (void *);
- char *name;
+ const char *name;
{
struct mcpcia_config *ccp = ccv;
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index 887004babff..1c86e6bfd45 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.21 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.22 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */
/*
@@ -65,7 +65,7 @@ struct alpha_pci_chipset {
const char *(*pc_intr_string)(void *, pci_intr_handle_t);
int (*pc_intr_line)(void *, pci_intr_handle_t);
void *(*pc_intr_establish)(void *, pci_intr_handle_t,
- int, int (*)(void *), void *, char *);
+ int, int (*)(void *), void *, const char *);
void (*pc_intr_disestablish)(void *, void *);
/* alpha-specific */
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index cf1a9651777..2c24f3332d1 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_up1000.c,v 1.14 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_up1000.c,v 1.15 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
/*-
@@ -62,7 +62,7 @@ int api_up1000_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
const char *api_up1000_intr_string(void *, pci_intr_handle_t);
int api_up1000_intr_line(void *, pci_intr_handle_t);
void *api_up1000_intr_establish(void *, pci_intr_handle_t,
- int, int (*func)(void *), void *, char *);
+ int, int (*func)(void *), void *, const char *);
void api_up1000_intr_disestablish(void *, void *);
void *api_up1000_pciide_compat_intr_establish(void *, struct device *,
@@ -161,7 +161,7 @@ api_up1000_intr_line(void *icv, pci_intr_handle_t ih)
void *
api_up1000_intr_establish(void *icv, pci_intr_handle_t ih, int level,
- int (*func)(void *), void *arg, char *name)
+ int (*func)(void *), void *arg, const char *name)
{
#if 0
struct irongate_config *icp = icv;
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 52ca5489e65..03f4ee4c732 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sio_pic.c,v 1.29 2008/08/09 16:41:21 miod Exp $ */
+/* $OpenBSD: sio_pic.c,v 1.30 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */
/*-
@@ -447,7 +447,7 @@ sio_intr_establish(v, irq, type, level, fn, arg, name)
int type;
int level;
int (*fn)(void *);
- char *name;
+ const char *name;
{
void *cookie;
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index a6d2ffaeae1..0e4a41c8cac 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: siovar.h,v 1.12 2004/06/28 02:28:43 aaron Exp $ */
+/* $OpenBSD: siovar.h,v 1.13 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $ */
/*
@@ -36,7 +36,7 @@ void sio_iointr(void *framep, unsigned long vec);
const char *sio_intr_string(void *, int);
int sio_intr_line(void *, int);
void *sio_intr_establish(void *, int, int, int, int (*)(void *),
- void *, char *);
+ void *, const char *);
void sio_intr_disestablish(void *, void *);
struct evcount sio_intr_count;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 07:22:09 +0000