Module Name: src
Committed By: flxd
Date: Wed Feb 28 17:13:44 UTC 2018
Modified Files:
src/sys/dev/pci: if_vr.c if_vrreg.h
Log Message:
Cosmetic fix for the Physical Address Registers PAR0 to PAR5.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/pci/if_vr.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_vrreg.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_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.121 src/sys/dev/pci/if_vr.c:1.122
--- src/sys/dev/pci/if_vr.c:1.121 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_vr.c Wed Feb 28 17:13:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.121 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.121 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.122 2018/02/28 17:13:44 flxd Exp $");
@@ -1594,8 +1594,7 @@ vr_attach(device_t parent, device_t self
* Get station address. The way the Rhine chips work,
* you're not allowed to directly access the EEPROM once
* they've been programmed a special way. Consequently,
- * we need to read the node address from the PAR0 and PAR1
- * registers.
+ * we need to read the node address from the PAR registers.
*
* XXXSCW: On the Rhine III, setting VR_EECSR_LOAD forces a reload
* of the *whole* EEPROM, not just the MAC address. This is
Index: src/sys/dev/pci/if_vrreg.h
diff -u src/sys/dev/pci/if_vrreg.h:1.16 src/sys/dev/pci/if_vrreg.h:1.17
--- src/sys/dev/pci/if_vrreg.h:1.16 Sun Nov 5 13:05:18 2006
+++ src/sys/dev/pci/if_vrreg.h Wed Feb 28 17:13:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vrreg.h,v 1.16 2006/11/05 13:05:18 tsutsui Exp $ */
+/* $NetBSD: if_vrreg.h,v 1.17 2018/02/28 17:13:44 flxd Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -38,8 +38,12 @@
* Rhine register definitions.
*/
-#define VR_PAR0 0x00 /* node address 0 to 4 */
-#define VR_PAR1 0x04 /* node address 2 to 6 */
+#define VR_PAR0 0x00 /* node address 0 */
+#define VR_PAR1 0x01 /* node address 1 */
+#define VR_PAR2 0x02 /* node address 2 */
+#define VR_PAR3 0x03 /* node address 3 */
+#define VR_PAR4 0x04 /* node address 4 */
+#define VR_PAR5 0x05 /* node address 5 */
#define VR_RXCFG 0x06 /* receiver config register */
#define VR_TXCFG 0x07 /* transmit config register */
#define VR_COMMAND 0x08 /* command register */
