Module Name: src
Committed By: matt
Date: Tue Jun 14 15:08:33 UTC 2011
Modified Files:
src/sys/arch/alpha/tc: tc_3000_300.c tc_3000_500.c tc_conf.h
Log Message:
struct device * -> device_t
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/tc/tc_3000_300.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/tc/tc_3000_500.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/tc/tc_conf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/tc/tc_3000_300.c
diff -u src/sys/arch/alpha/tc/tc_3000_300.c:1.30 src/sys/arch/alpha/tc/tc_3000_300.c:1.31
--- src/sys/arch/alpha/tc/tc_3000_300.c:1.30 Mon Mar 16 23:11:09 2009
+++ src/sys/arch/alpha/tc/tc_3000_300.c Tue Jun 14 15:08:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.c,v 1.30 2009/03/16 23:11:09 dsl Exp $ */
+/* $NetBSD: tc_3000_300.c,v 1.31 2011/06/14 15:08:33 matt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.30 2009/03/16 23:11:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.31 2011/06/14 15:08:33 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@
}
const struct evcnt *
-tc_3000_300_intr_evcnt(struct device *tcadev, void *cookie)
+tc_3000_300_intr_evcnt(device_t tcadev, void *cookie)
{
u_long dev = (u_long)cookie;
@@ -132,7 +132,7 @@
}
void
-tc_3000_300_intr_establish(struct device *tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
+tc_3000_300_intr_establish(device_t tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
{
volatile u_int32_t *imskp;
u_long dev = (u_long)cookie;
@@ -162,7 +162,7 @@
}
void
-tc_3000_300_intr_disestablish(struct device *tcadev, void *cookie)
+tc_3000_300_intr_disestablish(device_t tcadev, void *cookie)
{
volatile u_int32_t *imskp;
u_long dev = (u_long)cookie;
Index: src/sys/arch/alpha/tc/tc_3000_500.c
diff -u src/sys/arch/alpha/tc/tc_3000_500.c:1.29 src/sys/arch/alpha/tc/tc_3000_500.c:1.30
--- src/sys/arch/alpha/tc/tc_3000_500.c:1.29 Mon Mar 16 23:11:09 2009
+++ src/sys/arch/alpha/tc/tc_3000_500.c Tue Jun 14 15:08:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.c,v 1.29 2009/03/16 23:11:09 dsl Exp $ */
+/* $NetBSD: tc_3000_500.c,v 1.30 2011/06/14 15:08:33 matt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.29 2009/03/16 23:11:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.30 2011/06/14 15:08:33 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,9 +52,9 @@
#endif
void tc_3000_500_intr_setup(void);
-void tc_3000_500_intr_establish(struct device *, void *,
+void tc_3000_500_intr_establish(device_t, void *,
tc_intrlevel_t, int (*)(void *), void *);
-void tc_3000_500_intr_disestablish(struct device *, void *);
+void tc_3000_500_intr_disestablish(device_t, void *);
void tc_3000_500_iointr(void *, unsigned long);
int tc_3000_500_intrnull(void *);
@@ -144,7 +144,7 @@
}
const struct evcnt *
-tc_3000_500_intr_evcnt(struct device *tcadev, void *cookie)
+tc_3000_500_intr_evcnt(device_t tcadev, void *cookie)
{
u_long dev = (u_long)cookie;
@@ -156,7 +156,7 @@
}
void
-tc_3000_500_intr_establish(struct device *tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
+tc_3000_500_intr_establish(device_t tcadev, void *cookie, tc_intrlevel_t level, int (*func)(void *), void *arg)
{
u_long dev = (u_long)cookie;
@@ -176,7 +176,7 @@
}
void
-tc_3000_500_intr_disestablish(struct device *tcadev, void *cookie)
+tc_3000_500_intr_disestablish(device_t tcadev, void *cookie)
{
u_long dev = (u_long)cookie;
Index: src/sys/arch/alpha/tc/tc_conf.h
diff -u src/sys/arch/alpha/tc/tc_conf.h:1.11 src/sys/arch/alpha/tc/tc_conf.h:1.12
--- src/sys/arch/alpha/tc/tc_conf.h:1.11 Sat Mar 14 14:45:54 2009
+++ src/sys/arch/alpha/tc/tc_conf.h Tue Jun 14 15:08:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_conf.h,v 1.11 2009/03/14 14:45:54 dsl Exp $ */
+/* $NetBSD: tc_conf.h,v 1.12 2011/06/14 15:08:33 matt Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -41,10 +41,10 @@
extern void tc_3000_500_iointr(void *, unsigned long);
extern const struct evcnt *
- tc_3000_500_intr_evcnt(struct device *, void *);
-extern void tc_3000_500_intr_establish(struct device *, void *,
+ tc_3000_500_intr_evcnt(device_t, void *);
+extern void tc_3000_500_intr_establish(device_t, void *,
tc_intrlevel_t, int (*)(void *), void *);
-extern void tc_3000_500_intr_disestablish(struct device *, void *);
+extern void tc_3000_500_intr_disestablish(device_t, void *);
extern int tc_3000_500_nslots;
extern struct tc_slotdesc tc_3000_500_slots[];
@@ -61,10 +61,10 @@
extern void tc_3000_300_iointr(void *, unsigned long);
extern const struct evcnt *
- tc_3000_300_intr_evcnt(struct device *, void *);
-extern void tc_3000_300_intr_establish(struct device *, void *,
+ tc_3000_300_intr_evcnt(device_t, void *);
+extern void tc_3000_300_intr_establish(device_t, void *,
tc_intrlevel_t, int (*)(void *), void *);
-extern void tc_3000_300_intr_disestablish(struct device *, void *);
+extern void tc_3000_300_intr_disestablish(device_t, void *);
extern int tc_3000_300_nslots;
extern struct tc_slotdesc tc_3000_300_slots[];
