Module Name: src
Committed By: matt
Date: Wed Apr 21 17:27:35 UTC 2010
Modified Files:
src/sys/arch/mips/atheros [matt-nb5-mips64]: ar5312_board.c ar5315.c
ar5315_board.c
src/sys/arch/mips/atheros/dev [matt-nb5-mips64]: if_ath_arbus.c
src/sys/arch/mips/atheros/include [matt-nb5-mips64]: ar5312reg.h
src/sys/arch/mips/conf [matt-nb5-mips64]: Makefile.mips
Log Message:
sync with netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.80.1 src/sys/arch/mips/atheros/ar5312_board.c \
src/sys/arch/mips/atheros/ar5315_board.c
cvs rdiff -u -r1.5 -r1.5.28.1 src/sys/arch/mips/atheros/ar5315.c
cvs rdiff -u -r1.15 -r1.15.12.1 src/sys/arch/mips/atheros/dev/if_ath_arbus.c
cvs rdiff -u -r1.2 -r1.2.82.1 src/sys/arch/mips/atheros/include/ar5312reg.h
cvs rdiff -u -r1.50.24.6 -r1.50.24.7 src/sys/arch/mips/conf/Makefile.mips
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/atheros/ar5312_board.c
diff -u src/sys/arch/mips/atheros/ar5312_board.c:1.1 src/sys/arch/mips/atheros/ar5312_board.c:1.1.80.1
--- src/sys/arch/mips/atheros/ar5312_board.c:1.1 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/mips/atheros/ar5312_board.c Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $Id: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $Id: ar5312_board.c,v 1.1.80.1 2010/04/21 17:27:34 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -40,7 +40,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1.80.1 2010/04/21 17:27:34 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/ar531xvar.h>
-#include <contrib/dev/ath/ah_soc.h>
+#include <ah_soc.h>
extern const char *ether_sprintf(const uint8_t *);
Index: src/sys/arch/mips/atheros/ar5315_board.c
diff -u src/sys/arch/mips/atheros/ar5315_board.c:1.1 src/sys/arch/mips/atheros/ar5315_board.c:1.1.80.1
--- src/sys/arch/mips/atheros/ar5315_board.c:1.1 Tue Sep 26 06:37:32 2006
+++ src/sys/arch/mips/atheros/ar5315_board.c Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $NetBSD: ar5315_board.c,v 1.1.80.1 2010/04/21 17:27:34 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -46,7 +46,7 @@
* information data in flash for the AR5315.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1.80.1 2010/04/21 17:27:34 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -66,7 +66,7 @@
#include <net/if.h>
#include <net/if_ether.h>
-#include <contrib/dev/ath/ah_soc.h> /* XXX really doesn't belong in hal */
+#include <ah_soc.h> /* XXX really doesn't belong in hal */
#include <mips/atheros/include/ar5315reg.h>
#include <mips/atheros/include/ar531xvar.h>
Index: src/sys/arch/mips/atheros/ar5315.c
diff -u src/sys/arch/mips/atheros/ar5315.c:1.5 src/sys/arch/mips/atheros/ar5315.c:1.5.28.1
--- src/sys/arch/mips/atheros/ar5315.c:1.5 Wed Jan 23 05:23:59 2008
+++ src/sys/arch/mips/atheros/ar5315.c Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
+/* $NetBSD: ar5315.c,v 1.5.28.1 2010/04/21 17:27:34 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -48,7 +48,7 @@
* family.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5.28.1 2010/04/21 17:27:34 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -69,7 +69,7 @@
#include <prop/proplib.h>
-#include <contrib/dev/ath/ah_soc.h> /* XXX really doesn't belong in hal */
+#include <ah_soc.h> /* XXX really doesn't belong in hal */
#include <mips/atheros/include/ar5315reg.h>
#include <mips/atheros/include/ar531xvar.h>
Index: src/sys/arch/mips/atheros/dev/if_ath_arbus.c
diff -u src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.15 src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.15.12.1
--- src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.15 Wed Jul 9 19:47:23 2008
+++ src/sys/arch/mips/atheros/dev/if_ath_arbus.c Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.15.12.1 2010/04/21 17:27:34 matt Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill <jmcne...@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15.12.1 2010/04/21 17:27:34 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,9 @@
#include <dev/pci/pcidevs.h>
#include <dev/ic/ath_netbsd.h>
#include <dev/ic/athvar.h>
-#include <contrib/dev/ath/ah.h>
-#include <contrib/dev/ath/ah_soc.h> /* XXX really doesn't belong in hal */
+
+#include <ah.h>
+#include <ah_soc.h> /* XXX really doesn't belong in hal */
struct ath_arbus_softc {
struct ath_softc sc_ath;
Index: src/sys/arch/mips/atheros/include/ar5312reg.h
diff -u src/sys/arch/mips/atheros/include/ar5312reg.h:1.2 src/sys/arch/mips/atheros/include/ar5312reg.h:1.2.82.1
--- src/sys/arch/mips/atheros/include/ar5312reg.h:1.2 Mon Sep 4 05:17:26 2006
+++ src/sys/arch/mips/atheros/include/ar5312reg.h Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $Id: ar5312reg.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: ar5312reg.h,v 1.2.82.1 2010/04/21 17:27:34 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -197,11 +197,12 @@
#define AR5312_MISC_IRQ_UART0 4
#define AR5312_MISC_IRQ_UART0_DMA 5
#define AR5312_MISC_IRQ_WDOG 6
+
/*
* Board data. This is located in flash somewhere, ar531x_board_info
* locates it.
*/
-#include <contrib/dev/ath/ah_soc.h> /* XXX really doesn't belong in hal */
+#include <ah_soc.h> /* XXX really doesn't belong in hal */
/* XXX write-around for now */
#define AR5312_BOARD_MAGIC AR531X_BD_MAGIC
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.50.24.6 src/sys/arch/mips/conf/Makefile.mips:1.50.24.7
--- src/sys/arch/mips/conf/Makefile.mips:1.50.24.6 Sun Feb 14 21:50:38 2010
+++ src/sys/arch/mips/conf/Makefile.mips Wed Apr 21 17:27:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.50.24.6 2010/02/14 21:50:38 matt Exp $
+# $NetBSD: Makefile.mips,v 1.50.24.7 2010/04/21 17:27:34 matt Exp $
# Makefile for NetBSD
#
@@ -139,9 +139,6 @@
%RULES
-## Include rules for Atheros WLAN
-.include "$S/contrib/dev/ath/netbsd/Makefile.ath.inc"
-
##
## (9) port independent kernel machinery
##
