Module Name: src
Committed By: skrll
Date: Fri Aug 13 11:40:43 UTC 2021
Modified Files:
src/sys/arch/arm/footbridge: footbridge.c footbridge_clock.c
footbridge_com.c footbridge_com_io.c footbridge_intr.h
footbridge_io.c footbridge_irqhandler.c footbridge_pci.c
src/sys/arch/arm/footbridge/isa: dsrtc.c isa_io.c isa_io_asm.S
isa_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/footbridge/footbridge.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/footbridge/footbridge_clock.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/footbridge/footbridge_com.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/footbridge/footbridge_com_io.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/footbridge/footbridge_intr.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/footbridge/footbridge_io.c
cvs rdiff -u -r1.27 -r1.28 \
src/sys/arch/arm/footbridge/footbridge_irqhandler.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/footbridge/isa/dsrtc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/footbridge/isa/isa_io.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/footbridge/isa/isa_io_asm.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/footbridge/isa/isa_machdep.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/footbridge/footbridge.c
diff -u src/sys/arch/arm/footbridge/footbridge.c:1.28 src/sys/arch/arm/footbridge/footbridge.c:1.29
--- src/sys/arch/arm/footbridge/footbridge.c:1.28 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/footbridge/footbridge.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge.c,v 1.28 2021/08/07 16:18:43 thorpej Exp $ */
+/* $NetBSD: footbridge.c,v 1.29 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.28 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.29 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge.c
#include <arm/footbridge/dc21285reg.h>
#include <arm/footbridge/dc21285mem.h>
#include <arm/footbridge/footbridge.h>
-
+
/*
* DC21285 'Footbridge' device
*
@@ -126,8 +126,8 @@ footbridge_print(void *aux, const char *
* int footbridge_match(device_t parent, cfdata_t cf, void *aux)
*
* Just return ok for this if it is device 0
- */
-
+ */
+
static int
footbridge_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -141,7 +141,7 @@ footbridge_match(device_t parent, cfdata
* void footbridge_attach(device_t parent, device_t dev, void *aux)
*
*/
-
+
static void
footbridge_attach(device_t parent, device_t self, void *aux)
{
@@ -188,7 +188,7 @@ footbridge_attach(device_t parent, devic
"targ abt", footbridge_intr, sc);
sc->sc_parity_ih = footbridge_intr_claim(IRQ_PARITY, IPL_HIGH,
"parity", footbridge_intr, sc);
-
+
/* Set up the PCI bus tags */
footbridge_create_io_bs_tag(&footbridge_pci_io_bs_tag,
(void *)DC21285_PCI_IO_VBASE);
@@ -220,7 +220,7 @@ footbridge_attach(device_t parent, devic
break;
mask--;
mask &= SDRAM_MASK_256MB;
-
+
/*
* configure the mask, the offset into SDRAM and the address
* SDRAM is exposed on the PCI bus.
@@ -255,7 +255,7 @@ footbridge_attach(device_t parent, devic
fba.fba_fca.fca_tx_irq = IRQ_SERIAL_TX;
config_found(self, &fba.fba_fca, footbridge_print,
CFARGS(.iattr = "footbridge"));
-
+
/* Setup fast SA110 cache clean area */
#ifdef CPU_SA110
if (cputype == CPU_ID_SA110)
Index: src/sys/arch/arm/footbridge/footbridge_clock.c
diff -u src/sys/arch/arm/footbridge/footbridge_clock.c:1.26 src/sys/arch/arm/footbridge/footbridge_clock.c:1.27
--- src/sys/arch/arm/footbridge/footbridge_clock.c:1.26 Tue Jul 21 07:35:55 2009
+++ src/sys/arch/arm/footbridge/footbridge_clock.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_clock.c,v 1.26 2009/07/21 07:35:55 skrll Exp $ */
+/* $NetBSD: footbridge_clock.c,v 1.27 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_clock.c,v 1.26 2009/07/21 07:35:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_clock.c,v 1.27 2021/08/13 11:40:43 skrll Exp $");
/* Include header files */
@@ -88,8 +88,8 @@ CFATTACH_DECL_NEW(footbridge_clock, size
* int clockmatch(device_t parent, cfdata_t cf, void *aux);
*
* Just return ok for this if it is device 0
- */
-
+ */
+
static int
clockmatch(device_t parent, cfdata_t cf, void *aux)
{
@@ -105,7 +105,7 @@ clockmatch(device_t parent, cfdata_t cf,
* void clockattach(device_t parent, device_t self, void *aux)
*
*/
-
+
static void
clockattach(device_t parent, device_t self, void *aux)
{
@@ -119,7 +119,7 @@ clockattach(device_t parent, device_t se
clock_sc = sc;
/* Cannot do anything until cpu_initclocks() has been called */
-
+
aprint_normal("\n");
}
#endif
@@ -147,7 +147,7 @@ clockhandler(void *aframe)
* Function called by timer 2 interrupts.
* This just clears the interrupt condition and calls statclock().
*/
-
+
int
statclockhandler(void *aframe)
{
@@ -163,12 +163,12 @@ statclockhandler(void *aframe)
r = random() & (statvar-1);
} while (r == 0);
newint = statmin + (r * statcountperusec);
-
+
/* fetch the current count */
currentclock = bus_space_read_4(clock_sc->sc_iot, clock_sc->sc_ioh,
TIMER_2_VALUE);
- /*
+ /*
* work out how much time has run, add another usec for time spent
* here
*/
@@ -178,11 +178,11 @@ statclockhandler(void *aframe)
newint -= r;
r = 0;
}
- else
+ else
printf("statclockhandler: Statclock overrun\n");
- /*
+ /*
* update the clock to the new counter, this reloads the existing
* timer
*/
@@ -193,7 +193,7 @@ statclockhandler(void *aframe)
if (r)
/*
* We've completely overrun the previous interval,
- * make sure we report the correct number of ticks.
+ * make sure we report the correct number of ticks.
*/
statclock(frame);
@@ -242,16 +242,16 @@ setstatclockrate(int herz)
/* statint == num in counter to drop by desired herz */
statint = statprev = clock_sc->sc_statclock_count =
load_timer(TIMER_2_BASE, herz);
-
+
/* Get the total ticks a second */
countpersecond = statint * herz;
-
+
/* now work out how many ticks per usec */
statcountperusec = countpersecond / 1000000;
/* calculate a variance range of statvar */
statvarticks = statcountperusec * statvar;
-
+
/* minimum is statint - 50% of variant */
statmin = statint - (statvarticks / 2);
}
@@ -264,7 +264,7 @@ setstatclockrate(int herz)
* Timer 1 is used for the main system clock (hardclock)
* Timer 2 is used for the statistics clock (statclock)
*/
-
+
void
cpu_initclocks(void)
{
@@ -365,7 +365,7 @@ delay(unsigned n)
if (n == 0)
return;
- /*
+ /*
* not calibrated the timer yet, so try to live with this horrible
* loop!
*
@@ -388,13 +388,13 @@ delay(unsigned n)
while (n-- > 0) {
for (i = delaycount; --i;);
}
- return;
+ return;
}
last = bus_space_read_4(clock_sc->sc_iot, clock_sc->sc_ioh,
TIMER_3_VALUE);
delta = usecs = 0;
-
+
while (n > usecs) {
cur = bus_space_read_4(clock_sc->sc_iot, clock_sc->sc_ioh,
TIMER_3_VALUE);
Index: src/sys/arch/arm/footbridge/footbridge_com.c
diff -u src/sys/arch/arm/footbridge/footbridge_com.c:1.39 src/sys/arch/arm/footbridge/footbridge_com.c:1.40
--- src/sys/arch/arm/footbridge/footbridge_com.c:1.39 Fri Nov 20 18:03:52 2020
+++ src/sys/arch/arm/footbridge/footbridge_com.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com.c,v 1.39 2020/11/20 18:03:52 thorpej Exp $ */
+/* $NetBSD: footbridge_com.c,v 1.40 2021/08/13 11:40:43 skrll Exp $ */
/*-
* Copyright (c) 1997 Mark Brinicombe
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.39 2020/11/20 18:03:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.40 2021/08/13 11:40:43 skrll Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -89,8 +89,8 @@ struct fcom_softc {
#define HW_FLAG_CONSOLE 0x01
int sc_swflags;
int sc_l_ubrlcr;
- int sc_m_ubrlcr;
- int sc_h_ubrlcr;
+ int sc_m_ubrlcr;
+ int sc_h_ubrlcr;
char *sc_rxbuffer[2];
char *sc_rxbuf;
int sc_rxpos;
@@ -317,7 +317,7 @@ fcomwrite(dev_t dev, struct uio *uio, in
{
struct fcom_softc *sc = device_lookup_private(&fcom_cd, minor(dev));
struct tty *tp = sc->sc_tty;
-
+
return (*tp->t_linesw->l_write)(tp, uio, flag);
}
@@ -326,7 +326,7 @@ fcompoll(dev_t dev, int events, struct l
{
struct fcom_softc *sc = device_lookup_private(&fcom_cd, minor(dev));
struct tty *tp = sc->sc_tty;
-
+
return ((*tp->t_linesw->l_poll)(tp, events, l));
}
@@ -336,7 +336,7 @@ fcomioctl(dev_t dev, u_long cmd, void *d
struct fcom_softc *sc = device_lookup_private(&fcom_cd, minor(dev));
struct tty *tp = sc->sc_tty;
int error;
-
+
if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l)) !=
EPASSTHROUGH)
return error;
@@ -350,9 +350,9 @@ fcomioctl(dev_t dev, u_long cmd, void *d
case TIOCSFLAGS:
error = kauth_authorize_device_tty(l->l_cred,
- KAUTH_DEVICE_TTY_PRIVSET, tp);
+ KAUTH_DEVICE_TTY_PRIVSET, tp);
if (error)
- return (error);
+ return (error);
sc->sc_swflags = *(int *)data;
break;
}
@@ -403,7 +403,7 @@ fcomstart(struct tty *tp)
}
(void)splx(s);
-
+
cl = &tp->t_outq;
len = q_to_b(cl, buf, 64);
for (loop = 0; loop < len; ++loop) {
@@ -553,7 +553,7 @@ fcom_txintr(void *arg)
{
/* struct fcom_softc *sc = arg;*/
- printf("fcom_txintr()\n");
+ printf("fcom_txintr()\n");
return(0);
}
#endif
Index: src/sys/arch/arm/footbridge/footbridge_com_io.c
diff -u src/sys/arch/arm/footbridge/footbridge_com_io.c:1.9 src/sys/arch/arm/footbridge/footbridge_com_io.c:1.10
--- src/sys/arch/arm/footbridge/footbridge_com_io.c:1.9 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/footbridge/footbridge_com_io.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com_io.c,v 1.9 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: footbridge_com_io.c,v 1.10 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com_io.c,v 1.9 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com_io.c,v 1.10 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ fcomcons_bs_unmap(void *t, bus_space_han
*/
}
-void
+void
fcomcons_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
@@ -191,6 +191,6 @@ fcomcons_bs_subregion(void *t, bus_space
void
fcomcons_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t len, int flags)
{
-}
+}
/* End of footbridge_com_io.c */
Index: src/sys/arch/arm/footbridge/footbridge_intr.h
diff -u src/sys/arch/arm/footbridge/footbridge_intr.h:1.21 src/sys/arch/arm/footbridge/footbridge_intr.h:1.22
--- src/sys/arch/arm/footbridge/footbridge_intr.h:1.21 Wed Dec 9 15:28:38 2020
+++ src/sys/arch/arm/footbridge/footbridge_intr.h Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_intr.h,v 1.21 2020/12/09 15:28:38 martin Exp $ */
+/* $NetBSD: footbridge_intr.h,v 1.22 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@ static inline void __attribute__((__unus
footbridge_set_intrmask(void)
{
extern volatile uint32_t intr_enabled;
- volatile uint32_t * const dc21285_armcsr_vbase =
+ volatile uint32_t * const dc21285_armcsr_vbase =
(volatile uint32_t *)(DC21285_ARMCSR_VBASE);
/* fetch once so we write the same number to both registers */
@@ -93,7 +93,7 @@ footbridge_set_intrmask(void)
dc21285_armcsr_vbase[IRQ_ENABLE_SET>>2] = tmp;
dc21285_armcsr_vbase[IRQ_ENABLE_CLEAR>>2] = ~tmp;
}
-
+
static inline void __attribute__((__unused__))
footbridge_splx(int ipl)
{
Index: src/sys/arch/arm/footbridge/footbridge_io.c
diff -u src/sys/arch/arm/footbridge/footbridge_io.c:1.24 src/sys/arch/arm/footbridge/footbridge_io.c:1.25
--- src/sys/arch/arm/footbridge/footbridge_io.c:1.24 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/footbridge/footbridge_io.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_io.c,v 1.24 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: footbridge_io.c,v 1.25 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1997 Causality Limited
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.24 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_io.c,v 1.25 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ struct bus_space footbridge_bs_tag = {
/* Mmap bus space for user */
.bs_mmap = bs_notimpl_bs_mmap,
-
+
/* barrier */
.bs_barrier = footbridge_bs_barrier,
@@ -169,7 +169,7 @@ footbridge_bs_map(void *t, bus_addr_t bp
* The whole 64K of PCI space is always completely mapped during
* boot.
*
- * Eventually this function will do the mapping check overlapping /
+ * Eventually this function will do the mapping check overlapping /
* multiple mappings.
*/
@@ -208,7 +208,7 @@ footbridge_mem_bs_map(void *t, bus_addr_
}
/*
- * Eventually this function will do the mapping check for overlapping /
+ * Eventually this function will do the mapping check for overlapping /
* multiple mappings
*/
@@ -286,7 +286,7 @@ footbridge_mem_bs_unmap(void *t, bus_spa
uvm_km_free(kernel_map, startva, endva - startva, UVM_KMF_VAONLY);
}
-void
+void
footbridge_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
@@ -313,7 +313,7 @@ footbridge_bs_vaddr(void *t, bus_space_h
void
footbridge_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t len, int flags)
{
-}
+}
paddr_t
Index: src/sys/arch/arm/footbridge/footbridge_irqhandler.c
diff -u src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.27 src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.28
--- src/sys/arch/arm/footbridge/footbridge_irqhandler.c:1.27 Fri Nov 20 18:03:52 2020
+++ src/sys/arch/arm/footbridge/footbridge_irqhandler.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_irqhandler.c,v 1.27 2020/11/20 18:03:52 thorpej Exp $ */
+/* $NetBSD: footbridge_irqhandler.c,v 1.28 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0,"$NetBSD: footbridge_irqhandler.c,v 1.27 2020/11/20 18:03:52 thorpej Exp $");
+__KERNEL_RCSID(0,"$NetBSD: footbridge_irqhandler.c,v 1.28 2021/08/13 11:40:43 skrll Exp $");
#include "opt_irqstats.h"
@@ -192,11 +192,11 @@ footbridge_intr_init(void)
set_curcpl(0xffffffff);
footbridge_ipending = 0;
footbridge_set_intrmask();
-
+
for (i = 0, iq = footbridge_intrq; i < NIRQ; i++, iq++) {
TAILQ_INIT(&iq->iq_list);
}
-
+
footbridge_intr_calculate_masks();
/* Enable IRQ's, we don't have any FIQ's*/
@@ -247,9 +247,9 @@ footbridge_intr_claim(int irq, int ipl,
evcnt_detach(&iq->iq_ev);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, "footbridge", name);
-
+
restore_interrupts(oldirqstate);
-
+
return(ih);
}
Index: src/sys/arch/arm/footbridge/footbridge_pci.c
diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.32 src/sys/arch/arm/footbridge/footbridge_pci.c:1.33
--- src/sys/arch/arm/footbridge/footbridge_pci.c:1.32 Mon Feb 24 12:20:29 2020
+++ src/sys/arch/arm/footbridge/footbridge_pci.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.32 2020/02/24 12:20:29 rin Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.33 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.32 2020/02/24 12:20:29 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.33 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,7 +326,7 @@ footbridge_pci_intr_string(void *pcv, pc
}
#endif
snprintf(buf, len, "irq %" PRIu64, ih);
- return buf;
+ return buf;
}
void *
Index: src/sys/arch/arm/footbridge/isa/dsrtc.c
diff -u src/sys/arch/arm/footbridge/isa/dsrtc.c:1.12 src/sys/arch/arm/footbridge/isa/dsrtc.c:1.13
--- src/sys/arch/arm/footbridge/isa/dsrtc.c:1.12 Thu Oct 11 08:53:27 2012
+++ src/sys/arch/arm/footbridge/isa/dsrtc.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dsrtc.c,v 1.12 2012/10/11 08:53:27 skrll Exp $ */
+/* $NetBSD: dsrtc.c,v 1.13 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsrtc.c,v 1.12 2012/10/11 08:53:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsrtc.c,v 1.13 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@ ds1687_ram_read(struct dsrtc_softc *sc,
addr -= RTC_PC_RAM_SIZE;
if (addr < RTC_BANK0_RAM_SIZE)
- return(ds1687_read(sc, RTC_BANK0_RAM_START + addr));
+ return(ds1687_read(sc, RTC_BANK0_RAM_START + addr));
addr -= RTC_BANK0_RAM_SIZE;
if (addr < RTC_EXT_RAM_SIZE) {
@@ -218,7 +218,7 @@ dsrtcattach(device_t parent, device_t se
{
struct dsrtc_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;
-
+
sc->sc_iot = ia->ia_iot;
if (bus_space_map(sc->sc_iot, ia->ia_io[0].ir_addr,
ia->ia_io[0].ir_size, 0, &sc->sc_ioh)) {
Index: src/sys/arch/arm/footbridge/isa/isa_io.c
diff -u src/sys/arch/arm/footbridge/isa/isa_io.c:1.9 src/sys/arch/arm/footbridge/isa/isa_io.c:1.10
--- src/sys/arch/arm/footbridge/isa/isa_io.c:1.9 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/footbridge/isa/isa_io.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.9 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: isa_io.c,v 1.10 2021/08/13 11:40:43 skrll Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.9 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.10 2021/08/13 11:40:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ bs_protos(bs_notimpl);
*/
/*
- * NOTE: ASSEMBLY LANGUAGE RELIES ON THE COOKIE -- THE FIRST MEMBER OF
+ * NOTE: ASSEMBLY LANGUAGE RELIES ON THE COOKIE -- THE FIRST MEMBER OF
* THIS STRUCTURE -- TO BE THE VIRTUAL ADDRESS OF ISA/IO!
*/
struct bus_space isa_io_bs_tag = {
@@ -139,7 +139,7 @@ struct bus_space isa_io_bs_tag = {
};
/*
- * NOTE: ASSEMBLY LANGUAGE RELIES ON THE COOKIE -- THE FIRST MEMBER OF
+ * NOTE: ASSEMBLY LANGUAGE RELIES ON THE COOKIE -- THE FIRST MEMBER OF
* THIS STRUCTURE -- TO BE THE VIRTUAL ADDRESS OF ISA/MEMORY!
*/
struct bus_space isa_mem_bs_tag = {
@@ -282,7 +282,7 @@ isa_bs_alloc(
panic("isa_alloc(): Help!");
}
-void
+void
isa_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("isa_free(): Help!");
@@ -299,4 +299,4 @@ void
isa_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t len, int flags)
{
/* just return */
-}
+}
Index: src/sys/arch/arm/footbridge/isa/isa_io_asm.S
diff -u src/sys/arch/arm/footbridge/isa/isa_io_asm.S:1.2 src/sys/arch/arm/footbridge/isa/isa_io_asm.S:1.3
--- src/sys/arch/arm/footbridge/isa/isa_io_asm.S:1.2 Mon Apr 28 20:23:14 2008
+++ src/sys/arch/arm/footbridge/isa/isa_io_asm.S Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io_asm.S,v 1.2 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: isa_io_asm.S,v 1.3 2021/08/13 11:40:43 skrll Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -219,7 +219,7 @@ ENTRY(isa_bs_w_4)
/*
* write multiple
*/
-
+
ENTRY(isa_bs_wm_1)
add r0, r1, r2
mov r1, r3
@@ -242,7 +242,7 @@ ENTRY(isa_bs_wm_2)
teq r2, #0
moveq pc, lr
-Lisa_wm_2_loop:
+Lisa_wm_2_loop:
ldrh r3, [r1], #2 /*.word 0xe0d130b2*/
strh r3, [r0] /*.word 0xe1c030b0*/
subs r2, r2, #1
@@ -292,7 +292,7 @@ ENTRY(isa_bs_wr_2)
teq r2, #0
moveq pc, lr
-Lisa_wr_2_loop:
+Lisa_wr_2_loop:
ldrh r3, [r1], #2 /*.word 0xe0d130b2*/
strh r3, [r0], #2
subs r2, r2, #1
Index: src/sys/arch/arm/footbridge/isa/isa_machdep.c
diff -u src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.23 src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.24
--- src/sys/arch/arm/footbridge/isa/isa_machdep.c:1.23 Fri Nov 20 18:03:53 2020
+++ src/sys/arch/arm/footbridge/isa/isa_machdep.c Fri Aug 13 11:40:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.23 2020/11/20 18:03:53 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.24 2021/08/13 11:40:43 skrll Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.23 2020/11/20 18:03:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.24 2021/08/13 11:40:43 skrll Exp $");
#include "opt_irqstats.h"
@@ -272,7 +272,7 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
for (i = 0; i < ICU_LEN; i++) {
if (LEGAL_IRQ(i) == 0 || (mask & (1<<i)) == 0)
continue;
-
+
iq = &isa_intrq[i];
switch(iq->iq_ist) {
case IST_NONE:
@@ -380,12 +380,12 @@ isa_intr_establish(isa_chipset_tag_t ic,
/* do not stop us */
oldirqstate = disable_interrupts(I32_bit);
-
+
TAILQ_INSERT_TAIL(&iq->iq_list, ih, ih_list);
intr_calculatemasks();
- restore_interrupts(oldirqstate);
-
+ restore_interrupts(oldirqstate);
+
return (ih);
}
@@ -399,7 +399,7 @@ isa_intr_disestablish(isa_chipset_tag_t
struct intrq *iq = &isa_intrq[ih->ih_irq];
int irq = ih->ih_irq;
u_int oldirqstate;
-
+
if (!LEGAL_IRQ(irq))
panic("intr_disestablish: bogus irq");
@@ -428,29 +428,29 @@ isa_intr_init(void)
{
struct intrq *iq;
int i;
-
- /*
+
+ /*
* should get the parent here, but initialisation order being so
* strange I need to check if it's available
*/
for (i = 0; i < ICU_LEN; i++) {
iq = &isa_intrq[i];
TAILQ_INIT(&iq->iq_list);
-
+
snprintf(iq->iq_name, sizeof(iq->iq_name), "irq %d", i);
evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
NULL, "isa", iq->iq_name);
}
-
+
isa_icu_init();
intr_calculatemasks();
/* something to break the build in an informative way */
-#ifndef ISA_FOOTBRIDGE_IRQ
+#ifndef ISA_FOOTBRIDGE_IRQ
#warning Before using isa with footbridge you must define ISA_FOOTBRIDGE_IRQ
#endif
footbridge_intr_claim(ISA_FOOTBRIDGE_IRQ, IPL_BIO, "isabus",
isa_irqdispatch, NULL);
-
+
}
/* Static array of ISA DMA segments. We only have one on CATS */
