Module Name: src
Committed By: msaitoh
Date: Mon Jul 14 05:00:18 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
Cleanup comments. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.277 src/sys/dev/pci/if_wm.c:1.278
--- src/sys/dev/pci/if_wm.c:1.277 Mon Jul 14 01:24:58 2014
+++ src/sys/dev/pci/if_wm.c Mon Jul 14 05:00:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $ */
+/* $NetBSD: if_wm.c,v 1.278 2014/07/14 05:00:18 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.278 2014/07/14 05:00:18 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1631,7 +1631,7 @@ wm_attach(device_t parent, device_t self
case WM_T_82580:
case WM_T_82580ER:
case WM_T_I350:
- case WM_T_I354: /* XXXX ok? */
+ case WM_T_I354:
case WM_T_80003:
/* SPI */
wm_set_spiaddrbits(sc);
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.18 src/sys/dev/pci/if_wmvar.h:1.19
--- src/sys/dev/pci/if_wmvar.h:1.18 Fri Jul 11 08:34:27 2014
+++ src/sys/dev/pci/if_wmvar.h Mon Jul 14 05:00:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.18 2014/07/11 08:34:27 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.19 2014/07/14 05:00:18 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -72,29 +72,29 @@
#define _DEV_PCI_IF_WMVAR_H_
/* sc_flags */
-#define WM_F_HAS_MII 0x00000001 /* has MII */
-#define WM_F_LOCK_EECD 0x00000002 /* Lock using with EECD register */
-#define WM_F_LOCK_SWSM 0x00000004 /* Lock using with SWSM register */
-#define WM_F_LOCK_SWFW 0x00000008 /* Lock using with SWFW register */
-#define WM_F_LOCK_EXTCNF 0x00000010 /* Lock using with EXTCNF register */
-#define WM_F_EEPROM_EERDEEWR 0x00000020 /* EEPROM access via EERD/EEWR */
-#define WM_F_EEPROM_SPI 0x00000040 /* EEPROM is SPI */
-#define WM_F_EEPROM_FLASH 0x00000080 /* EEPROM is FLASH */
-#define WM_F_EEPROM_FLASH_HW 0x00000100 /* EEPROM is FLASH */
-#define WM_F_EEPROM_INVALID 0x00000200 /* EEPROM not present (bad checksum) */
-#define WM_F_IOH_VALID 0x00000400 /* I/O handle is valid */
-#define WM_F_BUS64 0x00000800 /* bus is 64-bit */
-#define WM_F_PCIX 0x00001000 /* bus is PCI-X */
-#define WM_F_CSA 0x00002000 /* bus is CSA */
-#define WM_F_PCIE 0x00004000 /* bus is PCI-Express */
-#define WM_F_SGMII 0x00008000 /* use SGMII */
-#define WM_F_NEWQUEUE 0x00010000 /* chips which has the new queue system */
+#define WM_F_HAS_MII 0x00000001 /* has MII */
+#define WM_F_LOCK_EECD 0x00000002 /* Lock using with EECD register */
+#define WM_F_LOCK_SWSM 0x00000004 /* Lock using with SWSM register */
+#define WM_F_LOCK_SWFW 0x00000008 /* Lock using with SWFW register */
+#define WM_F_LOCK_EXTCNF 0x00000010 /* Lock using with EXTCNF reg. */
+#define WM_F_EEPROM_EERDEEWR 0x00000020 /* EEPROM access via EERD/EEWR */
+#define WM_F_EEPROM_SPI 0x00000040 /* EEPROM is SPI */
+#define WM_F_EEPROM_FLASH 0x00000080 /* EEPROM is FLASH */
+#define WM_F_EEPROM_FLASH_HW 0x00000100 /* EEPROM is FLASH */
+#define WM_F_EEPROM_INVALID 0x00000200 /* EEPROM not present (bad cksum) */
+#define WM_F_IOH_VALID 0x00000400 /* I/O handle is valid */
+#define WM_F_BUS64 0x00000800 /* bus is 64-bit */
+#define WM_F_PCIX 0x00001000 /* bus is PCI-X */
+#define WM_F_CSA 0x00002000 /* bus is CSA */
+#define WM_F_PCIE 0x00004000 /* bus is PCI-Express */
+#define WM_F_SGMII 0x00008000 /* use SGMII */
+#define WM_F_NEWQUEUE 0x00010000 /* use new queue system */
#define WM_F_ASF_FIRMWARE_PRES 0x00020000
#define WM_F_ARC_SUBSYS_VALID 0x00040000
#define WM_F_HAS_AMT 0x00080000
#define WM_F_HAS_MANAGE 0x00100000
#define WM_F_WOL 0x00200000
-#define WM_F_EEE 0x00400000 /* Energy Efficiency Ethernet */
+#define WM_F_EEE 0x00400000 /* Energy Efficiency Ethernet */
typedef enum {
WM_T_unknown = 0,
