Convert to use pckbport infrastructure -- another file I missed on the first

pass.
This commit is contained in:
bjh21 2004-03-13 23:03:43 +00:00
parent 7b024ef69c
commit 759fb56651

View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbcvar.h,v 1.7 2003/12/12 14:30:16 martin Exp $ */
/* $NetBSD: pckbcvar.h,v 1.8 2004/03/13 23:03:43 bjh21 Exp $ */
/*
* Copyright (c) 1998
@ -37,6 +37,13 @@
#include <sys/callout.h>
#include <dev/pckbport/pckbportvar.h>
#include "rnd.h"
#if NRND > 0
#include <sys/rnd.h>
#endif
typedef void *pckbc_tag_t;
typedef int pckbc_slot_t;
#define PCKBC_KBD_SLOT 0
@ -56,6 +63,7 @@ struct pckbc_rbuf_item {
* needed early for console operation
*/
struct pckbc_internal {
pckbport_tag_t t_pt;
bus_space_tag_t t_iot;
bus_space_handle_t t_ioh_d, t_ioh_c; /* data port, cmd port */
bus_addr_t t_addr;
@ -82,10 +90,6 @@ struct pckbc_softc {
struct device sc_dv;
struct pckbc_internal *id;
pckbc_inputfcn inputhandler[PCKBC_NSLOTS];
void *inputarg[PCKBC_NSLOTS];
char *subname[PCKBC_NSLOTS];
void (*intr_establish) __P((struct pckbc_softc *, pckbc_slot_t));
};
@ -98,21 +102,11 @@ extern const char * const pckbc_slot_names[];
extern struct pckbc_internal pckbc_consdata;
extern int pckbc_console_attached;
void pckbc_set_inputhandler __P((pckbc_tag_t, pckbc_slot_t,
pckbc_inputfcn, void *, char *));
void pckbc_flush __P((pckbc_tag_t, pckbc_slot_t));
int pckbc_poll_cmd __P((pckbc_tag_t, pckbc_slot_t, u_char *, int,
int, u_char *, int));
int pckbc_enqueue_cmd __P((pckbc_tag_t, pckbc_slot_t, u_char *, int,
int, int, u_char *));
/* These functions are sometimes called by match routines */
int pckbc_send_cmd __P((bus_space_tag_t, bus_space_handle_t, u_char));
int pckbc_poll_data __P((pckbc_tag_t, pckbc_slot_t));
int pckbc_poll_data1 __P((pckbc_tag_t, pckbc_slot_t, int));
void pckbc_set_poll __P((pckbc_tag_t, pckbc_slot_t, int));
int pckbc_xt_translation __P((pckbc_tag_t, pckbc_slot_t, int));
void pckbc_slot_enable __P((pckbc_tag_t, pckbc_slot_t, int));
int pckbc_poll_data1 __P((void *, pckbc_slot_t));
/* More normal calls from attach routines */
void pckbc_attach __P((struct pckbc_softc *));
int pckbc_cnattach __P((bus_space_tag_t, bus_addr_t, bus_size_t,
pckbc_slot_t));