From owner-svn-src-head@FreeBSD.ORG  Mon Jan 11 04:29:27 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 05C8A106566C;
	Mon, 11 Jan 2010 04:29:27 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E669F8FC08;
	Mon, 11 Jan 2010 04:29:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0B4TQYD048938;
	Mon, 11 Jan 2010 04:29:26 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0B4TQ6Z048924;
	Mon, 11 Jan 2010 04:29:26 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001110429.o0B4TQ6Z048924@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 11 Jan 2010 04:29:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202063 - in head/sys/mips/cavium: . dev/rgmii
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jan 2010 04:29:27 -0000

Author: imp
Date: Mon Jan 11 04:29:26 2010
New Revision: 202063
URL: http://svn.freebsd.org/changeset/base/202063

Log:
  Cope with the move and if_timer going way.

Modified:
  head/sys/mips/cavium/dev/rgmii/octeon_fau.c
  head/sys/mips/cavium/dev/rgmii/octeon_fpa.c
  head/sys/mips/cavium/dev/rgmii/octeon_ipd.c
  head/sys/mips/cavium/dev/rgmii/octeon_pko.c
  head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
  head/sys/mips/cavium/files.octeon1   (contents, props changed)
  head/sys/mips/cavium/obio.c
  head/sys/mips/cavium/octeon_ebt3000_cf.c
  head/sys/mips/cavium/octeon_machdep.c
  head/sys/mips/cavium/std.octeon1   (contents, props changed)
  head/sys/mips/cavium/uart_bus_octeonusart.c
  head/sys/mips/cavium/uart_cpu_octeonusart.c
  head/sys/mips/cavium/uart_dev_oct16550.c

Modified: head/sys/mips/cavium/dev/rgmii/octeon_fau.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_fau.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/dev/rgmii/octeon_fau.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -4,10 +4,13 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fau.h"
 
 /*

Modified: head/sys/mips/cavium/dev/rgmii/octeon_fpa.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_fpa.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/dev/rgmii/octeon_fpa.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -4,6 +4,9 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -11,7 +14,7 @@
 #include <vm/pmap.h>
 
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fpa.h"
 
 

Modified: head/sys/mips/cavium/dev/rgmii/octeon_ipd.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_ipd.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/dev/rgmii/octeon_ipd.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -4,10 +4,13 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_ipd.h"
 
 /*

Modified: head/sys/mips/cavium/dev/rgmii/octeon_pko.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_pko.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/dev/rgmii/octeon_pko.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -4,12 +4,15 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fau.h"
 #include "octeon_fpa.h"
 #include "octeon_pko.h"

Modified: head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/locore.h>
 #include <machine/md_var.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 #include "octeon_fau.h"
 #include "octeon_fpa.h"
@@ -1058,7 +1058,6 @@ static void octeon_rgmx_xmit_mark_buffer
          * Reset output active flag and watchdog timer.
          */
         sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-        sc->ifp->if_timer = 0;
 }
 
 
@@ -1574,7 +1573,6 @@ static void octeon_rgmx_stop (struct rgm
 
         /* Reset transmitter variables and interface flags.  */
         sc->ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING);
-        sc->ifp->if_timer = 0;
         sc->txb_count = 0;
         sc->txb_sched = 0;
 }

Modified: head/sys/mips/cavium/files.octeon1
==============================================================================
--- head/sys/mips/cavium/files.octeon1	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/files.octeon1	Mon Jan 11 04:29:26 2010	(r202063)
@@ -2,16 +2,16 @@
 # Octeon Support Files
 #
 mips/mips/mp_machdep.c				optional smp
-mips/octeon1/dev/rgmii/octeon_fau.c		optional rgmii
-mips/octeon1/dev/rgmii/octeon_fpa.c		optional rgmii
-mips/octeon1/dev/rgmii/octeon_ipd.c 		optional rgmii
-mips/octeon1/dev/rgmii/octeon_pko.c		optional rgmii
-mips/octeon1/dev/rgmii/octeon_rgmx.c		optional rgmii
-mips/octeon1/obio.c				optional uart
-mips/octeon1/octeon_ebt3000_cf.c		optional cf
-mips/octeon1/octeon_machdep.c			standard
-mips/octeon1/uart_bus_octeonusart.c		optional uart
-mips/octeon1/uart_cpu_octeonusart.c		optional uart
-mips/octeon1/uart_dev_oct16550.c		optional uart
+mips/cavium/dev/rgmii/octeon_fau.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_fpa.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_ipd.c 		optional rgmii
+mips/cavium/dev/rgmii/octeon_pko.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_rgmx.c		optional rgmii
+mips/cavium/obio.c				optional uart
+mips/cavium/octeon_ebt3000_cf.c			optional cf
+mips/cavium/octeon_machdep.c			standard
+mips/cavium/uart_bus_octeonusart.c		optional uart
+mips/cavium/uart_cpu_octeonusart.c		optional uart
+mips/cavium/uart_dev_oct16550.c			optional uart
 mips/mips/intr_machdep.c			standard
 mips/mips/tick.c				standard

Modified: head/sys/mips/cavium/obio.c
==============================================================================
--- head/sys/mips/cavium/obio.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/obio.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <mips/octeon1/octeonreg.h>
-#include <mips/octeon1/obiovar.h>
+#include <mips/cavium/octeonreg.h>
+#include <mips/cavium/obiovar.h>
 
 int	obio_probe(device_t);
 int	obio_attach(device_t);

Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- head/sys/mips/cavium/octeon_ebt3000_cf.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/octeon_ebt3000_cf.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include "octeon_ebt3000_cf.h"
 #include "driveid.h"
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 /* ATA Commands */
 #define CMD_READ_SECTOR		0x20

Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/octeon_machdep.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpuregs.h>
 #include <machine/cpufunc.h>
-#include <mips/octeon1/octeon_pcmap_regs.h>
-#include <mips/octeon1/octeonreg.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
+#include <mips/cavium/octeonreg.h>
 #include <machine/hwfunc.h>
 #include <machine/intr_machdep.h>
 #include <machine/locore.h>

Modified: head/sys/mips/cavium/std.octeon1
==============================================================================
--- head/sys/mips/cavium/std.octeon1	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/std.octeon1	Mon Jan 11 04:29:26 2010	(r202063)
@@ -4,7 +4,7 @@
 # */
 # $FreeBSD$
 # 
-files	"../octeon1/files.octeon1"
+files	"../cavium/files.octeon1"
 
 #
 # 

Modified: head/sys/mips/cavium/uart_bus_octeonusart.c
==============================================================================
--- head/sys/mips/cavium/uart_bus_octeonusart.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/uart_bus_octeonusart.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 /*
  * XXXMIPS:
  */
-#include <mips/octeon1/octeonreg.h>
+#include <mips/cavium/octeonreg.h>
 
 #include "uart_if.h"
 

Modified: head/sys/mips/cavium/uart_cpu_octeonusart.c
==============================================================================
--- head/sys/mips/cavium/uart_cpu_octeonusart.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/uart_cpu_octeonusart.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <mips/octeon1/octeonreg.h>
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeonreg.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;

Modified: head/sys/mips/cavium/uart_dev_oct16550.c
==============================================================================
--- head/sys/mips/cavium/uart_dev_oct16550.c	Mon Jan 11 04:13:06 2010	(r202062)
+++ head/sys/mips/cavium/uart_dev_oct16550.c	Mon Jan 11 04:29:26 2010	(r202063)
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ic/ns16550.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 #include "uart_if.h"