add missing protos, clean up includes.
This commit is contained in:
chs
parent
89fab1629e
commit
ecdf1b4084
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.acorn26,v 1.2 2002/06/24 07:15:24 jdolecek Exp $
|
||||
# $NetBSD: Makefile.acorn26,v 1.3 2002/10/05 17:16:33 chs Exp $
|
||||
|
||||
# Makefile for NetBSD
|
||||
#
|
||||
@ -33,7 +33,6 @@ GENASSYM= ${ACORN26}/acorn26/genassym.cf
|
||||
##
|
||||
CPPFLAGS+= -Dacorn26
|
||||
CWARNFLAGS+= -Wcomment
|
||||
LOOSE_PROTOTYPES= yes
|
||||
# We'd like GCC to leave R14 alone as much as possible (so page faults in the
|
||||
# kernel are safer).
|
||||
CFLAGS+= -ffixed-r14
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.acorn32,v 1.14 2002/06/01 23:24:15 bjh21 Exp $
|
||||
# $NetBSD: Makefile.acorn32,v 1.15 2002/10/05 17:16:34 chs Exp $
|
||||
|
||||
# Makefile for NetBSD
|
||||
#
|
||||
@ -34,7 +34,6 @@ GENASSYM_EXTRAS+= ${ACORN32}/acorn32/genassym.cf
|
||||
##
|
||||
CPPFLAGS+= -Darm32
|
||||
CWARNFLAGS+= -Wcomment
|
||||
LOOSE_PROTOTYPES= yes
|
||||
AFLAGS+= -x assembler-with-cpp
|
||||
|
||||
##
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: amps.c,v 1.6 2002/10/02 03:31:59 thorpej Exp $ */
|
||||
/* $NetBSD: amps.c,v 1.7 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
@ -90,13 +90,15 @@ struct amps_softc {
|
||||
bus_space_tag_t sc_iot; /* Bus tag */
|
||||
};
|
||||
|
||||
int amps_probe __P((struct device *, struct cfdata *, void *));
|
||||
void amps_attach __P((struct device *, struct device *, void *));
|
||||
void amps_shutdown __P((void *arg));
|
||||
int amps_probe(struct device *, struct cfdata *, void *);
|
||||
void amps_attach(struct device *, struct device *, void *);
|
||||
|
||||
CFATTACH_DECL(amps, sizeof(struct amps_softc),
|
||||
amps_probe, amps_attach, NULL, NULL);
|
||||
|
||||
int amps_print(void *, const char *);
|
||||
void amps_shutdown(void *);
|
||||
|
||||
/*
|
||||
* Attach arguments for child devices.
|
||||
* Pass the podule details, the parent softc and the channel
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cosc.c,v 1.9 2002/10/02 03:31:59 thorpej Exp $ */
|
||||
/* $NetBSD: cosc.c,v 1.10 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Mark Brinicombe
|
||||
@ -59,26 +59,26 @@
|
||||
#include <acorn32/podulebus/coscvar.h>
|
||||
#include <dev/podulebus/podules.h>
|
||||
|
||||
void coscattach __P((struct device *, struct device *, void *));
|
||||
int coscmatch __P((struct device *, struct cfdata *, void *));
|
||||
void coscattach(struct device *, struct device *, void *);
|
||||
int coscmatch(struct device *, struct cfdata *, void *);
|
||||
|
||||
CFATTACH_DECL(cosc, sizeof(struct cosc_softc),
|
||||
coscmatch, coscattach, NULL, NULL);
|
||||
|
||||
int cosc_intr __P((void *arg));
|
||||
int cosc_setup_dma __P((struct esc_softc *sc, void *ptr, int len,
|
||||
int mode));
|
||||
int cosc_build_dma_chain __P((struct esc_softc *sc,
|
||||
struct esc_dma_chain *chain, void *p, int l));
|
||||
int cosc_need_bump __P((struct esc_softc *sc, void *ptr, int len));
|
||||
|
||||
void cosc_led __P((struct esc_softc *sc, int mode));
|
||||
int cosc_intr(void *);
|
||||
int cosc_setup_dma(struct esc_softc *, void *, int, int);
|
||||
int cosc_build_dma_chain(struct esc_softc *, struct esc_dma_chain *, void *,
|
||||
int);
|
||||
int cosc_need_bump(struct esc_softc *, void *, int);
|
||||
void cosc_led(struct esc_softc *, int);
|
||||
void cosc_set_dma_adr(struct esc_softc *, void *);
|
||||
void cosc_set_dma_tc(struct esc_softc *, unsigned int);
|
||||
void cosc_set_dma_mode(struct esc_softc *, int);
|
||||
|
||||
#if COSC_POLL > 0
|
||||
int cosc_poll = 1;
|
||||
#endif
|
||||
|
||||
|
||||
int
|
||||
coscmatch(pdp, cf, auxp)
|
||||
struct device *pdp;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: csc.c,v 1.8 2002/10/02 03:31:59 thorpej Exp $ */
|
||||
/* $NetBSD: csc.c,v 1.9 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
@ -47,8 +47,6 @@
|
||||
#include <dev/scsipi/scsi_all.h>
|
||||
#include <dev/scsipi/scsipi_all.h>
|
||||
#include <dev/scsipi/scsiconf.h>
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/io.h>
|
||||
#include <machine/intr.h>
|
||||
#include <machine/bootconfig.h>
|
||||
@ -60,19 +58,21 @@
|
||||
#include <dev/podulebus/podules.h>
|
||||
#include <dev/podulebus/powerromreg.h>
|
||||
|
||||
void cscattach __P((struct device *, struct device *, void *));
|
||||
int cscmatch __P((struct device *, struct cfdata *, void *));
|
||||
int cscmatch(struct device *, struct cfdata *, void *);
|
||||
void cscattach(struct device *, struct device *, void *);
|
||||
|
||||
CFATTACH_DECL(csc, sizeof(struct csc_softc),
|
||||
cscmatch, cscattach, NULL, NULL);
|
||||
|
||||
int csc_intr __P((void *arg));
|
||||
int csc_setup_dma __P((struct sfas_softc *sc, void *ptr, int len,
|
||||
int mode));
|
||||
int csc_build_dma_chain __P((struct sfas_softc *sc,
|
||||
struct sfas_dma_chain *chain, void *p, int l));
|
||||
int csc_need_bump __P((struct sfas_softc *sc, void *ptr, int len));
|
||||
void csc_led __P((struct sfas_softc *sc, int mode));
|
||||
int csc_intr(void *);
|
||||
int csc_setup_dma(void *, void *, int, int);
|
||||
int csc_build_dma_chain(void *, void *, void *, int);
|
||||
int csc_need_bump(void *, void *, int);
|
||||
void csc_led(void *, int);
|
||||
|
||||
void csc_set_dma_adr(struct sfas_softc *, void *);
|
||||
void csc_set_dma_tc(struct sfas_softc *, unsigned int);
|
||||
void csc_set_dma_mode(struct sfas_softc *, int);
|
||||
|
||||
/*
|
||||
* if we are a Cumana SCSI-2 card
|
||||
@ -267,20 +267,21 @@ csc_set_dma_mode(sc, mode)
|
||||
/* Initialize DMA for transfer */
|
||||
int
|
||||
csc_setup_dma(sc, ptr, len, mode)
|
||||
struct sfas_softc *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
int mode;
|
||||
void *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
int mode;
|
||||
{
|
||||
return(0);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Check if address and len is ok for DMA transfer */
|
||||
int
|
||||
csc_need_bump(sc, ptr, len)
|
||||
struct sfas_softc *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
void *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
{
|
||||
int p;
|
||||
|
||||
@ -299,20 +300,21 @@ csc_need_bump(sc, ptr, len)
|
||||
/* Interrupt driven routines */
|
||||
int
|
||||
csc_build_dma_chain(sc, chain, p, l)
|
||||
struct sfas_softc *sc;
|
||||
struct sfas_dma_chain *chain;
|
||||
void *p;
|
||||
int l;
|
||||
void *sc;
|
||||
void *chain;
|
||||
void *p;
|
||||
int l;
|
||||
{
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* Turn on/off led */
|
||||
void
|
||||
csc_led(sc, mode)
|
||||
struct sfas_softc *sc;
|
||||
int mode;
|
||||
csc_led(v, mode)
|
||||
void *v;
|
||||
int mode;
|
||||
{
|
||||
struct sfas_softc *sc = v;
|
||||
csc_regmap_p rp;
|
||||
|
||||
rp = (csc_regmap_p)sc->sc_fas;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: esc.c,v 1.8 2002/08/22 01:13:54 thorpej Exp $ */
|
||||
/* $NetBSD: esc.c,v 1.9 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Scott Stevens
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__RCSID("$NetBSD: esc.c,v 1.8 2002/08/22 01:13:54 thorpej Exp $");
|
||||
__RCSID("$NetBSD: esc.c,v 1.9 2002/10/05 17:16:34 chs Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
@ -876,7 +876,7 @@ esc_setup_nexus(dev, nexus, pendp, cbuf, clen, buf, len, mode)
|
||||
* reselection. Much nicer this way.
|
||||
*/
|
||||
if ((mode & ESC_SELECT_I) || (dev->sc_config_flags & ESC_NO_DMA)) {
|
||||
nexus->dma[0].ptr = (vm_offset_t)buf;
|
||||
nexus->dma[0].ptr = buf;
|
||||
nexus->dma[0].len = len;
|
||||
nexus->dma[0].flg = ESC_CHAIN_PRG;
|
||||
nexus->max_link = 1;
|
||||
@ -1229,10 +1229,11 @@ esc_midaction(dev, rp, nexus)
|
||||
dev->sc_len -= len-left;
|
||||
dev->sc_buf += len-left;
|
||||
|
||||
dev->sc_dma_buf += len-left;
|
||||
dev->sc_dma_len = left;
|
||||
dev->sc_dma_buf = (char *)dev->sc_dma_buf + len-left;
|
||||
dev->sc_dma_len = left;
|
||||
|
||||
dev->sc_dma_blk_ptr += len-left;
|
||||
dev->sc_dma_blk_ptr = (char *)dev->sc_dma_blk_ptr +
|
||||
len-left;
|
||||
dev->sc_dma_blk_len -= len-left;
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: escvar.h,v 1.2 2002/02/18 19:55:01 bjh21 Exp $ */
|
||||
/* $NetBSD: escvar.h,v 1.3 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Daniel Widenfalk
|
||||
@ -55,7 +55,7 @@
|
||||
* adress.
|
||||
*/
|
||||
struct esc_dma_chain {
|
||||
vm_offset_t ptr;
|
||||
void *ptr;
|
||||
u_short len;
|
||||
short flg;
|
||||
};
|
||||
@ -91,10 +91,10 @@ struct nexus {
|
||||
u_char *buf; /* Virtual adress of data */
|
||||
int len; /* Bytes left to transfer */
|
||||
|
||||
vm_offset_t dma_buf; /* Current DMA adress */
|
||||
void *dma_buf; /* Current DMA adress */
|
||||
int dma_len; /* Current DMA length */
|
||||
|
||||
vm_offset_t dma_blk_ptr; /* Current chain adress */
|
||||
void *dma_blk_ptr; /* Current chain adress */
|
||||
int dma_blk_len; /* Current chain length */
|
||||
u_char dma_blk_flg; /* Current chain flags */
|
||||
|
||||
@ -164,7 +164,7 @@ struct esc_softc {
|
||||
void *sc_spec; /* Board-specific data */
|
||||
|
||||
u_char *sc_bump_va; /* Bumpbuf virtual adr */
|
||||
vm_offset_t sc_bump_pa; /* Bumpbuf physical adr */
|
||||
void *sc_bump_pa; /* Bumpbuf physical adr */
|
||||
int sc_bump_sz; /* Bumpbuf size */
|
||||
|
||||
/* Configuration registers, must be set BEFORE escinitialize */
|
||||
@ -194,9 +194,9 @@ struct esc_softc {
|
||||
u_char *sc_buf; /* va */
|
||||
int sc_len;
|
||||
|
||||
vm_offset_t sc_dma_buf; /* pa */
|
||||
void *sc_dma_buf; /* pa */
|
||||
int sc_dma_len;
|
||||
vm_offset_t sc_dma_blk_ptr;
|
||||
void *sc_dma_blk_ptr;
|
||||
int sc_dma_blk_len;
|
||||
short sc_dma_blk_flg;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netslot.c,v 1.5 2002/06/19 23:27:48 bjh21 Exp $ */
|
||||
/* $NetBSD: netslot.c,v 1.6 2002/10/05 17:16:34 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1996 Mark Brinicombe.
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.5 2002/06/19 23:27:48 bjh21 Exp $");
|
||||
__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.6 2002/10/05 17:16:34 chs Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -47,7 +47,6 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.5 2002/06/19 23:27:48 bjh21 Exp $");
|
||||
#include <arm/arm32/katelib.h>
|
||||
#include <machine/intr.h>
|
||||
#include <machine/bootconfig.h>
|
||||
#include <machine/pmap.h>
|
||||
#include <arm/iomd/iomdreg.h>
|
||||
#include <arm/iomd/iomdvar.h>
|
||||
#include <dev/podulebus/podulebus.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ptsc.c,v 1.7 2002/10/02 03:31:59 thorpej Exp $ */
|
||||
/* $NetBSD: ptsc.c,v 1.8 2002/10/05 17:16:35 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Scott Stevens
|
||||
@ -52,8 +52,6 @@
|
||||
#include <dev/scsipi/scsi_all.h>
|
||||
#include <dev/scsipi/scsipi_all.h>
|
||||
#include <dev/scsipi/scsiconf.h>
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/io.h>
|
||||
#include <machine/intr.h>
|
||||
#include <machine/bootconfig.h>
|
||||
@ -65,19 +63,21 @@
|
||||
#include <dev/podulebus/podules.h>
|
||||
#include <dev/podulebus/powerromreg.h>
|
||||
|
||||
void ptscattach __P((struct device *, struct device *, void *));
|
||||
int ptscmatch __P((struct device *, struct cfdata *, void *));
|
||||
void ptscattach __P((struct device *, struct device *, void *));
|
||||
|
||||
CFATTACH_DECL(ptsc, sizeof(struct ptsc_softc),
|
||||
ptscmatch, ptscattach, NULL, NULL);
|
||||
|
||||
int ptsc_intr __P((void *arg));
|
||||
int ptsc_setup_dma __P((struct sfas_softc *sc, void *ptr, int len,
|
||||
int mode));
|
||||
int ptsc_build_dma_chain __P((struct sfas_softc *sc,
|
||||
struct sfas_dma_chain *chain, void *p, int l));
|
||||
int ptsc_need_bump __P((struct sfas_softc *sc, void *ptr, int len));
|
||||
void ptsc_led __P((struct sfas_softc *sc, int mode));
|
||||
int ptsc_intr(void *);
|
||||
int ptsc_setup_dma(void *, void *, int, int);
|
||||
int ptsc_build_dma_chain(void *, void *, void *, int);
|
||||
int ptsc_need_bump(void *, void *, int);
|
||||
void ptsc_led(void *, int);
|
||||
|
||||
void ptsc_set_dma_adr(struct sfas_softc *, void *);
|
||||
void ptsc_set_dma_tc(struct sfas_softc *, unsigned int);
|
||||
void ptsc_set_dma_mode(struct sfas_softc *, int);
|
||||
|
||||
/*
|
||||
* if we are a Power-tec SCSI-2 card
|
||||
@ -300,22 +300,22 @@ ptsc_set_dma_mode(sc, mode)
|
||||
|
||||
/* Initialize DMA for transfer */
|
||||
int
|
||||
ptsc_setup_dma(sc, ptr, len, mode)
|
||||
struct sfas_softc *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
int mode;
|
||||
ptsc_setup_dma(v, ptr, len, mode)
|
||||
void *v;
|
||||
void *ptr;
|
||||
int len;
|
||||
int mode;
|
||||
{
|
||||
return(0);
|
||||
|
||||
#if 0
|
||||
struct sfas_softc *sc = v;
|
||||
int retval;
|
||||
|
||||
retval = 0;
|
||||
|
||||
#if 0
|
||||
printf("ptsc_setup_dma(sc, ptr = 0x%08x, len = 0x%08x, mode = 0x%08x)\n", (u_int)ptr, len, mode);
|
||||
#endif
|
||||
return(0);
|
||||
|
||||
#if 0
|
||||
switch(mode) {
|
||||
case SFAS_DMA_READ:
|
||||
case SFAS_DMA_WRITE:
|
||||
@ -347,10 +347,10 @@ ptsc_setup_dma(sc, ptr, len, mode)
|
||||
|
||||
/* Check if address and len is ok for DMA transfer */
|
||||
int
|
||||
ptsc_need_bump(sc, ptr, len)
|
||||
struct sfas_softc *sc;
|
||||
void *ptr;
|
||||
int len;
|
||||
ptsc_need_bump(v, ptr, len)
|
||||
void *v;
|
||||
void *ptr;
|
||||
int len;
|
||||
{
|
||||
int p;
|
||||
|
||||
@ -368,11 +368,7 @@ ptsc_need_bump(sc, ptr, len)
|
||||
|
||||
/* Interrupt driven routines */
|
||||
int
|
||||
ptsc_build_dma_chain(sc, chain, p, l)
|
||||
struct sfas_softc *sc;
|
||||
struct sfas_dma_chain *chain;
|
||||
void *p;
|
||||
int l;
|
||||
ptsc_build_dma_chain(void *v1, void *v2, void *p, int l)
|
||||
{
|
||||
#if 0
|
||||
vm_offset_t pa, lastpa;
|
||||
@ -448,10 +444,9 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0)
|
||||
|
||||
/* Turn on/off led */
|
||||
void
|
||||
ptsc_led(sc, mode)
|
||||
struct sfas_softc *sc;
|
||||
int mode;
|
||||
ptsc_led(void *v, int mode)
|
||||
{
|
||||
struct sfas_softc *sc = v;
|
||||
ptsc_regmap_p rp;
|
||||
|
||||
rp = (ptsc_regmap_p)sc->sc_fas;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: sfas.c,v 1.7 2002/08/22 01:13:54 thorpej Exp $ */
|
||||
/* $NetBSD: sfas.c,v 1.8 2002/10/05 17:16:35 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Scott Stevens
|
||||
@ -70,22 +70,31 @@
|
||||
#include <acorn32/podulebus/sfasreg.h>
|
||||
#include <acorn32/podulebus/sfasvar.h>
|
||||
|
||||
void sfasinitialize __P((struct sfas_softc *));
|
||||
void sfas_minphys __P((struct buf *bp));
|
||||
void sfas_scsi_request __P((struct scsipi_channel *,
|
||||
scsipi_adapter_req_t, void *));
|
||||
void sfas_donextcmd __P((struct sfas_softc *dev, struct sfas_pending *pendp));
|
||||
void sfas_scsidone __P((struct sfas_softc *dev, struct scsipi_xfer *xs,
|
||||
int stat));
|
||||
void sfasintr __P((struct sfas_softc *dev));
|
||||
void sfasiwait __P((struct sfas_softc *dev));
|
||||
void sfas_ixfer __P((struct sfas_softc *dev, int polling));
|
||||
void sfasreset __P((struct sfas_softc *dev, int how));
|
||||
int sfasselect __P((struct sfas_softc *dev, struct sfas_pending *pendp,
|
||||
unsigned char *cbuf, int clen,
|
||||
unsigned char *buf, int len, int mode));
|
||||
void sfasicmd __P((struct sfas_softc *dev, struct sfas_pending *pendp));
|
||||
void sfasgo __P((struct sfas_softc *dev, struct sfas_pending *pendp));
|
||||
void sfas_minphys(struct buf *);
|
||||
void sfas_init_nexus(struct sfas_softc *, struct nexus *);
|
||||
void sfasinitialize(struct sfas_softc *);
|
||||
void sfas_scsi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *);
|
||||
void sfas_donextcmd(struct sfas_softc *, struct sfas_pending *);
|
||||
void sfas_scsidone(struct sfas_softc *, struct scsipi_xfer *, int);
|
||||
void sfasintr(struct sfas_softc *);
|
||||
void sfasiwait(struct sfas_softc *);
|
||||
void sfas_ixfer(void *, int);
|
||||
void sfasreset(struct sfas_softc *, int);
|
||||
int sfasselect(struct sfas_softc *, struct sfas_pending *, unsigned char *,
|
||||
int, unsigned char *, int, int);
|
||||
void sfasicmd(struct sfas_softc *, struct sfas_pending *);
|
||||
void sfasgo(struct sfas_softc *, struct sfas_pending *);
|
||||
void sfas_save_pointers(struct sfas_softc *);
|
||||
void sfas_restore_pointers(struct sfas_softc *);
|
||||
void sfas_build_sdtrm(struct sfas_softc *, int, int);
|
||||
int sfas_select_unit(struct sfas_softc *, short);
|
||||
struct nexus *sfas_arbitate_target(struct sfas_softc *, int);
|
||||
void sfas_setup_nexus(struct sfas_softc *, struct nexus *,
|
||||
struct sfas_pending *, unsigned char *, int,
|
||||
unsigned char *, int, int);
|
||||
int sfas_pretests(struct sfas_softc *, sfas_regmap_p);
|
||||
int sfas_midaction(struct sfas_softc *, sfas_regmap_p, struct nexus *);
|
||||
int sfas_postaction(struct sfas_softc *, sfas_regmap_p, struct nexus *);
|
||||
|
||||
/*
|
||||
* Initialize these to make 'em patchable. Defaults to enable sync and discon.
|
||||
@ -528,10 +537,11 @@ sfasiwait(dev)
|
||||
* rules that apply to sfasiwait also applies here.
|
||||
*/
|
||||
void
|
||||
sfas_ixfer(dev, polling)
|
||||
struct sfas_softc *dev;
|
||||
sfas_ixfer(v, polling)
|
||||
void *v;
|
||||
int polling;
|
||||
{
|
||||
struct sfas_softc *dev = v;
|
||||
sfas_regmap_p rp;
|
||||
u_char *buf;
|
||||
int len, mode, phase;
|
||||
@ -784,7 +794,7 @@ sfas_setup_nexus(dev, nexus, pendp, cbuf, clen, buf, len, mode)
|
||||
* reselection. Much nicer this way.
|
||||
*/
|
||||
if ((mode & SFAS_SELECT_I) || (dev->sc_config_flags & SFAS_NO_DMA)) {
|
||||
nexus->dma[0].ptr = (vm_offset_t)buf;
|
||||
nexus->dma[0].ptr = buf;
|
||||
nexus->dma[0].len = len;
|
||||
nexus->dma[0].flg = SFAS_CHAIN_PRG;
|
||||
nexus->max_link = 1;
|
||||
@ -1137,10 +1147,11 @@ sfas_midaction(dev, rp, nexus)
|
||||
dev->sc_len -= len-left;
|
||||
dev->sc_buf += len-left;
|
||||
|
||||
dev->sc_dma_buf += len-left;
|
||||
dev->sc_dma_len = left;
|
||||
dev->sc_dma_buf = (char *)dev->sc_dma_buf + len-left;
|
||||
dev->sc_dma_len = left;
|
||||
|
||||
dev->sc_dma_blk_ptr += len-left;
|
||||
dev->sc_dma_blk_ptr = (char *)dev->sc_dma_blk_ptr +
|
||||
len-left;
|
||||
dev->sc_dma_blk_len -= len-left;
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: sfasvar.h,v 1.1 2001/10/05 22:27:59 reinoud Exp $ */
|
||||
/* $NetBSD: sfasvar.h,v 1.2 2002/10/05 17:16:35 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Daniel Widenfalk
|
||||
@ -55,7 +55,7 @@
|
||||
* adress.
|
||||
*/
|
||||
struct sfas_dma_chain {
|
||||
vm_offset_t ptr;
|
||||
void *ptr;
|
||||
u_short len;
|
||||
short flg;
|
||||
};
|
||||
@ -91,10 +91,10 @@ struct nexus {
|
||||
u_char *buf; /* Virtual adress of data */
|
||||
int len; /* Bytes left to transfer */
|
||||
|
||||
vm_offset_t dma_buf; /* Current DMA adress */
|
||||
void *dma_buf; /* Current DMA adress */
|
||||
int dma_len; /* Current DMA length */
|
||||
|
||||
vm_offset_t dma_blk_ptr; /* Current chain adress */
|
||||
void *dma_blk_ptr; /* Current chain adress */
|
||||
int dma_blk_len; /* Current chain length */
|
||||
u_char dma_blk_flg; /* Current chain flags */
|
||||
|
||||
@ -164,7 +164,7 @@ struct sfas_softc {
|
||||
void *sc_spec; /* Board-specific data */
|
||||
|
||||
u_char *sc_bump_va; /* Bumpbuf virtual adr */
|
||||
vm_offset_t sc_bump_pa; /* Bumpbuf physical adr */
|
||||
void *sc_bump_pa; /* Bumpbuf physical adr */
|
||||
int sc_bump_sz; /* Bumpbuf size */
|
||||
|
||||
/* Configuration registers, must be set BEFORE sfasinitialize */
|
||||
@ -174,16 +174,17 @@ struct sfas_softc {
|
||||
u_char sc_config_flags;
|
||||
|
||||
/* Generic DMA functions */
|
||||
int (*sc_setup_dma)();
|
||||
int (*sc_build_dma_chain)();
|
||||
int (*sc_need_bump)();
|
||||
int (*sc_setup_dma)(void *, void *, int, int);
|
||||
int (*sc_build_dma_chain)(void *, void *, void *,
|
||||
int);
|
||||
int (*sc_need_bump)(void *, void *, int);
|
||||
|
||||
/* Optional replacement ixfer */
|
||||
void (*sc_ixfer)();
|
||||
void (*sc_ixfer)(void *, int);
|
||||
|
||||
/* Generic Led data */
|
||||
int sc_led_status;
|
||||
void (*sc_led)();
|
||||
void (*sc_led)(void *, int);
|
||||
|
||||
/* Nexus list */
|
||||
struct nexus sc_nexus[8];
|
||||
@ -194,9 +195,9 @@ struct sfas_softc {
|
||||
u_char *sc_buf; /* va */
|
||||
int sc_len;
|
||||
|
||||
vm_offset_t sc_dma_buf; /* pa */
|
||||
void *sc_dma_buf; /* pa */
|
||||
int sc_dma_len;
|
||||
vm_offset_t sc_dma_blk_ptr;
|
||||
void *sc_dma_blk_ptr;
|
||||
int sc_dma_blk_len;
|
||||
short sc_dma_blk_flg;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.arm,v 1.16 2002/01/31 09:53:33 chris Exp $
|
||||
# $NetBSD: Makefile.arm,v 1.17 2002/10/05 17:16:35 chs Exp $
|
||||
|
||||
# Makefile for NetBSD
|
||||
#
|
||||
@ -34,8 +34,6 @@ GENASSYM= ${ARM}/arm32/genassym.cf
|
||||
## (2) compile settings
|
||||
##
|
||||
CPPFLAGS+= -D${MACHINE}
|
||||
## only set if the md Makefile hasn't said otherwise
|
||||
LOOSE_PROTOTYPES?= yes
|
||||
AFLAGS+= -x assembler-with-cpp
|
||||
|
||||
##
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: console.c,v 1.7 2002/10/02 15:45:14 thorpej Exp $ */
|
||||
/* $NetBSD: console.c,v 1.8 2002/10/05 17:16:36 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1995 Melvyn Tang-Richardson
|
||||
@ -61,6 +61,7 @@
|
||||
#include <dev/cons.h>
|
||||
|
||||
#include <arm/iomd/vidc.h>
|
||||
#include <arm/iomd/console/console.h>
|
||||
#include <machine/vconsole.h>
|
||||
#include <arm/arm32/katelib.h>
|
||||
#include <machine/bootconfig.h>
|
||||
@ -101,12 +102,25 @@ static int want_switch=-1;
|
||||
* Prototypes
|
||||
*/
|
||||
|
||||
int physcon_switch __P((u_int /*number*/));
|
||||
void physconstart __P((struct tty */*tp*/));
|
||||
static struct vconsole *vconsole_spawn __P((dev_t , struct vconsole *));
|
||||
int physconparam __P((struct tty */*tp*/, struct termios */*t*/));
|
||||
int physcon_switchup __P((void));
|
||||
int physcon_switchdown __P((void));
|
||||
int physcon_switch(u_int);
|
||||
void physconstart(struct tty *);
|
||||
void physconinit(struct consdev *);
|
||||
int physconparam(struct tty *, struct termios *);
|
||||
int physcon_switchup(void);
|
||||
int physcon_switchdown(void);
|
||||
char physcongetchar(void);
|
||||
int physconkbd(int);
|
||||
|
||||
void rpcconsolecnprobe(struct consdev *);
|
||||
void rpcconsolecninit(struct consdev *);
|
||||
char rpcconsolecngetc(dev_t);
|
||||
void rpcconsolecnputc(dev_t, char);
|
||||
void rpcconsolecnpollc(dev_t, int);
|
||||
|
||||
struct vconsole *find_vc(dev_t);
|
||||
void vconsole_addcharmap(struct vconsole *);
|
||||
static struct vconsole *vconsole_spawn(dev_t, struct vconsole *);
|
||||
void console_flush(void);
|
||||
|
||||
/*
|
||||
* Exported variables
|
||||
@ -955,6 +969,8 @@ physconinit(cp)
|
||||
vconsole_master->PUTSTRING("\x0c", 1, vconsole_master);
|
||||
}
|
||||
|
||||
#if CHUQ
|
||||
|
||||
/*
|
||||
* void physconputstring(char *string, int length)
|
||||
*
|
||||
@ -969,6 +985,8 @@ physconputstring(string, length)
|
||||
vconsole_current->PUTSTRING(string, length, vconsole_current);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* void physcongetchar(void)
|
||||
*
|
||||
@ -1007,7 +1025,6 @@ rpcconsolecnprobe(cp)
|
||||
char rpc_buf[RPC_BUF_LEN];
|
||||
int rpc_buf_ptr = 0;
|
||||
static int cnpolling = 0;
|
||||
|
||||
#define RPC_BUF_FLUSH \
|
||||
{ \
|
||||
vconsole_current->PUTSTRING(rpc_buf, rpc_buf_ptr, vconsole_current); \
|
||||
@ -1021,6 +1038,7 @@ rpcconsolecninit(cp)
|
||||
physconinit(cp); /* woo Woo WOO!!!, woo, woo, yes ok bye */
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
rpcconsolecnputc(dev, character)
|
||||
dev_t dev;
|
||||
@ -1040,6 +1058,8 @@ void
|
||||
console_flush()
|
||||
RPC_BUF_FLUSH
|
||||
|
||||
#if CHUQ
|
||||
|
||||
int
|
||||
console_switchdown()
|
||||
{
|
||||
@ -1054,6 +1074,8 @@ console_switchup()
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int
|
||||
console_unblank()
|
||||
{
|
||||
@ -1088,12 +1110,16 @@ console_scrollforward ()
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if CHUQ
|
||||
|
||||
int
|
||||
console_switchlast()
|
||||
{
|
||||
return (physcon_switch(lastconsole));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int
|
||||
physcon_switchdown()
|
||||
{
|
||||
@ -1218,10 +1244,13 @@ rpcconsolecnpollc(dev, on)
|
||||
cnpolling = on;
|
||||
}
|
||||
|
||||
int rpcprobe(struct device *, struct cfdata *, void *);
|
||||
void rpcattach(struct device *, struct device *, void *);
|
||||
|
||||
int
|
||||
rpcprobe(parent, match, aux)
|
||||
struct device *parent;
|
||||
void *match;
|
||||
struct cfdata *match;
|
||||
void *aux;
|
||||
{
|
||||
return(1);
|
||||
@ -1241,13 +1270,6 @@ rpcattach(parent, self, aux)
|
||||
vconsole_master->R_ATTACH(vconsole_master, parent, self, aux);
|
||||
}
|
||||
|
||||
/*
|
||||
CFATTACH_DECL(rpc, sizeof(struct device),
|
||||
rpcprobe, rpcattach, NULL, NULL);
|
||||
|
||||
extern struct cfdriver rpc_cd;
|
||||
*/
|
||||
|
||||
CFATTACH_DECL(vt, sizeof(struct device),
|
||||
rpcprobe, rpcattach, NULL, NULL);
|
||||
|
||||
|
||||
9
sys/arch/arm/iomd/console/console.h
Normal file
9
sys/arch/arm/iomd/console/console.h
Normal file
@ -0,0 +1,9 @@
|
||||
/* $NetBSD: console.h,v 1.1 2002/10/05 17:16:36 chs Exp $ */
|
||||
|
||||
struct tty *find_tp(dev_t);
|
||||
struct vconsole *vconsole_spawn_re(dev_t, struct vconsole *);
|
||||
|
||||
void console_switch(u_int);
|
||||
int console_unblank(void);
|
||||
int console_scrollback(void);
|
||||
int console_scrollforward(void);
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: dumb.c,v 1.1 2001/10/05 22:27:45 reinoud Exp $ */
|
||||
/* $NetBSD: dumb.c,v 1.2 2002/10/05 17:16:36 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1995 Melvyn Tang-Richardson
|
||||
@ -52,6 +52,11 @@
|
||||
#define TERMTYPE_PUTSTRING dumb_putstring
|
||||
#define TERMTYPE_INIT dumb_init
|
||||
|
||||
int dumb_init(struct vconsole *);
|
||||
static void do_scrollup(struct vconsole *);
|
||||
static int do_render(char, struct vconsole *);
|
||||
int dumb_putstring(char *, int, struct vconsole *);
|
||||
|
||||
int
|
||||
TERMTYPE_INIT(vc)
|
||||
struct vconsole *vc;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vidcconsole.c,v 1.7 2002/10/02 15:45:14 thorpej Exp $ */
|
||||
/* $NetBSD: vidcconsole.c,v 1.8 2002/10/05 17:16:37 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Mark Brinicombe
|
||||
@ -62,13 +62,8 @@
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/param.h>
|
||||
/*#include <machine/katelib.h>*/
|
||||
/*#include <machine/cpu.h>*/
|
||||
/*#include <machine/bootconfig.h>*/
|
||||
/*#include <machine/iomd.h>*/
|
||||
/*#include <machine/intr.h>*/
|
||||
/*#include <machine/pmap.h>*/
|
||||
#include <arm/iomd/vidc.h>
|
||||
#include <arm/iomd/console/console.h>
|
||||
#include <machine/vconsole.h>
|
||||
|
||||
extern const struct cdevsw physcon_cdevsw;
|
||||
@ -76,7 +71,8 @@ extern struct vconsole *vconsole_default;
|
||||
extern videomemory_t videomemory;
|
||||
extern struct render_engine vidcrender;
|
||||
|
||||
struct vconsole *vconsole_spawn_re __P((dev_t dev, struct vconsole *vc));
|
||||
int vidcconsole_probe(struct device *, struct cfdata *, void *);
|
||||
void vidcconsole_attach(struct device *, struct device *, void *);
|
||||
|
||||
struct vidcconsole_softc {
|
||||
struct device device;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vidcrender.c,v 1.9 2002/09/27 15:35:47 provos Exp $ */
|
||||
/* $NetBSD: vidcrender.c,v 1.10 2002/10/05 17:16:37 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Mark Brinicombe
|
||||
@ -69,6 +69,7 @@
|
||||
#include <arm/iomd/iomdreg.h>
|
||||
#include <arm/iomd/iomdvar.h>
|
||||
#include <arm/iomd/vidc.h>
|
||||
#include <arm/iomd/console/console.h>
|
||||
#include <machine/vconsole.h>
|
||||
|
||||
#include <arm/iomd/console/fonts/font_normal.h>
|
||||
@ -132,21 +133,48 @@ int p_cursor_normal;
|
||||
int p_cursor_transparent;
|
||||
|
||||
/* Local function prototypes */
|
||||
static void vidcrender_cls __P((struct vconsole *vc));
|
||||
static int vidc_cursor_init __P((struct vconsole *vc));
|
||||
int vidcrender_cursorintr __P((void *arg));
|
||||
int vidcrender_flashintr __P((void *arg));
|
||||
static int vidcrender_textpalette __P((struct vconsole *vc));
|
||||
static void vidcrender_render __P((struct vconsole *vc, char c));
|
||||
static void vidcrender_mode __P((struct vconsole *vc, struct vidc_mode *mode));
|
||||
int vidcrender_flash __P((struct vconsole *vc, int flash));
|
||||
int vidcrender_cursorflash __P((struct vconsole *vc, int flash));
|
||||
int vidcrender_flash_go __P((struct vconsole *vc));
|
||||
int vidcrender_blank __P((struct vconsole *vc, int /*type*/));
|
||||
void vidcrender_putchar __P((dev_t dev, char c, struct vconsole *vc));
|
||||
extern int vidcrendermc_cls __P((unsigned char *, unsigned char *, int));
|
||||
static int vidcrender_coldinit(struct vconsole *);
|
||||
static void vidcrender_cls(struct vconsole *);
|
||||
static int vidc_cursor_init(struct vconsole *);
|
||||
int vidcrender_cursorintr(void *);
|
||||
int vidcrender_flashintr(void *);
|
||||
static int vidcrender_textpalette(struct vconsole *);
|
||||
static void vidcrender_render(struct vconsole *, char);
|
||||
static void vidcrender_mode(struct vconsole *, struct vidc_mode *);
|
||||
int vidcrender_init(struct vconsole *);
|
||||
int vidcrender_flash(struct vconsole *, int);
|
||||
int vidcrender_cursorflash(struct vconsole *, int);
|
||||
int vidcrender_flash_go(struct vconsole *);
|
||||
int vidcrender_blank(struct vconsole *, int);
|
||||
void vidcrender_reinit(void);
|
||||
void vidcrender_putchar(dev_t, char, struct vconsole *);
|
||||
int vidcrender_spawn(struct vconsole *);
|
||||
int vidcrender_redraw(struct vconsole *, int, int, int, int);
|
||||
int vidcrender_swapin(struct vconsole *);
|
||||
paddr_t vidcrender_mmap(struct vconsole *, off_t, int);
|
||||
void vidcrender_scrollup(struct vconsole *, int, int);
|
||||
void vidcrender_scrolldown(struct vconsole *, int, int);
|
||||
int vidcrender_scrollback(struct vconsole *);
|
||||
void vidcrender_update(struct vconsole *);
|
||||
int vidcrender_scrollforward(struct vconsole *);
|
||||
int vidcrender_scrollbackend(struct vconsole *);
|
||||
int vidcrender_clreos(struct vconsole *, int);
|
||||
int vidcrender_debugprint(struct vconsole *);
|
||||
static int vidcrender_cursorupdate(struct vconsole *);
|
||||
static int vidcrender_cursorflashrate(struct vconsole *, int);
|
||||
int vidcrender_setfgcol(struct vconsole *, int);
|
||||
int vidcrender_setbgcol(struct vconsole *, int);
|
||||
int vidcrender_sgr(struct vconsole *, int);
|
||||
int vidcrender_scrollregion(struct vconsole *, int, int);
|
||||
int vidcrender_ioctl(struct vconsole *, dev_t, int, caddr_t, int,
|
||||
struct proc *);
|
||||
int vidcrender_attach(struct vconsole *, struct device *,
|
||||
struct device *, void *);
|
||||
|
||||
struct vconsole *vconsole_spawn_re __P((dev_t dev, struct vconsole *vc));
|
||||
extern int vidcrendermc_cls(unsigned char *, unsigned char *, int);
|
||||
extern void vidcrendermc_render(unsigned char *, unsigned char *, int, int);
|
||||
|
||||
void physcon_display_base(u_int);
|
||||
|
||||
/*
|
||||
* This will be called while still in the mode that we were left
|
||||
@ -538,7 +566,7 @@ vidcrender_init(vc)
|
||||
}
|
||||
|
||||
void
|
||||
vidcrender_reinit()
|
||||
vidcrender_reinit(void)
|
||||
{
|
||||
vidcrender_coldinit(vconsole_current);
|
||||
vidcrender_mode(vconsole_current, vidc_currentmode);
|
||||
@ -715,9 +743,6 @@ vidcrender_mmap(vc, offset, nprot)
|
||||
return(arm_btop(((videomemory.vidm_pbase) + (offset))));
|
||||
}
|
||||
|
||||
extern void vidcrendermc_render __P(( unsigned char *addr, unsigned char *fontaddr,
|
||||
int fast_render, int xres ));
|
||||
|
||||
void
|
||||
vidcrender_render(vc, c)
|
||||
struct vconsole *vc;
|
||||
@ -1457,8 +1482,6 @@ vidcrender_blank(vc, type)
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern struct tty *find_tp __P((dev_t dev));
|
||||
|
||||
int vidcrender_ioctl ( struct vconsole *vc, dev_t dev, int cmd, caddr_t data,
|
||||
int flag, struct proc *p )
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vt220.c,v 1.1 2001/10/05 22:27:45 reinoud Exp $ */
|
||||
/* $NetBSD: vt220.c,v 1.2 2002/10/05 17:16:37 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1995 Melvyn Tang-Richardson
|
||||
@ -90,6 +90,8 @@ char console_proc[41]; /* Is this debugging ? */
|
||||
|
||||
extern struct vconsole *vconsole_master;
|
||||
|
||||
extern void sysbeep(int, int); /* XXX elsewhere ? */
|
||||
|
||||
static int default_beepstate = 0;
|
||||
|
||||
#define CDATA struct vt220_info *cdata = (struct vt220_info *)vc->data
|
||||
@ -97,14 +99,65 @@ static int default_beepstate = 0;
|
||||
struct vt220_info master_termdata_store;
|
||||
struct vt220_info *master_termdata = &master_termdata_store;
|
||||
|
||||
int do_render __P(( char /*c*/, struct vconsole */*vc*/ ));
|
||||
void do_render_noscroll __P(( char /*c*/, struct vconsole */*vc*/ ));
|
||||
void do_scrollcheck __P(( struct vconsole */*vc*/ ));
|
||||
void vt_ris __P((struct vconsole */*vc*/));
|
||||
int do_render(char, struct vconsole *);
|
||||
void do_render_noscroll(char, struct vconsole *);
|
||||
void do_scrollcheck(struct vconsole *);
|
||||
int mapped_cls(struct vconsole *);
|
||||
void do_scrollup(struct vconsole *);
|
||||
void do_scrolldown(struct vconsole *);
|
||||
void vt_ris(struct vconsole *);
|
||||
#if defined(DIAGNOSTIC) && NQMS > 0
|
||||
void qms_console_freeze __P((void)); /* XXX */
|
||||
void qms_console_freeze(void); /* XXX */
|
||||
#endif /* DIAGNOSTIC && NQMS */
|
||||
|
||||
void clr_params(struct vt220_info *);
|
||||
void respond(struct vconsole *);
|
||||
|
||||
int vt220_init(struct vconsole *);
|
||||
int vt220_putstring(char *, int, struct vconsole *);
|
||||
int vt220_swapin(struct vconsole *);
|
||||
int vt220_swapout(struct vconsole *);
|
||||
int vt220_sleep(struct vconsole *);
|
||||
int vt220_wake(struct vconsole *);
|
||||
int vt220_scrollback(struct vconsole *);
|
||||
int vt220_scrollforward(struct vconsole *);
|
||||
int vt220_scrollbackend(struct vconsole *);
|
||||
int vt220_debugprint(struct vconsole *);
|
||||
int vt220_modechange(struct vconsole *);
|
||||
int vt220_attach(struct vconsole *, struct device *, struct device *, void *);
|
||||
|
||||
void vt_curadr(struct vconsole *);
|
||||
void vt_reset_dec_priv_qm(struct vconsole *);
|
||||
void vt_sc(struct vconsole *);
|
||||
void vt_rc(struct vconsole *);
|
||||
void vt_clreol(struct vconsole *);
|
||||
void vt_ind(struct vconsole *);
|
||||
void vt_nel(struct vconsole *);
|
||||
void vt_ri(struct vconsole *);
|
||||
int vt_sel(struct vconsole *);
|
||||
void vt_cuu(struct vconsole *);
|
||||
void vt_cub(struct vconsole *);
|
||||
void vt_da(struct vconsole *);
|
||||
void vt_str(struct vconsole *);
|
||||
void vt_ris(struct vconsole *);
|
||||
void vt_cud(struct vconsole *);
|
||||
void vt_tst(struct vconsole *);
|
||||
void vt_il(struct vconsole *);
|
||||
void vt_ic(struct vconsole *);
|
||||
void vt_dch(struct vconsole *);
|
||||
void vt_dl(struct vconsole *);
|
||||
void vt_stbm(struct vconsole *);
|
||||
void vt_dsr(struct vconsole *);
|
||||
void vt_su(struct vconsole *);
|
||||
void vt_set_dec_priv_qm(struct vconsole *);
|
||||
void vt_keyappl(struct vconsole *);
|
||||
void vt_clrtab(struct vconsole *);
|
||||
void vt_cuf(struct vconsole *);
|
||||
void vt_sgr(struct vconsole *);
|
||||
void vt_clreos(struct vconsole *);
|
||||
void vt_set_ansi(struct vconsole *);
|
||||
void vt_reset_ansi(struct vconsole *);
|
||||
|
||||
void
|
||||
clr_params(cdata)
|
||||
struct vt220_info *cdata;
|
||||
@ -309,8 +362,6 @@ vt_curadr(vc)
|
||||
}
|
||||
}
|
||||
|
||||
extern void sysbeep __P((int pitch, int period)); /* XXX elsewhere ? */
|
||||
|
||||
void
|
||||
vt_reset_dec_priv_qm(vc)
|
||||
struct vconsole *vc;
|
||||
@ -1773,11 +1824,6 @@ TERMTYPE_PUTSTRING(string, length, vc)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
console_debug()
|
||||
{
|
||||
}
|
||||
|
||||
int
|
||||
vt220_swapin(vc)
|
||||
struct vconsole *vc;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kbd.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $ */
|
||||
/* $NetBSD: kbd.c,v 1.3 2002/10/05 17:16:35 chs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1997 Mark Brinicombe.
|
||||
@ -67,6 +67,7 @@
|
||||
#include <machine/bus.h>
|
||||
#include <machine/kbd.h>
|
||||
#include <arm/iomd/kbdvar.h>
|
||||
#include <arm/iomd/console/console.h>
|
||||
#include "vt.h"
|
||||
#include "kbd.h"
|
||||
|
||||
@ -141,12 +142,6 @@ void autorepeatstart __P((void *));
|
||||
void autorepeat __P((void *));
|
||||
|
||||
extern int physconkbd __P((int key));
|
||||
extern void console_switch __P((u_int number));
|
||||
/*extern int console_switchdown __P((void));
|
||||
extern int console_switchup __P((void));*/
|
||||
extern int console_unblank __P((void));
|
||||
extern int console_scrollback __P((void));
|
||||
extern int console_scrollforward __P((void));
|
||||
#ifdef PMAP_DEBUG
|
||||
extern void pmap_debug __P((int level));
|
||||
#endif
|
||||
@ -156,6 +151,7 @@ extern struct cfdriver kbd_cd;
|
||||
|
||||
dev_type_open(kbdopen);
|
||||
dev_type_close(kbdclose);
|
||||
dev_type_poll(kbdpoll);
|
||||
dev_type_read(kbdread);
|
||||
dev_type_ioctl(kbdioctl);
|
||||
|
||||
@ -959,6 +955,7 @@ kbddecodekey(sc, code)
|
||||
case 0x200:
|
||||
console_scrollback();
|
||||
break;
|
||||
#if CHUQ
|
||||
/*
|
||||
case 0x202:
|
||||
console_switchdown();
|
||||
@ -967,6 +964,7 @@ kbddecodekey(sc, code)
|
||||
console_switchup();
|
||||
break;
|
||||
*/
|
||||
#endif
|
||||
#endif
|
||||
case 0x204:
|
||||
--kbdautorepeat.ka_rate;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user