Module Name: src
Committed By: riastradh
Date: Mon Jan 13 16:23:48 UTC 2025
Modified Files:
src/sys/arch/mac68k/obio: asc.c ascaudio.c ascreg.h
Log Message:
mac68k/asc: Nix trailing whitespace.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mac68k/obio/asc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mac68k/obio/ascaudio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mac68k/obio/ascreg.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/mac68k/obio/asc.c
diff -u src/sys/arch/mac68k/obio/asc.c:1.58 src/sys/arch/mac68k/obio/asc.c:1.59
--- src/sys/arch/mac68k/obio/asc.c:1.58 Thu Oct 12 09:48:53 2017
+++ src/sys/arch/mac68k/obio/asc.c Mon Jan 13 16:23:48 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.58 2017/10/12 09:48:53 flxd Exp $ */
+/* $NetBSD: asc.c,v 1.59 2025/01/13 16:23:48 riastradh Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.58 2017/10/12 09:48:53 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.59 2025/01/13 16:23:48 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -307,7 +307,7 @@ ascmmap(dev_t dev, off_t off, int prot)
return (-1);
}
-static int
+static int
asc_ring_bell(void *arg, int freq, int length, int volume)
{
struct asc_softc *sc = (struct asc_softc *)arg;
@@ -356,7 +356,7 @@ asc_ring_bell(void *arg, int freq, int l
return (0);
}
-static void
+static void
asc_stop_bell(void *arg)
{
struct asc_softc *sc = (struct asc_softc *)arg;
@@ -385,7 +385,6 @@ asc_intr_enable(void)
splx(s);
}
-
/*ARGSUSED*/
static void
asc_intr(void *arg)
Index: src/sys/arch/mac68k/obio/ascaudio.c
diff -u src/sys/arch/mac68k/obio/ascaudio.c:1.3 src/sys/arch/mac68k/obio/ascaudio.c:1.4
--- src/sys/arch/mac68k/obio/ascaudio.c:1.3 Sun Jan 12 09:28:26 2025
+++ src/sys/arch/mac68k/obio/ascaudio.c Mon Jan 13 16:23:48 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ascaudio.c,v 1.3 2025/01/12 09:28:26 nat Exp $ */
+/* $NetBSD: ascaudio.c,v 1.4 2025/01/13 16:23:48 riastradh Exp $ */
/*-
* Copyright (c) 2017, 2023 Nathanial Sloss <[email protected]>
@@ -29,7 +29,7 @@
/* Based on pad(4) and asc(4) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ascaudio.c,v 1.3 2025/01/12 09:28:26 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ascaudio.c,v 1.4 2025/01/13 16:23:48 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -200,7 +200,7 @@ ascaudioattach(device_t parent, device_t
return;
}
- /* Pull in the options flags. */
+ /* Pull in the options flags. */
sc->sc_options = ((device_cfdata(self)->cf_flags) &
ASCAUDIO_OPTIONS_MASK);
@@ -280,7 +280,6 @@ ascaudioattach(device_t parent, device_t
aprint_error_dev(sc->sc_dev,
"couldn't establish power handler\n");
-
if (sc->sc_ver != EASC_VER && sc->sc_ver != EASC_VER2)
return;
@@ -291,7 +290,7 @@ ascaudioattach(device_t parent, device_t
bus_space_write_1(sc->sc_tag, sc->sc_handle, FIFOCTRLA, tmp);
bus_space_write_1(sc->sc_tag, sc->sc_handle, FIFOCTRLB, tmp);
-
+
}
int
@@ -377,7 +376,7 @@ ascaudio_query_format(void *opaque, stru
.frequency_type = 1,
.frequency = { 11025 }, }
};
-
+
return audio_query_format(asc_formats, ASCAUDIO_NFORMATS, ae);
}
@@ -408,7 +407,6 @@ ascaudio_start_output(void *opaque, void
sc->sc_pintr = intr;
sc->sc_pintrarg = intrarg;
-
loc = block;
if (bus_space_read_1(sc->sc_tag, sc->sc_handle, ASCMODE) !=
MODEFIFO) {
@@ -487,7 +485,6 @@ ascaudio_start_input(void *opaque, void
if (!sc)
return (ENODEV);
-
uint8_t *loc;
loc = block;
@@ -538,7 +535,7 @@ ascaudio_start_input(void *opaque, void
bus_space_read_1(sc->sc_tag, sc->sc_handle, FIFO_B);
}
#endif
-
+
return 0;
}
@@ -599,7 +596,6 @@ ascaudio_halt(void *opaque)
sc->sc_avail = 0;
sc->sc_recavail = 0;
-
bus_space_write_1(sc->sc_tag, sc->sc_handle, FIFOPARAM, CLEARFIFO);
sc->sc_rptr = sc->sc_recbuf;
@@ -887,7 +883,7 @@ more:
mutex_exit(&sc->sc_intr_lock);
}
-
+
static void
ascaudio_intr_enable(void)
{
Index: src/sys/arch/mac68k/obio/ascreg.h
diff -u src/sys/arch/mac68k/obio/ascreg.h:1.2 src/sys/arch/mac68k/obio/ascreg.h:1.3
--- src/sys/arch/mac68k/obio/ascreg.h:1.2 Sun Jan 12 09:28:26 2025
+++ src/sys/arch/mac68k/obio/ascreg.h Mon Jan 13 16:23:48 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: ascreg.h,v 1.2 2025/01/12 09:28:26 nat Exp $ */
+/* $NetBSD: ascreg.h,v 1.3 2025/01/13 16:23:48 riastradh Exp $ */
/*-
* Copyright (c) 2017, 2023 Nathanial Sloss <[email protected]>
@@ -39,7 +39,7 @@
#define VERLOC 0x800
-#define ASCMODE 0x801
+#define ASCMODE 0x801
#define MODESTOP 0
#define MODEFIFO 1
#define MODEWAVE 2 /* not in easc */
@@ -65,7 +65,7 @@
#define ASCRATE 0x807
#define MACFREQ 0 /* 22254 Hz */
#define F22KHZ 2 /* 22050 Hz */
-#define F44KHZ 3 /* 44100 Hz */
+#define F44KHZ 3 /* 44100 Hz */
#define APLAYREC 0x80a
#define RECORDA __BIT(0)
