Merge in Lite2: remove u_long cast from B_MAGICMASK and B_DEVMAGIC

cosmetic changes to comments and number formatting
Reviewed by:	davidg & bde
This commit is contained in:
Jeffrey Hsu 1996-03-11 02:09:55 +00:00
parent 0bf8ba0417
commit 1061e94f8b
1 changed files with 15 additions and 16 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1982, 1986, 1988, 1993
* Copyright (c) 1982, 1986, 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -30,28 +30,27 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)reboot.h 8.1 (Berkeley) 6/2/93
* $Id: reboot.h,v 1.9 1995/01/25 20:05:03 bde Exp $
* @(#)reboot.h 8.3 (Berkeley) 12/13/94
* $Id: reboot.h,v 1.11 1996/02/24 06:46:17 hsu Exp $
*/
#ifndef _SYS_REBOOT_H_
#define _SYS_REBOOT_H_
/*
* Arguments to reboot system call.
* These are passed to boot program in r11,
* and on to init.
* Arguments to reboot system call. These are passed to
* the boot program and on to init.
*/
#define RB_AUTOBOOT 0 /* flags for system auto-booting itself */
#define RB_ASKNAME 0x01 /* ask for file name to reboot from */
#define RB_SINGLE 0x02 /* reboot to single user only */
#define RB_NOSYNC 0x04 /* dont sync before reboot */
#define RB_HALT 0x08 /* don't reboot, just halt */
#define RB_INITNAME 0x10 /* name given for /etc/init (unused) */
#define RB_DFLTROOT 0x20 /* use compiled-in rootdev */
#define RB_KDB 0x40 /* give control to kernel debugger */
#define RB_RDONLY 0x80 /* mount root fs read-only */
#define RB_ASKNAME 0x001 /* ask for file name to reboot from */
#define RB_SINGLE 0x002 /* reboot to single user only */
#define RB_NOSYNC 0x004 /* dont sync before reboot */
#define RB_HALT 0x008 /* don't reboot, just halt */
#define RB_INITNAME 0x010 /* name given for /etc/init (unused) */
#define RB_DFLTROOT 0x020 /* use compiled-in rootdev */
#define RB_KDB 0x040 /* give control to kernel debugger */
#define RB_RDONLY 0x080 /* mount root fs read-only */
#define RB_DUMP 0x100 /* dump kernel memory before reboot */
#define RB_MINIROOT 0x200 /* mini-root present in memory at boot time */
#define RB_CONFIG 0x400 /* invoke user configuration routing */
@ -89,8 +88,8 @@
#define B_TYPEMASK 0xff
#define B_TYPE(val) (((val) >> B_TYPESHIFT) & B_TYPEMASK)
#define B_MAGICMASK ((u_long)0xf0000000)
#define B_DEVMAGIC ((u_long)0xa0000000)
#define B_MAGICMASK 0xf0000000
#define B_DEVMAGIC 0xa0000000
#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \