CVS commit: src/sys/arch/arm/ep93xx
Module Name:src Committed By: skrll Date: Tue Sep 27 06:32:53 UTC 2022 Modified Files: src/sys/arch/arm/ep93xx: eppcic.c Log Message: malloc -> kmem To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ep93xx/eppcic.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/arm/ep93xx/eppcic.c diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.11 src/sys/arch/arm/ep93xx/eppcic.c:1.12 --- src/sys/arch/arm/ep93xx/eppcic.c:1.11 Sun Nov 21 08:25:26 2021 +++ src/sys/arch/arm/ep93xx/eppcic.c Tue Sep 27 06:32:53 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $ */ +/* $NetBSD: eppcic.c,v 1.12 2022/09/27 06:32:53 skrll Exp $ */ /* * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved. @@ -26,12 +26,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.12 2022/09/27 06:32:53 skrll Exp $"); #include #include #include -#include +#include #include #include #include @@ -175,7 +175,7 @@ eppcic_attach_common(device_t parent, de epled_red_off(); #endif /* socket 0 */ - ph = malloc(sizeof(struct eppcic_handle), M_DEVBUF, M_WAITOK); + ph = kmem_alloc(sizeof(*ph), KM_SLEEP); sc->sc_ph[0] = ph; ph->ph_sc = sc; ph->ph_socket = 0;
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src Committed By: skrll Date: Tue Sep 27 06:32:53 UTC 2022 Modified Files: src/sys/arch/arm/ep93xx: eppcic.c Log Message: malloc -> kmem To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ep93xx/eppcic.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/arm/ep93xx
Module Name:src
Committed By: thorpej
Date: Sat Sep 17 19:44:14 UTC 2022
Modified Files:
src/sys/arch/arm/ep93xx: epe.c epevar.h
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epevar.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/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.48 src/sys/arch/arm/ep93xx/epe.c:1.49
--- src/sys/arch/arm/ep93xx/epe.c:1.48 Wed Feb 19 02:51:54 2020
+++ src/sys/arch/arm/ep93xx/epe.c Sat Sep 17 19:44:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $ */
+/* $NetBSD: epe.c,v 1.49 2022/09/17 19:44:13 thorpej Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.49 2022/09/17 19:44:13 thorpej Exp $");
#include
#include
@@ -189,8 +189,8 @@ epe_gctx(struct epe_softc *sc)
} while (sc->TXStsQ_cur != cur);
sc->TXDQ_avail += ndq;
- if (ifp->if_flags & IFF_OACTIVE) {
- ifp->if_flags &= ~IFF_OACTIVE;
+ if (sc->tx_busy) {
+ sc->tx_busy = false;
/* Disable end-of-tx-chain interrupt */
EPE_WRITE(IntEn, IntEn_REOFIE);
}
@@ -544,7 +544,7 @@ start:
if (epe_gctx(sc) == 0) {
/* Enable End-Of-TX-Chain interrupt */
EPE_WRITE(IntEn, IntEn_REOFIE | IntEn_ECIE);
- ifp->if_flags |= IFF_OACTIVE;
+ sc->tx_busy = true;
ifp->if_timer = 10;
splx(s);
return;
@@ -687,7 +687,7 @@ epe_ifstop(struct ifnet *ifp, int disabl
/* Down the MII. */
mii_down(>sc_mii);
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
ifp->if_timer = 0;
sc->sc_mii.mii_media_status &= ~IFM_ACTIVE;
}
Index: src/sys/arch/arm/ep93xx/epevar.h
diff -u src/sys/arch/arm/ep93xx/epevar.h:1.7 src/sys/arch/arm/ep93xx/epevar.h:1.8
--- src/sys/arch/arm/ep93xx/epevar.h:1.7 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/ep93xx/epevar.h Sat Sep 17 19:44:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: epevar.h,v 1.7 2012/11/12 18:00:36 skrll Exp $*/
+/* $NetBSD: epevar.h,v 1.8 2022/09/17 19:44:13 thorpej Exp $*/
/*-
* Copyright (c) 2004 Jesse Off
* All rights reserved
@@ -60,6 +60,7 @@ struct epe_softc {
struct epe_qmeta rxq[RX_QLEN];
struct epe_qmeta txq[TX_QLEN];
struct callout epe_tick_ch;
+ bool tx_busy;
};
#endif /* _EPEVAR_H_ */
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src Committed By: thorpej Date: Sat Sep 17 19:44:14 UTC 2022 Modified Files: src/sys/arch/arm/ep93xx: epe.c epevar.h Log Message: Eliminate use of IFF_OACTIVE. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/ep93xx/epe.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epevar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src
Committed By: skrll
Date: Sun Nov 21 08:25:27 UTC 2021
Modified Files:
src/sys/arch/arm/ep93xx: ep93xx_intr.c ep93xx_space.c ep93xxreg.h
epclk.c epclkreg.h epcom.c epcomreg.h epereg.h epgpio.c epled.c
eppcic.c eprtc.c epsoc.c epwdog.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/ep93xx/ep93xx_intr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ep93xx/ep93xx_space.c \
src/sys/arch/arm/ep93xx/eprtc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ep93xx/ep93xxreg.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/ep93xx/epclk.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/epclkreg.h \
src/sys/arch/arm/ep93xx/epcomreg.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/ep93xx/epcom.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/epereg.h \
src/sys/arch/arm/ep93xx/epled.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epgpio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ep93xx/eppcic.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ep93xx/epsoc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ep93xx/epwdog.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/arm/ep93xx/ep93xx_intr.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.26 src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.27
--- src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.26 Fri Nov 20 18:03:52 2020
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_intr.c,v 1.26 2020/11/20 18:03:52 thorpej Exp $ */
+/* $NetBSD: ep93xx_intr.c,v 1.27 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.26 2020/11/20 18:03:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.27 2021/11/21 08:25:26 skrll Exp $");
/*
* Interrupt support for the Cirrus Logic EP93XX
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.
#include
-#include
-#include
+#include
+#include
/* Interrupt handler queues. */
struct intrq intrq[NIRQ];
Index: src/sys/arch/arm/ep93xx/ep93xx_space.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_space.c:1.6 src/sys/arch/arm/ep93xx/ep93xx_space.c:1.7
--- src/sys/arch/arm/ep93xx/ep93xx_space.c:1.6 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/ep93xx/ep93xx_space.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_space.c,v 1.6 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: ep93xx_space.c,v 1.7 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.6 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_space.c,v 1.7 2021/11/21 08:25:26 skrll Exp $");
/*
* bus_space I/O functions for ep93xx
@@ -196,7 +196,7 @@ ep93xx_bs_alloc(void *t, bus_addr_t rsta
panic("ep93xx_bs_alloc(): not implemented\n");
}
-void
+void
ep93xx_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("ep93xx_bs_free(): not implemented\n");
@@ -228,5 +228,5 @@ ep93xx_bs_barrier(void *t, bus_space_han
bus_size_t len, int flags)
{
/* NULL */
-}
+}
/* End of ep93xx_space.c */
Index: src/sys/arch/arm/ep93xx/eprtc.c
diff -u src/sys/arch/arm/ep93xx/eprtc.c:1.6 src/sys/arch/arm/ep93xx/eprtc.c:1.7
--- src/sys/arch/arm/ep93xx/eprtc.c:1.6 Sat Oct 27 17:17:37 2012
+++ src/sys/arch/arm/ep93xx/eprtc.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eprtc.c,v 1.6 2012/10/27 17:17:37 chs Exp $ */
+/* $NetBSD: eprtc.c,v 1.7 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.6 2012/10/27 17:17:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.7 2021/11/21 08:25:26 skrll Exp $");
#include
#include
@@ -34,9 +34,9 @@ __KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.
#include
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
struct eprtc_softc {
bus_space_tag_t sc_iot;
Index: src/sys/arch/arm/ep93xx/ep93xxreg.h
diff -u src/sys/arch/arm/ep93xx/ep93xxreg.h:1.8 src/sys/arch/arm/ep93xx/ep93xxreg.h:1.9
--- src/sys/arch/arm/ep93xx/ep93xxreg.h:1.8 Fri Sep 17 08:13:06 2021
+++ src/sys/arch/arm/ep93xx/ep93xxreg.h Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xxreg.h,v 1.8 2021/09/17 08:13:06 andvar Exp $ */
+/* $NetBSD: ep93xxreg.h,v 1.9 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -30,7 +30,7 @@
#define _EP93XXREG_H_
/*
- * Physical memory map for the Cirrus Logic EP93XX
+ * Physical memory map for the Cirrus Logic EP93XX
*/
/*
Index: src/sys/arch/arm/ep93xx/epclk.c
diff -u src/sys/arch/arm/ep93xx/epclk.c:1.22 src/sys/arch/arm/ep93xx/epclk.c:1.23
--- src/sys/arch/arm/ep93xx/epclk.c:1.22 Fri May 29
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src Committed By: skrll Date: Sun Nov 21 08:25:27 UTC 2021 Modified Files: src/sys/arch/arm/ep93xx: ep93xx_intr.c ep93xx_space.c ep93xxreg.h epclk.c epclkreg.h epcom.c epcomreg.h epereg.h epgpio.c epled.c eppcic.c eprtc.c epsoc.c epwdog.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/ep93xx/ep93xx_intr.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ep93xx/ep93xx_space.c \ src/sys/arch/arm/ep93xx/eprtc.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ep93xx/ep93xxreg.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/ep93xx/epclk.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/epclkreg.h \ src/sys/arch/arm/ep93xx/epcomreg.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/ep93xx/epcom.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ep93xx/epereg.h \ src/sys/arch/arm/ep93xx/epled.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epgpio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/ep93xx/eppcic.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ep93xx/epsoc.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ep93xx/epwdog.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
