summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2003-02-05 12:03:54 +0000
committertsutsui <tsutsui@NetBSD.org>2003-02-05 12:03:54 +0000
commit6aea963ed92b52ab757a87dc0cce6c3d74479e5a (patch)
treee455147236eacffcb9b176fa4322caac717b6de1 /sys/dev
parentcc7308ce0b0e0ade68f7ee794345ba5359fae0a3 (diff)
It seems the LAN Adapter on dreamcast actually uses slow 150ns SRAM,
so handle it properly by an additional quirk flag in sc_flags. The problem was reported by Pat Wendorf on port-dreamcast, and the fix was suggested and confirmed by Christian Groessler.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/mb86960.c8
-rw-r--r--sys/dev/ic/mb86960var.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index 2b5bf051d7b..34f296852e4 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.55 2002/12/24 13:10:26 tsutsui Exp $ */
+/* $NetBSD: mb86960.c,v 1.56 2003/02/05 12:03:54 tsutsui Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.55 2002/12/24 13:10:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.56 2003/02/05 12:03:54 tsutsui Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -154,9 +154,11 @@ mb86960_attach(sc, myea)
* the driver performance.
*/
sc->proto_dlcr6 = FE_D6_BUFSIZ_32KB | FE_D6_TXBSIZ_2x4KB |
- FE_D6_BBW_BYTE | FE_D6_SBW_WORD | FE_D6_SRAM_100ns;
+ FE_D6_BBW_BYTE | FE_D6_SRAM_100ns;
if (sc->sc_flags & FE_FLAGS_SBW_BYTE)
sc->proto_dlcr6 |= FE_D6_SBW_BYTE;
+ if (sc->sc_flags & FE_FLAGS_SRAM_150ns)
+ sc->proto_dlcr6 &= ~FE_D6_SRAM_100ns;
/*
* Minimum initialization of the hardware.
diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h
index 484377b2d48..2e1f1d476ec 100644
--- a/sys/dev/ic/mb86960var.h
+++ b/sys/dev/ic/mb86960var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960var.h,v 1.32 2002/11/30 14:15:10 tsutsui Exp $ */
+/* $NetBSD: mb86960var.h,v 1.33 2003/02/05 12:03:54 tsutsui Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -136,6 +136,7 @@ struct mb86960_softc {
u_int32_t sc_flags; /* controller quirks */
#define FE_FLAGS_MB86960 0x0001 /* DLCR7 is differnt on MB86960 */
#define FE_FLAGS_SBW_BYTE 0x0002 /* byte access mode for system bus */
+#define FE_FLAGS_SRAM_150ns 0x0004 /* The board has slow SRAM */
u_int8_t proto_dlcr4; /* DLCR4 prototype. */
u_int8_t proto_dlcr5; /* DLCR5 prototype. */