 @@ -1,58 +1,60 @@
-/*	$NetBSD: lan9118.c,v 1.9 2009/11/29 10:17:01 kiyohara Exp $	*/
+/*	$NetBSD: lan9118.c,v 1.10 2009/12/02 12:51:50 kiyohara Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
+ *
  * 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.
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.9 2009/11/29 10:17:01 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lan9118.c,v 1.10 2009/12/02 12:51:50 kiyohara Exp $");
 /*
  * The LAN9118 Family
  * * The LAN9118 is targeted for 32-bit applications requiring high
  *   performance, and provides the highest level of performance possible for
  *   a non-PCI 10/100 Ethernet controller.
+ *
  * * The LAN9117 is designed to provide the highest level of performance
  *   possible for 16-bit applications. It also has an external MII interface,
  *   which can be used to attach an external PHY.
+ *
  * * The LAN9116 and LAN9115 are designed for performance-sensitive
  *   applications with less intensive performance requirements. The LAN9116
  *   is for 32-bit host processors, while the LAN9115 is for 16-bit
  *   applications, which may also require an external PHY. Both devices
  *   deliver superior levels of performance.
+ *
  * The LAN9218 Family
  *   Also support HP Auto-MDIX.
  */
 #include "bpfilter.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/bus.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -168,28 +170,28 @@ lan9118_attach(struct lan9118_softc *sc)
 		/* byte swap mode */
 		bus_space_write_4(sc->sc_iot, sc->sc_ioh, LAN9118_WORD_SWAP,
 xffffffff);
 	val = bus_space_read_4(sc->sc_iot, sc->sc_ioh, LAN9118_BYTE_TEST);
 	if (val != LAN9118_BYTE_TEST_VALUE) {
 		aprint_error(": failed to detect chip\n");
 		return EINVAL;
+	}
 	val = bus_space_read_4(sc->sc_iot, sc->sc_ioh, LAN9118_ID_REV);
 	sc->sc_id = LAN9118_ID_REV_ID(val);
 	sc->sc_rev = LAN9118_ID_REV_REV(val);
-#define LAN9xxx_ID(id)	((id) >= 0x9000 ? (id) & 0xfff : \
+#define LAN9xxx_ID(id)	\
-			    ((id) >= 0x1000 ? ((id) >> 4) + 0x100 : (id)))
+ (IS_LAN9118(id) ? (id) : (IS_LAN9218(id) ? ((id) >> 4) + 0x100 : (id) & 0xfff))
 	aprint_normal(": SMSC LAN9%03x Rev %d\n",
 	    LAN9xxx_ID(sc->sc_id), sc->sc_rev);
 	if (sc->sc_flags & LAN9118_FLAGS_SWAP)
 		aprint_normal_dev(sc->sc_dev, "byte swap mode\n");
 	timo = 3 * 1000 * 1000;	/* XXXX 3sec */
 	do {
 		val = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
 		    LAN9118_MAC_CSR_CMD);
 		if (!(val & LAN9118_MAC_CSR_CMD_BUSY))
 			break;
 @@ -226,27 +228,28 @@ lan9118_attach(struct lan9118_softc *sc)
 	IFQ_SET_READY(&ifp->if_snd);
 #if 0	/* Not support 802.1Q VLAN-sized frames yet. */
 	sc->sc_ec.ec_capabilities |= ETHERCAP_VLAN_MTU;
 #endif
 	ifmedia_init(&sc->sc_mii.mii_media, 0,
 	    lan9118_ifm_change, lan9118_ifm_status);
 	/*
 	 * Number of instance of Internal PHY is always 0.  External PHY
 	 * number that above.
 	 */
 	sc->sc_mii.mii_instance++;
-	if (sc->sc_id == LAN9118_ID_9115 || sc->sc_id == LAN9118_ID_9117) {
+	if (sc->sc_id == LAN9118_ID_9115 || sc->sc_id == LAN9118_ID_9117 ||
 	    sc->sc_id == LAN9218_ID_9215 || sc->sc_id == LAN9218_ID_9217) {
 		if (bus_space_read_4(sc->sc_iot, sc->sc_ioh, LAN9118_HW_CFG) &
 		    LAN9118_HW_CFG_EXT_PHY_DET) {
 			/*
 			 * We always have a internal PHY at phy1.
 			 * In addition, external PHY is attached.
 			 */
 			DPRINTFN(1, ("%s: detect External PHY\n", __func__));
 			sc->sc_mii.mii_readreg = lan9118_miibus_readreg;
 			sc->sc_mii.mii_writereg = lan9118_miibus_writereg;
 			sc->sc_mii.mii_statchg = lan9118_miibus_statchg;
 			/* Switch MII and SMI */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lan9118reg.h,v 1.1 2009/08/09 06:40:10 kiyohara Exp $	*/
+/*	$NetBSD: lan9118reg.h,v 1.2 2009/12/02 12:51:50 kiyohara Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
+ *
  * 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.
+ *
 @@ -20,30 +20,36 @@
  * (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.
  */
 #ifndef _LAN9118REG_H_
 #define _LAN9118REG_H_
 #define LAN9118_IOSIZE	0x100
-#define LAN9118_ID_9115	0x115
+#define LAN9118_ID_9115	0x0115
-#define LAN9118_ID_9116	0x116
+#define LAN9118_ID_9116	0x0116
-#define LAN9118_ID_9117	0x117
+#define LAN9118_ID_9117	0x0117
-#define LAN9118_ID_9118	0x118
+#define LAN9118_ID_9118	0x0118
 #define LAN9218_ID_9215	0x115a
 #define LAN9218_ID_9217	0x117a
 #define LAN9218_ID_9218	0x118a
 #define IS_LAN9118(id)	((id) >= LAN9118_ID_9115 && (id) <= LAN9118_ID_9118)
 #define IS_LAN9218(id)	((id) >= LAN9218_ID_9215 && (id) <= LAN9218_ID_9218)
 #define LAN9118_IPHY_ADDR	0x01	/* Internal PHY Address */
 #define LAN9118_RXDFIFOP	0x00	/* RX Data FIFO Port */
 #define LAN9118_RXDFIFOAP	0x04	/* RX Data FIFO Alias Ports */
 #define LAN9118_TXDFIFOP	0x20	/* TX Data FIFO Port */
 #define LAN9118_TXDFIFOAP	0x24	/* TX Data FIFO Alias Ports */
 #define LAN9118_RXSFIFOP	0x40	/* RX Status FIFO Port */
 #define LAN9118_RXSFIFOPEEK	0x44	/* RX Status FIFO PEEK */
 #define LAN9118_TXSFIFOP	0x48	/* TX Status FIFO Port */
 #define LAN9118_TXSFIFOPEEK	0x4c	/* TX Status FIFO PEEK */