Sync with CSRG.

This commit is contained in:
mycroft 1994-12-13 15:01:22 +00:00
parent b066aea3d7
commit 361c17b43d
2 changed files with 23 additions and 24 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: queue.h,v 1.8 1994/08/30 03:01:30 mycroft Exp $ */ /* $NetBSD: queue.h,v 1.9 1994/12/13 15:04:28 mycroft Exp $ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)queue.h 8.4 (Berkeley) 1/4/94 * @(#)queue.h 8.5 (Berkeley) 8/20/94
*/ */
#ifndef _SYS_QUEUE_H_ #ifndef _SYS_QUEUE_H_
@ -45,16 +45,16 @@
* A list is headed by a single forward pointer (or an array of forward * A list is headed by a single forward pointer (or an array of forward
* pointers for a hash table header). The elements are doubly linked * pointers for a hash table header). The elements are doubly linked
* so that an arbitrary element can be removed without a need to * so that an arbitrary element can be removed without a need to
* traverse the list. New elements can be added to the list after * traverse the list. New elements can be added to the list before
* an existing element or at the head of the list. A list may only be * or after an existing element or at the head of the list. A list
* traversed in the forward direction. * may only be traversed in the forward direction.
* *
* A tail queue is headed by a pair of pointers, one to the head of the * A tail queue is headed by a pair of pointers, one to the head of the
* list and the other to the tail of the list. The elements are doubly * list and the other to the tail of the list. The elements are doubly
* linked so that an arbitrary element can be removed without a need to * linked so that an arbitrary element can be removed without a need to
* traverse the list. New elements can be added to the list after * traverse the list. New elements can be added to the list before or
* an existing element, at the head of the list, or at the end of the * after an existing element, at the head of the list, or at the end of
* list. A tail queue may only be traversed in the forward direction. * the list. A tail queue may only be traversed in the forward direction.
* *
* A circle queue is headed by a pair of pointers, one to the head of the * A circle queue is headed by a pair of pointers, one to the head of the
* list and the other to the tail of the list. The elements are doubly * list and the other to the tail of the list. The elements are doubly

View File

@ -1,7 +1,7 @@
/* $NetBSD: reboot.h,v 1.6 1994/06/29 06:45:01 cgd Exp $ */ /* $NetBSD: reboot.h,v 1.7 1994/12/13 15:01:22 mycroft Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1988, 1993 * Copyright (c) 1982, 1986, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -32,24 +32,23 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)reboot.h 8.1 (Berkeley) 6/2/93 * @(#)reboot.h 8.2 (Berkeley) 7/10/94
*/ */
/* /*
* Arguments to reboot system call. * Arguments to reboot system call. These are passed to boot program
* These are passed to boot program in r11, * in r11, and on to init.
* and on to init.
*/ */
#define RB_AUTOBOOT 0 /* flags for system auto-booting itself */ #define RB_AUTOBOOT 0 /* flags for system auto-booting itself */
#define RB_ASKNAME 0x01 /* ask for file name to reboot from */ #define RB_ASKNAME 0x001 /* ask for file name to reboot from */
#define RB_SINGLE 0x02 /* reboot to single user only */ #define RB_SINGLE 0x002 /* reboot to single user only */
#define RB_NOSYNC 0x04 /* dont sync before reboot */ #define RB_NOSYNC 0x004 /* dont sync before reboot */
#define RB_HALT 0x08 /* don't reboot, just halt */ #define RB_HALT 0x008 /* don't reboot, just halt */
#define RB_INITNAME 0x10 /* name given for /etc/init (unused) */ #define RB_INITNAME 0x010 /* name given for /etc/init (unused) */
#define RB_DFLTROOT 0x20 /* use compiled-in rootdev */ #define RB_DFLTROOT 0x020 /* use compiled-in rootdev */
#define RB_KDB 0x40 /* give control to kernel debugger */ #define RB_KDB 0x040 /* give control to kernel debugger */
#define RB_RDONLY 0x80 /* mount root fs read-only */ #define RB_RDONLY 0x080 /* mount root fs read-only */
#define RB_DUMP 0x100 /* dump kernel memory before reboot */ #define RB_DUMP 0x100 /* dump kernel memory before reboot */
#define RB_MINIROOT 0x200 /* mini-root present in memory at boot time */ #define RB_MINIROOT 0x200 /* mini-root present in memory at boot time */
@ -81,8 +80,8 @@
#define B_TYPEMASK 0xff #define B_TYPEMASK 0xff
#define B_TYPE(val) (((val) >> B_TYPESHIFT) & B_TYPEMASK) #define B_TYPE(val) (((val) >> B_TYPESHIFT) & B_TYPEMASK)
#define B_MAGICMASK ((u_long)0xf0000000) #define B_MAGICMASK 0xf0000000
#define B_DEVMAGIC ((u_long)0xa0000000) #define B_DEVMAGIC 0xa0000000
#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \ #define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \ (((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \