CVS commit: src/sys/arch/mmeye/dev
Module Name:src Committed By: andvar Date: Fri Sep 29 21:23:33 UTC 2023 Modified Files: src/sys/arch/mmeye/dev: mmeyepcmcia.c Log Message: Remove h->sock from DPRINTF arguments, it is leftover from shpcic_handle, removed when code was moved to mmeye specific device code in 2002. Add const for *width_names[] definition. Redefine ioaddr in mmeyepcmcia_chip_io_alloc() and calculate in advance, since DPRINTF() expects it as one of the arguments. This code was simplified with mmEye-WL added support in 2011, but broke debug code. Fixes MMEYEPCMCIADEBUG enabled build. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mmeye/dev/mmeyepcmcia.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mmeye/dev
Module Name:src
Committed By: andvar
Date: Fri Sep 29 21:23:33 UTC 2023
Modified Files:
src/sys/arch/mmeye/dev: mmeyepcmcia.c
Log Message:
Remove h->sock from DPRINTF arguments, it is leftover from shpcic_handle,
removed
when code was moved to mmeye specific device code in 2002.
Add const for *width_names[] definition.
Redefine ioaddr in mmeyepcmcia_chip_io_alloc() and calculate in advance, since
DPRINTF() expects it as one of the arguments. This code was simplified with
mmEye-WL
added support in 2011, but broke debug code.
Fixes MMEYEPCMCIADEBUG enabled build.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mmeye/dev/mmeyepcmcia.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.25 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.26
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.25 Sat Aug 7 16:19:00 2021
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Fri Sep 29 21:23:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.25 2021/08/07 16:19:00 thorpej Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.26 2023/09/29 21:23:33 andvar Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.25 2021/08/07 16:19:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.26 2023/09/29 21:23:33 andvar Exp $");
#include
#include
@@ -538,15 +538,14 @@ mmeyepcmcia_intr_socket(struct mmeyepcmc
MMEYEPCMCIA_CSC_BATTDEAD);
if (cscreg & MMEYEPCMCIA_CSC_GPI) {
- DPRINTF(("%s: %02x GPI\n", device_xname(h->sc->dev), h->sock));
+ DPRINTF(("%s: GPI\n", device_xname(h->sc->dev)));
}
if (cscreg & MMEYEPCMCIA_CSC_CD) {
int statreg;
statreg = mmeyepcmcia_read(h, MMEYEPCMCIA_IF_STATUS);
- DPRINTF(("%s: %02x CD %x\n", device_xname(h->sc->dev), h->sock,
- statreg));
+ DPRINTF(("%s: CD %x\n", device_xname(h->sc->dev), statreg));
if ((statreg & MMEYEPCMCIA_IF_STATUS_CARDDETECT_MASK) ==
MMEYEPCMCIA_IF_STATUS_CARDDETECT_PRESENT) {
@@ -572,14 +571,14 @@ mmeyepcmcia_intr_socket(struct mmeyepcmc
}
}
if (cscreg & MMEYEPCMCIA_CSC_READY) {
- DPRINTF(("%s: %02x READY\n", device_xname(h->sc->dev), h->sock));
+ DPRINTF(("%s: READY\n", device_xname(h->sc->dev)));
/* shouldn't happen */
}
if (cscreg & MMEYEPCMCIA_CSC_BATTWARN) {
- DPRINTF(("%s: %02x BATTWARN\n", device_xname(h->sc->dev), h->sock));
+ DPRINTF(("%s: BATTWARN\n", device_xname(h->sc->dev)));
}
if (cscreg & MMEYEPCMCIA_CSC_BATTDEAD) {
- DPRINTF(("%s: %02x BATTDEAD\n", device_xname(h->sc->dev), h->sock));
+ DPRINTF(("%s: BATTDEAD\n", device_xname(h->sc->dev)));
}
return cscreg ? 1 : 0;
}
@@ -791,17 +790,18 @@ mmeyepcmcia_chip_io_alloc(pcmcia_chipset
bus_size_t size, bus_size_t align, struct pcmcia_io_handle *pcihp)
{
struct mmeyepcmcia_handle *h = (struct mmeyepcmcia_handle *) pch;
+ bus_addr_t ioaddr;
/*
* Allocate some arbitrary I/O space.
*/
-
- DPRINTF(("mmeyepcmcia_chip_io_alloc alloc port %lx+%lx\n",
- (u_long) ioaddr, (u_long) size));
+ ioaddr = h->sc->iobase + start;
+ DPRINTF(("mmeyepcmcia_chip_io_alloc alloc port %lx+%lx\n",
+ioaddr, size));
pcihp->iot = h->sc->memt;
pcihp->ioh = 0;
- pcihp->addr = h->sc->iobase + start;
+ pcihp->addr = ioaddr;
pcihp->size = size;
return 0;
@@ -822,7 +822,7 @@ mmeyepcmcia_chip_io_map(pcmcia_chipset_h
bus_addr_t busaddr;
int i, win;
#ifdef MMEYEPCMCIADEBUG
- static char *width_names[] = { "auto", "io8", "io16" };
+ static const char *width_names[] = { "auto", "io8", "io16" };
#endif
/* I/O width is hardwired to 16bit mode on mmeye. */
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Fri Sep 29 18:56:14 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +VDP vulnerability disclosure policy To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Fri Sep 29 18:56:14 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +VDP vulnerability disclosure policy To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.368 src/share/misc/acronyms.comp:1.369 --- src/share/misc/acronyms.comp:1.368 Thu Sep 21 13:38:03 2023 +++ src/share/misc/acronyms.comp Fri Sep 29 18:56:14 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.368 2023/09/21 13:38:03 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.369 2023/09/29 18:56:14 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1800,6 +1800,7 @@ VCM virtual channel memory VCO voltage-controlled oscillator VCP virtual chassis port VCS version control system +VDP vulnerability disclosure policy VDPAU Video Decode and Presentation API for Unix VES virtual execution system VESA Video Electronics Standards Association
CVS commit: src/libexec/ftpd
Module Name:src
Committed By: shm
Date: Fri Sep 29 14:49:03 UTC 2023
Modified Files:
src/libexec/ftpd: conf.c
Log Message:
Fix uninitialized memory usage in count_users()
If the file was previously empty, pids table is not set, the code however used
pids[0] which is uninitialized in this case. In some scenarios it may lead to
propagate garbage value from pids[0] to the file and cause writing outside of
allocated memory.
OK lukem@
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/libexec/ftpd/conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/conf.c
diff -u src/libexec/ftpd/conf.c:1.64 src/libexec/ftpd/conf.c:1.65
--- src/libexec/ftpd/conf.c:1.64 Sun Nov 4 20:46:46 2012
+++ src/libexec/ftpd/conf.c Fri Sep 29 14:49:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.64 2012/11/04 20:46:46 christos Exp $ */
+/* $NetBSD: conf.c,v 1.65 2023/09/29 14:49:03 shm Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: conf.c,v 1.64 2012/11/04 20:46:46 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.65 2023/09/29 14:49:03 shm Exp $");
#endif /* not lint */
#include
@@ -909,7 +909,7 @@ count_users(void)
goto cleanup_count;
if (fstat(fd, ) == -1)
goto cleanup_count;
- if ((pids = malloc(sb.st_size + sizeof(pid_t))) == NULL)
+ if ((pids = calloc(sb.st_size + sizeof(pid_t), 1)) == NULL)
goto cleanup_count;
/* XXX: implement a better read loop */
scount = read(fd, pids, sb.st_size);
CVS commit: src/libexec/ftpd
Module Name:src Committed By: shm Date: Fri Sep 29 14:49:03 UTC 2023 Modified Files: src/libexec/ftpd: conf.c Log Message: Fix uninitialized memory usage in count_users() If the file was previously empty, pids table is not set, the code however used pids[0] which is uninitialized in this case. In some scenarios it may lead to propagate garbage value from pids[0] to the file and cause writing outside of allocated memory. OK lukem@ To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/libexec/ftpd/conf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/examples/wpa_supplicant
Module Name:src
Committed By: gutteridge
Date: Fri Sep 29 14:05:28 UTC 2023
Modified Files:
src/share/examples/wpa_supplicant: wpa_supplicant.conf
Log Message:
wpa_supplicant.conf: fix connection string for Eduroam
"MSCHAPV2" must have an uppercase "V" in the connection string.
Reported by nebbionegiuse...@gmail.com in PR misc/57634.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/share/examples/wpa_supplicant/wpa_supplicant.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/wpa_supplicant/wpa_supplicant.conf
diff -u src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.3 src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.4
--- src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.3 Thu Nov 26 16:07:40 2015
+++ src/share/examples/wpa_supplicant/wpa_supplicant.conf Fri Sep 29 14:05:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: wpa_supplicant.conf,v 1.3 2015/11/26 16:07:40 hubertf Exp $
+# $NetBSD: wpa_supplicant.conf,v 1.4 2023/09/29 14:05:28 gutteridge Exp $
#
# example wpa_supplicant config
#
@@ -60,7 +60,7 @@ network={
# key_mgmt=WPA-EAP
# auth_alg=OPEN
# eap=PEAP
-# phase2="auth=MSCHAPv2"
+# phase2="auth=MSCHAPV2"
#
# priority=5
#}
CVS commit: src/share/examples/wpa_supplicant
Module Name:src Committed By: gutteridge Date: Fri Sep 29 14:05:28 UTC 2023 Modified Files: src/share/examples/wpa_supplicant: wpa_supplicant.conf Log Message: wpa_supplicant.conf: fix connection string for Eduroam "MSCHAPV2" must have an uppercase "V" in the connection string. Reported by nebbionegiuse...@gmail.com in PR misc/57634. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/share/examples/wpa_supplicant/wpa_supplicant.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/utmp_update
Module Name:src
Committed By: christos
Date: Fri Sep 29 12:08:03 UTC 2023
Modified Files:
src/libexec/utmp_update: utmp_update.c
Log Message:
Check for non-printable characters in ut_host.
reported by https://twitter.com/adamsimuntis
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/libexec/utmp_update/utmp_update.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.13 src/libexec/utmp_update/utmp_update.c:1.14
--- src/libexec/utmp_update/utmp_update.c:1.13 Sun Apr 26 04:56:19 2015
+++ src/libexec/utmp_update/utmp_update.c Fri Sep 29 08:08:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $ */
+/* $NetBSD: utmp_update.c,v 1.14 2023/09/29 12:08:03 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $");
+__RCSID("$NetBSD: utmp_update.c,v 1.14 2023/09/29 12:08:03 christos Exp $");
#include
#include
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: utmp_update.c,v 1.13 2
#include
#include
#include
+#include
#include
#include
#include
@@ -80,6 +81,7 @@ main(int argc, char *argv[])
int res;
uid_t euid, ruid;
char tty[MAXPATHLEN];
+ const char *p, *ep;
euid = geteuid();
ruid = getuid();
@@ -115,6 +117,12 @@ main(int argc, char *argv[])
logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
}
+ p = utx->ut_host;
+ ep = p + sizeof(utx->ut_host);
+ for (; p < ep && *p; p++)
+ if (!isprint((unsigned char)*p))
+ logerr(0, "Non-printable characters in hostname");
+
if (ruid != 0) {
if ((pwd = getpwuid(ruid)) == NULL)
logerr(0, "User %ld does not exist in password"
CVS commit: src/libexec/utmp_update
Module Name:src Committed By: christos Date: Fri Sep 29 12:08:03 UTC 2023 Modified Files: src/libexec/utmp_update: utmp_update.c Log Message: Check for non-printable characters in ut_host. reported by https://twitter.com/adamsimuntis To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/libexec/utmp_update/utmp_update.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Sep 29 09:08:30 UTC 2023
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.156 -r1.157 src/sys/dev/mii/miidevs_data.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/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.167 src/sys/dev/mii/miidevs.h:1.168
--- src/sys/dev/mii/miidevs.h:1.167 Fri Sep 29 03:39:00 2023
+++ src/sys/dev/mii/miidevs.h Fri Sep 29 09:08:30 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.167 2023/09/29 03:39:00 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.168 2023/09/29 09:08:30 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.169 2023/09/29 03:38:36 msaitoh Exp
+ * NetBSD: miidevs,v 1.170 2023/09/29 09:08:16 msaitoh Exp
*/
/*-
@@ -409,9 +409,14 @@
#define MII_MODEL_ATTANSIC_I82578 0x0004 /* Intel 82578 10/100/1000 media interface */
#define MII_STR_ATTANSIC_I82578 "Intel 82578 10/100/1000 media interface"
/* Acquired by MaxLinear */
-#define MII_MODEL_INTEL2_GPY211 0x /* MaxLinear GPY21[125] 2.5G PHY */
-#define MII_STR_INTEL2_GPY211 "MaxLinear GPY21[125] 2.5G PHY"
-
+#define MII_MODEL_INTEL2_GPY211 0x /* MaxLinear GPY21[125] 2.5G media interface */
+#define MII_STR_INTEL2_GPY211 "MaxLinear GPY21[125] 2.5G media interface"
+#define MII_MODEL_INTEL2_I226_1 0x0001 /* I226 2.5G media interface (1) */
+#define MII_STR_INTEL2_I226_1 "I226 2.5G media interface (1)"
+#define MII_MODEL_INTEL2_I226_2 0x0005 /* I226 2.5G media interface (2) */
+#define MII_STR_INTEL2_I226_2 "I226 2.5G media interface (2)"
+#define MII_MODEL_INTEL2_I225 0x000c /* I225 2.5G media interface */
+#define MII_STR_INTEL2_I225 "I225 2.5G media interface"
/* JMicron PHYs */
#define MII_MODEL_JMICRON_JMP211 0x0021 /* JMP211 10/100/1000 media interface */
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.156 src/sys/dev/mii/miidevs_data.h:1.157
--- src/sys/dev/mii/miidevs_data.h:1.156 Fri Sep 29 03:39:00 2023
+++ src/sys/dev/mii/miidevs_data.h Fri Sep 29 09:08:30 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.156 2023/09/29 03:39:00 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.157 2023/09/29 09:08:30 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.169 2023/09/29 03:38:36 msaitoh Exp
+ * NetBSD: miidevs,v 1.170 2023/09/29 09:08:16 msaitoh Exp
*/
/*-
@@ -357,219 +357,225 @@ static const uint32_t mii_products[] = {
MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_I82578,
305, 1634, 625, 565, 571, 0,
MII_OUI_INTEL2, MII_MODEL_INTEL2_GPY211,
- 419, 1640, 1651, 497, 0,
+ 419, 1640, 1651, 565, 571, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_I226_1,
+ 1656, 1651, 565, 571, 1661, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_I226_2,
+ 1656, 1651, 565, 571, 1665, 0,
+ MII_OUI_INTEL2, MII_MODEL_INTEL2_I225,
+ 1669, 1651, 565, 571, 0,
MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP211,
- 1656, 625, 565, 571, 0,
+ 1674, 625, 565, 571, 0,
MII_OUI_JMICRON, MII_MODEL_JMICRON_JMP202,
- 1663, 558, 565, 571, 0,
+ 1681, 558, 565, 571, 0,
MII_OUI_xxLEVEL1, MII_MODEL_xxLEVEL1_LXT970,
- 1670, 558, 565, 571, 0,
+ 1688, 558, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD,
- 1677, 804, 565, 571, 0,
+ 1695, 804, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT974,
- 1685, 558, 748, 497, 0,
+ 1703, 558, 748, 497, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT975,
- 1692, 558, 748, 497, 0,
+ 1710, 558, 748, 497, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000,
- 1677, 804, 565, 571, 0,
+ 1695, 804, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT971,
- 1699, 558, 565, 571, 0,
+ 1717, 558, 565, 571, 0,
MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT973,
- 1708, 558, 761, 497, 0,
+ 1726, 558, 761, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000,
- 236, 1715, 1550, 497, 0,
+ 236, 1733, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1011,
- 236, 1723, 1550, 497, 0,
+ 236, 1741, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_3,
- 236, 1715, 1550, 497, 0,
+ 236, 1733, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000S,
- 236, 1731, 1550, 497, 0,
+ 236, 1749, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5,
- 236, 1715, 1550, 497, 0,
+ 236, 1733, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1101,
- 236, 1740, 1550, 497, 0,
+ 236, 1758, 1550, 497, 0,
MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E3082,
- 236, 1748, 558, 1756, 1761,
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Sep 29 09:08:30 UTC 2023 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.156 -r1.157 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Sep 29 09:08:16 UTC 2023 Modified Files: src/sys/dev/mii: miidevs Log Message: miidevs: Update I22[56] - Add model 0x0001 and 0x0005 for I226 and 0x000c for I225. Need more info to write better descriptions. - Modify GPY211's description a little. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/dev/mii/miidevs 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/miidevs diff -u src/sys/dev/mii/miidevs:1.169 src/sys/dev/mii/miidevs:1.170 --- src/sys/dev/mii/miidevs:1.169 Fri Sep 29 03:38:36 2023 +++ src/sys/dev/mii/miidevs Fri Sep 29 09:08:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.169 2023/09/29 03:38:36 msaitoh Exp $ +$NetBSD: miidevs,v 1.170 2023/09/29 09:08:16 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -280,8 +280,10 @@ model xxMARVELL I210 0x I210 10/100 model xxMARVELL I82563 0x000a i82563 10/100/1000 media interface model ATTANSIC I82578 0x0004 Intel 82578 10/100/1000 media interface /* Acquired by MaxLinear */ -model INTEL2 GPY211 0x MaxLinear GPY21[125] 2.5G PHY - +model INTEL2 GPY211 0x MaxLinear GPY21[125] 2.5G media interface +model INTEL2 I226_1 0x0001 I226 2.5G media interface (1) +model INTEL2 I226_2 0x0005 I226 2.5G media interface (2) +model INTEL2 I225 0x000c I225 2.5G media interface /* JMicron PHYs */ model JMICRON JMP211 0x0021 JMP211 10/100/1000 media interface
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Sep 29 09:08:16 UTC 2023 Modified Files: src/sys/dev/mii: miidevs Log Message: miidevs: Update I22[56] - Add model 0x0001 and 0x0005 for I226 and 0x000c for I225. Need more info to write better descriptions. - Modify GPY211's description a little. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: andvar Date: Fri Sep 29 06:09:20 UTC 2023 Modified Files: src/sys/arch/evbsh3/evbsh3: locore.S Log Message: reorder includes alphabetically to match mmeye counterpart, NFCI. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbsh3/evbsh3/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: andvar Date: Fri Sep 29 06:09:20 UTC 2023 Modified Files: src/sys/arch/evbsh3/evbsh3: locore.S Log Message: reorder includes alphabetically to match mmeye counterpart, NFCI. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbsh3/evbsh3/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbsh3/evbsh3/locore.S diff -u src/sys/arch/evbsh3/evbsh3/locore.S:1.15 src/sys/arch/evbsh3/evbsh3/locore.S:1.16 --- src/sys/arch/evbsh3/evbsh3/locore.S:1.15 Tue Jul 28 21:25:48 2020 +++ src/sys/arch/evbsh3/evbsh3/locore.S Fri Sep 29 06:09:20 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.15 2020/07/28 21:25:48 uwe Exp $ */ +/* $NetBSD: locore.S,v 1.16 2023/09/29 06:09:20 andvar Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -81,13 +81,13 @@ #endif #include -#include +#include +#include #include #include #include #include -#include -#include +#include #define INIT_STACK \ ((IOM_RAM_BEGIN + IOM_RAM_SIZE - 0x1000) | 0x8000)
