From owner-svn-src-all@FreeBSD.ORG Tue Jan 26 22:38:32 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2517E106566B; Tue, 26 Jan 2010 22:38:32 +0000 (UTC) (envelope-from jfv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF6D88FC12; Tue, 26 Jan 2010 22:38:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0QMcVdp024386; Tue, 26 Jan 2010 22:38:31 GMT (envelope-from jfv@svn.freebsd.org) Received: (from jfv@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0QMcVFW024384; Tue, 26 Jan 2010 22:38:31 GMT (envelope-from jfv@svn.freebsd.org) Message-Id: <201001262238.o0QMcVFW024384@svn.freebsd.org> From: Jack F Vogel Date: Tue, 26 Jan 2010 22:38:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203050 - head/sys/dev/e1000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2010 22:38:32 -0000 Author: jfv Date: Tue Jan 26 22:38:31 2010 New Revision: 203050 URL: http://svn.freebsd.org/changeset/base/203050 Log: Remove some internal conditional defines that will fail in kernel tree. Modified: head/sys/dev/e1000/e1000_ich8lan.c Modified: head/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- head/sys/dev/e1000/e1000_ich8lan.c Tue Jan 26 22:32:22 2010 (r203049) +++ head/sys/dev/e1000/e1000_ich8lan.c Tue Jan 26 22:38:31 2010 (r203050) @@ -478,7 +478,6 @@ static s32 e1000_init_mac_params_ich8lan mac->ops.led_on = e1000_led_on_ich8lan; mac->ops.led_off = e1000_led_off_ich8lan; break; -#if defined(NAHUM4) || defined(NAHUM5) case e1000_pchlan: /* save PCH revision_id */ e1000_read_pci_cfg(hw, 0x2, &pci_cfg); @@ -493,7 +492,6 @@ static s32 e1000_init_mac_params_ich8lan mac->ops.led_on = e1000_led_on_pchlan; mac->ops.led_off = e1000_led_off_pchlan; break; -#endif /* defined(NAHUM4) || defined(NAHUM5) */ default: break; } @@ -612,11 +610,9 @@ void e1000_init_function_pointers_ich8la case e1000_ich10lan: hw->phy.ops.init_params = e1000_init_phy_params_ich8lan; break; -#if defined(NAHUM4) || defined(NAHUM5) case e1000_pchlan: hw->phy.ops.init_params = e1000_init_phy_params_pchlan; break; -#endif /* defined(NAHUM4) || defined(NAHUM5) */ default: break; } @@ -834,7 +830,6 @@ static s32 e1000_sw_lcd_config_ich8lan(s cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK; cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT; -#if defined(NAHUM4) || defined(NAHUM5) if (!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) && (hw->mac.type == e1000_pchlan)) { /* @@ -859,7 +854,6 @@ static s32 e1000_sw_lcd_config_ich8lan(s goto out; } -#endif /* defined(NAHUM4) || defined(NAHUM5) */ /* Configure LCD from extended configuration region. */ /* cnf_base_addr is in DWORD */ @@ -2690,16 +2684,9 @@ static s32 e1000_reset_hw_ich8lan(struct DEBUGOUT("Auto Read Done did not complete\n"); } } -#if defined(NAHUM4) || defined(NAHUM5) - /* Dummy read to clear the phy wakeup bit after lcd reset */ -#if defined(NAHUM4) && defined(NAHUM5) - if ((hw->mac.type == e1000_pchlan) || (hw->mac.type == e1000_pch2lan)) -#else if (hw->mac.type == e1000_pchlan) -#endif hw->phy.ops.read_reg(hw, BM_WUC, ®); -#endif /* defined(NAHUM4) || defined(NAHUM5) */ ret_val = e1000_sw_lcd_config_ich8lan(hw); if (ret_val) goto out;