Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys - Merge dev/ic/ate_subr.c into dev/ic/mb86960.c since it...
details: https://anonhg.NetBSD.org/src/rev/2e4e7d5bdbc8
branches: trunk
changeset: 537673:2e4e7d5bdbc8
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Fri Oct 04 15:22:27 2002 +0000
description:
- Merge dev/ic/ate_subr.c into dev/ic/mb86960.c since it only has EEPROM
read function which can also be used for other MB86965 based boards.
- Rewrite EEPROM read function as per 93C06 EEPROM datasheet.
- Misc cleanup.
diffstat:
sys/conf/files | 3 +-
sys/dev/ic/ate_subr.c | 148 -----------------------------------------------
sys/dev/ic/ate_subr.h | 47 --------------
sys/dev/ic/mb86960.c | 84 ++++++++++++++++++++++++++-
sys/dev/ic/mb86960reg.h | 26 ++++++-
sys/dev/ic/mb86960var.h | 4 +-
sys/dev/isa/if_ate.c | 17 ++--
sys/dev/mca/if_ate_mca.c | 11 +-
8 files changed, 120 insertions(+), 220 deletions(-)
diffs (truncated from 508 to 300 lines):
diff -r 56b5fa913af3 -r 2e4e7d5bdbc8 sys/conf/files
--- a/sys/conf/files Fri Oct 04 15:16:21 2002 +0000
+++ b/sys/conf/files Fri Oct 04 15:22:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.553 2002/09/30 06:50:39 onoe Exp $
+# $NetBSD: files,v 1.554 2002/10/04 15:22:27 tsutsui Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -748,7 +748,6 @@
# Allied-Telesis Ethernet driver based on Fujitsu MB8696xA controllers
#
device ate: arp, ether, ifnet, mb86960
-file dev/ic/ate_subr.c ate
# Crystal Semiconductor CS8900, CS8920, and CS8920M Ethernet
#
diff -r 56b5fa913af3 -r 2e4e7d5bdbc8 sys/dev/ic/ate_subr.c
--- a/sys/dev/ic/ate_subr.c Fri Oct 04 15:16:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/* $NetBSD: ate_subr.c,v 1.3 2002/09/28 18:19:08 tsutsui Exp $ */
-
-/*
- * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
- *
- * This software may be used, modified, copied, distributed, and sold, in
- * both source and binary form provided that the above copyright, these
- * terms and the following disclaimer are retained. The name of the author
- * and/or the contributor may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND THE CONTRIBUTOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE CONTRIBUTOR BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION.
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions copyright (C) 1993, David Greenman. This software may be used,
- * modified, copied, distributed, and sold, in both source and binary form
- * provided that the above copyright and these terms are retained. Under no
- * circumstances is the author responsible for the proper functioning of this
- * software, nor does the author assume any responsibility for damages
- * incurred with its use.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ate_subr.c,v 1.3 2002/09/28 18:19:08 tsutsui Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/ic/mb86960reg.h>
-#include <dev/ic/ate_subr.h>
-
-static __inline__ void ate_strobe __P((bus_space_tag_t, bus_space_handle_t));
-
-/*
- * Routines to read all bytes from the config EEPROM through MB86965A.
- * I'm not sure what exactly I'm doing here... I was told just to follow
- * the steps, and it worked. Could someone tell me why the following
- * code works? (Or, why all similar codes I tried previously doesn't
- * work.) FIXME.
- */
-
-static __inline__ void
-ate_strobe (iot, ioh)
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
-{
-
- /*
- * Output same value twice. To speed-down execution?
- */
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT | FE_B16_CLOCK);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT | FE_B16_CLOCK);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
-}
-
-void
-ate_read_eeprom(iot, ioh, data)
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
- u_char *data;
-{
- int n, count;
- u_char val, bit;
-
- /* Read bytes from EEPROM; two bytes per an iteration. */
- for (n = 0; n < FE_EEPROM_SIZE / 2; n++) {
- /* Reset the EEPROM interface. */
- bus_space_write_1(iot, ioh, FE_BMPR16, 0x00);
- bus_space_write_1(iot, ioh, FE_BMPR17, 0x00);
- bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
-
- /* Start EEPROM access. */
- bus_space_write_1(iot, ioh, FE_BMPR17, FE_B17_DATA);
- ate_strobe(iot, ioh);
-
- /* Pass the iteration count to the chip. */
- count = 0x80 | n;
- for (bit = 0x80; bit != 0x00; bit >>= 1) {
- bus_space_write_1(iot, ioh, FE_BMPR17,
- (count & bit) ? FE_B17_DATA : 0);
- ate_strobe(iot, ioh);
- }
- bus_space_write_1(iot, ioh, FE_BMPR17, 0x00);
-
- /* Read a byte. */
- val = 0;
- for (bit = 0x80; bit != 0x00; bit >>= 1) {
- ate_strobe(iot, ioh);
- if (bus_space_read_1(iot, ioh, FE_BMPR17) &
- FE_B17_DATA)
- val |= bit;
- }
- *data++ = val;
-
- /* Read one more byte. */
- val = 0;
- for (bit = 0x80; bit != 0x00; bit >>= 1) {
- ate_strobe(iot, ioh);
- if (bus_space_read_1(iot, ioh, FE_BMPR17) &
- FE_B17_DATA)
- val |= bit;
- }
- *data++ = val;
- }
-
- /* Make sure the EEPROM is turned off. */
- bus_space_write_1(iot, ioh, FE_BMPR16, 0);
- bus_space_write_1(iot, ioh, FE_BMPR17, 0);
-
-#if ATE_DEBUG >= 3
- /* Report what we got. */
- data -= FE_EEPROM_SIZE;
- log(LOG_INFO, "ate_read_eeprom: EEPROM at %04x:"
- " %02x%02x%02x%02x %02x%02x%02x%02x -"
- " %02x%02x%02x%02x %02x%02x%02x%02x -"
- " %02x%02x%02x%02x %02x%02x%02x%02x -"
- " %02x%02x%02x%02x %02x%02x%02x%02x\n",
- (int) ioh, /* XXX */
- data[ 0], data[ 1], data[ 2], data[ 3],
- data[ 4], data[ 5], data[ 6], data[ 7],
- data[ 8], data[ 9], data[10], data[11],
- data[12], data[13], data[14], data[15],
- data[16], data[17], data[18], data[19],
- data[20], data[21], data[22], data[23],
- data[24], data[25], data[26], data[27],
- data[28], data[29], data[30], data[31]);
-#endif
-}
diff -r 56b5fa913af3 -r 2e4e7d5bdbc8 sys/dev/ic/ate_subr.h
--- a/sys/dev/ic/ate_subr.h Fri Oct 04 15:16:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/* $NetBSD: ate_subr.h,v 1.3 2002/09/28 18:19:08 tsutsui Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * EEPROM allocation of AT1700/RE2000.
- */
-#define FE_ATI_EEP_ADDR 0x08 /* Station address. (8-13) */
-#define FE_ATI_EEP_MEDIA 0x18 /* Media type. */
-#define FE_ATI_EEP_MAGIC 0x19 /* XXX Magic. */
-#define FE_ATI_EEP_MODEL 0x1e /* Hardware type. */
-#define FE_ATI_EEP_REVISION 0x1f /* Hardware revision. */
-
-#define FE_ATI_MODEL_AT1700T 0x00
-#define FE_ATI_MODEL_AT1700BT 0x01
-#define FE_ATI_MODEL_AT1700FT 0x02
-#define FE_ATI_MODEL_AT1700AT 0x03
-
-void ate_read_eeprom __P((bus_space_tag_t, bus_space_handle_t, u_char *));
diff -r 56b5fa913af3 -r 2e4e7d5bdbc8 sys/dev/ic/mb86960.c
--- a/sys/dev/ic/mb86960.c Fri Oct 04 15:16:21 2002 +0000
+++ b/sys/dev/ic/mb86960.c Fri Oct 04 15:22:27 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.52 2002/09/29 17:10:37 tsutsui Exp $ */
+/* $NetBSD: mb86960.c,v 1.53 2002/10/04 15:22:29 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.52 2002/09/29 17:10:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.53 2002/10/04 15:22:29 tsutsui Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -1844,6 +1844,85 @@
return (0);
}
+/*
+ * Routines to read all bytes from the config EEPROM (93C06) through MB86965A.
+ */
+void
+mb86965_read_eeprom(iot, ioh, data)
+ bus_space_tag_t iot;
+ bus_space_handle_t ioh;
+ u_int8_t *data;
+{
+ int addr, op, bit;
+ u_int16_t val;
+
+ /* Read bytes from EEPROM; two bytes per an iteration. */
+ for (addr = 0; addr < FE_EEPROM_SIZE / 2; addr++) {
+ /* Reset the EEPROM interface. */
+ bus_space_write_1(iot, ioh, FE_BMPR16, 0x00);
+ bus_space_write_1(iot, ioh, FE_BMPR17, 0x00);
+ bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
+
+ /* Send start bit. */
+ bus_space_write_1(iot, ioh, FE_BMPR17, FE_B17_DATA);
+ FE_EEPROM_DELAY();
+ bus_space_write_1(iot, ioh,
+ FE_BMPR16, FE_B16_SELECT | FE_B16_CLOCK);
+ FE_EEPROM_DELAY();
+ bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
+
+ /* Send read command and read address. */
+ op = 0x80 | addr; /* READ instruction */
+ for (bit = 8; bit > 0; bit--) {
+ bus_space_write_1(iot, ioh, FE_BMPR17,
+ (op & (1 << (bit - 1))) ? FE_B17_DATA : 0);
+ FE_EEPROM_DELAY();
+ bus_space_write_1(iot, ioh,
+ FE_BMPR16, FE_B16_SELECT | FE_B16_CLOCK);
+ FE_EEPROM_DELAY();
+ bus_space_write_1(iot, ioh, FE_BMPR16, FE_B16_SELECT);
+ }
+ bus_space_write_1(iot, ioh, FE_BMPR17, 0x00);
+
+ /* Read two bytes in each address */
+ val = 0;
+ for (bit = 16; bit > 0; bit--) {
+ FE_EEPROM_DELAY();
+ bus_space_write_1(iot, ioh,
+ FE_BMPR16, FE_B16_SELECT | FE_B16_CLOCK);
+ FE_EEPROM_DELAY();
+ if (bus_space_read_1(iot, ioh, FE_BMPR17) &
+ FE_B17_DATA)
+ val |= 1 << (bit - 1);
+ bus_space_write_1(iot, ioh,
+ FE_BMPR16, FE_B16_SELECT);
+ }
+ data[addr * 2] = val >> 8;
+ data[addr * 2 + 1] = val & 0xff;
+ }
+
+ /* Make sure the EEPROM is turned off. */
Home |
Main Index |
Thread Index |
Old Index