From 3b2ba57709a39f158b0b6d493e48afca1b5f33d5 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Mon, 9 Jan 2006 19:13:41 +0000
Subject: Restore console bell functionnality lost in the wscons merge.

---
 sys/arch/mac68k/dev/akbd.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys/arch/mac68k/dev/akbd.c b/sys/arch/mac68k/dev/akbd.c
index cb4d8eb7a3f..372252e15ba 100644
--- a/sys/arch/mac68k/dev/akbd.c
+++ b/sys/arch/mac68k/dev/akbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbd.c,v 1.4 2006/01/08 17:45:29 miod Exp $	*/
+/*	$OpenBSD: akbd.c,v 1.5 2006/01/09 19:13:40 miod Exp $	*/
 /*	$NetBSD: akbd.c,v 1.17 2005/01/15 16:00:59 chs Exp $	*/
 
 /*
@@ -376,8 +376,7 @@ akbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case WSKBDIO_BELL:
 	case WSKBDIO_COMPLEXBELL:
 #define d ((struct wskbd_bell_data *)data)
-		mac68k_ring_bell(d->pitch, d->period * hz / 1000, 100);
-		/* comes in as msec, goes out as ticks; volume ignored */
+		mac68k_ring_bell(d->pitch, d->period * hz / 1000, d->volume);
 #undef d
 		return (0);
 
@@ -485,12 +484,14 @@ akbd_is_console(void)
 	return ((mac68k_machine.serial_console & 0x03) == 0);
 }
 
+void akbd_cnbell(void *, u_int, u_int, u_int);
 void akbd_cngetc(void *, u_int *, int *);
 void akbd_cnpollc(void *, int);
 
 struct wskbd_consops akbd_consops = {
 	akbd_cngetc,
 	akbd_cnpollc,
+	akbd_cnbell
 };
 
 int
@@ -543,3 +544,9 @@ void
 akbd_cnpollc(void *v, int on)
 {
 }
+
+void
+akbd_cnbell(void *v, u_int pitch, u_int period, u_int volume)
+{
+	mac68k_ring_bell(pitch, period * hz / 1000, volume);
+}
-- 
cgit v1.2.3