Module Name: src
Committed By: msaitoh
Date: Wed May 29 08:24:06 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Use BGE_SETBIT() instead of CSR_WRITE_4() for the BGE_MISC_LOCAL_CTL register
to not to modify some GPIO bits.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/dev/pci/if_bge.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/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.250 src/sys/dev/pci/if_bge.c:1.251
--- src/sys/dev/pci/if_bge.c:1.250 Tue May 28 17:03:34 2013
+++ src/sys/dev/pci/if_bge.c Wed May 29 08:24:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.250 2013/05/28 17:03:34 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.251 2013/05/29 08:24:06 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.250 2013/05/28 17:03:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.251 2013/05/29 08:24:06 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2971,7 +2971,7 @@ bge_blockinit(struct bge_softc *sc)
/* 5718 step 45, 57XX step 79 */
/* Set misc. local control, enable interrupts on attentions */
- CSR_WRITE_4(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_ONATTN);
+ BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_INTR_ONATTN);
if (BGE_IS_5717_PLUS(sc)) {
CSR_READ_4(sc, BGE_MISC_LOCAL_CTL); /* Flush */
/* 5718 step 46 */