Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make kbd_iopen/kbd_iclose internal routines; introduce kbd_cc_{open,close}

Browse Source 
for opening and closing the device when attached to /dev/console.
This commit is contained in:
pk 2000-03-22 16:08:51 +00:00
parent 82d947ce4d
commit 4174ad4b3d
3 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sys/dev/sun/kbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd.c,v 1.23 2000/03/19 12:50:43 pk Exp $ */
/* $NetBSD: kbd.c,v 1.24 2000/03/22 16:08:51 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@ -86,12 +86,14 @@
*/
/* Prototypes */
static void kbd_new_layout(struct kbd_softc *k);
static void kbd_repeat(void *arg);
static void kbd_set_leds(struct kbd_softc *k, int leds);
static void kbd_update_leds(struct kbd_softc *k);
static void kbd_was_reset(struct kbd_softc *k);
static int kbd_drain_tx(struct kbd_softc *k);
static void kbd_new_layout __P((struct kbd_softc *));
static void kbd_repeat __P((void *));
static void kbd_set_leds __P((struct kbd_softc *, int));
static void kbd_update_leds __P((struct kbd_softc *));
static void kbd_was_reset __P((struct kbd_softc *));
static int kbd_drain_tx __P((struct kbd_softc *));
static int kbd_iopen __P((struct kbd_softc *));
static int kbd_iclose __P((struct kbd_softc *));
cdev_decl(kbd); /* open, close, read, write, ioctl, stop, ... */
@ -128,7 +130,7 @@ kbdopen(dev, flags, mode, p)
return (EBUSY);
k->k_events.ev_io = p;
if ((error = kbd_iopen(k->k_cc)) != 0) {
if ((error = kbd_iopen(k)) != 0) {
k->k_events.ev_io = NULL;
return (error);
}
@ -782,20 +784,37 @@ kbd_input_raw(k, c)
EV_WAKEUP(&k->k_events);
}
/****************************************************************
* misc...
****************************************************************/
/****************************************************************/
/*
* Initialization to be done at first open.
* This is called from kbdopen or kdopen (in kd.c)
* Called with user context.
* Open/close routines called upon opening /dev/console
* if we serve console input.
*/
int
kbd_iopen(cc)
kbd_cc_open(cc)
struct cons_channel *cc;
{
struct kbd_softc *k = (struct kbd_softc *)cc->cc_dev;
return (kbd_iopen(k));
}
int
kbd_cc_close(cc)
struct cons_channel *cc;
{
struct kbd_softc *k = (struct kbd_softc *)cc->cc_dev;
return (kbd_iclose(k));
}
/*
* Initialization to be done at first open.
* This is called from kbdopen() or kd_cc_open()
* Called with user context.
*/
int
kbd_iopen(k)
struct kbd_softc *k;
{
struct kbd_state *ks;
int error, s;
@ -859,8 +878,8 @@ out:
}
int
kbd_iclose(cc)
struct cons_channel *cc;
kbd_iclose(k)
struct kbd_softc *k;
{
/* For now: */ return (0);
}

6
sys/dev/sun/kbd_zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd_zs.c,v 1.2 2000/03/19 12:50:43 pk Exp $ */
/* $NetBSD: kbd_zs.c,v 1.3 2000/03/22 16:08:51 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@ -153,8 +153,8 @@ kbd_zs_attach(parent, self, aux)
return;
cc->cc_dev = self;
cc->cc_iopen = kbd_iopen;
cc->cc_iclose = kbd_iclose;
cc->cc_iopen = kbd_cc_open;
cc->cc_iclose = kbd_cc_close;
cc->cc_upstream = NULL;
cons_attach_input(cc);
k->k_cc = cc;

7
sys/dev/sun/kbdvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbdvar.h,v 1.2 2000/03/19 12:50:43 pk Exp $ */
/* $NetBSD: kbdvar.h,v 1.3 2000/03/22 16:08:51 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@ -147,6 +147,8 @@ struct kbd_softc {
void kbd_input_raw __P((struct kbd_softc *k, int));
void kbd_output(struct kbd_softc *k, int c);
void kbd_start_tx(struct kbd_softc *k);
int kbd_cc_open __P((struct cons_channel *));
int kbd_cc_close __P((struct cons_channel *));
/*
* kbd console input channel interface.
@ -166,6 +168,3 @@ struct cons_channel {
/* Special hook to attach the keyboard driver to the console */
void cons_attach_input __P((struct cons_channel *));
int kbd_iopen __P((struct cons_channel *));
int kbd_iclose __P((struct cons_channel *));