Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify. No functional change.

This commit is contained in:
msaitoh 2014-10-24 17:58:09 +00:00
parent ef64d03c09
commit 2e26c34f2a
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.306 2014/10/24 17:50:50 msaitoh Exp $ */
/* $NetBSD: if_wm.c,v 1.307 2014/10/24 17:58:09 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.306 2014/10/24 17:50:50 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.307 2014/10/24 17:58:09 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2804,24 +2804,8 @@ wm_read_mac_addr(struct wm_softc *sc, uint8_t *enaddr)
case WM_T_82580:
case WM_T_I350:
case WM_T_I354:
switch (sc->sc_funcid) {
case 0:
/* default value (== NVM_OFF_MACADDR) */
break;
case 1:
offset = NVM_OFF_LAN1;
break;
case 2:
offset = NVM_OFF_LAN2;
break;
case 3:
offset = NVM_OFF_LAN3;
break;
default:
goto bad;
/* NOTREACHED */
break;
}
/* EEPROM Top Level Partitioning */
offset = NVM_OFF_LAN_FUNC_82580(sc->sc_funcid) + 0;
break;
case WM_T_82571:
case WM_T_82575:

6
sys/dev/pci/if_wmreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wmreg.h,v 1.64 2014/10/24 17:50:50 msaitoh Exp $ */
/* $NetBSD: if_wmreg.h,v 1.65 2014/10/24 17:58:09 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -972,9 +972,7 @@ struct livengood_tcpip_ctxdesc {
* EEPROM Partitioning. See Table 6-1, "EEPROM Top Level Partitioning"
* in 82580's datasheet.
*/
#define NVM_OFF_LAN1 0x0080 /* Offset for LAN1 (82580)*/
#define NVM_OFF_LAN2 0x00c0 /* Offset for LAN2 (82580)*/
#define NVM_OFF_LAN3 0x0100 /* Offset for LAN3 (82580)*/
#define NVM_OFF_LAN_FUNC_82580(x) ((x) ? (0x40 + (0x40 * (x))) : 0)
/* ich8 flash control */
#define ICH_FLASH_COMMAND_TIMEOUT 5000 /* 5000 uSecs - adjusted */