From 8b5bfe4ceb6f18bc0d1bf9864e45b3f1a1d87539 Mon Sep 17 00:00:00 2001 From: "Federico G. Schwindt" Date: Thu, 24 Nov 2005 12:25:08 +0000 Subject: don't redefine BGE_PCIMISCCTL_ENDIAN_WORDSWAP and lower the delay while waiting for the firmware. tested and ok brad@ --- sys/dev/pci/if_bgereg.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/dev/pci/if_bgereg.h') diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index 8ab2b8f0344..a5588017b0e 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bgereg.h,v 1.31 2005/11/19 23:04:48 brad Exp $ */ +/* $OpenBSD: if_bgereg.h,v 1.32 2005/11/24 12:25:07 fgsch Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -209,7 +209,6 @@ #define BGE_PCIMISCCTL_INDIRECT_ACCESS 0x00000080 #define BGE_PCIMISCCTL_ASICREV 0xFFFF0000 -#define BGE_HIF_SWAP_OPTIONS (BGE_PCIMISCCTL_ENDIAN_WORDSWAP) #if BYTE_ORDER == LITTLE_ENDIAN #define BGE_DMA_SWAP_OPTIONS \ BGE_MODECTL_WORDSWAP_NONFRAME| \ @@ -221,7 +220,7 @@ #endif #define BGE_INIT \ - (BGE_HIF_SWAP_OPTIONS|BGE_PCIMISCCTL_CLEAR_INTA| \ + (BGE_PCIMISCCTL_ENDIAN_WORDSWAP|BGE_PCIMISCCTL_CLEAR_INTA| \ BGE_PCIMISCCTL_MASK_PCI_INTR|BGE_PCIMISCCTL_INDIRECT_ACCESS) #define BGE_CHIPID_BCM5700_A0 0x70000000 -- cgit v1.2.3