Al's double-blank-line removal request
This commit is contained in:
@@ -19,7 +19,6 @@
|
||||
#include <ansi.h>
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef NDEBUG
|
||||
/* Debugging disabled -- do not evaluate assertions. */
|
||||
#define assert(expr) ((void) 0)
|
||||
|
||||
@@ -112,5 +112,4 @@ extern int errno; /* place where the error numbers go */
|
||||
#define EBADREQUEST (_SIGN 107) /* destination cannot handle request */
|
||||
#define EDONTREPLY (_SIGN 201) /* pseudo-code: don't send a reply */
|
||||
|
||||
|
||||
#endif /* _ERRNO_H */
|
||||
|
||||
@@ -59,7 +59,6 @@ struct flock {
|
||||
pid_t l_pid; /* process id of the locks' owner */
|
||||
};
|
||||
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( int creat, (const char *_path, _mnx_Mode_t _mode) );
|
||||
_PROTOTYPE( int fcntl, (int _filedes, int _cmd, ...) );
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#ifndef _BIOS_H
|
||||
#define _BIOS_H
|
||||
|
||||
|
||||
/* PART I --
|
||||
* The BIOS interrupt vector table (IVT) area (1024 B as of address 0x0000).
|
||||
* Although this area holds 256 interrupt vectors (with jump addresses), some
|
||||
@@ -31,7 +30,6 @@
|
||||
#define BIOS_HD1_PARAMS_ADDR 0x0118 /* disk 1 parameters */
|
||||
#define BIOS_HD1_PARAMS_SIZE 4L
|
||||
|
||||
|
||||
/* PART I --
|
||||
* Addresses in the BIOS data area (256 B as of address 0x0400). The addresses
|
||||
* listed below are the most important ones, and the ones that are currently
|
||||
@@ -110,7 +108,6 @@
|
||||
#define VDU_VIDEO_MODE_ADDR 0x49A /* current video mode */
|
||||
#define VDU_VIDEO_MODE_SIZE 1L
|
||||
|
||||
|
||||
/* PART III --
|
||||
* The motherboard BIOS memory contains some known values that are currently
|
||||
* in use. Other sections in the upper memory area (UMA) addresses vary in
|
||||
@@ -124,6 +121,5 @@
|
||||
#define PS_386_MACHINE 0xF8 /* ID byte for PS/2 modela 70/80 */
|
||||
#define PC_AT_MACHINE 0xFC /* PC/AT, PC/XT286, PS/2 models 50/60 */
|
||||
|
||||
|
||||
#endif /* _BIOS_H */
|
||||
|
||||
|
||||
@@ -70,7 +70,6 @@ Dallas DS12887, compatible with the Motorola MC146818
|
||||
*/
|
||||
#define RTC_REG_C 0xC
|
||||
|
||||
|
||||
/* Contents of the general purpose CMOS RAM (source IBM reference manual) */
|
||||
#define CMOS_STATUS 0xE
|
||||
#define CS_LOST_POWER 0x80 /* Chip lost power */
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
#ifndef _IBM_CPU_H
|
||||
#define _IBM_CPU_H 1
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
/* Magic numbers for interrupt controller. */
|
||||
#define END_OF_INT 0x20 /* code used to re-enable after an interrupt */
|
||||
|
||||
|
||||
/* Interrupt vectors defined/reserved by processor. */
|
||||
#define DIVIDE_VECTOR 0 /* divide error */
|
||||
#define DEBUG_VECTOR 1 /* single step (trace) */
|
||||
@@ -50,7 +49,6 @@
|
||||
#define AT_WINI_0_IRQ 14 /* at winchester controller 0 */
|
||||
#define AT_WINI_1_IRQ 15 /* at winchester controller 1 */
|
||||
|
||||
|
||||
/* Interrupt number to hardware vector. */
|
||||
#define BIOS_VECTOR(irq) \
|
||||
(((irq) < 8 ? BIOS_IRQ0_VEC : BIOS_IRQ8_VEC) + ((irq) & 0x07))
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
* Created: March 2005, Jorrit N. Herder
|
||||
*/
|
||||
|
||||
|
||||
/* I/O-mapped peripherals. I/O addresses are different from memory addresses
|
||||
* due to the I/O signal on the ISA bus. Individual I/O ports are defined by
|
||||
* the drivers that use them or looked up with help of the BIOS.
|
||||
@@ -123,7 +122,6 @@
|
||||
#define BIOS_DATA_BEGIN 0x00400 /* BIOS data area */
|
||||
#define BIOS_DATA_END 0x004FF
|
||||
|
||||
|
||||
/* The base memory is followed by 384 KB reserved memory located at the top of
|
||||
* the first MB of physical memory. This memory is known as the upper memory
|
||||
* area (UMA). It is used for memory-mapped peripherals, such as video RAM,
|
||||
@@ -145,7 +143,6 @@
|
||||
#define UMA_COLOR_TEXT_BEGIN 0xB8000 /* color text */
|
||||
#define UMA_COLOR_TEXT_END 0xBFFFF
|
||||
|
||||
|
||||
/* o The next 128K (the memory range C0000-DFFFF) is reserved for the adapter
|
||||
* BIOS that resides in the ROM on some adapter boards. Most VGA-compatible
|
||||
* video adapters use the first 32 KB of this area for their on-board BIOS.
|
||||
@@ -159,7 +156,6 @@
|
||||
#define UMA_IDE_HD_BIOS_BEGIN 0xC8000 /* IDE hard disk */
|
||||
#define UMA_IDE_HD_BIOS_END 0xCBFFF
|
||||
|
||||
|
||||
/* o The last 128K of the upper memory area (E0000-FFFFF) is reserved for
|
||||
* motherboard BIOS (Basic I/O System). The POST (Power-On Self Test) and
|
||||
* bootstrap loader also reside in this space. The memory falls apart in
|
||||
@@ -172,5 +168,4 @@
|
||||
#define UMA_SYSTEM_BIOS_BEGIN 0xF0000 /* system BIOS */
|
||||
#define UMA_SYSTEM_BIOS_END 0xFFFFF
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -14,14 +14,12 @@ struct cd_play_mss
|
||||
u8_t end_mss[3];
|
||||
};
|
||||
|
||||
|
||||
struct cd_play_track
|
||||
{
|
||||
u8_t begin_track;
|
||||
u8_t end_track;
|
||||
};
|
||||
|
||||
|
||||
struct cd_disk_info
|
||||
{
|
||||
u8_t first_track;
|
||||
@@ -30,7 +28,6 @@ struct cd_disk_info
|
||||
u8_t first_track_mss[3];
|
||||
};
|
||||
|
||||
|
||||
struct cd_toc_entry
|
||||
{
|
||||
u8_t control_address;
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#define NONE 0x6ace /* used to indicate 'no process at all' */
|
||||
#define SELF 0x8ace /* used to indicate 'own process' */
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Process numbers of processes in the system image *
|
||||
*===========================================================================*/
|
||||
@@ -44,7 +43,6 @@
|
||||
/* Number of processes contained in the system image. */
|
||||
#define NR_BOOT_PROCS (NR_TASKS + INIT_PROC_NR + 1)
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Kernel notification types *
|
||||
*===========================================================================*/
|
||||
@@ -70,7 +68,6 @@
|
||||
#define NOTIFY_TIMESTAMP m2_l2
|
||||
#define NOTIFY_FLAGS m2_i1
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Messages for BLOCK and CHARACTER device drivers *
|
||||
*===========================================================================*/
|
||||
@@ -127,7 +124,6 @@
|
||||
#define TAPE_STAT0 m2_l1
|
||||
#define TAPE_STAT1 m2_l2
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Messages for networking layer *
|
||||
*===========================================================================*/
|
||||
@@ -177,7 +173,6 @@
|
||||
# define DL_MULTI_REQ 0x4
|
||||
# define DL_BROAD_REQ 0x8
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* SYSTASK request types and field names *
|
||||
*===========================================================================*/
|
||||
@@ -233,7 +228,6 @@
|
||||
#define MEM_TOT_SIZE m4_l3 /* total memory size */
|
||||
#define MEM_CHUNK_TAG m4_l4 /* tag to identify chunk of mem */
|
||||
|
||||
|
||||
/* Field names for SYS_DEVIO, SYS_VDEVIO, SYS_SDEVIO. */
|
||||
#define DIO_REQUEST m2_i3 /* device in or output */
|
||||
# define DIO_INPUT 0 /* input */
|
||||
@@ -379,7 +373,6 @@
|
||||
#define SEL_ERRORFDS m8_p3
|
||||
#define SEL_TIMEOUT m8_p4
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Messages for system management server *
|
||||
*===========================================================================*/
|
||||
@@ -398,7 +391,6 @@
|
||||
# define SRV_PRIV_ADDR m1_p3 /* privileges string */
|
||||
# define SRV_PRIV_LEN m1_i3 /* length of privileges */
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Miscellaneous messages used by TTY *
|
||||
*===========================================================================*/
|
||||
@@ -417,5 +409,4 @@
|
||||
# define DIAG_BUF_COUNT m1_i1
|
||||
# define DIAG_PROC_NR m1_i2
|
||||
|
||||
|
||||
#endif /* _MINIX_COM_H */
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#define OS_RELEASE "3"
|
||||
#define OS_VERSION "0.7"
|
||||
|
||||
|
||||
/* This file sets configuration parameters for the MINIX kernel, FS, and PM.
|
||||
* It is divided up into two main sections. The first section contains
|
||||
* user-settable parameters. In the second section, various internal system
|
||||
@@ -86,7 +85,6 @@
|
||||
#define NR_RS_LINES 4 /* # rs232 terminals (0 to 4) */
|
||||
#define NR_PTYS 32 /* # pseudo terminals (0 to 64) */
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* There are no user-settable parameters after this line *
|
||||
*===========================================================================*/
|
||||
|
||||
@@ -92,7 +92,6 @@
|
||||
#define hclick_to_physb(n) ((phys_bytes) (n) << HCLICK_SHIFT)
|
||||
#define physb_to_hclick(n) ((n) >> HCLICK_SHIFT)
|
||||
|
||||
|
||||
#define ABS -999 /* this process means absolute memory */
|
||||
|
||||
/* Flag bits for i_mode in the inode. */
|
||||
|
||||
@@ -25,7 +25,6 @@ extern struct dmap {
|
||||
int dmap_flags;
|
||||
} dmap[];
|
||||
|
||||
|
||||
/*===========================================================================*
|
||||
* Major and minor device numbers *
|
||||
*===========================================================================*/
|
||||
@@ -57,5 +56,4 @@ extern struct dmap {
|
||||
#define LOG_MAJOR 15 /* major device for log driver */
|
||||
# define IS_KLOG_DEV 0 /* minor device for /dev/klog */
|
||||
|
||||
|
||||
#endif /* _DMAP_H */
|
||||
|
||||
@@ -80,7 +80,6 @@ typedef struct {
|
||||
#define m8_p3 m_u.m_m8.m8p3
|
||||
#define m8_p4 m_u.m_m8.m8p4
|
||||
|
||||
|
||||
/*==========================================================================*
|
||||
* Minix run-time system (IPC). *
|
||||
*==========================================================================*/
|
||||
@@ -102,5 +101,4 @@ _PROTOTYPE( int send, (int dest, message *m_ptr) );
|
||||
_PROTOTYPE( int nb_receive, (int src, message *m_ptr) );
|
||||
_PROTOTYPE( int nb_send, (int dest, message *m_ptr) );
|
||||
|
||||
|
||||
#endif /* _IPC_H */
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#ifndef SOUND_H
|
||||
#define SOUND_H
|
||||
|
||||
|
||||
/* ------- Mixer stuff ------- */
|
||||
|
||||
/* Available devices */
|
||||
|
||||
@@ -146,6 +146,5 @@ _PROTOTYPE(int sys_out, (int port, unsigned long value, int type) );
|
||||
#define sys_inl(p,v) sys_in((p), (unsigned long*) (v), DIO_LONG)
|
||||
_PROTOTYPE(int sys_in, (int port, unsigned long *value, int type) );
|
||||
|
||||
|
||||
#endif /* _SYSLIB_H */
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
* Mar 31, 2004: setup like other libraries, such as syslib
|
||||
*/
|
||||
|
||||
|
||||
/*==========================================================================*
|
||||
* Miscellaneous helper functions.
|
||||
*==========================================================================*/
|
||||
|
||||
@@ -59,7 +59,6 @@ typedef struct {
|
||||
vir_bytes iov_size; /* sizeof an I/O buffer */
|
||||
} iovec_t;
|
||||
|
||||
|
||||
/* PM passes the address of a structure of this type to KERNEL when
|
||||
* sys_sendsig() is invoked as part of the signal catching mechanism.
|
||||
* The structure contain all the information that KERNEL needs to build
|
||||
|
||||
@@ -50,7 +50,6 @@ typedef struct dns_hdr
|
||||
#define DHF_UNUSED 0x30
|
||||
#define DHF_RCODE 0x0F
|
||||
|
||||
|
||||
/*
|
||||
Define constants based on rfc883
|
||||
*/
|
||||
|
||||
@@ -28,7 +28,6 @@ extern u32_t _tmp_l;
|
||||
#define BIG_ENDIAN 1
|
||||
#endif
|
||||
|
||||
|
||||
#if (LITTLE_ENDIAN) && (BIG_ENDIAN)
|
||||
#include "both LITTLE_ENDIAN and BIG_ENDIAN are defined"
|
||||
/* LITTLE_ENDIAN and BIG_ENDIAN are both defined */
|
||||
|
||||
@@ -19,7 +19,6 @@ struct passwd {
|
||||
char *pw_gecos; /* just in case you have a GE 645 around */
|
||||
};
|
||||
|
||||
|
||||
/* Function Prototypes. */
|
||||
_PROTOTYPE( struct passwd *getpwnam, (const char *_name) );
|
||||
_PROTOTYPE( struct passwd *getpwuid, (_mnx_Uid_t _uid) );
|
||||
|
||||
@@ -64,7 +64,6 @@ typedef unsigned long sigset_t;
|
||||
#define SIGTTIN 21 /* background process wants to read */
|
||||
#define SIGTTOU 22 /* background process wants to write */
|
||||
|
||||
|
||||
/* The sighandler_t type is not allowed unless _POSIX_SOURCE is defined. */
|
||||
typedef void _PROTOTYPE( (*__sighandler_t), (int) );
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#ifndef _STDARG_H
|
||||
#define _STDARG_H
|
||||
|
||||
|
||||
#ifdef __GNUC__
|
||||
/* The GNU C-compiler uses its own, but similar varargs mechanism. */
|
||||
|
||||
@@ -73,7 +72,6 @@ void va_end (va_list); /* Defined in libgcc.a */
|
||||
|
||||
#else /* not __GNUC__ */
|
||||
|
||||
|
||||
typedef char *va_list;
|
||||
|
||||
#define __vasz(x) ((sizeof(x)+sizeof(int)-1) & ~(sizeof(int) -1))
|
||||
@@ -84,7 +82,6 @@ typedef char *va_list;
|
||||
- __vasz(type))))
|
||||
#define va_end(ap)
|
||||
|
||||
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#endif /* _STDARG_H */
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
#ifndef _SYS_RESOURCE_H
|
||||
#define _SYS_RESOURCE_H
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
#ifndef _SYS_SELECT_H
|
||||
#define _SYS_SELECT_H 1
|
||||
|
||||
|
||||
@@ -116,7 +116,6 @@ struct termios {
|
||||
#define TCIOFF 3 /* transmit a STOP character on the line */
|
||||
#define TCION 4 /* transmit a START character on the line */
|
||||
|
||||
|
||||
/* Function Prototypes. */
|
||||
#ifndef _ANSI_H
|
||||
#include <ansi.h>
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#ifndef _TIMERS_H
|
||||
#define _TIMERS_H
|
||||
|
||||
|
||||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@@ -40,7 +39,6 @@ typedef struct timer
|
||||
#undef TMR_NEVER
|
||||
#define TMR_NEVER ((clock_t) LONG_MAX)
|
||||
|
||||
|
||||
/* These definitions can be used to set or get data from a timer variable. */
|
||||
#define tmr_arg(tp) (&(tp)->tmr_arg)
|
||||
#define tmr_exp_time(tp) (&(tp)->tmr_exp_time)
|
||||
@@ -61,7 +59,5 @@ _PROTOTYPE( void tmrs_exptimers, (timer_t **tmrs, clock_t now, clock_t *new_head
|
||||
_PROTOTYPE( clock_t tmrs_settimer, (timer_t **tmrs, timer_t *tp,
|
||||
clock_t exp_time, tmr_func_t watchdog, clock_t *new_head) );
|
||||
|
||||
|
||||
#endif /* _TIMERS_H */
|
||||
|
||||
|
||||
|
||||
@@ -121,4 +121,3 @@ _PROTOTYPE( void relocate, (void));
|
||||
_PROTOTYPE( int writesectors, (int _off, int _seg, off_t _adr, int _ct));
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#define BTMP "/usr/adm/btmp" /* the bad-login history file */
|
||||
#define UTMP "/etc/utmp" /* the user accouting file */
|
||||
|
||||
|
||||
struct utmp {
|
||||
char ut_user[8]; /* user name */
|
||||
char ut_id[4]; /* /etc/inittab ID */
|
||||
@@ -20,7 +19,6 @@ struct utmp {
|
||||
|
||||
#define ut_name ut_user /* for compatibility with other systems */
|
||||
|
||||
|
||||
/* Definitions for ut_type. */
|
||||
#define RUN_LVL 1 /* this is a RUN_LEVEL record */
|
||||
#define BOOT_TIME 2 /* this is a REBOOT record */
|
||||
|
||||
Reference in New Issue
Block a user