diff options
| author |   bcallah <bcallah@openbsd.org> | 2013-10-22 14:06:08 +0000 |
|---|---|---|
| committer | bcallah <bcallah@openbsd.org> | 2013-10-22 14:06:08 +0000 |
| commit | 45b6e6bcaae02a9a3b4535ca1699882aa3da3bfc (patch) | |
| tree | 774912b059b1d1f0bf1f006556ec39107a8ff478 | |
| parent | addl *-ALLWINNER and *-IMX (diff) | |
| download | wireguard-openbsd-45b6e6bcaae02a9a3b4535ca1699882aa3da3bfc.tar.xz wireguard-openbsd-45b6e6bcaae02a9a3b4535ca1699882aa3da3bfc.zip | |
Replace some backwards compat functions with the current ones; the old
ones were removed some time ago.
Noticed by William Orr <will AT worrbase DOT com>
ok jasper@
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxgmx.c | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxipd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c index 4ddcdb15215..c9f9a1096a3 100644 --- a/sys/arch/octeon/dev/cn30xxgmx.c +++ b/sys/arch/octeon/dev/cn30xxgmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmx.c,v 1.7 2013/09/19 00:15:59 jmatthew Exp $ */ +/* $OpenBSD: cn30xxgmx.c,v 1.8 2013/10/22 14:06:08 bcallah Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -1431,7 +1431,7 @@ cn30xxgmx_intr_rml_gmx1(void) int cn30xxgmx_intr_drop(void *arg) { - octeon_write_csr(CIU_INT0_SUM0, CIU_INTX_SUM0_GMX_DRP); + octeon_xkphys_write_8(CIU_INT0_SUM0, CIU_INTX_SUM0_GMX_DRP); cn30xxgmx_intr_drop_evcnt.ev_count++; return (1); } diff --git a/sys/arch/octeon/dev/cn30xxipd.c b/sys/arch/octeon/dev/cn30xxipd.c index 671a5eefe26..a92ca60a9b3 100644 --- a/sys/arch/octeon/dev/cn30xxipd.c +++ b/sys/arch/octeon/dev/cn30xxipd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxipd.c,v 1.2 2012/12/05 23:20:14 deraadt Exp $ */ +/* $OpenBSD: cn30xxipd.c,v 1.3 2013/10/22 14:06:08 bcallah Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -312,7 +312,7 @@ cn30xxipd_int_summary(struct cn30xxipd_softc *sc) int cn30xxipd_intr_drop(void *arg) { - octeon_write_csr(CIU_INT0_SUM0, CIU_INTX_SUM0_IPD_DRP); + octeon_xkphys_write_8(CIU_INT0_SUM0, CIU_INTX_SUM0_IPD_DRP); cn30xxipd_intr_drop_evcnt.ev_count++; return (1); } |