Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2011 21:11:40 +0000 (UTC)
From:      Pyun YongHyeon <yongari@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226815 - head/sys/dev/bge
Message-ID:  <201110262111.p9QLBelx067660@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yongari
Date: Wed Oct 26 21:11:40 2011
New Revision: 226815
URL: http://svn.freebsd.org/changeset/base/226815

Log:
  Define MAC address mail box and use it instead of using
  hard-coded value.

Modified:
  head/sys/dev/bge/if_bge.c
  head/sys/dev/bge/if_bgereg.h

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Wed Oct 26 21:05:45 2011	(r226814)
+++ head/sys/dev/bge/if_bge.c	Wed Oct 26 21:11:40 2011	(r226815)
@@ -5938,11 +5938,11 @@ bge_get_eaddr_mem(struct bge_softc *sc, 
 {
 	uint32_t mac_addr;
 
-	mac_addr = bge_readmem_ind(sc, 0x0c14);
+	mac_addr = bge_readmem_ind(sc, BGE_SRAM_MAC_ADDR_HIGH_MB);
 	if ((mac_addr >> 16) == 0x484b) {
 		ether_addr[0] = (uint8_t)(mac_addr >> 8);
 		ether_addr[1] = (uint8_t)mac_addr;
-		mac_addr = bge_readmem_ind(sc, 0x0c18);
+		mac_addr = bge_readmem_ind(sc, BGE_SRAM_MAC_ADDR_LOW_MB);
 		ether_addr[2] = (uint8_t)(mac_addr >> 24);
 		ether_addr[3] = (uint8_t)(mac_addr >> 16);
 		ether_addr[4] = (uint8_t)(mac_addr >> 8);

Modified: head/sys/dev/bge/if_bgereg.h
==============================================================================
--- head/sys/dev/bge/if_bgereg.h	Wed Oct 26 21:05:45 2011	(r226814)
+++ head/sys/dev/bge/if_bgereg.h	Wed Oct 26 21:11:40 2011	(r226815)
@@ -77,6 +77,8 @@
 #define	BGE_SRAM_FW_CMD_MB		0x00000B78
 #define	BGE_SRAM_FW_CMD_LEN_MB		0x00000B7C
 #define	BGE_SRAM_FW_CMD_DATA_MB		0x00000B80
+#define	BGE_SRAM_MAC_ADDR_HIGH_MB	0x00000C14
+#define	BGE_SRAM_MAC_ADDR_LOW_MB	0x00000C18
 #define	BGE_SOFTWARE_GENCOMM_END	0x00000FFF
 #define	BGE_UNMAPPED			0x00001000
 #define	BGE_UNMAPPED_END		0x00001FFF



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110262111.p9QLBelx067660>