Module Name: src
Committed By: pgoyette
Date: Thu Dec 15 06:48:14 UTC 2016
Modified Files:
src/sys/dev: spkr_audio.c spkrvar.h
src/sys/dev/isa: spkr_pcppi.c
src/sys/modules: Makefile
src/sys/modules/spkr: Makefile spkr.ioconf
Log Message:
Create a single combined module for spkr_pcppi and spkr_audio, and
build it for all architectures.
By doing this, we can handle pcppi, audio, or both attachments with
non-built-in modules.
XXX Still to do: the module currently cannot be unloaded, and the
XXX spkr device(s) currently cannot be detached. (Really, two
XXX sides of the same problem.)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spkr_audio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/spkrvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/isa/spkr_pcppi.c
cvs rdiff -u -r1.187 -r1.188 src/sys/modules/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/spkr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/spkr/spkr.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spkr_audio.c
diff -u src/sys/dev/spkr_audio.c:1.1 src/sys/dev/spkr_audio.c:1.2
--- src/sys/dev/spkr_audio.c:1.1 Thu Dec 15 04:36:07 2016
+++ src/sys/dev/spkr_audio.c Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $ */
+/* $NetBSD: spkr_audio.c,v 1.2 2016/12/15 06:48:14 pgoyette Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.2 2016/12/15 06:48:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_audio.c
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/module.h>
#include <sys/uio.h>
#include <sys/proc.h>
#include <sys/ioctl.h>
@@ -77,14 +76,6 @@ struct spkr_audio_softc {
CFATTACH_DECL_NEW(spkr_audio, sizeof(struct spkr_audio_softc),
spkr_audio_probe, spkr_audio_attach, spkr_audio_detach, NULL);
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "audio" */);
-
-static int
-spkr_modcmd(modcmd_t cmd, void *arg)
-{
- return spkr__modcmd(cmd, arg);
-}
-
static void
spkr_audio_tone(device_t self, u_int xhz, u_int ticks)
{
Index: src/sys/dev/spkrvar.h
diff -u src/sys/dev/spkrvar.h:1.4 src/sys/dev/spkrvar.h:1.5
--- src/sys/dev/spkrvar.h:1.4 Tue Dec 13 20:20:34 2016
+++ src/sys/dev/spkrvar.h Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkrvar.h,v 1.4 2016/12/13 20:20:34 christos Exp $ */
+/* $NetBSD: spkrvar.h,v 1.5 2016/12/15 06:48:14 pgoyette Exp $ */
#ifndef _SYS_DEV_SPKRVAR_H
#define _SYS_DEV_SPKRVAR_H
@@ -20,7 +20,6 @@ struct spkr_softc {
void (*sc_rest)(device_t, int);
};
-int spkr__modcmd(modcmd_t, void *);
void spkr_attach(device_t,
void (*)(device_t, u_int, u_int), void (*)(device_t, int));
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.7 src/sys/dev/isa/spkr_pcppi.c:1.8
--- src/sys/dev/isa/spkr_pcppi.c:1.7 Wed Dec 14 22:30:42 2016
+++ src/sys/dev/isa/spkr_pcppi.c Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.8 2016/12/15 06:48:14 pgoyette Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.8 2016/12/15 06:48:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/module.h>
#include <sys/uio.h>
#include <sys/proc.h>
#include <sys/ioctl.h>
@@ -76,14 +75,6 @@ static int spkr_pcppi_detach(device_t, i
CFATTACH_DECL_NEW(spkr_pcppi, sizeof(struct spkr_pcppi_softc),
spkr_pcppi_probe, spkr_pcppi_attach, spkr_pcppi_detach, NULL);
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "pcppi" */);
-
-static int
-spkr_modcmd(modcmd_t cmd, void *arg)
-{
- return spkr__modcmd(cmd, arg);
-}
-
#define SPKRPRI (PZERO - 1)
/* emit tone of frequency hz for given number of ticks */
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.187 src/sys/modules/Makefile:1.188
--- src/sys/modules/Makefile:1.187 Thu Dec 15 04:37:00 2016
+++ src/sys/modules/Makefile Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.187 2016/12/15 04:37:00 christos Exp $
+# $NetBSD: Makefile,v 1.188 2016/12/15 06:48:14 pgoyette Exp $
.include <bsd.own.mk>
@@ -116,6 +116,7 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
+SUBDIR+= spkr
SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
@@ -365,7 +366,6 @@ SUBDIR+= auvitek
SUBDIR+= coram
SUBDIR+= cxdtv
SUBDIR+= emdtv
-SUBDIR+= spkr
.endif
.if (${MKISCSI} != "no")
Index: src/sys/modules/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.5 src/sys/modules/spkr/Makefile:1.6
--- src/sys/modules/spkr/Makefile:1.5 Fri Dec 9 06:12:03 2016
+++ src/sys/modules/spkr/Makefile Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/12/09 06:12:03 christos Exp $
+# $NetBSD: Makefile,v 1.6 2016/12/15 06:48:14 pgoyette Exp $
.include "../Makefile.inc"
@@ -8,6 +8,9 @@ KMOD= spkr
IOCONF= spkr.ioconf
SRCS= spkr.c spkr_pcppi.c
+.PATH: ${S}/dev
+SRCS+= spkr_audio.c audiobell.c
+
WARNS= 4
.include <bsd.kmodule.mk>
Index: src/sys/modules/spkr/spkr.ioconf
diff -u src/sys/modules/spkr/spkr.ioconf:1.3 src/sys/modules/spkr/spkr.ioconf:1.4
--- src/sys/modules/spkr/spkr.ioconf:1.3 Thu Dec 8 23:22:18 2016
+++ src/sys/modules/spkr/spkr.ioconf Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: spkr.ioconf,v 1.3 2016/12/08 23:22:18 nat Exp $
+# $NetBSD: spkr.ioconf,v 1.4 2016/12/15 06:48:14 pgoyette Exp $
ioconf spkr
@@ -6,5 +6,7 @@ include "conf/files"
include "dev/isa/files.isa"
pseudo-root pcppi*
-
spkr* at pcppi?
+
+pseudo-root audio*
+spkr* at audio?
