Module Name: src
Committed By: matt
Date: Sun Jul 10 23:32:03 UTC 2011
Modified Files:
src/sys/arch/mips/sibyte/dev: sbgbus.c sbjcn.c sbmac.c sbobio.c sbscn.c
sbsmbus.c sbwdog.c
src/sys/arch/mips/sibyte/pci: sbbrz_pci.c sbpcihb.c
Log Message:
cleanup <machine/*.h> includes
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/sibyte/dev/sbgbus.c \
src/sys/arch/mips/sibyte/dev/sbwdog.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/sibyte/dev/sbjcn.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/sibyte/dev/sbobio.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/mips/sibyte/dev/sbscn.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/sibyte/dev/sbsmbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/sibyte/pci/sbbrz_pci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/sibyte/pci/sbpcihb.c
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/mips/sibyte/dev/sbgbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbgbus.c:1.12 src/sys/arch/mips/sibyte/dev/sbgbus.c:1.13
--- src/sys/arch/mips/sibyte/dev/sbgbus.c:1.12 Tue Feb 1 03:16:54 2011
+++ src/sys/arch/mips/sibyte/dev/sbgbus.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbgbus.c,v 1.12 2011/02/01 03:16:54 matt Exp $ */
+/* $NetBSD: sbgbus.c,v 1.13 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.12 2011/02/01 03:16:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.13 2011/07/10 23:32:03 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,9 +41,11 @@
#include "ioconf.h"
-#include <machine/locore.h>
-#include <machine/sb1250/sb1250_regs.h>
-#include <machine/sb1250/sb1250_genbus.h>
+#include <mips/locore.h>
+
+#include <sbmips/sb1250/sb1250_regs.h>
+#include <sbmips/sb1250/sb1250_genbus.h>
+
#include <sbmips/dev/sbobio/sbobiovar.h>
#include <sbmips/dev/sbgbus/sbgbusvar.h>
Index: src/sys/arch/mips/sibyte/dev/sbwdog.c
diff -u src/sys/arch/mips/sibyte/dev/sbwdog.c:1.12 src/sys/arch/mips/sibyte/dev/sbwdog.c:1.13
--- src/sys/arch/mips/sibyte/dev/sbwdog.c:1.12 Sun Feb 20 07:47:39 2011
+++ src/sys/arch/mips/sibyte/dev/sbwdog.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbwdog.c,v 1.12 2011/02/20 07:47:39 matt Exp $ */
+/* $NetBSD: sbwdog.c,v 1.13 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbwdog.c,v 1.12 2011/02/20 07:47:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbwdog.c,v 1.13 2011/07/10 23:32:03 matt Exp $");
#include "locators.h"
@@ -51,7 +51,7 @@
#include <dev/sysmon/sysmonvar.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_scd.h>
Index: src/sys/arch/mips/sibyte/dev/sbjcn.c
diff -u src/sys/arch/mips/sibyte/dev/sbjcn.c:1.27 src/sys/arch/mips/sibyte/dev/sbjcn.c:1.28
--- src/sys/arch/mips/sibyte/dev/sbjcn.c:1.27 Sun Apr 24 16:26:56 2011
+++ src/sys/arch/mips/sibyte/dev/sbjcn.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcn.c,v 1.27 2011/04/24 16:26:56 rmind Exp $ */
+/* $NetBSD: sbjcn.c,v 1.28 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbjcn.c,v 1.27 2011/04/24 16:26:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbjcn.c,v 1.28 2011/07/10 23:32:03 matt Exp $");
#define SBJCN_DEBUG
@@ -129,8 +129,10 @@
#include <sbmips/dev/sbscd/sbscdvar.h>
#include <sbmips/dev/sbscd/sbjcnvar.h>
+
#include <dev/cons.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
void sbjcn_attach_channel(struct sbjcn_softc *sc, int chan, int intr);
static void sbjcncn_grabdword(struct sbjcn_channel *ch);
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.40 src/sys/arch/mips/sibyte/dev/sbmac.c:1.41
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.40 Sun Feb 20 07:47:39 2011
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.40 2011/02/20 07:47:39 matt Exp $ */
+/* $NetBSD: sbmac.c,v 1.41 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.40 2011/02/20 07:47:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.41 2011/07/10 23:32:03 matt Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -61,12 +61,7 @@
#include <netinet/if_inarp.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#include <machine/locore.h>
+#include <mips/locore.h>
#include "sbobiovar.h"
@@ -1957,22 +1952,6 @@
arp_ifinit(ifp, ifa);
break;
#endif
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)LLADDR(ifp->if_sadl);
- else
- memcpy(LLADDR(ifp->if_sadl), ina->x_host.c_host,
- ifp->if_addrlen);
- /* Set new address. */
- sbmac_init_and_start(sc);
- break;
- }
-#endif
default:
sbmac_init_and_start(sc);
break;
Index: src/sys/arch/mips/sibyte/dev/sbobio.c
diff -u src/sys/arch/mips/sibyte/dev/sbobio.c:1.21 src/sys/arch/mips/sibyte/dev/sbobio.c:1.22
--- src/sys/arch/mips/sibyte/dev/sbobio.c:1.21 Sun Feb 20 07:47:39 2011
+++ src/sys/arch/mips/sibyte/dev/sbobio.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbobio.c,v 1.21 2011/02/20 07:47:39 matt Exp $ */
+/* $NetBSD: sbobio.c,v 1.22 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,13 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.21 2011/02/20 07:47:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbobio.c,v 1.22 2011/07/10 23:32:03 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
+
#include <mips/sibyte/include/sb1250_int.h>
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_scd.h>
Index: src/sys/arch/mips/sibyte/dev/sbscn.c
diff -u src/sys/arch/mips/sibyte/dev/sbscn.c:1.35 src/sys/arch/mips/sibyte/dev/sbscn.c:1.36
--- src/sys/arch/mips/sibyte/dev/sbscn.c:1.35 Sun Apr 24 16:26:56 2011
+++ src/sys/arch/mips/sibyte/dev/sbscn.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbscn.c,v 1.35 2011/04/24 16:26:56 rmind Exp $ */
+/* $NetBSD: sbscn.c,v 1.36 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -109,7 +109,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.35 2011/04/24 16:26:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.36 2011/07/10 23:32:03 matt Exp $");
#define SBSCN_DEBUG
@@ -145,7 +145,7 @@
#endif
#include <mips/sibyte/dev/sbscnvar.h>
#include <dev/cons.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
void sbscn_attach_channel(struct sbscn_softc *sc, int chan, int intr);
#if defined(DDB) || defined(KGDB)
Index: src/sys/arch/mips/sibyte/dev/sbsmbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.15 src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.16
--- src/sys/arch/mips/sibyte/dev/sbsmbus.c:1.15 Tue Feb 1 06:13:08 2011
+++ src/sys/arch/mips/sibyte/dev/sbsmbus.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbsmbus.c,v 1.15 2011/02/01 06:13:08 matt Exp $ */
+/* $NetBSD: sbsmbus.c,v 1.16 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbsmbus.c,v 1.15 2011/02/01 06:13:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbsmbus.c,v 1.16 2011/07/10 23:32:03 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/swarm.h>
+#include <sbmips/swarm.h>
#include <mips/sibyte/dev/sbsmbusvar.h>
#include <dev/smbus/x1241reg.h>
Index: src/sys/arch/mips/sibyte/pci/sbbrz_pci.c
diff -u src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.3 src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.4
--- src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.3 Wed Apr 6 01:44:45 2011
+++ src/sys/arch/mips/sibyte/pci/sbbrz_pci.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbbrz_pci.c,v 1.3 2011/04/06 01:44:45 dyoung Exp $ */
+/* $NetBSD: sbbrz_pci.c,v 1.4 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -64,7 +64,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sbbrz_pci.c,v 1.3 2011/04/06 01:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbbrz_pci.c,v 1.4 2011/07/10 23:32:03 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_scd.h>
#include <mips/sibyte/include/sb1250_int.h>
Index: src/sys/arch/mips/sibyte/pci/sbpcihb.c
diff -u src/sys/arch/mips/sibyte/pci/sbpcihb.c:1.2 src/sys/arch/mips/sibyte/pci/sbpcihb.c:1.3
--- src/sys/arch/mips/sibyte/pci/sbpcihb.c:1.2 Thu Feb 17 14:24:12 2011
+++ src/sys/arch/mips/sibyte/pci/sbpcihb.c Sun Jul 10 23:32:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbpcihb.c,v 1.2 2011/02/17 14:24:12 matt Exp $ */
+/* $NetBSD: sbpcihb.c,v 1.3 2011/07/10 23:32:03 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -48,7 +48,7 @@
#include <dev/pci/ppbreg.h>
#include <dev/pci/pcidevs.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/sibyte/include/sb1250_regs.h>
#include <mips/sibyte/include/sb1250_scd.h>
