Update reference to the Atheros HAL exported headers.
`external/isc/atheros_hal/dist', former `contrib/dev/ath/' is now in cpp(1)'s include path. Fix build of MERAKI kernel.
This commit is contained in:
alc
parent
eb247ff739
commit
6ce0e276a4
|
|
@ -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.2 2009/07/06 00:43:22 alc 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.2 2009/07/06 00:43:22 alc Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp
|
|||
#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 *);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
|
||||
/* $NetBSD: ar5315.c,v 1.6 2009/07/06 00:43:22 alc 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.6 2009/07/06 00:43:22 alc Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_kgdb.h"
|
||||
|
|
@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $");
|
|||
|
||||
#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>
|
||||
|
|
|
|||
|
|
@ -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.2 2009/07/06 00:43:22 alc 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.2 2009/07/06 00:43:22 alc Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_kgdb.h"
|
||||
|
|
@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp
|
|||
#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>
|
||||
|
|
|
|||
|
|
@ -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.16 2009/07/06 00:43:23 alc Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Jared D. McNeill <jmcneill@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.16 2009/07/06 00:43:23 alc Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -64,8 +64,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp
|
|||
#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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: ar5312reg.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
|
||||
/* $Id: ar5312reg.h,v 1.3 2009/07/06 00:43:23 alc 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue