Use common version of cons.c.
This commit is contained in:
mycroft
parent
442a100145
commit
ea15b558a8
|
|
@ -1,9 +1,8 @@
|
|||
# $Id: files.hp300,v 1.8 1994/01/08 11:08:28 cgd Exp $
|
||||
# $Id: files.hp300,v 1.9 1994/02/06 00:44:26 mycroft Exp $
|
||||
#
|
||||
arch/hp300/hp300/autoconf.c standard
|
||||
arch/hp300/hp300/clock.c standard clock needs-count # XXX? split?
|
||||
arch/hp300/hp300/conf.c standard
|
||||
arch/hp300/hp300/cons.c standard
|
||||
arch/hp300/hp300/dkbad.c standard
|
||||
arch/hp300/hp300/kgdb_glue.c optional kgdb compile-with "${NORMAL_C} -fno-defer-pop"
|
||||
arch/hp300/hp300/kgdb_stub.c optional kgdb
|
||||
|
|
@ -33,6 +32,7 @@ arch/hp300/dev/hpib.c optional hpib device-driver
|
|||
arch/hp300/dev/nhpib.c optional hpib device-driver
|
||||
arch/hp300/dev/fhpib.c optional hpib device-driver
|
||||
arch/hp300/dev/rd.c optional rd device-driver
|
||||
arch/hp300/dev/rd_compat.c optional rd device-driver
|
||||
arch/hp300/dev/ct.c optional ct device-driver
|
||||
arch/hp300/dev/if_le.c optional le device-driver
|
||||
arch/hp300/dev/ppi.c optional ppi device-driver
|
||||
|
|
@ -47,4 +47,5 @@ arch/hp300/hpux/hpux_sig.c optional hpuxcompat
|
|||
arch/hp300/hpux/hpux_syscalls.c optional hpuxcompat
|
||||
arch/hp300/hpux/hpux_sysent.c optional hpuxcompat
|
||||
arch/hp300/hpux/hpux_tty.c optional hpuxcompat
|
||||
dev/cons.c standard
|
||||
thisisfor_in_proto.c optional hy
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
# $Id: files.hp300.oldconf,v 1.8 1994/01/08 11:08:28 cgd Exp $
|
||||
# $Id: files.hp300.oldconf,v 1.9 1994/02/06 00:44:26 mycroft Exp $
|
||||
#
|
||||
arch/hp300/hp300/autoconf.c standard
|
||||
arch/hp300/hp300/clock.c standard clock needs-count # XXX? split?
|
||||
arch/hp300/hp300/conf.c standard
|
||||
arch/hp300/hp300/cons.c standard
|
||||
arch/hp300/hp300/dkbad.c standard
|
||||
arch/hp300/hp300/kgdb_glue.c optional kgdb compile-with "${NORMAL_C} -fno-defer-pop"
|
||||
arch/hp300/hp300/kgdb_stub.c optional kgdb
|
||||
|
|
@ -33,6 +32,7 @@ arch/hp300/dev/hpib.c optional hpib device-driver
|
|||
arch/hp300/dev/nhpib.c optional hpib device-driver
|
||||
arch/hp300/dev/fhpib.c optional hpib device-driver
|
||||
arch/hp300/dev/rd.c optional rd device-driver
|
||||
arch/hp300/dev/rd_compat.c optional rd device-driver
|
||||
arch/hp300/dev/ct.c optional ct device-driver
|
||||
arch/hp300/dev/if_le.c optional le device-driver
|
||||
arch/hp300/dev/ppi.c optional ppi device-driver
|
||||
|
|
@ -47,4 +47,5 @@ arch/hp300/hpux/hpux_sig.c optional hpuxcompat
|
|||
arch/hp300/hpux/hpux_syscalls.c optional hpuxcompat
|
||||
arch/hp300/hpux/hpux_sysent.c optional hpuxcompat
|
||||
arch/hp300/hpux/hpux_tty.c optional hpuxcompat
|
||||
dev/cons.c standard
|
||||
thisisfor_in_proto.c optional hy
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)dca.c 7.12 (Berkeley) 6/27/91
|
||||
* $Id: dca.c,v 1.9 1993/08/29 13:46:31 deraadt Exp $
|
||||
* $Id: dca.c,v 1.10 1994/02/06 00:44:32 mycroft Exp $
|
||||
*/
|
||||
|
||||
#include "dca.h"
|
||||
|
|
@ -632,7 +632,7 @@ dcamctl(dev, bits, how)
|
|||
/*
|
||||
* Following are all routines needed for DCA to act as console
|
||||
*/
|
||||
#include "../hp300/cons.h"
|
||||
#include <dev/cons.h>
|
||||
|
||||
dcacnprobe(cp)
|
||||
struct consdev *cp;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
*
|
||||
* from: Utah Hdr: dcm.c 1.26 91/01/21
|
||||
* from: @(#)dcm.c 7.14 (Berkeley) 6/27/91
|
||||
* $Id: dcm.c,v 1.10 1994/01/30 18:31:04 mycroft Exp $
|
||||
* $Id: dcm.c,v 1.11 1994/02/06 00:44:34 mycroft Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -1135,7 +1135,7 @@ dcmsetischeme(brd, flags)
|
|||
/*
|
||||
* Following are all routines needed for DCM to act as console
|
||||
*/
|
||||
#include "../hp300/cons.h"
|
||||
#include <dev/cons.h>
|
||||
|
||||
dcmcnprobe(cp)
|
||||
struct consdev *cp;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
*
|
||||
* from: Utah Hdr: ite.c 1.1 90/07/09
|
||||
* from: @(#)ite.c 7.6 (Berkeley) 5/16/91
|
||||
* $Id: ite.c,v 1.15 1994/01/30 18:30:45 mycroft Exp $
|
||||
* $Id: ite.c,v 1.16 1994/02/06 00:44:36 mycroft Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -776,7 +776,7 @@ ite_clrtoeos(ip, sp)
|
|||
/*
|
||||
* Console functions
|
||||
*/
|
||||
#include "../hp300/cons.h"
|
||||
#include <dev/cons.h>
|
||||
#include "grfioctl.h"
|
||||
#include "grfvar.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -31,15 +31,15 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)conf.c 7.9 (Berkeley) 5/28/91
|
||||
* $Id: conf.c,v 1.4 1994/01/26 14:28:56 brezak Exp $
|
||||
* $Id: conf.c,v 1.5 1994/02/06 00:44:39 mycroft Exp $
|
||||
*/
|
||||
|
||||
#include "sys/param.h"
|
||||
#include "sys/systm.h"
|
||||
#include "sys/buf.h"
|
||||
#include "sys/ioctl.h"
|
||||
#include "sys/tty.h"
|
||||
#include "sys/conf.h"
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/tty.h>
|
||||
#include <sys/conf.h>
|
||||
|
||||
int rawread __P((dev_t, struct uio *, int));
|
||||
int rawwrite __P((dev_t, struct uio *, int));
|
||||
|
|
@ -125,7 +125,7 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
|
|||
dev_decl(n,open); dev_decl(n,close); dev_decl(n,read); \
|
||||
dev_decl(n,write); dev_decl(n,ioctl); dev_decl(n,stop); \
|
||||
dev_decl(n,reset); dev_decl(n,select); dev_decl(n,map); \
|
||||
dev_decl(n,strategy); extern struct tty __CONCAT(n,_tty)[]
|
||||
dev_decl(n,strategy); extern struct tty *__CONCAT(n,_tty)[]
|
||||
|
||||
#define dev_tty_init(c,n) (c > 0 ? __CONCAT(n,_tty) : 0)
|
||||
|
||||
|
|
@ -337,3 +337,49 @@ int mem_no = 2; /* major device number of memory special file */
|
|||
* provided as a character (raw) device.
|
||||
*/
|
||||
dev_t swapdev = makedev(3, 0);
|
||||
|
||||
/*
|
||||
* This entire table could be autoconfig()ed but that would mean that
|
||||
* the kernel's idea of the console would be out of sync with that of
|
||||
* the standalone boot. I think it best that they both use the same
|
||||
* known algorithm unless we see a pressing need otherwise.
|
||||
*/
|
||||
#include <dev/cons.h>
|
||||
|
||||
/* console-specific types */
|
||||
#if 0 /* XXX */
|
||||
#define dev_type_cnprobe(n) void n __P((struct consdev *))
|
||||
#define dev_type_cninit(n) void n __P((struct consdev *))
|
||||
#define dev_type_cngetc(n) int n __P((dev_t))
|
||||
#define dev_type_cnputc(n) void n __P((dev_t, int))
|
||||
#else
|
||||
#define dev_type_cnprobe(n) int n()
|
||||
#define dev_type_cninit(n) int n()
|
||||
#define dev_type_cngetc(n) int n()
|
||||
#define dev_type_cnputc(n) int n()
|
||||
#endif
|
||||
|
||||
#define cons_decl(n) \
|
||||
dev_decl(n,cnprobe); dev_decl(n,cninit); dev_decl(n,cngetc); \
|
||||
dev_decl(n,cnputc)
|
||||
|
||||
#define cons_init(n) { \
|
||||
dev_init(1,n,cnprobe), dev_init(1,n,cninit), dev_init(1,n,cngetc), \
|
||||
dev_init(1,n,cnputc) }
|
||||
|
||||
cons_decl(ite);
|
||||
cons_decl(dca);
|
||||
cons_decl(dcm);
|
||||
|
||||
struct consdev constab[] = {
|
||||
#if NITE > 0
|
||||
cons_init(ite),
|
||||
#endif
|
||||
#if NDCA > 0
|
||||
cons_init(dca),
|
||||
#endif
|
||||
#if NDCM > 0
|
||||
cons_init(dcm),
|
||||
#endif
|
||||
{ 0 },
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue