CVS commit: src/sys/arch/sgimips/mace
Module Name:src Committed By: mrg Date: Thu Aug 3 08:31:06 UTC 2023 Modified Files: src/sys/arch/sgimips/mace: mace.c Log Message: check a pointer's value not the address of a pointer. found by GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/mace/mace.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/sgimips/mace/mace.c diff -u src/sys/arch/sgimips/mace/mace.c:1.25 src/sys/arch/sgimips/mace/mace.c:1.26 --- src/sys/arch/sgimips/mace/mace.c:1.25 Sat Aug 7 16:19:04 2021 +++ src/sys/arch/sgimips/mace/mace.c Thu Aug 3 08:31:06 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: mace.c,v 1.25 2021/08/07 16:19:04 thorpej Exp $ */ +/* $NetBSD: mace.c,v 1.26 2023/08/03 08:31:06 mrg Exp $ */ /* * Copyright (c) 2003 Christopher Sekiya @@ -45,7 +45,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.25 2021/08/07 16:19:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.26 2023/08/03 08:31:06 mrg Exp $"); #include #include @@ -302,7 +302,7 @@ mace_intr_disestablish(void *cookie) /* do not do an unmask when irq is shared. */ for (i = 0; i < MACE_NINTR; i++) - if ([i].func != NULL && maceintrtab[i].irq == irq) + if (maceintrtab[i].func != NULL && maceintrtab[i].irq == irq) break; if (i == MACE_NINTR) crime_intr_unmask(intr);
CVS commit: src/sys/arch/sgimips/mace
Module Name:src Committed By: mrg Date: Thu Aug 3 08:31:06 UTC 2023 Modified Files: src/sys/arch/sgimips/mace: mace.c Log Message: check a pointer's value not the address of a pointer. found by GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/mace/mace.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/sgimips/mace
Module Name:src
Committed By: thorpej
Date: Sun Sep 18 13:26:40 UTC 2022
Modified Files:
src/sys/arch/sgimips/mace: if_mec.c
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sgimips/mace/if_mec.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/sgimips/mace/if_mec.c
diff -u src/sys/arch/sgimips/mace/if_mec.c:1.63 src/sys/arch/sgimips/mace/if_mec.c:1.64
--- src/sys/arch/sgimips/mace/if_mec.c:1.63 Wed Jan 29 05:37:08 2020
+++ src/sys/arch/sgimips/mace/if_mec.c Sun Sep 18 13:26:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mec.c,v 1.63 2020/01/29 05:37:08 thorpej Exp $ */
+/* $NetBSD: if_mec.c,v 1.64 2022/09/18 13:26:40 thorpej Exp $ */
/*-
* Copyright (c) 2004, 2008 Izumi Tsutsui. All rights reserved.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.63 2020/01/29 05:37:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.64 2022/09/18 13:26:40 thorpej Exp $");
#include "opt_ddb.h"
@@ -905,7 +905,6 @@ mec_init(struct ifnet *ifp)
return rc;
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
mec_start(ifp);
return 0;
@@ -953,7 +952,7 @@ mec_start(struct ifnet *ifp)
int len, bufoff, buflen, nsegs, align, resid, pseg, nptr, slen, i;
uint32_t txdcmd;
- if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & IFF_RUNNING) == 0)
return;
/*
@@ -1391,9 +1390,8 @@ mec_start(struct ifnet *ifp)
}
if (sc->sc_txpending == MEC_NTXDESC - 1) {
- /* No more slots; notify upper layer. */
+ /* No more slots. */
MEC_EVCNT_INCR(>sc_ev_txdstall);
- ifp->if_flags |= IFF_OACTIVE;
}
if (sc->sc_txpending != opending) {
@@ -1422,7 +1420,7 @@ mec_stop(struct ifnet *ifp, int disable)
DPRINTF(MEC_DEBUG_STOP, ("%s\n", __func__));
ifp->if_timer = 0;
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
callout_stop(>sc_tick_ch);
mii_down(>sc_mii);
@@ -1900,8 +1898,6 @@ mec_txintr(struct mec_softc *sc, uint32_
/* cancel the watchdog timer if there are no pending TX packets */
if (sc->sc_txpending == 0)
ifp->if_timer = 0;
- if (sc->sc_txpending < MEC_NTXDESC - MEC_NTXDESC_RSVD)
- ifp->if_flags &= ~IFF_OACTIVE;
}
static bool
CVS commit: src/sys/arch/sgimips/mace
Module Name:src Committed By: thorpej Date: Sun Sep 18 13:26:40 UTC 2022 Modified Files: src/sys/arch/sgimips/mace: if_mec.c Log Message: Eliminate use of IFF_OACTIVE. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sgimips/mace/if_mec.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/sgimips/mace
Module Name:src Committed By: isaki Date: Fri Jun 7 13:24:21 UTC 2019 Modified Files: src/sys/arch/sgimips/mace: mavb.c Log Message: mavb supports only playback for now, so drop FULLDUPLEX and INDEPENDENT property. These properies are valid only for bidirectional device. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/mace/mavb.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/sgimips/mace
Module Name:src
Committed By: isaki
Date: Fri Jun 7 13:24:21 UTC 2019
Modified Files:
src/sys/arch/sgimips/mace: mavb.c
Log Message:
mavb supports only playback for now, so drop FULLDUPLEX and INDEPENDENT
property. These properies are valid only for bidirectional device.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/mace/mavb.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/sgimips/mace/mavb.c
diff -u src/sys/arch/sgimips/mace/mavb.c:1.13 src/sys/arch/sgimips/mace/mavb.c:1.14
--- src/sys/arch/sgimips/mace/mavb.c:1.13 Wed May 8 13:40:16 2019
+++ src/sys/arch/sgimips/mace/mavb.c Fri Jun 7 13:24:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mavb.c,v 1.13 2019/05/08 13:40:16 isaki Exp $ */
+/* $NetBSD: mavb.c,v 1.14 2019/06/07 13:24:21 isaki Exp $ */
/* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */
/*
@@ -711,8 +711,7 @@ int
mavb_get_props(void *hdl)
{
- return AUDIO_PROP_PLAYBACK |
- AUDIO_PROP_FULLDUPLEX | AUDIO_PROP_INDEPENDENT;
+ return AUDIO_PROP_PLAYBACK;
}
static void
