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 <sys/cdefs.h>
-__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 <arm/locore.h>
-#include <arm/ep93xx/ep93xxreg.h>
-#include <arm/ep93xx/ep93xxvar.h>
+#include <arm/ep93xx/ep93xxreg.h>
+#include <arm/ep93xx/ep93xxvar.h>
/* 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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -34,9 +34,9 @@ __KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.
#include <sys/device.h>
#include <dev/clock_subr.h>
#include <sys/bus.h>
-#include <arm/ep93xx/ep93xxvar.h>
-#include <arm/ep93xx/epsocvar.h>
-#include <arm/ep93xx/eprtcreg.h>
+#include <arm/ep93xx/ep93xxvar.h>
+#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/eprtcreg.h>
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 12:30:38 2020
+++ src/sys/arch/arm/ep93xx/epclk.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epclk.c,v 1.22 2020/05/29 12:30:38 rin Exp $ */
+/* $NetBSD: epclk.c,v 1.23 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -31,7 +31,7 @@
*
* We use the 64Hz RTC interrupt as its the only thing that allows for timekeeping
* of a second (crystal error only). There are two general purpose timers
- * on the ep93xx, but they run at a frequency that makes a perfect integer
+ * on the ep93xx, but they run at a frequency that makes a perfect integer
* number of ticks per second impossible. Note that there was an errata with
* the ep93xx processor and many early boards (including the Cirrus eval board) have
* a broken crystal oscillator input that may make this 64Hz unreliable. However,
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.22 2020/05/29 12:30:38 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.23 2021/11/21 08:25:26 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -55,9 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.
#include <arm/cpufunc.h>
-#include <arm/ep93xx/epsocvar.h>
-#include <arm/ep93xx/epclkreg.h>
-#include <arm/ep93xx/ep93xxreg.h>
+#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/epclkreg.h>
+#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <dev/clock_subr.h>
@@ -139,11 +139,11 @@ epclk_attach(device_t parent, device_t s
} else
first_run = false;
- if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size,
+ if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size,
0, &sc->sc_ioh))
panic("%s: Cannot map registers", device_xname(self));
#if defined(HZ) && (HZ == 64)
- if (bus_space_map(sa->sa_iot, EP93XX_APB_HWBASE + EP93XX_APB_SYSCON +
+ if (bus_space_map(sa->sa_iot, EP93XX_APB_HWBASE + EP93XX_APB_SYSCON +
EP93XX_SYSCON_TEOI, 4, 0, &sc->sc_teoi_ioh))
panic("%s: Cannot map registers", device_xname(self));
#endif
Index: src/sys/arch/arm/ep93xx/epclkreg.h
diff -u src/sys/arch/arm/ep93xx/epclkreg.h:1.3 src/sys/arch/arm/ep93xx/epclkreg.h:1.4
--- src/sys/arch/arm/ep93xx/epclkreg.h:1.3 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epclkreg.h Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epclkreg.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epclkreg.h,v 1.4 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -15,7 +15,7 @@
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
+ * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
* HEAD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
Index: src/sys/arch/arm/ep93xx/epcomreg.h
diff -u src/sys/arch/arm/ep93xx/epcomreg.h:1.3 src/sys/arch/arm/ep93xx/epcomreg.h:1.4
--- src/sys/arch/arm/ep93xx/epcomreg.h:1.3 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epcomreg.h Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epcomreg.h,v 1.3 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epcomreg.h,v 1.4 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -15,7 +15,7 @@
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
+ * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
* HEAD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
Index: src/sys/arch/arm/ep93xx/epcom.c
diff -u src/sys/arch/arm/ep93xx/epcom.c:1.32 src/sys/arch/arm/ep93xx/epcom.c:1.33
--- src/sys/arch/arm/ep93xx/epcom.c:1.32 Fri Nov 20 18:03:52 2020
+++ src/sys/arch/arm/ep93xx/epcom.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.32 2020/11/20 18:03:52 thorpej Exp $ */
+/* $NetBSD: epcom.c,v 1.33 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.32 2020/11/20 18:03:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.33 2021/11/21 08:25:26 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -291,7 +291,7 @@ epcomparam(struct tty *tp, struct termio
sc->sc_lcrhi = cflag2lcrhi(t->c_cflag);
sc->sc_lcrlo = EPCOMSPEED2BRD(t->c_ospeed) & 0xff;
sc->sc_lcrmid = EPCOMSPEED2BRD(t->c_ospeed) >> 8;
-
+
/* And copy to tty. */
tp->t_ispeed = 0;
tp->t_ospeed = t->c_ospeed;
@@ -542,7 +542,7 @@ epcomopen(dev_t dev, int flag, int mode,
splx(s2);
}
-
+
splx(s);
error = ttyopen(tp, COMDIALOUT(dev), ISSET(flag, O_NONBLOCK));
@@ -603,7 +603,7 @@ epcomread(dev_t dev, struct uio *uio, in
if (COM_ISALIVE(sc) == 0)
return (EIO);
-
+
return ((*tp->t_linesw->l_read)(tp, uio, flag));
}
@@ -615,7 +615,7 @@ epcomwrite(dev_t dev, struct uio *uio, i
if (COM_ISALIVE(sc) == 0)
return (EIO);
-
+
return ((*tp->t_linesw->l_write)(tp, uio, flag));
}
@@ -627,7 +627,7 @@ epcompoll(dev_t dev, int events, struct
if (COM_ISALIVE(sc) == 0)
return (EIO);
-
+
return ((*tp->t_linesw->l_poll)(tp, events, l));
}
@@ -678,7 +678,7 @@ epcomioctl(dev_t dev, u_long cmd, void *
case TIOCSFLAGS:
error = kauth_authorize_device_tty(l->l_cred,
- KAUTH_DEVICE_TTY_PRIVSET, tp);
+ KAUTH_DEVICE_TTY_PRIVSET, tp);
if (error)
break;
sc->sc_swflags = *(int *)data;
@@ -735,7 +735,7 @@ cflag2lcrhi(tcflag_t cflag)
lcrhi |= (cflag & PARODD) ? 0 : LinCtrlHigh_EPS;
lcrhi |= (cflag & CSTOPB) ? LinCtrlHigh_STP2 : 0;
lcrhi |= LinCtrlHigh_FEN; /* FIFO always enabled */
-
+
return (lcrhi);
}
@@ -971,7 +971,7 @@ epcom_rxsoft(struct epcom_softc *sc, str
if (cc != scc) {
sc->sc_rbget = get;
s = splserial();
-
+
cc = sc->sc_rbavail += scc - cc;
/* Buffers should be ok again, release possible block. */
if (cc >= 1) {
@@ -1022,7 +1022,7 @@ epcomintr(void* arg)
(void) bus_space_read_4(iot, ioh, EPCOM_IntIDIntClr);
- if (COM_ISALIVE(sc) == 0)
+ if (COM_ISALIVE(sc) == 0)
panic("intr on disabled epcom");
flagr = bus_space_read_4(iot, ioh, EPCOM_Flag);
Index: src/sys/arch/arm/ep93xx/epereg.h
diff -u src/sys/arch/arm/ep93xx/epereg.h:1.4 src/sys/arch/arm/ep93xx/epereg.h:1.5
--- src/sys/arch/arm/ep93xx/epereg.h:1.4 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/arm/ep93xx/epereg.h Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epereg.h,v 1.4 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epereg.h,v 1.5 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -16,7 +16,7 @@
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
+ * ARE DISCLAIMED. IN NO EVENT SHALL ICHIRO FUKUHARA OR THE VOICES IN HIS
* HEAD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -102,7 +102,7 @@
#define EPE_RXDEnq 0x0000009cUL /* Receive Descriptor Enqueue */
#define EPE_RXStsQBAdd 0x000000a0UL /* Receive Status Queue Base Address */
#define EPE_RXStsQBLen 0x000000a4UL /* Receive Status Queue Base Length */
-#define EPE_RXStsQCurLen 0x000000a6UL /* Recv Sts Q Current Length */
+#define EPE_RXStsQCurLen 0x000000a6UL /* Recv Sts Q Current Length */
#define EPE_RXStsQCurAdd 0x000000a8UL /* Recv Sts Q Current Address */
#define EPE_RXStsEnq 0x000000acUL /* Receive Status Enqueue */
#define EPE_TXDQBAdd 0x000000b0UL /* Transmit Descriptor Q Base Addr */
Index: src/sys/arch/arm/ep93xx/epled.c
diff -u src/sys/arch/arm/ep93xx/epled.c:1.4 src/sys/arch/arm/ep93xx/epled.c:1.5
--- src/sys/arch/arm/ep93xx/epled.c:1.4 Sat Oct 27 17:17:37 2012
+++ src/sys/arch/arm/ep93xx/epled.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epled.c,v 1.4 2012/10/27 17:17:37 chs Exp $ */
+/* $NetBSD: epled.c,v 1.5 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,15 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epled.c,v 1.4 2012/10/27 17:17:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epled.c,v 1.5 2021/11/21 08:25:26 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/bus.h>
-#include <arm/ep93xx/epgpiovar.h>
-#include <arm/ep93xx/epledvar.h>
+#include <arm/ep93xx/epgpiovar.h>
+#include <arm/ep93xx/epledvar.h>
struct epled_softc {
int sc_port;
@@ -59,7 +59,7 @@ epled_match(device_t parent, cfdata_t cf
void
epled_attach(device_t parent, device_t self, void *aux)
-{
+{
struct epled_softc *sc = device_private(self);
struct epgpio_attach_args *ga = aux;
Index: src/sys/arch/arm/ep93xx/epgpio.c
diff -u src/sys/arch/arm/ep93xx/epgpio.c:1.7 src/sys/arch/arm/ep93xx/epgpio.c:1.8
--- src/sys/arch/arm/ep93xx/epgpio.c:1.7 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/ep93xx/epgpio.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epgpio.c,v 1.7 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: epgpio.c,v 1.8 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.7 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.8 2021/11/21 08:25:26 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,8 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1
#include <machine/intr.h>
#include <sys/gpio.h>
#include <dev/gpio/gpiovar.h>
-#include <arm/ep93xx/ep93xxvar.h>
-#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/ep93xxvar.h>
+#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/epgpioreg.h>
#include <arm/ep93xx/epgpiovar.h>
#include "opt_ep93xx_gpio_mask.h"
Index: src/sys/arch/arm/ep93xx/eppcic.c
diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.10 src/sys/arch/arm/ep93xx/eppcic.c:1.11
--- src/sys/arch/arm/ep93xx/eppcic.c:1.10 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/ep93xx/eppcic.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eppcic.c,v 1.10 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.10 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,14 +39,14 @@ __KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
-#include <arm/ep93xx/epsocvar.h>
-#include <arm/ep93xx/epgpiovar.h>
-#include <arm/ep93xx/eppcicvar.h>
+#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/epgpiovar.h>
+#include <arm/ep93xx/eppcicvar.h>
#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/epsmcreg.h>
#include "epled.h"
#if NEPLED > 0
-#include <arm/ep93xx/epledvar.h>
+#include <arm/ep93xx/epledvar.h>
#endif
#include "epgpio.h"
@@ -265,11 +265,11 @@ eppcic_config_socket(struct eppcic_handl
ph->ph_socket);
}
-static int
+static int
eppcic_print(void *arg, const char *pnp)
-{
+{
return (UNCONF);
-}
+}
static void
eppcic_event_thread(void *arg)
Index: src/sys/arch/arm/ep93xx/epsoc.c
diff -u src/sys/arch/arm/ep93xx/epsoc.c:1.15 src/sys/arch/arm/ep93xx/epsoc.c:1.16
--- src/sys/arch/arm/ep93xx/epsoc.c:1.15 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/ep93xx/epsoc.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epsoc.c,v 1.15 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: epsoc.c,v 1.16 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.15 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.16 2021/11/21 08:25:26 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.
#include <arm/cpufunc.h>
-#include <arm/ep93xx/ep93xxreg.h>
+#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
@@ -119,13 +119,13 @@ epsoc_attach(device_t parent, device_t s
}
printf(": Cirrus Logic EP93xx SoC rev %s\n", rev);
- clkset1 = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
+ clkset1 = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
EP93XX_SYSCON_ClkSet1);
{
int fclkdiv, hclkdiv, pclkdiv, pll1_ps;
int pll1x1fbd1, pll1x2fbd2, pll1x2ipd;
int hclkdivisors[] = {1, 2, 4, 5, 6, 8, 16, 32};
-
+
fclkdiv = (clkset1 & 0x0e000000) >> 25;
hclkdiv = (clkset1 & 0x00700000) >> 20;
pclkdiv = (clkset1 & 0x000c0000) >> 18;
@@ -143,10 +143,10 @@ epsoc_attach(device_t parent, device_t s
else
fclk = 14745600ULL;
}
- printf("%s: fclk %lld.%02lld MHz hclk %lld.%02lld MHz pclk %lld.%02lld MHz\n",
+ printf("%s: fclk %lld.%02lld MHz hclk %lld.%02lld MHz pclk %lld.%02lld MHz\n",
device_xname(self),
- fclk / 1000000, (fclk % 1000000 + 5000) / 10000,
- hclk / 1000000, (hclk % 1000000 + 5000) / 10000,
+ fclk / 1000000, (fclk % 1000000 + 5000) / 10000,
+ hclk / 1000000, (hclk % 1000000 + 5000) / 10000,
pclk / 1000000, (pclk % 1000000 + 5000) / 10000);
sc->sc_fclk = fclk;
Index: src/sys/arch/arm/ep93xx/epwdog.c
diff -u src/sys/arch/arm/ep93xx/epwdog.c:1.5 src/sys/arch/arm/ep93xx/epwdog.c:1.6
--- src/sys/arch/arm/ep93xx/epwdog.c:1.5 Sat Oct 27 17:17:37 2012
+++ src/sys/arch/arm/ep93xx/epwdog.c Sun Nov 21 08:25:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: epwdog.c,v 1.5 2012/10/27 17:17:37 chs Exp $ */
+/* $NetBSD: epwdog.c,v 1.6 2021/11/21 08:25:26 skrll Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,15 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epwdog.c,v 1.5 2012/10/27 17:17:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epwdog.c,v 1.6 2021/11/21 08:25:26 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/bus.h>
-#include <arm/ep93xx/ep93xxvar.h>
-#include <arm/ep93xx/epsocvar.h>
+#include <arm/ep93xx/ep93xxvar.h>
+#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/epwdogreg.h>
#include <arm/ep93xx/epwdogvar.h>
