Module Name: src
Committed By: christos
Date: Sat Dec 10 22:36:28 UTC 2016
Modified Files:
src/sys/dev/wscons: wskbd.c
Log Message:
remove VAUDIOSPEAKER, needs to be done differently.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/dev/wscons/wskbd.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/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.137 src/sys/dev/wscons/wskbd.c:1.138
--- src/sys/dev/wscons/wskbd.c:1.137 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/wscons/wskbd.c Sat Dec 10 17:36:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.137 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: wskbd.c,v 1.138 2016/12/10 22:36:28 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.137 2016/12/08 11:31:08 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.138 2016/12/10 22:36:28 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -156,10 +156,6 @@ int wskbddebug = 0;
#include <dev/wscons/wsmuxvar.h>
-#ifdef VAUDIOSPEAKER
-#include <dev/spkrvar.h>
-#endif
-
struct wskbd_internal {
const struct wskbd_mapdata *t_keymap;
@@ -190,7 +186,7 @@ struct wskbd_softc {
int sc_ledstate;
int sc_isconsole;
-
+
struct wskbd_bell_data sc_bell_data;
struct wskbd_keyrepeat_data sc_keyrepeat_data;
#ifdef WSDISPLAY_SCROLLSUPPORT
@@ -1093,27 +1089,16 @@ wskbd_displayioctl(device_t dev, u_long
case WSKBDIO_BELL:
if ((flag & FWRITE) == 0)
return (EACCES);
-#ifndef VAUDIOSPEAKER
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
WSKBDIO_COMPLEXBELL, (void *)&sc->sc_bell_data, flag, l));
-#else
- wskbd_cnbell(0, sc->sc_bell_data.pitch, sc->sc_bell_data.period,
- sc->sc_bell_data.volume);
- return 0;
-#endif
case WSKBDIO_COMPLEXBELL:
if ((flag & FWRITE) == 0)
return (EACCES);
ubdp = (struct wskbd_bell_data *)data;
SETBELL(ubdp, ubdp, &sc->sc_bell_data);
-#ifndef VAUDIOSPEAKER
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
WSKBDIO_COMPLEXBELL, (void *)ubdp, flag, l));
-#else
- wskbd_cnbell(0, ubdp->pitch, ubdp->period, ubdp->volume);
- return 0;
-#endif
case WSKBDIO_SETBELL:
if ((flag & FWRITE) == 0)
@@ -1481,14 +1466,10 @@ wskbd_cnbell(dev_t dev, u_int pitch, u_i
if (!wskbd_console_initted)
return;
-#ifndef VAUDIOSPEAKER
if (wskbd_console_data.t_consops->bell != NULL)
(*wskbd_console_data.t_consops->bell)
(wskbd_console_data.t_consaccesscookie, pitch, period,
volume);
-#else
- speaker_play(pitch, period, volume);
-#endif
}
static inline void
