Remove duplicate declarations of LKM functions and macros.
This commit is contained in:
mycroft
parent
8427290044
commit
fc3def4096
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.12 1996/07/11 03:47:58 cgd Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.13 1996/09/05 15:46:22 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -43,14 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev();
|
||||
#endif
|
||||
|
||||
bdev_decl(sw);
|
||||
#include "st.h"
|
||||
bdev_decl(st);
|
||||
@ -124,12 +116,6 @@ cdev_decl(cd);
|
||||
cdev_decl(ch);
|
||||
#include "scc.h"
|
||||
cdev_decl(scc);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
#include "audio.h"
|
||||
cdev_decl(audio);
|
||||
#include "wscons.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.36 1996/05/19 21:04:18 veego Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.37 1996/09/05 15:46:26 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -50,8 +50,6 @@
|
||||
#include <sys/bankeddev.h>
|
||||
#endif
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#include "vnd.h"
|
||||
#include "sd.h"
|
||||
#include "cd.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.9 1996/08/29 22:05:50 mark Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.10 1996/09/05 15:46:29 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Mark Brinicombe.
|
||||
@ -52,14 +52,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev();
|
||||
#endif
|
||||
|
||||
#include "wdc.h"
|
||||
bdev_decl(wd);
|
||||
bdev_decl(sw);
|
||||
@ -234,12 +226,6 @@ cdev_decl(ch);
|
||||
cdev_decl(uk);
|
||||
#include "ss.h"
|
||||
cdev_decl(ss);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
#include "tun.h"
|
||||
cdev_decl(tun);
|
||||
cdev_decl(vnd);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.14 1996/03/27 10:23:54 leo Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.15 1996/09/05 15:46:32 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -48,14 +48,6 @@
|
||||
#include <sys/bankeddev.h>
|
||||
#endif
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev();
|
||||
#endif
|
||||
|
||||
#define bdev_rd_init(c,n) { \
|
||||
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,strategy), \
|
||||
dev_init(c,n,ioctl), (dev_type_dump((*))) enxio, dev_size_init(c,n), 0 }
|
||||
@ -159,12 +151,6 @@ dev_decl(filedesc,open);
|
||||
cdev_decl(bpf);
|
||||
#include "tun.h"
|
||||
cdev_decl(tun);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
cdev_decl(lpt);
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.31 1996/03/14 21:26:28 christos Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.32 1996/09/05 15:46:34 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -43,14 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev();
|
||||
#endif
|
||||
|
||||
#include "ct.h"
|
||||
bdev_decl(ct);
|
||||
#include "mt.h"
|
||||
@ -145,12 +137,6 @@ dev_decl(filedesc,open);
|
||||
cdev_decl(bpf);
|
||||
#include "tun.h"
|
||||
cdev_decl(tun);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.76 1996/08/25 23:39:37 jtk Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.77 1996/09/05 15:46:37 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
|
||||
@ -37,12 +37,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev __P((void));
|
||||
#endif
|
||||
|
||||
#include "wdc.h"
|
||||
bdev_decl(wd);
|
||||
bdev_decl(sw);
|
||||
@ -110,12 +104,11 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
|
||||
0, seltrue, (dev_type_mmap((*))) enodev }
|
||||
|
||||
/* open, close, read, ioctl */
|
||||
#define cdev_ss_init(c,n) { \
|
||||
#define cdev_joy_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, 0, seltrue, \
|
||||
(dev_type_mmap((*))) enodev }
|
||||
#define cdev_joy_init cdev_ss_init
|
||||
|
||||
/* open, close, ioctl, select -- XXX should be a generic device */
|
||||
#define cdev_ocis_init(c,n) { \
|
||||
@ -162,12 +155,6 @@ dev_decl(filedesc,open);
|
||||
cdev_decl(bpf);
|
||||
#include "spkr.h"
|
||||
cdev_decl(spkr);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
#include "mms.h"
|
||||
cdev_decl(mms);
|
||||
#include "lms.h"
|
||||
@ -210,7 +197,7 @@ struct cdevsw cdevsw[] =
|
||||
cdev_lpt_init(NLPT,lpt), /* 16: parallel printer */
|
||||
cdev_ch_init(NCH,ch), /* 17: SCSI autochanger */
|
||||
cdev_disk_init(NCCD,ccd), /* 18: concatenated disk driver */
|
||||
cdev_ss_init(NSS,ss), /* 19: SCSI scanner */
|
||||
cdev_scanner_init(NSS,ss), /* 19: SCSI scanner */
|
||||
cdev_notdef(), /* 20 */
|
||||
cdev_apm_init(NAPM,apm), /* 21: Advancded Power Management */
|
||||
cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.34 1996/06/19 02:20:54 briggs Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.35 1996/09/05 15:46:40 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
@ -46,8 +46,6 @@
|
||||
#include <sys/vnode.h>
|
||||
#include <dev/cons.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
bdev_decl(sw);
|
||||
#include "st.h"
|
||||
bdev_decl(st);
|
||||
@ -65,12 +63,6 @@ bdev_decl(ccd);
|
||||
bdev_decl(rd);
|
||||
/* No cdev for rd */
|
||||
|
||||
#ifdef LKM
|
||||
int lkmenodev __P((void));
|
||||
#else
|
||||
#define lkmenodev enodev
|
||||
#endif
|
||||
|
||||
struct bdevsw bdevsw[] =
|
||||
{
|
||||
bdev_notdef(), /* 0 */
|
||||
@ -139,14 +131,6 @@ cdev_decl(bpf);
|
||||
cdev_decl(tun);
|
||||
dev_decl(filedesc,open);
|
||||
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
|
||||
cdev_decl(lkm);
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
{
|
||||
cdev_cn_init(1,cn), /* 0: virtual console */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.6 1996/05/20 01:16:50 chuck Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.7 1996/09/05 15:46:43 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -43,14 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifdef LKM
|
||||
int lkmenodev();
|
||||
#else
|
||||
#define lkmenodev enodev
|
||||
#endif
|
||||
|
||||
bdev_decl(sw);
|
||||
#include "sd.h"
|
||||
bdev_decl(sd);
|
||||
@ -121,12 +113,6 @@ cdev_decl(bpf);
|
||||
|
||||
#include "tun.h"
|
||||
cdev_decl(tun);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.27 1996/03/14 21:30:37 christos Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.28 1996/09/05 15:46:47 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -43,8 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#include "sd.h"
|
||||
bdev_decl(sd);
|
||||
bdev_decl(sw);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.4 1996/07/16 23:24:39 thorpej Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.5 1996/09/05 15:46:50 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
@ -47,8 +47,6 @@
|
||||
#include <sys/tty.h>
|
||||
#include <sys/conf.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
/*
|
||||
* Block devices.
|
||||
*/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.21 1996/03/14 21:31:56 christos Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.22 1996/09/05 15:46:53 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
@ -46,8 +46,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#include "vnd.h"
|
||||
bdev_decl(vnd);
|
||||
bdev_decl(sw);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.48 1996/03/14 21:35:47 christos Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.49 1996/09/05 15:46:56 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994 Adam Glass, Gordon W. Ross
|
||||
@ -44,8 +44,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#include "cd.h"
|
||||
bdev_decl(cd);
|
||||
cdev_decl(cd);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.23 1996/07/20 18:08:19 ragge Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.24 1996/09/05 15:46:59 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986 The Regents of the University of California.
|
||||
@ -43,12 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#endif
|
||||
|
||||
#include "hp.h" /* 0 */
|
||||
bdev_decl(hp);
|
||||
|
||||
@ -227,12 +221,6 @@ cdev_decl(pts);
|
||||
#define ptcioctl ptyioctl
|
||||
cdev_decl(ptc);
|
||||
cdev_decl(log);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
cdev_decl(lkm);
|
||||
|
||||
cdev_decl(hp);
|
||||
cdev_decl(rk);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.3 1996/05/20 14:56:20 oki Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.4 1996/09/05 15:47:02 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
@ -43,14 +43,6 @@
|
||||
#include <sys/conf.h>
|
||||
#include <sys/vnode.h>
|
||||
|
||||
int ttselect __P((dev_t, int, struct proc *));
|
||||
|
||||
#ifndef LKM
|
||||
#define lkmenodev enodev
|
||||
#else
|
||||
int lkmenodev();
|
||||
#endif
|
||||
|
||||
bdev_decl(sw);
|
||||
#include "fd.h"
|
||||
#define fdopen Fdopen /* conflicts with fdopen() in kern_descrip.c */
|
||||
@ -186,11 +178,6 @@ cdev_decl(sram);
|
||||
cdev_decl(bpf);
|
||||
#include "tun.h"
|
||||
cdev_decl(tun);
|
||||
#ifdef LKM
|
||||
#define NLKM 1
|
||||
#else
|
||||
#define NLKM 0
|
||||
#endif
|
||||
|
||||
#include "com.h"
|
||||
cdev_decl(com);
|
||||
@ -200,7 +187,6 @@ cdev_decl(zs);
|
||||
cdev_decl(pow);
|
||||
#include "bell.h"
|
||||
cdev_decl(bell);
|
||||
cdev_decl(lkm);
|
||||
|
||||
struct cdevsw cdevsw[] =
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.h,v 1.35 1996/09/02 06:44:54 mycroft Exp $ */
|
||||
/* $NetBSD: conf.h,v 1.36 1996/09/05 15:47:05 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
@ -126,10 +126,14 @@ extern struct bdevsw bdevsw[];
|
||||
dev_init(c,n,strategy), (dev_type_ioctl((*))) enodev, \
|
||||
(dev_type_dump((*))) enodev, 0 }
|
||||
|
||||
#ifdef LKM
|
||||
#define bdev_lkm_dummy() { \
|
||||
(dev_type_open((*))) lkmenodev, (dev_type_close((*))) enodev, \
|
||||
(dev_type_strategy((*))) enodev, (dev_type_ioctl((*))) enodev, \
|
||||
(dev_type_dump((*))) enodev, 0 }
|
||||
#else
|
||||
#define bdev_lkm_dummy(c,n) bdev_notdef(c,n)
|
||||
#endif
|
||||
|
||||
#define bdev_notdef() { \
|
||||
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
|
||||
@ -206,11 +210,15 @@ extern struct cdevsw cdevsw[];
|
||||
(dev_type_stop((*))) enodev, 0, dev_init(c,n,select), \
|
||||
(dev_type_mmap((*))) enodev }
|
||||
|
||||
#ifdef LKM
|
||||
#define cdev_lkm_dummy() { \
|
||||
(dev_type_open((*))) lkmenodev, (dev_type_close((*))) enodev, \
|
||||
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
|
||||
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
|
||||
0, seltrue, (dev_type_mmap((*))) enodev }
|
||||
#else
|
||||
#define cdev_lkm_dummy(c,n) cdev_notdef(c,n)
|
||||
#endif
|
||||
|
||||
#define cdev_notdef() { \
|
||||
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
|
||||
@ -356,7 +364,6 @@ cdev_decl(log);
|
||||
|
||||
#ifndef LKM
|
||||
# define NLKM 0
|
||||
# define lkmenodev enodev
|
||||
#else
|
||||
# define NLKM 1
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: systm.h,v 1.52 1996/08/16 01:23:46 jtc Exp $ */
|
||||
/* $NetBSD: systm.h,v 1.53 1996/09/05 15:47:07 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1988, 1991, 1993
|
||||
@ -126,7 +126,9 @@ int enoioctl __P((void));
|
||||
int enxio __P((void));
|
||||
int eopnotsupp __P((void));
|
||||
|
||||
#ifdef LKM
|
||||
int lkmenodev __P((void));
|
||||
#endif
|
||||
|
||||
int seltrue __P((dev_t dev, int which, struct proc *p));
|
||||
void *hashinit __P((int count, int type, u_long *hashmask));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user