[src/netbsd-1-6]: src/sys/arch/hp300/dev Pull up revision 1.49 (requested by ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d339f00928c1
branches:  netbsd-1-6
changeset: 528354:d339f00928c1
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Jul 07 07:24:59 2002 +0000

description:
Pull up revision 1.49 (requested by gmcgarry in ticket #439):
Fix console bell.

diffstat:

 sys/arch/hp300/dev/hil.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 67fba1087c66 -r d339f00928c1 sys/arch/hp300/dev/hil.c
--- a/sys/arch/hp300/dev/hil.c  Sat Jul 06 14:05:49 2002 +0000
+++ b/sys/arch/hp300/dev/hil.c  Sun Jul 07 07:24:59 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hil.c,v 1.48 2002/03/17 05:44:49 gmcgarry Exp $        */
+/*     $NetBSD: hil.c,v 1.48.6.1 2002/07/07 07:24:59 lukem Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.48 2002/03/17 05:44:49 gmcgarry Exp $");                                                  
+__KERNEL_RCSID(0, "$NetBSD: hil.c,v 1.48.6.1 2002/07/07 07:24:59 lukem Exp $");                                                  
 
 #include "opt_compat_hpux.h"
 #include "rnd.h"
@@ -1193,9 +1193,12 @@
        void  *v;
 {
        struct hil_softc *hilp = v;
-       struct hil_dev *hildevice = hilp->hl_addr;
+       struct hil_dev *hildevice = HILADDR;
        char db;
 
+       if (hilp != NULL)
+               hildevice = hilp->hl_addr;
+
        /* Set the autorepeat rate */
        db = ar_format(KBD_ARR);
        send_hil_cmd(hildevice, HIL_SETARR, &db, 1, NULL);
@@ -1300,7 +1303,7 @@
        HILWAIT(hilkbd_cn_device);
        WRITEHILCMD(hilkbd_cn_device, HIL_INTON);
 
-       hilkbd_cn_ops.arg = va;
+       hilkbd_cn_ops.arg = NULL;
        itekbdcnattach(&hilkbd_cn_ops, &hilkbd_cn_map);
 
        return (0);