 @@ -1,14 +1,14 @@
-/* $Id: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $Id: ar5312_board.c,v 1.1.72.1 2009/08/07 06:50:47 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,37 +30,37 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * 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.72.1 2009/08/07 06:50:47 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #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 *);
 /*
  * Locate the Board Configuration data using heuristics.
  * Search backward from the (aliased) end of flash looking
  * for the signature string that marks the start of the data.
  * We search at most 500KB.
  */
 const struct ar531x_boarddata *
 ar531x_board_info(void)
+{
 	static const struct ar531x_boarddata *board = NULL;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $NetBSD: ar5315_board.c,v 1.1.72.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -36,47 +36,47 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This file provides code to locate board-specific configuration and radio
  * 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.72.1 2009/08/07 06:50:48 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <dev/cons.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/cpuregs.h>
 #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>
 #include <mips/atheros/include/arbusvar.h>
 #include <machine/locore.h>
 #include "com.h"
 /*
  * Locate the Board Configuration data using heuristics.
  * Search backward from the (aliased) end of flash looking
  * for the signature string that marks the start of the data.
  * We search at most 500KB.

 @@ -1,14 +1,14 @@
-/* $NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
+/* $NetBSD: ar5315.c,v 1.5.20.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,48 +38,48 @@
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This file includes a bunch of implementation specific bits for
  * AR5315, which differs these from other members of the AR531X
  * 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.20.1 2009/08/07 06:50:48 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/cpuregs.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #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>
 #include <mips/atheros/include/arbusvar.h>
 #include <machine/locore.h>
 /* helper macro for accessing system registers without bus space */
 #define	REGVAL(x)	*((volatile uint32_t *)(MIPS_PHYS_TO_KSEG1((x))))
 #define	GETSYSREG(x)	REGVAL((x) + AR5315_SYSREG_BASE)
 #define	PUTSYSREG(x,v)	(REGVAL((x) + AR5315_SYSREG_BASE)) = (v)
 #define	GETPCIREG(x)	REGVAL((x) + AR5315_PCI_BASE)
 #define	PUTPCIREG(x,v)	(REGVAL((x) + AR5315_PCI_BASE)) = (v)

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.15.4.1 2009/08/07 06:50:48 snj Exp $ */
 /*-
  * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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.4.1 2009/08/07 06:50:48 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <net/if.h>
 @@ -54,28 +54,29 @@ __KERNEL_RCSID(0, "$NetBSD: if_ath_arbus
 #include <net/if_arp.h>
 #include <netinet/in.h>
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 #include <mips/atheros/include/ar531xvar.h>
 #include <mips/atheros/include/arbusvar.h>
 #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;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	void			*sc_ih;
 	struct ar531x_config	sc_config;
 };
 static int	ath_arbus_match(device_t, cfdata_t, void *);
 static void	ath_arbus_attach(device_t, device_t, void *);
 static int	ath_arbus_detach(device_t, int);

 @@ -1,14 +1,14 @@
-/* $Id: ar5312reg.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: ar5312reg.h,v 1.2.74.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -187,31 +187,32 @@
 #define	AR5312_IRQ_WLAN0		0
 #define	AR5312_IRQ_ENET0		1
 #define	AR5312_IRQ_ENET1		2
 #define	AR5312_IRQ_WLAN1		3
 #define	AR5312_IRQ_MISC			4
 #define	AR5312_MISC_IRQ_TIMER		0
 #define	AR5312_MISC_IRQ_AHBPERR		1
 #define	AR5312_MISC_IRQ_AHBDMAE		2
 #define	AR5312_MISC_IRQ_GPIO		3
 #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
 /* config bits */
 #define	AR5312_BOARD_CONFIG_ENET0	BD_ENET0
 #define	AR5312_BOARD_CONFIG_ENET1	BD_ENET1
 #define	AR5312_BOARD_CONFIG_UART1	BD_UART1
 #define	AR5312_BOARD_CONFIG_UART0	BD_UART0
 #define	AR5312_BOARD_CONFIG_RSTFACTORY	BD_RSTFACTORY
 #define	AR5312_BOARD_CONFIG_SYSLED	BD_SYSLED
 #define	AR5312_BOARD_CONFIG_EXTUARTCLK	BD_EXTUARTCLK
 #define	AR5312_BOARD_CONFIG_CPUFREQ	BD_CPUFREQ