Module Name: src
Committed By: mrg
Date: Thu Jun 17 06:41:06 UTC 2010
Modified Files:
src/sys/dev/pci: if_cas.c
Log Message:
disable interrupts when resetting the device.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_cas.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_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.8 src/sys/dev/pci/if_cas.c:1.9
--- src/sys/dev/pci/if_cas.c:1.8 Mon Apr 5 07:20:25 2010
+++ src/sys/dev/pci/if_cas.c Thu Jun 17 06:41:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.8 2010/04/05 07:20:25 joerg Exp $ */
+/* $NetBSD: if_cas.c,v 1.9 2010/06/17 06:41:05 mrg Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.8 2010/04/05 07:20:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.9 2010/06/17 06:41:05 mrg Exp $");
#include "opt_inet.h"
@@ -784,6 +784,9 @@
cas_reset_rx(sc);
cas_reset_tx(sc);
+ /* Disable interrupts */
+ bus_space_write_4(sc->sc_memt, sc->sc_memh, CAS_INTMASK, ~(uint32_t)0);
+
/* Do a full reset */
bus_space_write_4(t, h, CAS_RESET,
CAS_RESET_RX | CAS_RESET_TX | CAS_RESET_BLOCK_PCS);
