Module Name: src
Committed By: msaitoh
Date: Tue Apr 9 11:28:45 UTC 2019
Modified Files:
src/sys/dev/mii: mii.c mii_physubr.c miivar.h
Log Message:
- Use uint16_t more for MII registers.
- Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/mii/mii.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/mii/miivar.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/mii/mii.c
diff -u src/sys/dev/mii/mii.c:1.53 src/sys/dev/mii/mii.c:1.54
--- src/sys/dev/mii/mii.c:1.53 Mon Mar 25 09:20:46 2019
+++ src/sys/dev/mii/mii.c Tue Apr 9 11:28:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.c,v 1.53 2019/03/25 09:20:46 msaitoh Exp $ */
+/* $NetBSD: mii.c,v 1.54 2019/04/09 11:28:45 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.53 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.54 2019/04/09 11:28:45 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -280,7 +280,7 @@ bitreverse(unsigned char x)
}
u_int
-mii_oui(u_int id1, u_int id2)
+mii_oui(uint16_t id1, uint16_t id2)
{
u_int h;
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.86 src/sys/dev/mii/mii_physubr.c:1.87
--- src/sys/dev/mii/mii_physubr.c:1.86 Mon Mar 25 09:20:46 2019
+++ src/sys/dev/mii/mii_physubr.c Tue Apr 9 11:28:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.86 2019/03/25 09:20:46 msaitoh Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.87 2019/04/09 11:28:45 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.86 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.87 2019/04/09 11:28:45 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -699,7 +699,7 @@ mii_phy_resume(device_t dv, const pmf_qu
/*
* Given an ifmedia word, return the corresponding ANAR value.
*/
-int
+uint16_t
mii_anar(int media)
{
int rv;
Index: src/sys/dev/mii/miivar.h
diff -u src/sys/dev/mii/miivar.h:1.66 src/sys/dev/mii/miivar.h:1.67
--- src/sys/dev/mii/miivar.h:1.66 Tue Feb 26 05:26:10 2019
+++ src/sys/dev/mii/miivar.h Tue Apr 9 11:28:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.66 2019/02/26 05:26:10 msaitoh Exp $ */
+/* $NetBSD: miivar.h,v 1.67 2019/04/09 11:28:45 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -196,9 +196,9 @@ struct mii_phydesc {
* An array of these structures map MII media types to BMCR/ANAR settings.
*/
struct mii_media {
- int mm_bmcr; /* BMCR settings for this media */
- int mm_anar; /* ANAR settings for this media */
- int mm_gtcr; /* 100base-T2 or 1000base-T CR */
+ uint16_t mm_bmcr; /* BMCR settings for this media */
+ uint16_t mm_anar; /* ANAR settings for this media */
+ uint16_t mm_gtcr; /* 100base-T2 or 1000base-T CR */
};
#define MII_MEDIA_NONE 0
@@ -291,9 +291,9 @@ int mii_mediachg(struct mii_data *);
void mii_tick(struct mii_data *);
void mii_pollstat(struct mii_data *);
void mii_down(struct mii_data *);
-int mii_anar(int);
+uint16_t mii_anar(int);
-int mii_ifmedia_change(struct mii_data *);
+int mii_ifmedia_change(struct mii_data *);
int mii_phy_activate(device_t, enum devact);
int mii_phy_detach(device_t, int);
@@ -317,7 +317,7 @@ u_int mii_phy_flowstatus(struct mii_soft
void ukphy_status(struct mii_softc *);
-u_int mii_oui(u_int, u_int);
+u_int mii_oui(uint16_t, uint16_t);
#define MII_OUI(id1, id2) mii_oui(id1, id2)
#define MII_MODEL(id2) (((id2) & IDR2_MODEL) >> 4)
#define MII_REV(id2) ((id2) & IDR2_REV)
