Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.4-lite, except for some prototypes in disk.h that would've caused trouble

This commit is contained in:
glass 1994-05-20 04:26:12 +00:00
parent 7e3eb8ad92
commit 1f7c6f8453
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/sys/device.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This software was developed by the Computer Systems Engineering group
* at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
@ -11,13 +11,41 @@
* This product includes software developed by the University of
* California, Lawrence Berkeley Laboratory.
*
* %sccs.include.redist.c%
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* %W% (Berkeley) %G%
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: $Header: /cvsroot/src/sys/sys/device.h,v 1.1 1993/08/13 13:20:07 glass Exp $ (LBL)
* from: @(#)device.h 8.2 (Berkeley) 2/17/94
* $Id: device.h,v 1.2 1994/05/20 04:26:12 glass Exp $
*/
#ifndef _SYS_DEVICE_H_
#define _SYS_DEVICE_H_
/*
* Minimal device structures.
* Note that all ``system'' device types are listed here.
@ -113,3 +141,5 @@ int config_found __P((struct device *, void *, cfprint_t));
int config_rootfound __P((char *, void *));
void config_attach __P((struct device *, struct cfdata *, void *, cfprint_t));
void evcnt_attach __P((struct device *, const char *, struct evcnt *));
#endif /* !_SYS_DEVICE_H_ */

9
sys/sys/disk.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 1992 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This software was developed by the Computer Systems Engineering group
* at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
@ -39,9 +39,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)disk.h 5.1 (Berkeley) 7/10/92
* from: @(#)disk.h 8.1 (Berkeley) 6/2/93
* $Id: disk.h,v 1.4 1994/05/20 04:26:14 glass Exp $
*
* from: $Header: /cvsroot/src/sys/sys/disk.h,v 1.3 1994/02/01 19:37:55 mycroft Exp $ (LBL)
* from: Header: disk.h,v 1.5 92/11/19 04:33:03 torek Exp (LBL)
*/
/*