mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-31 16:57:10 +00:00
Code Issues Releases Activity

Cope with the move and if_timer going way.

Browse Source
This commit is contained in:
Warner Losh 2010-01-11 04:29:26 +00:00
parent 18f323353c
commit a6ec986223
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=202063
13 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/mips/cavium/dev/rgmii/octeon_fau.c
View File

@ -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"
/*

5
sys/mips/cavium/dev/rgmii/octeon_fpa.c
View File

@ -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"

5
sys/mips/cavium/dev/rgmii/octeon_ipd.c
View File

@ -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"
/*

5
sys/mips/cavium/dev/rgmii/octeon_pko.c
View File

@ -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"

4
sys/mips/cavium/dev/rgmii/octeon_rgmx.c
View File

@ -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_buffers_done (struct rgmx_softc_dev *sc, u_int
* 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 rgmx_softc_dev *sc)
/* 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;
}

22
sys/mips/cavium/files.octeon1
View File

@ -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

4
sys/mips/cavium/obio.c
View File

@ -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);

2
sys/mips/cavium/octeon_ebt3000_cf.c
View File

@ -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

4
sys/mips/cavium/octeon_machdep.c
View File

@ -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>

2
sys/mips/cavium/std.octeon1
View File

@ -4,7 +4,7 @@
# */
# $FreeBSD$
#
files "../octeon1/files.octeon1"
files "../cavium/files.octeon1"
#
#

2
sys/mips/cavium/uart_bus_octeonusart.c
View File

@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
/*
* XXXMIPS:
*/
#include <mips/octeon1/octeonreg.h>
#include <mips/cavium/octeonreg.h>
#include "uart_if.h"

4
sys/mips/cavium/uart_cpu_octeonusart.c
View File

@ -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;

2
sys/mips/cavium/uart_dev_oct16550.c
View File

@ -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"