Hi tech --

Here's a diff to replace some backwards compat calls with their
new calls. The rest were long replaced; I'm assuming these went
unnoticed because they're both under an
#ifdef OCTEON_ETH_DEBUG

This was pointed out by William Orr <will AT worrbase ! com> in a
private email.

OK?

~Brian

Index: cn30xxgmx.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/cn30xxgmx.c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 cn30xxgmx.c
--- cn30xxgmx.c 19 Sep 2013 00:15:59 -0000      1.7
+++ cn30xxgmx.c 21 Oct 2013 16:32:04 -0000
@@ -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);
 }
Index: cn30xxipd.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/cn30xxipd.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 cn30xxipd.c
--- cn30xxipd.c 5 Dec 2012 23:20:14 -0000       1.2
+++ cn30xxipd.c 21 Oct 2013 16:32:04 -0000
@@ -312,7 +312,7 @@ cn30xxipd_int_summary(struct cn30xxipd_s
 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);
 }

Reply via email to