Update for conf.h.
This commit is contained in:
mycroft
parent
8f8bccf41f
commit
0a6d915b83
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.7 1995/01/25 04:48:13 cgd Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.8 1995/04/10 08:06:06 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
|
|
@ -48,53 +48,13 @@ int rawwrite __P((dev_t, struct uio *, int));
|
|||
void swstrategy __P((struct buf *));
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#define dev_type_open(n) int n __P((dev_t, int, int, struct proc *))
|
||||
#define dev_type_close(n) int n __P((dev_t, int, int, struct proc *))
|
||||
#define dev_type_strategy(n) void n __P((struct buf *))
|
||||
#define dev_type_ioctl(n) \
|
||||
int n __P((dev_t, int, caddr_t, int, struct proc *))
|
||||
|
||||
/* bdevsw-specific types */
|
||||
#define dev_type_dump(n) int n()
|
||||
#define dev_type_size(n) int n __P((dev_t))
|
||||
|
||||
#define dev_decl(n,t) __CONCAT(dev_type_,t)(__CONCAT(n,t))
|
||||
#define dev_init(c,n,t) \
|
||||
(c > 0 ? __CONCAT(n,t) : (__CONCAT(dev_type_,t)((*))) enxio)
|
||||
|
||||
/* bdevsw-specific initializations */
|
||||
#define dev_size_init(c,n) (c > 0 ? __CONCAT(n,size) : 0)
|
||||
|
||||
#define bdev_decl(n) \
|
||||
dev_decl(n,open); dev_decl(n,close); dev_decl(n,strategy); \
|
||||
dev_decl(n,ioctl); dev_decl(n,dump); dev_decl(n,size)
|
||||
|
||||
#define bdev_disk_init(c,n) { \
|
||||
dev_init(c,n,open), (dev_type_close((*))) nullop, \
|
||||
dev_init(c,n,strategy), dev_init(c,n,ioctl), \
|
||||
dev_init(c,n,dump), dev_size_init(c,n), 0 }
|
||||
|
||||
#define bdev_tape_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), \
|
||||
dev_init(c,n,strategy), dev_init(c,n,ioctl), \
|
||||
dev_init(c,n,dump), 0, B_TAPE }
|
||||
|
||||
#define bdev_swap_init() { \
|
||||
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
|
||||
swstrategy, (dev_type_ioctl((*))) enodev, \
|
||||
(dev_type_dump((*))) enodev, 0, 0 }
|
||||
|
||||
#define bdev_notdef() bdev_tape_init(0,no)
|
||||
bdev_decl(no); /* dummy declarations */
|
||||
|
||||
#include "sd.h"
|
||||
#include "wd.h"
|
||||
#include "id.h"
|
||||
#include "vnd.h"
|
||||
|
||||
bdev_decl(sd);
|
||||
#include "wd.h"
|
||||
bdev_decl(wd);
|
||||
#include "id.h"
|
||||
bdev_decl(id);
|
||||
#include "vnd.h"
|
||||
bdev_decl(vnd);
|
||||
|
||||
struct bdevsw bdevsw[] =
|
||||
|
|
@ -108,85 +68,19 @@ struct bdevsw bdevsw[] =
|
|||
bdev_disk_init(NVND,vnd), /* 6: vnode disk driver */
|
||||
bdev_notdef(), /* 7 */
|
||||
};
|
||||
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
|
||||
|
||||
int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
|
||||
|
||||
/* cdevsw-specific types */
|
||||
#define dev_type_read(n) int n __P((dev_t, struct uio *, int))
|
||||
#define dev_type_write(n) int n __P((dev_t, struct uio *, int))
|
||||
#define dev_type_stop(n) int n __P((struct tty *, int))
|
||||
#define dev_type_reset(n) int n __P((int))
|
||||
#define dev_type_select(n) int n __P((dev_t, int, struct proc *))
|
||||
#define dev_type_map(n) int n __P(())
|
||||
|
||||
#define cdev_decl(n) \
|
||||
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)[]
|
||||
|
||||
#define dev_tty_init(c,n) (c > 0 ? __CONCAT(n,_tty) : 0)
|
||||
|
||||
/* open, read, write, ioctl, strategy */
|
||||
#define cdev_disk_init(c,n) { \
|
||||
dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) nullop, 0, seltrue, (dev_type_map((*))) enodev, \
|
||||
dev_init(c,n,strategy) }
|
||||
|
||||
/* open, close, read, write, ioctl, strategy */
|
||||
#define cdev_tape_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), rawread, rawwrite, \
|
||||
dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) nullop, 0, seltrue, (dev_type_map((*))) enodev, \
|
||||
dev_init(c,n,strategy) }
|
||||
|
||||
/* open, close, read, write, ioctl, stop, tty */
|
||||
#define cdev_tty_init(c,n) { \
|
||||
/* open, close, read, write, ioctl, stop, tty, mmap */
|
||||
#define cdev_gsp_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
|
||||
(dev_type_reset((*))) nullop, dev_tty_init(c,n), ttselect, \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
#define cdev_notdef() { \
|
||||
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
|
||||
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
|
||||
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) nullop, 0, seltrue, \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
cdev_decl(no); /* dummy declarations */
|
||||
dev_init(c,n,map), 0 }
|
||||
|
||||
cdev_decl(cn);
|
||||
/* open, close, read, write, ioctl, select -- XXX should be a tty */
|
||||
#define cdev_cn_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
|
||||
(dev_type_reset((*))) nullop, 0, dev_init(c,n,select), \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
cdev_decl(ctty);
|
||||
/* open, read, write, ioctl, select -- XXX should be a tty */
|
||||
#define cdev_ctty_init(c,n) { \
|
||||
dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
|
||||
(dev_type_reset((*))) nullop, 0, dev_init(c,n,select), \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
dev_type_read(mmrw);
|
||||
/* read/write */
|
||||
#define cdev_mm_init(c,n) { \
|
||||
(dev_type_open((*))) nullop, (dev_type_close((*))) nullop, mmrw, \
|
||||
mmrw, (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \
|
||||
(dev_type_reset((*))) nullop, 0, seltrue, (dev_type_map((*))) enodev, 0 }
|
||||
|
||||
/* read, write, strategy */
|
||||
#define cdev_swap_init(c,n) { \
|
||||
(dev_type_open((*))) nullop, (dev_type_close((*))) nullop, rawread, \
|
||||
rawwrite, (dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) nullop, 0, (dev_type_select((*))) enodev, \
|
||||
(dev_type_map((*))) enodev, dev_init(c,n,strategy) }
|
||||
|
||||
#define mmread mmrw
|
||||
#define mmwrite mmrw
|
||||
#include "pty.h"
|
||||
#define pts_tty pt_tty
|
||||
#define ptsioctl ptyioctl
|
||||
|
|
@ -194,71 +88,18 @@ cdev_decl(pts);
|
|||
#define ptc_tty pt_tty
|
||||
#define ptcioctl ptyioctl
|
||||
cdev_decl(ptc);
|
||||
|
||||
/* open, close, read, write, ioctl, tty, select */
|
||||
#define cdev_ptc_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
|
||||
(dev_type_reset((*))) nullop, dev_tty_init(c,n), dev_init(c,n,select), \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
cdev_decl(log);
|
||||
/* open, close, read, ioctl, select -- XXX should be a generic device */
|
||||
#define cdev_log_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
|
||||
(dev_type_stop((*))) enodev, (dev_type_reset((*))) nullop, 0, \
|
||||
dev_init(c,n,select), (dev_type_map((*))) enodev, 0 }
|
||||
|
||||
cdev_decl(sd);
|
||||
cdev_decl(wd);
|
||||
cdev_decl(id);
|
||||
|
||||
/* open, close, ioctl, select, map -- XXX should be a map device */
|
||||
#define cdev_grf_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) nullop, \
|
||||
(dev_type_write((*))) nullop, dev_init(c,n,ioctl), \
|
||||
(dev_type_stop((*))) enodev, (dev_type_reset((*))) nullop, 0, \
|
||||
dev_init(c,n,select), dev_init(c,n,map), 0 }
|
||||
|
||||
#include "zs.h"
|
||||
cdev_decl(zs);
|
||||
|
||||
#include "gsp.h"
|
||||
cdev_decl(gsp);
|
||||
/* open, close, read, write, ioctl, stop, tty, map */
|
||||
#define cdev_gsp_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
|
||||
(dev_type_reset((*))) nullop, dev_tty_init(c,n), ttselect, \
|
||||
dev_init(c,n,map), 0 }
|
||||
|
||||
|
||||
cdev_decl(vnd);
|
||||
/* open, read, write, ioctl -- XXX should be a disk */
|
||||
#define cdev_vnd_init(c,n) { \
|
||||
dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) nullop, 0, seltrue, (dev_type_map((*))) enodev, \
|
||||
0 }
|
||||
|
||||
dev_type_open(fdopen);
|
||||
/* open */
|
||||
#define cdev_fd_init(c,n) { \
|
||||
dev_init(c,n,open), (dev_type_close((*))) enodev, \
|
||||
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
|
||||
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) enodev, 0, (dev_type_select((*))) enodev, \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
cdev_decl(fd);
|
||||
#include "bpfilter.h"
|
||||
cdev_decl(bpf);
|
||||
/* open, close, read, write, ioctl, select -- XXX should be generic device */
|
||||
#define cdev_bpf_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
|
||||
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
|
||||
(dev_type_reset((*))) enodev, 0, dev_init(c,n,select), \
|
||||
(dev_type_map((*))) enodev, 0 }
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
{
|
||||
|
|
@ -281,13 +122,12 @@ struct cdevsw cdevsw[] =
|
|||
cdev_notdef(), /* 16 */
|
||||
cdev_notdef(), /* 17: concatenated disk */
|
||||
cdev_notdef(), /* 18: mapped clock */
|
||||
cdev_vnd_init(NVND,vnd), /* 19: vnode disk */
|
||||
cdev_disk_init(NVND,vnd), /* 19: vnode disk */
|
||||
cdev_notdef(), /* 20: exabyte tape */
|
||||
cdev_fd_init(1,fd), /* 21: file descriptor pseudo-dev */
|
||||
cdev_bpf_init(NBPFILTER,bpf), /* 22: berkeley packet filter */
|
||||
cdev_bpftun_init(NBPFILTER,bpf),/* 22: berkeley packet filter */
|
||||
};
|
||||
|
||||
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
int mem_no = 2; /* major device number of memory special file */
|
||||
|
||||
|
|
@ -322,31 +162,6 @@ iszerodev(dev)
|
|||
return (major(dev) == mem_no && minor(dev) == 12);
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns true if dev is a disk device.
|
||||
*/
|
||||
isdisk(dev, type)
|
||||
dev_t dev;
|
||||
int type;
|
||||
{
|
||||
|
||||
/* XXXX This needs to be dynamic for LKMs. */
|
||||
switch (major(dev)) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 4:
|
||||
case 6:
|
||||
return (type == VBLK);
|
||||
case 8:
|
||||
case 9:
|
||||
case 10:
|
||||
case 19:
|
||||
return (type == VCHR);
|
||||
default:
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
static int chrtoblktbl[] = {
|
||||
/* XXXX This needs to be dynamic for LKMs. */
|
||||
/*VCHR*/ /*VBLK*/
|
||||
|
|
@ -399,27 +214,6 @@ chrtoblk(dev)
|
|||
*/
|
||||
#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(gsp);
|
||||
cons_decl(zs);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue