[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 53/68] Normalize whitespace
From: |
Marin Ramesa |
Subject: |
[PATCH 53/68] Normalize whitespace |
Date: |
Fri, 29 Nov 2013 22:54:18 +0100 |
Normalize whitespace.
---
chips/busses.c | 3 ---
ddb/db_access.c | 2 --
ddb/db_break.c | 1 -
ddb/db_break.h | 1 +
ddb/db_cond.c | 1 -
ddb/db_expr.h | 1 -
ddb/db_ext_symtab.c | 2 --
ddb/db_macro.c | 1 -
ddb/db_mp.c | 1 -
ddb/db_task_thread.c | 2 --
ddb/db_trap.c | 1 -
ddb/db_watch.c | 2 --
ddb/db_write_cmd.c | 2 --
ddb/nlist.h | 1 -
device/blkio.c | 3 +--
device/chario.c | 1 -
device/cirbuf.c | 2 --
device/cons.h | 2 ++
device/dev_name.c | 2 --
device/dev_pager.c | 1 -
device/device_init.c | 3 +--
device/kmsg.h | 2 --
i386/i386/cpu_number.h | 1 +
i386/i386/debug.h | 2 +-
i386/i386/eflags.h | 1 +
i386/i386/io_perm.h | 1 -
i386/i386/ktss.c | 1 +
i386/i386/ldt.c | 1 +
i386/i386/ldt.h | 2 +-
i386/i386/lock.h | 3 +--
i386/i386/machine_task.c | 5 -----
i386/i386/proc_reg.h | 1 +
i386/i386/setjmp.h | 1 +
i386/i386/trap.c | 3 ---
i386/i386/vm_param.h | 1 +
i386/i386/xen.h | 2 --
i386/i386at/autoconf.c | 2 --
i386/i386at/cons_conf.c | 1 +
i386/i386at/disk.h | 6 ------
i386/i386at/kd.c | 36 ----------------------------------
i386/i386at/kd.h | 4 ----
i386/i386at/kd_event.c | 9 ---------
i386/i386at/kd_mouse.c | 7 -------
i386/i386at/kdsoft.h | 4 ----
i386/i386at/model_dep.c | 2 --
i386/include/mach/i386/asm.h | 3 ---
i386/include/mach/i386/cthreads.h | 1 +
i386/include/mach/i386/disk.h | 3 ---
i386/include/mach/i386/exec/elf.h | 1 +
i386/include/mach/i386/multiboot.h | 4 +---
i386/include/mach/i386/thread_status.h | 2 +-
i386/include/mach/i386/trap.h | 1 -
i386/include/mach/sa/stdarg.h | 1 +
include/alloca.h | 1 +
include/device/disk_status.h | 1 -
include/device/net_status.h | 5 +----
include/device/tape_status.h | 4 ----
include/mach/boot.h | 5 ++---
include/mach/default_pager_types.h | 2 --
include/mach/error.h | 4 ----
include/mach/exec/a.out.h | 1 +
include/mach/exec/elf.h | 4 +---
include/mach/exec/exec.h | 1 -
include/mach/inline.h | 1 +
include/mach/machine.h | 1 -
include/mach/message.h | 8 +-------
include/mach/multiboot.h | 1 +
include/mach/pc_sample.h | 6 ------
include/mach/port.h | 1 -
include/mach/processor_info.h | 1 -
include/mach/profil.h | 12 ------------
include/mach/syscall_sw.h | 1 -
include/mach/vm_prot.h | 1 +
include/mach/vm_statistics.h | 1 +
include/mach_debug/ipc_info.h | 3 ---
include/mach_debug/pc_info.h | 1 -
include/mach_debug/vm_info.h | 2 --
include/sys/reboot.h | 1 +
include/sys/types.h | 1 +
ipc/ipc_entry.c | 2 --
ipc/ipc_entry.h | 2 --
ipc/ipc_hash.c | 2 --
ipc/ipc_init.c | 2 --
ipc/ipc_kmsg_queue.h | 3 +++
ipc/ipc_marequest.c | 4 ----
ipc/ipc_object.c | 3 ---
ipc/ipc_port.c | 1 -
ipc/ipc_space.c | 2 --
ipc/ipc_thread.h | 1 -
ipc/mach_debug.c | 2 --
ipc/mach_port.c | 4 ++--
ipc/port.h | 1 -
kern/act.h | 22 ++-------------------
kern/ast.c | 1 -
kern/boot_script.c | 1 -
kern/boot_script.h | 3 ---
kern/bootstrap.c | 5 -----
kern/counters.c | 1 +
kern/debug.h | 1 +
kern/ipc_host.c | 2 --
kern/ipc_sched.c | 2 --
kern/ipc_tt.c | 2 --
kern/lock.c | 1 -
kern/lock.h | 1 -
kern/lock_mon.c | 4 ----
kern/mach_clock.h | 3 +--
kern/machine.c | 2 --
kern/pc_sample.h | 1 +
kern/printf.c | 1 -
kern/priority.c | 2 --
kern/processor.c | 1 -
kern/processor.h | 1 -
kern/queue.c | 2 --
kern/shuttle.h | 8 --------
kern/syscall_emulation.c | 3 ---
kern/thread_swap.c | 2 --
vm/memory_object.c | 1 -
vm/memory_object_proxy.c | 4 ----
vm/pmap.h | 3 ---
vm/vm_external.c | 2 --
vm/vm_external.h | 1 -
vm/vm_fault.c | 10 ----------
vm/vm_kern.c | 2 --
vm/vm_map.c | 3 ---
vm/vm_page.h | 2 --
vm/vm_pageout.c | 2 --
vm/vm_resident.c | 3 ---
vm/vm_types.h | 1 -
vm/vm_user.c | 3 ---
129 files changed, 45 insertions(+), 312 deletions(-)
diff --git a/chips/busses.c b/chips/busses.c
index f9f6f1b..9c46320 100644
--- a/chips/busses.c
+++ b/chips/busses.c
@@ -42,9 +42,6 @@
#include <mach/std_types.h>
#include <chips/busses.h>
-
-
-
/*
* configure_bus_master
*
diff --git a/ddb/db_access.c b/ddb/db_access.c
index 4df9831..308f168 100644
--- a/ddb/db_access.c
+++ b/ddb/db_access.c
@@ -37,8 +37,6 @@
#include <kern/task.h>
#include <ddb/db_access.h>
-
-
/*
* Access unaligned data items on aligned (longword)
* boundaries.
diff --git a/ddb/db_break.c b/ddb/db_break.c
index 0491be7..7e819b1 100644
--- a/ddb/db_break.c
+++ b/ddb/db_break.c
@@ -30,7 +30,6 @@
#if MACH_KDB
-
/*
* Breakpoints.
*/
diff --git a/ddb/db_break.h b/ddb/db_break.h
index 89e7889..ad153c3 100644
--- a/ddb/db_break.h
+++ b/ddb/db_break.h
@@ -27,6 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
+
#ifndef _DDB_DB_BREAK_H_
#define _DDB_DB_BREAK_H_
diff --git a/ddb/db_cond.c b/ddb/db_cond.c
index 82ec0d6..9d730e4 100644
--- a/ddb/db_cond.c
+++ b/ddb/db_cond.c
@@ -38,7 +38,6 @@
#include <kern/debug.h>
-
#define DB_MAX_COND 10 /* maximum conditions to be set */
int db_ncond_free = DB_MAX_COND; /* free condition */
diff --git a/ddb/db_expr.h b/ddb/db_expr.h
index 989b66b..dead2a6 100644
--- a/ddb/db_expr.h
+++ b/ddb/db_expr.h
@@ -12,7 +12,6 @@
#include <mach/boolean.h>
#include <machine/db_machdep.h>
-
/* Prototypes for functions exported by this module.
*/
diff --git a/ddb/db_ext_symtab.c b/ddb/db_ext_symtab.c
index 9831a01..0d867e3 100644
--- a/ddb/db_ext_symtab.c
+++ b/ddb/db_ext_symtab.c
@@ -38,8 +38,6 @@
#include <kern/task.h>
#include <ddb/db_sym.h>
-
-
/*
* Loads a symbol table for an external file into the kernel debugger.
* The symbol table data is an array of characters. It is assumed that
diff --git a/ddb/db_macro.c b/ddb/db_macro.c
index 9d14b12..b63ec2f 100644
--- a/ddb/db_macro.c
+++ b/ddb/db_macro.c
@@ -38,7 +38,6 @@
#include <ddb/db_macro.h>
#include <ddb/db_output.h>
-
/*
* debugger macro support
*/
diff --git a/ddb/db_mp.c b/ddb/db_mp.c
index 1785e4d..5b71d08 100644
--- a/ddb/db_mp.c
+++ b/ddb/db_mp.c
@@ -137,7 +137,6 @@ db_leave()
db_active[mycpu]--;
}
-
/*
* invoke kernel debugger on slave processors
*/
diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c
index 21ec3dd..e375e57 100644
--- a/ddb/db_task_thread.c
+++ b/ddb/db_task_thread.c
@@ -34,8 +34,6 @@
#include <ddb/db_task_thread.h>
#include <ddb/db_variables.h>
-
-
/*
* Following constants are used to prevent infinite loop of task
* or thread search due to the incorrect list.
diff --git a/ddb/db_trap.c b/ddb/db_trap.c
index d2abfbd..c399a5e 100644
--- a/ddb/db_trap.c
+++ b/ddb/db_trap.c
@@ -45,7 +45,6 @@
#include <ddb/db_trap.h>
#include <ddb/db_run.h>
-
extern jmp_buf_t *db_recover;
extern int db_inst_count;
diff --git a/ddb/db_watch.c b/ddb/db_watch.c
index e2bd8d6..990fdfa 100644
--- a/ddb/db_watch.c
+++ b/ddb/db_watch.c
@@ -48,8 +48,6 @@
#include <ddb/db_sym.h>
#include <ddb/db_task_thread.h>
-
-
/*
* Watchpoints.
*/
diff --git a/ddb/db_write_cmd.c b/ddb/db_write_cmd.c
index 1908005..592963f 100644
--- a/ddb/db_write_cmd.c
+++ b/ddb/db_write_cmd.c
@@ -44,8 +44,6 @@
#include <ddb/db_sym.h>
#include <ddb/db_task_thread.h>
-
-
/*
* Write to file.
*/
diff --git a/ddb/nlist.h b/ddb/nlist.h
index b948dfd..a0a3260 100644
--- a/ddb/nlist.h
+++ b/ddb/nlist.h
@@ -59,5 +59,4 @@ struct nlist {
#define N_TYPE 0x1e /* mask for all the type bits */
#define N_STAB 0xe0 /* if any of these bits set, a SDB
entry */
-
#endif /* _DDB_NLIST_H_ */
diff --git a/device/blkio.c b/device/blkio.c
index 939067d..c1012f8 100644
--- a/device/blkio.c
+++ b/device/blkio.c
@@ -29,6 +29,7 @@
*
* Block IO driven from generic kernel IO interface.
*/
+
#include <mach/kern_return.h>
#include <device/param.h>
@@ -36,8 +37,6 @@
#include <device/io_req.h>
#include <device/ds_routines.h>
-
-
io_return_t block_io(strat, max_count, ior)
void (*strat)();
void (*max_count)();
diff --git a/device/chario.c b/device/chario.c
index 387428a..cfa8e5b 100644
--- a/device/chario.c
+++ b/device/chario.c
@@ -91,7 +91,6 @@ int pdma_default = 1; /* turn pseudo dma on by
default */
int pdma_timeouts[NSPEEDS]; /* how many ticks in timeout */
int pdma_water_mark[NSPEEDS];
-
void chario_init(void)
{
/* the basic idea with the timeouts is two allow enough
diff --git a/device/cirbuf.c b/device/cirbuf.c
index 7af2d7a..611dabf 100644
--- a/device/cirbuf.c
+++ b/device/cirbuf.c
@@ -35,8 +35,6 @@
#include <kern/debug.h>
#include <kern/kalloc.h>
-
-
/* read at c_cf, write at c_cl */
/* if c_cf == c_cl, buffer is empty */
/* if c_cl == c_cf - 1, buffer is full */
diff --git a/device/cons.h b/device/cons.h
index 8ac796c..8f2cc1e 100644
--- a/device/cons.h
+++ b/device/cons.h
@@ -23,6 +23,7 @@
#ifndef _DEVICE_CONS_H
#define _DEVICE_CONS_H
+
#include <sys/types.h>
struct consdev {
@@ -54,4 +55,5 @@ extern int cngetc(void);
extern int cnmaygetc(void);
extern void cnputc(char);
+
#endif /* _DEVICE_CONS_H */
diff --git a/device/dev_name.c b/device/dev_name.c
index de9e360..804ca14 100644
--- a/device/dev_name.c
+++ b/device/dev_name.c
@@ -34,8 +34,6 @@
#include <device/dev_hdr.h>
#include <device/conf.h>
-
-
/*
* Routines placed in empty entries in the device tables
*/
diff --git a/device/dev_pager.c b/device/dev_pager.c
index 1797713..1d65ce3 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -121,7 +121,6 @@ struct dev_pager {
typedef struct dev_pager *dev_pager_t;
#define DEV_PAGER_NULL ((dev_pager_t)0)
-
struct kmem_cache dev_pager_cache;
void dev_pager_reference(dev_pager_t ds)
diff --git a/device/device_init.c b/device/device_init.c
index fb98e31..53d421b 100644
--- a/device/device_init.c
+++ b/device/device_init.c
@@ -29,6 +29,7 @@
*
* Initialize device service as part of kernel task.
*/
+
#include <ipc/ipc_port.h>
#include <ipc/ipc_space.h>
#include <kern/debug.h>
@@ -41,8 +42,6 @@
#include <device/ds_routines.h>
#include <device/net_io.h>
-
-
ipc_port_t master_device_port;
void
diff --git a/device/kmsg.h b/device/kmsg.h
index b8c1f36..1929046 100644
--- a/device/kmsg.h
+++ b/device/kmsg.h
@@ -1,7 +1,6 @@
#ifndef _DEVICE_KMSG_H_
#define _DEVICE_KMSG_H_ 1
-
#include <sys/types.h>
#include <device/device_types.h>
@@ -14,5 +13,4 @@ io_return_t kmsggetstat (dev_t dev, int flavor,
int *data, unsigned int *count);
void kmsg_putchar (int c);
-
#endif /* !_DEVICE_KMSG_H_ */
diff --git a/i386/i386/cpu_number.h b/i386/i386/cpu_number.h
index 7808e49..b75b9de 100644
--- a/i386/i386/cpu_number.h
+++ b/i386/i386/cpu_number.h
@@ -27,6 +27,7 @@
* Machine-dependent definitions for cpu identification.
*
*/
+
#ifndef _I386_CPU_NUMBER_H_
#define _I386_CPU_NUMBER_H_
diff --git a/i386/i386/debug.h b/i386/i386/debug.h
index f87b95b..77ca55d 100644
--- a/i386/i386/debug.h
+++ b/i386/i386/debug.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _I386_DEBUG_
#define _I386_DEBUG_
@@ -30,7 +31,6 @@ void dump_ss(struct i386_saved_state *st);
#ifdef DEBUG
-
/* Maximum number of entries in a debug trace.
If the buffer overflows, the oldest entries are forgotten. */
#define DEBUG_TRACE_LEN 512
diff --git a/i386/i386/eflags.h b/i386/i386/eflags.h
index 58ad968..26e638c 100644
--- a/i386/i386/eflags.h
+++ b/i386/i386/eflags.h
@@ -23,6 +23,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
+
#ifndef _KERNEL_I386_EFLAGS_H_
#define _KERNEL_I386_EFLAGS_H_
diff --git a/i386/i386/io_perm.h b/i386/i386/io_perm.h
index a68e103..53f2ec6 100644
--- a/i386/i386/io_perm.h
+++ b/i386/i386/io_perm.h
@@ -26,7 +26,6 @@
#include <device/dev_hdr.h>
#include <ipc/ipc_types.h>
-
/* The highest possible I/O port. */
#define IOPB_MAX 0xffff
diff --git a/i386/i386/ktss.c b/i386/i386/ktss.c
index 1b2938a..e10edd2 100644
--- a/i386/i386/ktss.c
+++ b/i386/i386/ktss.c
@@ -31,6 +31,7 @@
*
* XXX multiprocessor??
*/
+
#include "vm_param.h"
#include "seg.h"
#include "gdt.h"
diff --git a/i386/i386/ldt.c b/i386/i386/ldt.c
index 37f09fb..31d842f 100644
--- a/i386/i386/ldt.c
+++ b/i386/i386/ldt.c
@@ -27,6 +27,7 @@
* "Local" descriptor table. At the moment, all tasks use the
* same LDT.
*/
+
#include <mach/machine/vm_types.h>
#include <mach/xen.h>
diff --git a/i386/i386/ldt.h b/i386/i386/ldt.h
index f196c74..416cc73 100644
--- a/i386/i386/ldt.h
+++ b/i386/i386/ldt.h
@@ -34,6 +34,7 @@
* This file describes the standard LDT provided by default
* to all user-level Mach tasks.
*/
+
#ifndef _I386_LDT_
#define _I386_LDT_
@@ -48,7 +49,6 @@
#define LDTSZ 4
-
#ifndef __ASSEMBLER__
extern struct real_descriptor ldt[LDTSZ];
diff --git a/i386/i386/lock.h b/i386/i386/lock.h
index b989927..e0e7afc 100644
--- a/i386/i386/lock.h
+++ b/i386/i386/lock.h
@@ -26,6 +26,7 @@
/*
* Machine-dependent simple locks for the i386.
*/
+
#ifndef _I386_LOCK_H_
#define _I386_LOCK_H_
@@ -123,6 +124,4 @@ extern void simple_lock_pause(void);
#endif /* NCPUS > 1 */
-
-
#endif /* _I386_LOCK_H_ */
diff --git a/i386/i386/machine_task.c b/i386/i386/machine_task.c
index 62b22e3..31a0e2e 100644
--- a/i386/i386/machine_task.c
+++ b/i386/i386/machine_task.c
@@ -27,11 +27,9 @@
#include <machine/io_perm.h>
-
/* The cache which holds our IO permission bitmaps. */
struct kmem_cache machine_task_iopb_cache;
-
/* Initialize the machine task module. The function is called once at
start up by task_init in kern/task.c. */
void
@@ -41,7 +39,6 @@ machine_task_module_init (void)
NULL, NULL, NULL, 0);
}
-
/* Initialize the machine specific part of task TASK. */
void
machine_task_init (task_t task)
@@ -51,7 +48,6 @@ machine_task_init (task_t task)
simple_lock_init (&task->machine.iopb_lock);
}
-
/* Destroy the machine specific part of task TASK and release all
associated resources. */
void
@@ -62,7 +58,6 @@ machine_task_terminate (task_t task)
(vm_offset_t) task->machine.iopb);
}
-
/* Try to release as much memory from the machine specific data in
task TASK. */
void
diff --git a/i386/i386/proc_reg.h b/i386/i386/proc_reg.h
index 8083536..d2aec41 100644
--- a/i386/i386/proc_reg.h
+++ b/i386/i386/proc_reg.h
@@ -26,6 +26,7 @@
/*
* Processor registers for i386 and i486.
*/
+
#ifndef _I386_PROC_REG_H_
#define _I386_PROC_REG_H_
diff --git a/i386/i386/setjmp.h b/i386/i386/setjmp.h
index 5c43d40..d65d9e2 100644
--- a/i386/i386/setjmp.h
+++ b/i386/i386/setjmp.h
@@ -26,6 +26,7 @@
/*
* Setjmp/longjmp buffer for i386.
*/
+
#ifndef _I386_SETJMP_H_
#define _I386_SETJMP_H_
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index e104e12..868e7dc 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -120,7 +120,6 @@ user_page_fault_continue(kr)
/*NOTREACHED*/
}
-
static char *trap_type[] = {
"Divide error",
"Debug trap",
@@ -147,7 +146,6 @@ char *trap_name(unsigned int trapnum)
return trapnum < TRAP_TYPES ? trap_type[trapnum] : "(unknown)";
}
-
boolean_t brb = TRUE;
/*
@@ -343,7 +341,6 @@ dump_ss(regs);
}
}
-
/*
* Trap from user mode.
* Return TRUE if from emulated system call.
diff --git a/i386/i386/vm_param.h b/i386/i386/vm_param.h
index ffd91d6..6617b63 100644
--- a/i386/i386/vm_param.h
+++ b/i386/i386/vm_param.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _I386_KERNEL_I386_VM_PARAM_
#define _I386_KERNEL_I386_VM_PARAM_
diff --git a/i386/i386/xen.h b/i386/i386/xen.h
index 5bdaf0b..4983587 100644
--- a/i386/i386/xen.h
+++ b/i386/i386/xen.h
@@ -46,8 +46,6 @@ MACH_INLINE unsigned long xchgl(volatile unsigned long *ptr,
unsigned long x)
#define _TOSTR(x) #x
#define TOSTR(x) _TOSTR (x)
-
-
/* x86-specific hypercall interface. */
#define _hypcall0(type, name) \
MACH_INLINE type hyp_##name(void) \
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index de1cdc4..0eefa5c 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -35,7 +35,6 @@
#define SPL_SIX (vm_offset_t)SPL6
#define SPL_TTY (vm_offset_t)SPLTTY
-
#if NCOM > 0
extern struct bus_driver comdriver;
#include <i386at/com.h>
@@ -54,7 +53,6 @@ struct bus_ctlr bus_master_init[] = {
{0}
};
-
struct bus_device bus_device_init[] = {
/* driver name unit intr address am phys_address
diff --git a/i386/i386at/cons_conf.c b/i386/i386at/cons_conf.c
index cf42bb6..7d0df58 100644
--- a/i386/i386at/cons_conf.c
+++ b/i386/i386at/cons_conf.c
@@ -27,6 +27,7 @@
* the standalone boot. I think it best that they both use the same
* known algorithm unless we see a pressing need otherwise.
*/
+
#include <sys/types.h>
#include <device/cons.h>
diff --git a/i386/i386at/disk.h b/i386/i386at/disk.h
index e1fe6b9..9449896 100644
--- a/i386/i386at/disk.h
+++ b/i386/i386at/disk.h
@@ -52,8 +52,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Grab the public part. */
#include <mach/machine/disk.h>
-
-
#define MAX_ALTENTS 253 /* Maximum # of slots for alts */
/* allowed for in the table. */
@@ -83,7 +81,6 @@ typedef struct alt_info altinfo_t;
#define BAD_BLK 0x80 /* needed for V_VERIFY */
/* BAD_BLK moved from old hdreg.h */
-
#define HDPDLOC 29 /* location of pdinfo/vtoc */
#define LBLLOC 1 /* label block for xxxbsd */
@@ -91,8 +88,6 @@ typedef struct alt_info altinfo_t;
#define V_OPEN 0x100 /* Partition open (for driver use) */
#define V_VALID 0x200 /* Partition is valid to use */
-
-
/* Sanity word for the physical description area */
#define VALID_PD 0xCA5E600D
@@ -146,7 +141,6 @@ union io_arg {
} ia_xfmt; /* used for the V_XFORMAT ioctl */
};
-
#define BOOTSZ 446 /* size of boot code in master boot
block */
#define FD_NUMPART 4 /* number of 'partitions' in fdisk
table */
#define ACTIVE 128 /* indicator of active partition */
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 5605257..1846931 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -641,8 +641,6 @@ io_return_t kdsetstat(dev, flavor, data, count)
return (result);
}
-
-
/*
* kdsetbell:
*
@@ -688,7 +686,6 @@ struct kbentry * kbent;
return(0);
}
-
/*
* kdsetkbent:
*
@@ -1312,7 +1309,6 @@ u_char ch;
return;
}
-
/*
* kd_setpos:
*
@@ -1342,7 +1338,6 @@ csrpos_t newpos;
(*kd_dsetcursor)(newpos);
}
-
/*
* kd_scrollup:
*
@@ -1373,7 +1368,6 @@ kd_scrollup()
return;
}
-
/*
* kd_scrolldn:
*
@@ -1404,7 +1398,6 @@ kd_scrolldn()
}
-
/*
* kd_parseesc:
*
@@ -1444,7 +1437,6 @@ kd_parseesc()
}
-
/* kd_update_kd_attr:
*
* Updates kd_attr according to kd_attrflags and kd_color.
@@ -1765,7 +1757,6 @@ kd_tab()
}
-
/*
* kd_cls:
*
@@ -1782,7 +1773,6 @@ kd_cls()
return;
}
-
/*
* kd_home:
*
@@ -1800,7 +1790,6 @@ kd_home()
return;
}
-
/*
* kd_up:
*
@@ -1820,7 +1809,6 @@ kd_up()
return;
}
-
/*
* kd_down:
*
@@ -1840,7 +1828,6 @@ kd_down()
return;
}
-
/*
* kd_right:
*
@@ -1862,7 +1849,6 @@ kd_right()
return;
}
-
/*
* kd_left:
*
@@ -1880,7 +1866,6 @@ kd_left()
return;
}
-
/*
* kd_cr:
*
@@ -1898,7 +1883,6 @@ kd_cr()
return;
}
-
/*
* kd_cltobcur:
*
@@ -1921,7 +1905,6 @@ kd_cltobcur()
return;
}
-
/*
* kd_cltopcur:
*
@@ -1942,7 +1925,6 @@ kd_cltopcur()
return;
}
-
/*
* kd_cltoecur:
*
@@ -1964,7 +1946,6 @@ kd_cltoecur()
}
}
-
/*
* kd_clfrbcur:
*
@@ -1985,7 +1966,6 @@ kd_clfrbcur()
}
}
-
/*
* kd_delln:
*
@@ -2024,7 +2004,6 @@ int number;
return;
}
-
/*
* kd_insln:
*
@@ -2064,7 +2043,6 @@ int number;
return;
}
-
/*
* kd_delch:
*
@@ -2106,7 +2084,6 @@ int number;
}
-
/*
* kd_erase:
*
@@ -2133,7 +2110,6 @@ int number;
return;
}
-
/*
* kd_eraseln:
*
@@ -2156,7 +2132,6 @@ kd_eraseln()
return;
}
-
/*
* kd_insch:
*
@@ -2197,7 +2172,6 @@ int number;
return;
}
-
/*
* kd_isupper, kd_islower:
*
@@ -2263,7 +2237,6 @@ unsigned char ch;
return;
}
-
/*
* kd_getdata:
*
@@ -2487,7 +2460,6 @@ int new_button = 0;
}
-
/*
* Code specific to EGA/CGA/VGA boards. This code relies on the fact
* that the "slam" functions take a word count and ONE_SPACE takes up
@@ -2495,7 +2467,6 @@ int new_button = 0;
*/
#define SLAMBPW 2 /* bytes per word for "slam"
fcns */
-
/*
* kd_xga_init:
*
@@ -2563,7 +2534,6 @@ kd_xga_init()
kd_setpos(xga_getpos());
}
-
/*
* xga_getpos:
*
@@ -2591,7 +2561,6 @@ xga_getpos()
return(ONE_SPACE * (csrpos_t)pos);
}
-
/*
* charput:
*
@@ -2607,7 +2576,6 @@ char chattr; /* its
attribute */
*(vid_start + pos + 1) = chattr;
}
-
/*
* charsetcursor:
*
@@ -2628,7 +2596,6 @@ csrpos_t newpos;
kd_curpos = newpos;
}
-
/*
* charmvup:
*
@@ -2642,7 +2609,6 @@ int count;
kd_slmscu(vid_start+from, vid_start+to, count);
}
-
/*
* charmvdown:
*
@@ -2656,7 +2622,6 @@ int count;
kd_slmscd(vid_start+from, vid_start+to, count);
}
-
/*
* charclear:
*
@@ -2671,7 +2636,6 @@ char chattr;
kd_slmwd(vid_start+to, count, ((unsigned short)chattr<<8)+K_SPACE);
}
-
/*
* kd_noopreset:
*
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index d97fdd5..de3bf92 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -203,7 +203,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define K_TBCD 0x01 /* 4-decade BCD counter */
-
/*
* Fun definitions for displayed characters and characters read from
* the keyboard.
@@ -269,7 +268,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define KS_SHIFTED 0x10
#define KS_CTLED 0x20
-
/*
* Scancode values, not to be confused with Ascii values.
*/
@@ -548,7 +546,6 @@ typedef u_char Scancode;
#define K_PDN 0x1b,0x5b,0x55
#define K_INS 0x1b,0x5b,0x40
-
/*
* This array maps scancodes to Ascii characters (or character
* sequences).
@@ -562,7 +559,6 @@ extern u_char key_map[NUMKEYS][WIDTH_KMAP];
#endif /* KERNEL */
-
/*
* These routines are declared here so that all the modules making
* up the kd driver agree on how to do locking.
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index db14225..49bd5f3 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -85,7 +85,6 @@ queue_head_t kbd_read_queue = { &kbd_read_queue,
&kbd_read_queue };
static boolean_t initialized = FALSE;
-
/*
* kbdinit - set up event queue.
*/
@@ -102,7 +101,6 @@ kbdinit()
splx(s);
}
-
/*
* kbdopen - Verify that open is read-only and remember process
* group leader.
@@ -122,7 +120,6 @@ kbdopen(dev, flags)
return(0);
}
-
/*
* kbdclose - Make sure that the kd driver is in Ascii mode and
* reset various flags.
@@ -141,7 +138,6 @@ kbdclose(dev, flags)
splx(s);
}
-
io_return_t kbdgetstat(dev, flavor, data, count)
dev_t dev;
int flavor;
@@ -191,8 +187,6 @@ io_return_t kbdsetstat(dev, flavor, data, count)
return (D_SUCCESS);
}
-
-
/*
* kbdread - dequeue and return any queued events.
*/
@@ -266,8 +260,6 @@ boolean_t kbd_read_done(ior)
return (TRUE);
}
-
-
/*
* kd_enqsc - enqueue a scancode. Should be called at SPLKD.
*/
@@ -284,7 +276,6 @@ kd_enqsc(sc)
kbd_enqueue(&ev);
}
-
/*
* kbd_enqueue - enqueue an event and wake up selecting processes, if
* any. Should be called at SPLKD.
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index 5a80474..d8d1611 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -91,7 +91,6 @@ kd_event_queue mouse_queue; /* queue of mouse
events */
boolean_t mouse_in_use = FALSE;
queue_head_t mouse_read_queue = { &mouse_read_queue, &mouse_read_queue };
-
/*
* The state of the 3 buttons is encoded in the low-order 3 bits (both
* here and in other variables in the driver).
@@ -107,7 +106,6 @@ boolean_t mouse_char_cmd = FALSE; /* mouse
response is to cmd */
boolean_t mouse_char_wanted = FALSE; /* want mouse response */
int mouse_char_index; /* mouse response */
-
/*
* init_mouse_hw - initialize the serial port.
*/
@@ -125,7 +123,6 @@ init_mouse_hw(unit, mode)
outb(base_addr + RIE, IERD | IELS);
}
-
/*
* mouseopen - Verify that the request is read-only, initialize,
* and remember process group leader.
@@ -313,7 +310,6 @@ io_return_t mousegetstat(dev, flavor, data, count)
return D_SUCCESS;
}
-
/*
* mouseread - dequeue and return any queued events.
*/
@@ -387,8 +383,6 @@ boolean_t mouse_read_done(ior)
return (TRUE);
}
-
-
/*
* mouseintr - Get a byte and pass it up for handling. Called at SPLKD.
*/
@@ -415,7 +409,6 @@ mouseintr(int unit)
}
}
-
/*
* handle_byte - Accumulate bytes until we have an entire packet.
* If the mouse has moved or any of the buttons have changed state (up
diff --git a/i386/i386at/kdsoft.h b/i386/i386at/kdsoft.h
index 1dfd2b2..a206412 100644
--- a/i386/i386at/kdsoft.h
+++ b/i386/i386at/kdsoft.h
@@ -72,7 +72,6 @@ extern short kd_lines; /* num lines in tty
display */
extern short kd_cols;
extern char kd_attr; /* current character attribute */
-
/*
* Globals used only for bitmap-based controllers.
* XXX - probably needs reworking for color.
@@ -153,7 +152,6 @@ extern void (*kd_dsetcursor)();
/* set cursor position on displayed page */
extern void (*kd_dreset)(); /* prepare for reboot */
-
/*
* The following font layout is assumed:
*
@@ -189,7 +187,6 @@ extern short cursor_height; /* bit height
of cursor */
extern u_char char_black; /* 8 black (off) bits */
extern u_char char_white; /* 8 white (on) bits */
-
/*
* The tty emulation does not usually require the entire frame buffer.
* (xstart, ystart) is the bit address for the upper left corner of the
@@ -198,7 +195,6 @@ extern u_char char_white; /* 8 white (on)
bits */
extern short xstart, ystart;
-
/*
* Accelerators for bitmap displays.
*/
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index f0f9ed6..f6c5ab8 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -251,7 +251,6 @@ void db_reset_cpu(void)
halt_all_cpus(1);
}
-
/*
* Compute physical memory size and other parameters.
*/
@@ -688,7 +687,6 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp)
? mods_start_pa
+ boot_info.mods_count * sizeof(struct multiboot_module)
: 0;
-
retry:
#endif /* MACH_HYP */
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
index 3e3f48b..c621ab0 100644
--- a/i386/include/mach/i386/asm.h
+++ b/i386/include/mach/i386/asm.h
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-
#define S_ARG0 4(%esp)
#define S_ARG1 8(%esp)
#define S_ARG2 12(%esp)
@@ -89,8 +88,6 @@
#define data16 .byte 0x66
#define addr16 .byte 0x67
-
-
#ifdef GPROF
#define MCOUNT .data; gLB(9) .long 0; .text; lea LBb(x, 9),%edx; call
mcount
diff --git a/i386/include/mach/i386/cthreads.h
b/i386/include/mach/i386/cthreads.h
index f9755b4..18a77ff 100644
--- a/i386/include/mach/i386/cthreads.h
+++ b/i386/include/mach/i386/cthreads.h
@@ -23,6 +23,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
+
#ifndef _MACHINE_CTHREADS_H_
#define _MACHINE_CTHREADS_H_
diff --git a/i386/include/mach/i386/disk.h b/i386/include/mach/i386/disk.h
index 40ed4fa..9715f9d 100644
--- a/i386/include/mach/i386/disk.h
+++ b/i386/include/mach/i386/disk.h
@@ -55,7 +55,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define PART_DISK 2 /* partition number for entire disk */
#endif
-
/* driver ioctl() commands */
#define V_CONFIG _IOW('v',1,union io_arg)/* Configure Drive */
@@ -72,7 +71,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define V_XFORMAT _IO('v',13) /* Selectively mark sectors as
bad */
#define V_SETPARMS _IOW('v',14,int) /* Set drivers parameters */
-
/*
* Data structure for the V_VERIFY ioctl
*/
@@ -88,7 +86,6 @@ union vfy_io {
}vfy_out;
};
-
/* data structure returned by the Get Parameters ioctl: */
struct disk_parms {
/*00*/ char dp_type; /* Disk type (see below) */
diff --git a/i386/include/mach/i386/exec/elf.h
b/i386/include/mach/i386/exec/elf.h
index cfa988d..17bc513 100644
--- a/i386/include/mach/i386/exec/elf.h
+++ b/i386/include/mach/i386/exec/elf.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_I386_EXEC_ELF_H_
#define _MACH_I386_EXEC_ELF_H_
diff --git a/i386/include/mach/i386/multiboot.h
b/i386/include/mach/i386/multiboot.h
index 8f1c47b..5bc7c09 100644
--- a/i386/include/mach/i386/multiboot.h
+++ b/i386/include/mach/i386/multiboot.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_I386_MULTIBOOT_H_
#define _MACH_I386_MULTIBOOT_H_
@@ -142,7 +143,6 @@ struct multiboot_info
#define MULTIBOOT_ELF_SHDR 0x00000020
#define MULTIBOOT_MEM_MAP 0x00000040
-
/* The mods_addr field above contains the physical address of the first
of 'mods_count' multiboot_module structures. */
struct multiboot_module
@@ -158,7 +158,6 @@ struct multiboot_module
unsigned reserved;
};
-
/* The mmap_addr field above contains the physical address of the first
of the AddrRangeDesc structure. "size" represents the size of the
rest of the structure and optional padding. The offset to the beginning
@@ -188,5 +187,4 @@ struct multiboot_mmap
/* usable memory "Type", all others are reserved. */
#define MB_ARD_MEMORY 1
-
#endif /* _MACH_I386_MULTIBOOT_H_ */
diff --git a/i386/include/mach/i386/thread_status.h
b/i386/include/mach/i386/thread_status.h
index ba1e3de..dd36d5c 100644
--- a/i386/include/mach/i386/thread_status.h
+++ b/i386/include/mach/i386/thread_status.h
@@ -119,7 +119,6 @@ struct i386_float_state {
};
#define i386_FLOAT_STATE_COUNT (sizeof(struct
i386_float_state)/sizeof(unsigned int))
-
#define PORT_MAP_BITS 0x400
struct i386_isa_port_map_state {
unsigned char pm[PORT_MAP_BITS>>3];
@@ -148,6 +147,7 @@ struct v86_interrupt_table {
struct i386_debug_state {
unsigned int dr[8];
};
+
#define i386_DEBUG_STATE_COUNT \
(sizeof(struct i386_debug_state)/sizeof(unsigned int))
diff --git a/i386/include/mach/i386/trap.h b/i386/include/mach/i386/trap.h
index 70b28fe..873f7f2 100644
--- a/i386/include/mach/i386/trap.h
+++ b/i386/include/mach/i386/trap.h
@@ -56,5 +56,4 @@
#define T_PF_WRITE 0x2 /* write access */
#define T_PF_USER 0x4 /* from user state */
-
#endif /* _MACH_I386_TRAP_H_ */
diff --git a/i386/include/mach/sa/stdarg.h b/i386/include/mach/sa/stdarg.h
index 550fec4..9dae1d4 100644
--- a/i386/include/mach/sa/stdarg.h
+++ b/i386/include/mach/sa/stdarg.h
@@ -26,6 +26,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
+
#ifndef _MACH_SA_STDARG_H_
#define _MACH_SA_STDARG_H_
diff --git a/include/alloca.h b/include/alloca.h
index 29081ca..bbfb995 100644
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -17,6 +17,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_ALLOCA_H_
#define _MACH_ALLOCA_H_
diff --git a/include/device/disk_status.h b/include/device/disk_status.h
index a6ed106..eb8d576 100644
--- a/include/device/disk_status.h
+++ b/include/device/disk_status.h
@@ -71,7 +71,6 @@
#define MAXPARTITIONS 8
#endif
-
#ifndef LOCORE
struct disklabel {
unsigned int d_magic; /* the magic number */
diff --git a/include/device/net_status.h b/include/device/net_status.h
index 9ab95b9..67d0beb 100644
--- a/include/device/net_status.h
+++ b/include/device/net_status.h
@@ -61,7 +61,6 @@ struct net_status {
#define HDR_CHAOS 5 /* Chaosnet */
#define HDR_802 6 /* IEEE 802 networks */
-
/*
* A network address is an array of bytes. In order to return
* this in an array of (long) integers, it is returned in net order.
@@ -146,7 +145,6 @@ typedef filter_t *filter_array_t;
#define NETF_ADD (16<<NETF_NBPA)
#define NETF_SUB (17<<NETF_NBPA)
-
/* stack arguments */
#define NETF_NOPUSH 0 /* don`t push */
#define NETF_PUSHLIT 1 /* next word in filter */
@@ -194,8 +192,7 @@ struct net_rcv_msg {
boolean_t sent;
};
typedef struct net_rcv_msg *net_rcv_msg_t;
-#define net_rcv_msg_packet_count packet_type.msgt_number
-
+#define net_rcv_msg_packet_count packet_type.msgt_number
#endif /* _DEVICE_NET_STATUS_H_ */
diff --git a/include/device/tape_status.h b/include/device/tape_status.h
index 97cb098..6b6305f 100644
--- a/include/device/tape_status.h
+++ b/include/device/tape_status.h
@@ -87,7 +87,6 @@ struct tape_status {
#define MT_ISCY 0x09 /* CCI Cipher */
#define MT_ISSCSI 0x0a /* SCSI tape (all brands) */
-
/*
* Set status parameters
*/
@@ -109,7 +108,6 @@ struct tape_params {
#define MTCACHE 8 /* enable controller cache */
#define MTNOCACHE 9 /* disable controller cache */
-
/*
* U*x compatibility
*/
@@ -129,12 +127,10 @@ struct mtget {
/* end not yet implemented */
};
-
/* mag tape io control commands */
#define MTIOCTOP _IOW('m', 1, struct tape_params)/* do a mag
tape op */
#define MTIOCGET _IOR('m', 2, struct mtget) /* get tape
status */
#define MTIOCIEOT _IO('m', 3) /* ignore EOT error */
#define MTIOCEEOT _IO('m', 4) /* enable EOT error */
-
#endif _TAPE_STATUS_H_
diff --git a/include/mach/boot.h b/include/mach/boot.h
index d3e141f..9b253f6 100644
--- a/include/mach/boot.h
+++ b/include/mach/boot.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_BOOT_
#define _MACH_BOOT_
@@ -56,6 +57,7 @@ struct boot_module
vm_offset_t bss;
vm_offset_t ebss;
};
+
#define BMOD_VALID(bmod) ((bmod)->magic == BMOD_MAGIC)
#define BMOD_NEXT(bmod) ((struct boot_module*)((bmod)->edata))
@@ -67,11 +69,9 @@ struct boot_rendezvous
#endif !__ASSEMBLER__
-
/* This is the magic value that must appear in boot_module.magic. */
#define BMOD_MAGIC 0x424d4f44 /* 'BMOD' */
-
/* Following are the codes for boot_rendezvous.code. */
/* This rendezvous is used for choosing a microkernel to start.
@@ -89,5 +89,4 @@ struct boot_rendezvous
XX When can they be deallocated? */
#define BRZV_DATA 'D'
-
#endif _MACH_BOOT_
diff --git a/include/mach/default_pager_types.h
b/include/mach/default_pager_types.h
index 99e43ce..a3a7545 100644
--- a/include/mach/default_pager_types.h
+++ b/include/mach/default_pager_types.h
@@ -38,7 +38,6 @@ typedef struct default_pager_info {
vm_size_t dpi_page_size; /* the pager's vm page size */
} default_pager_info_t;
-
typedef struct default_pager_object {
vm_offset_t dpo_object; /* object managed by the pager */
vm_size_t dpo_size; /* backing store used for the object */
@@ -46,7 +45,6 @@ typedef struct default_pager_object {
typedef default_pager_object_t *default_pager_object_array_t;
-
typedef struct default_pager_page {
vm_offset_t dpp_offset; /* offset of the page in its object */
} default_pager_page_t;
diff --git a/include/mach/error.h b/include/mach/error.h
index 72a2d79..329b161 100644
--- a/include/mach/error.h
+++ b/include/mach/error.h
@@ -41,12 +41,10 @@
* | system(6) | subsystem(12) | code(14) |
*/
-
#define err_none (mach_error_t)0
#define ERR_SUCCESS (mach_error_t)0
#define ERR_ROUTINE_NIL (mach_error_fn_t)0
-
#define err_system(x) (((x)&0x3f)<<26)
#define err_sub(x) (((x)&0xfff)<<14)
@@ -58,7 +56,6 @@
#define sub_emask (err_sub(0xfff))
#define code_emask (0x3fff)
-
/* Mach error systems */
#define err_kern err_system(0x0) /* kernel */
#define err_us err_system(0x1) /* user space
library */
@@ -72,7 +69,6 @@
#define err_max_system 0x3f
-
/* special old "subsystems" that don't really follow the above rules */
#define err_mig -300
#define err_exec 6000
diff --git a/include/mach/exec/a.out.h b/include/mach/exec/a.out.h
index c6dcaff..49afecd 100644
--- a/include/mach/exec/a.out.h
+++ b/include/mach/exec/a.out.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_A_OUT_
#define _MACH_A_OUT_
diff --git a/include/mach/exec/elf.h b/include/mach/exec/elf.h
index 8198930..babf15e 100644
--- a/include/mach/exec/elf.h
+++ b/include/mach/exec/elf.h
@@ -22,6 +22,7 @@
/*
* OSF Research Institute MK6.1 (unencumbered) 1/31/1995
*/
+
#ifndef _MACH_EXEC_ELF_H_
#define _MACH_EXEC_ELF_H_
@@ -48,7 +49,6 @@ typedef struct {
Elf32_Half e_shstrndx;
} Elf32_Ehdr;
-
/* e_ident[] identification indexes - figure 4-4, page 4-7 */
#define EI_MAG0 0
@@ -197,7 +197,6 @@ typedef struct
#define STT_LOPROC 13
#define STT_HIPROC 15
-
/* relocation entries - page 4-31, figure 4-19 */
typedef struct
@@ -219,7 +218,6 @@ typedef struct
#define ELF32_R_TYPE(__i) ((unsigned char) (__i))
#define ELF32_R_INFO(__s, __t) (((__s)<<8) + (unsigned char) (__t))
-
/* program header - page 5-2, figure 5-1 */
typedef struct {
diff --git a/include/mach/exec/exec.h b/include/mach/exec/exec.h
index 94b234b..7aac08e 100644
--- a/include/mach/exec/exec.h
+++ b/include/mach/exec/exec.h
@@ -126,5 +126,4 @@ int exec_load(exec_read_func_t *read, exec_read_exec_func_t
*read_exec,
#define EX_CORRUPT 6002 /* recognized executable, but mangled */
#define EX_BAD_LAYOUT 6003 /* something wrong with the memory or
file image layout */
-
#endif /* _MACH_EXEC_H_ */
diff --git a/include/mach/inline.h b/include/mach/inline.h
index 35f5c5d..03eb5bd 100644
--- a/include/mach/inline.h
+++ b/include/mach/inline.h
@@ -17,6 +17,7 @@
*
* Author: Bryan Ford, University of Utah CSS
*/
+
#ifndef _MACH_INLINE_H_
#define _MACH_INLINE_H_
diff --git a/include/mach/machine.h b/include/mach/machine.h
index b696d4b..5cee7a4 100644
--- a/include/mach/machine.h
+++ b/include/mach/machine.h
@@ -263,5 +263,4 @@ extern struct machine_slot machine_slot[NCPUS];
#define CPU_SUBTYPE_ALPHA_ISP ((cpu_subtype_t) 3)
#define CPU_SUBTYPE_ALPHA_21064 ((cpu_subtype_t) 4)
-
#endif /* _MACH_MACHINE_H_ */
diff --git a/include/mach/message.h b/include/mach/message.h
index f78e978..aff9b30 100644
--- a/include/mach/message.h
+++ b/include/mach/message.h
@@ -35,7 +35,6 @@
#include <mach/kern_return.h>
#include <mach/port.h>
-
/*
* The timeout mechanism uses mach_msg_timeout_t values,
@@ -296,7 +292,6 @@ typedef integer_t mach_msg_option_t;
#define MACH_SEND_ALWAYS 0x00010000 /* internal use only */
-
/*
* Much code assumes that mach_msg_return_t == kern_return_t.
* This definition is useful for descriptive purposes.
@@ -381,7 +376,6 @@ typedef kern_return_t mach_msg_return_t;
#define MACH_RCV_BODY_ERROR 0x1000400c
/* Error receiving message body. See special bits. */
-
extern mach_msg_return_t
mach_msg_trap
(mach_msg_header_t *msg,
diff --git a/include/mach/multiboot.h b/include/mach/multiboot.h
index 3880fa8..84f0366 100644
--- a/include/mach/multiboot.h
+++ b/include/mach/multiboot.h
@@ -20,6 +20,7 @@
*
* Author: Bryan Ford, University of Utah CSL
*/
+
#ifndef _MACH_MULTIBOOT_H_
#define _MACH_MULTIBOOT_H_
diff --git a/include/mach/pc_sample.h b/include/mach/pc_sample.h
index 662addb..406b160 100644
--- a/include/mach/pc_sample.h
+++ b/include/mach/pc_sample.h
@@ -31,10 +31,8 @@
typedef natural_t sampled_pc_flavor_t;
-
#define SAMPLED_PC_PERIODIC 0x1 /* default */
-
#define SAMPLED_PC_VM_ZFILL_FAULTS 0x10
#define SAMPLED_PC_VM_REACTIVATION_FAULTS 0x20
#define SAMPLED_PC_VM_PAGEIN_FAULTS 0x40
@@ -46,9 +44,6 @@ typedef natural_t sampled_pc_flavor_t;
SAMPLED_PC_VM_PAGEIN_FAULTS |\
SAMPLED_PC_VM_COW_FAULTS )
-
-
-
/*
* Definitions for the PC sampling interface.
*/
@@ -62,5 +57,4 @@ typedef struct sampled_pc {
typedef sampled_pc_t *sampled_pc_array_t;
typedef unsigned int sampled_pc_seqno_t;
-
#endif /* _MACH_PC_SAMPLE_H_ */
diff --git a/include/mach/port.h b/include/mach/port.h
index 53f6071..c8626fb 100644
--- a/include/mach/port.h
+++ b/include/mach/port.h
@@ -38,7 +38,6 @@
#include <mach/boolean.h>
#include <mach/machine/vm_types.h>
-
typedef vm_offset_t mach_port_t;
typedef mach_port_t *mach_port_array_t;
typedef int *rpc_signature_info_t;
diff --git a/include/mach/processor_info.h b/include/mach/processor_info.h
index 5f761ea..0a25eba 100644
--- a/include/mach/processor_info.h
+++ b/include/mach/processor_info.h
@@ -68,7 +68,6 @@ typedef struct processor_basic_info *processor_basic_info_t;
#define PROCESSOR_BASIC_INFO_COUNT \
(sizeof(processor_basic_info_data_t)/sizeof(integer_t))
-
#define PROCESSOR_SET_BASIC_INFO 1 /* basic information */
struct processor_set_basic_info {
diff --git a/include/mach/profil.h b/include/mach/profil.h
index 0eb4ce4..5003aab 100644
--- a/include/mach/profil.h
+++ b/include/mach/profil.h
@@ -48,7 +48,6 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
#ifndef _MACH_PROFIL_H_
#define _MACH_PROFIL_H_
@@ -56,14 +55,12 @@
#include <ipc/ipc_object.h>
#include <vm/vm_kern.h>
-
#define NB_PROF_BUFFER 2 /* number of buffers servicing
a
* profiled thread */
#define SIZE_PROF_BUFFER 100 /* size of a profil buffer (in
int)
* This values is also defined in
* the server (ugly), be careful ! */
-
struct prof_data {
ipc_object_t prof_port; /* where to send a full buffer */
@@ -88,11 +85,9 @@ typedef struct buffer *buffer_t;
? (pbuf)->prof_index = (nb), 1 \
: 0)
-
#define get_pbuf_nb(pbuf) \
(pbuf)->prof_index
-
extern vm_map_t kernel_map;
#define dealloc_pbuf_area(pbuf) \
@@ -107,7 +102,6 @@ extern vm_map_t kernel_map;
(vm_offset_t)(pbuf), \
sizeof(struct prof_data)); \
}
-
#define alloc_pbuf_area(pbuf, vmpbuf) \
(vmpbuf) = (vm_offset_t) 0; \
@@ -132,8 +126,6 @@ extern vm_map_t kernel_map;
else \
(pbuf) = NULLPBUF;
-
-
/* MACRO set_pbuf_value
**
** enters the value 'val' in the buffer 'pbuf' and returns the following
@@ -164,7 +156,6 @@ extern vm_map_t kernel_map;
} \
}
-
#define reset_pbuf_area(pbuf) \
{ \
register int *i = &((pbuf)->prof_index); \
@@ -173,7 +164,6 @@ extern vm_map_t kernel_map;
(pbuf)->prof_area[*i].p_index = 0; \
}
-
/**************************************************************/
/* Structure, elements used for queuing operations on buffers */
/**************************************************************/
@@ -195,8 +185,6 @@ struct buf_to_send {
#undef thread_t
-
-
typedef struct buf_to_send *buf_to_send_t;
#define NULLBTS ((buf_to_send_t) 0)
diff --git a/include/mach/syscall_sw.h b/include/mach/syscall_sw.h
index 89597e9..631b87b 100644
--- a/include/mach/syscall_sw.h
+++ b/include/mach/syscall_sw.h
@@ -74,7 +74,6 @@ kernel_trap(nw_receive,-93,2)
kernel_trap(nw_rpc,-94,4)
kernel_trap(nw_select,-95,3)
-
/*
* These are syscall versions of Mach kernel calls.
* They only work on local tasks.
diff --git a/include/mach/vm_prot.h b/include/mach/vm_prot.h
index 22a76a8..2548c6a 100644
--- a/include/mach/vm_prot.h
+++ b/include/mach/vm_prot.h
@@ -76,4 +76,5 @@ typedef int vm_prot_t;
* This protection value says whether special notification is to be used.
*/
#define VM_PROT_NOTIFY ((vm_prot_t) 0x10)
+
#endif /* _MACH_VM_PROT_H_ */
diff --git a/include/mach/vm_statistics.h b/include/mach/vm_statistics.h
index 2039a82..8686b7e 100644
--- a/include/mach/vm_statistics.h
+++ b/include/mach/vm_statistics.h
@@ -72,4 +72,5 @@ struct pmap_statistics {
};
typedef struct pmap_statistics *pmap_statistics_t;
+
#endif /* _MACH_VM_STATISTICS_H_ */
diff --git a/include/mach_debug/ipc_info.h b/include/mach_debug/ipc_info.h
index ef0b0c6..3efb0d6 100644
--- a/include/mach_debug/ipc_info.h
+++ b/include/mach_debug/ipc_info.h
@@ -43,7 +43,6 @@
* in mach_debug_types.defs when adding/removing fields.
*/
-
typedef struct ipc_info_space {
natural_t iis_genno_mask; /* generation number mask */
natural_t iis_table_size; /* size of table */
@@ -53,7 +52,6 @@ typedef struct ipc_info_space {
natural_t iis_tree_hash; /* # of hashed entries in tree */
} ipc_info_space_t;
-
typedef struct ipc_info_name {
mach_port_t iin_name; /* port name, including gen number */
/*boolean_t*/integer_t iin_collision; /* collision at this entry? */
@@ -68,7 +66,6 @@ typedef struct ipc_info_name {
typedef ipc_info_name_t *ipc_info_name_array_t;
-
typedef struct ipc_info_tree_name {
ipc_info_name_t iitn_name;
mach_port_t iitn_lchild; /* name of left child */
diff --git a/include/mach_debug/pc_info.h b/include/mach_debug/pc_info.h
index bc43fa8..e18a3d7 100644
--- a/include/mach_debug/pc_info.h
+++ b/include/mach_debug/pc_info.h
@@ -30,7 +30,6 @@
#ifndef _MACH_DEBUG_PC_INFO_H_
#define _MACH_DEBUG_PC_INFO_H_
-
typedef struct sampled_pc {
task_t task;
thread_t thread;
diff --git a/include/mach_debug/vm_info.h b/include/mach_debug/vm_info.h
index 70ba887..e736205 100644
--- a/include/mach_debug/vm_info.h
+++ b/include/mach_debug/vm_info.h
@@ -63,7 +63,6 @@ typedef struct vm_region_info {
typedef vm_region_info_t *vm_region_info_array_t;
-
typedef natural_t vm_object_info_state_t;
#define VOI_STATE_PAGER_CREATED 0x00000001
@@ -97,7 +96,6 @@ typedef struct vm_object_info {
typedef vm_object_info_t *vm_object_info_array_t;
-
typedef natural_t vm_page_info_state_t;
#define VPI_STATE_BUSY 0x00000001
diff --git a/include/sys/reboot.h b/include/sys/reboot.h
index 21d421a..98306df 100644
--- a/include/sys/reboot.h
+++ b/include/sys/reboot.h
@@ -60,6 +60,7 @@
* it is mostly the same, except the flags after RB_DFLTROOT
* have diverged from BSD.
*/
+
#ifndef _MACH_SYS_REBOOT_H_
#define _MACH_SYS_REBOOT_H_
diff --git a/include/sys/types.h b/include/sys/types.h
index 19e7b24..97be23c 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -23,6 +23,7 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
+
#ifndef _MACH_SA_SYS_TYPES_H_
#define _MACH_SA_SYS_TYPES_H_
diff --git a/ipc/ipc_entry.c b/ipc/ipc_entry.c
index 3a06244..fb444bc 100644
--- a/ipc/ipc_entry.c
+++ b/ipc/ipc_entry.c
@@ -832,7 +832,6 @@ ipc_entry_grow_table(space)
return KERN_SUCCESS;
}
-
#if MACH_KDB
#include <ddb/db_output.h>
#include <kern/task.h>
@@ -843,7 +842,6 @@ ipc_entry_t db_ipc_object_by_name(
task_t task,
mach_port_t name);
-
ipc_entry_t
db_ipc_object_by_name(
task_t task,
diff --git a/ipc/ipc_entry.h b/ipc/ipc_entry.h
index 6afa4f6..edc947d 100644
--- a/ipc/ipc_entry.h
+++ b/ipc/ipc_entry.h
@@ -113,7 +113,6 @@ typedef struct ipc_entry {
#define IE_BITS_GEN_ONE 0
#endif
-
typedef struct ipc_tree_entry {
struct ipc_entry ite_entry;
mach_port_t ite_name;
@@ -134,7 +133,6 @@ extern struct kmem_cache ipc_tree_entry_cache;
#define ite_alloc() ((ipc_tree_entry_t)
kmem_cache_alloc(&ipc_tree_entry_cache))
#define ite_free(ite) kmem_cache_free(&ipc_tree_entry_cache,
(vm_offset_t) (ite))
-
extern ipc_entry_t
ipc_entry_lookup(ipc_space_t space, mach_port_t name);
diff --git a/ipc/ipc_hash.c b/ipc/ipc_hash.c
index 5eec58c..6373474 100644
--- a/ipc/ipc_hash.c
+++ b/ipc/ipc_hash.c
@@ -52,8 +52,6 @@
#include <vm/vm_user.h>
#endif
-
-
/*
* Routine: ipc_hash_lookup
* Purpose:
diff --git a/ipc/ipc_init.c b/ipc/ipc_init.c
index ca7e791..e6dc1a4 100644
--- a/ipc/ipc_init.c
+++ b/ipc/ipc_init.c
@@ -50,8 +50,6 @@
#include <ipc/ipc_hash.h>
#include <ipc/ipc_init.h>
-
-
static struct vm_map ipc_kernel_map_store;
vm_map_t ipc_kernel_map = &ipc_kernel_map_store;
vm_size_t ipc_kernel_map_size = 8 * 1024 * 1024;
diff --git a/ipc/ipc_kmsg_queue.h b/ipc/ipc_kmsg_queue.h
index 51ccbe2..b3ac785 100644
--- a/ipc/ipc_kmsg_queue.h
+++ b/ipc/ipc_kmsg_queue.h
@@ -23,9 +23,12 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
+
#ifndef _IPC_KMSG_QUEUE_H_
#define _IPC_KMSG_QUEUE_H_
+
struct ipc_kmsg_queue {
struct ipc_kmsg *ikmq_base; };
+
#endif
diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c
index 06c53eb..f9b6db8 100644
--- a/ipc/ipc_marequest.c
+++ b/ipc/ipc_marequest.c
@@ -56,7 +56,6 @@
#include <vm/vm_user.h>
#endif
-
struct kmem_cache ipc_marequest_cache;
#define imar_alloc() ((ipc_marequest_t)
kmem_cache_alloc(&ipc_marequest_cache))
@@ -85,8 +84,6 @@ typedef struct ipc_marequest_bucket {
ipc_marequest_bucket_t ipc_marequest_table;
-
-
/*
* Routine: ipc_marequest_init
* Purpose:
@@ -391,7 +388,6 @@ ipc_marequest_destroy(marequest)
#if MACH_IPC_DEBUG
-
/*
* Routine: ipc_marequest_info
* Purpose:
diff --git a/ipc/ipc_object.c b/ipc/ipc_object.c
index b8cae8f..3efbe90 100644
--- a/ipc/ipc_object.c
+++ b/ipc/ipc_object.c
@@ -53,11 +53,8 @@
#include <ddb/db_output.h>
#endif /* MACH_KDB */
-
struct kmem_cache ipc_object_caches[IOT_NUMBER];
-
-
/*
* Routine: ipc_object_reference
* Purpose:
diff --git a/ipc/ipc_port.c b/ipc/ipc_port.c
index b960739..73b28ca 100644
--- a/ipc/ipc_port.c
+++ b/ipc/ipc_port.c
@@ -56,7 +56,6 @@
#include <ipc/ipc_print.h>
#endif /* MACH_KDB */
-
decl_simple_lock_data(, ipc_port_multiple_lock_data)
decl_simple_lock_data(, ipc_port_timestamp_lock_data)
diff --git a/ipc/ipc_space.c b/ipc/ipc_space.c
index ab55e83..e151d99 100644
--- a/ipc/ipc_space.c
+++ b/ipc/ipc_space.c
@@ -53,8 +53,6 @@
#include <ipc/ipc_space.h>
#include <ipc/ipc_right.h>
-
-
struct kmem_cache ipc_space_cache;
ipc_space_t ipc_space_kernel;
ipc_space_t ipc_space_reply;
diff --git a/ipc/ipc_thread.h b/ipc/ipc_thread.h
index 008ab4a..72cd54f 100644
--- a/ipc/ipc_thread.h
+++ b/ipc/ipc_thread.h
@@ -57,7 +57,6 @@ typedef struct ipc_thread_queue {
#define ITHQ_NULL ((ipc_thread_queue_t) 0)
-
#define ipc_thread_links_init(thread) \
MACRO_BEGIN \
(thread)->ith_next = (thread); \
diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c
index 28dd693..76bba67 100644
--- a/ipc/mach_debug.c
+++ b/ipc/mach_debug.c
@@ -51,8 +51,6 @@
#include <ipc/ipc_table.h>
#include <ipc/ipc_right.h>
-
-
/*
* Routine: mach_port_get_srights [kernel call]
* Purpose:
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index 46cb4de..7a05d95 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -61,8 +61,6 @@
#include <ipc/ipc_right.h>
#include <ipc/mach_port.h>
-
-
/*
* Routine: mach_port_names_helper
* Purpose:
@@ -1564,5 +1562,7 @@ mach_port_set_syscall_right(task, name)
return KERN_SUCCESS;
}
+
#endif
+
#endif /* MIGRATING_THREADS */
diff --git a/ipc/port.h b/ipc/port.h
index 6e9f77b..a344144 100644
--- a/ipc/port.h
+++ b/ipc/port.h
@@ -76,7 +76,6 @@
typedef mach_port_t mach_port_index_t; /* index values */
typedef mach_port_t mach_port_gen_t; /* generation numbers */
-
#define MACH_PORT_UREFS_MAX ((mach_port_urefs_t) ((1 << 16) - 1))
#define MACH_PORT_UREFS_OVERFLOW(urefs, delta)
\
diff --git a/kern/act.h b/kern/act.h
index e064724..55d3956 100644
--- a/kern/act.h
+++ b/kern/act.h
@@ -46,15 +46,12 @@ struct task;
struct thread;
struct Act;
-
struct ReturnHandler {
struct ReturnHandler *next;
void (*handler)(struct ReturnHandler *rh, struct Act *act);
};
typedef struct ReturnHandler ReturnHandler;
-
-
struct Act {
/*** Task linkage ***/
@@ -68,20 +65,14 @@ struct Act {
This is constant as long as the activation is allocated. */
struct task *task;
-
-
/*** Machine-dependent state ***/
/* XXX should be first to allow maximum flexibility to MD code */
MachineAct mact;
-
-
/*** Consistency ***/
RefCount ref_count;
decl_simple_lock_data(,lock)
-
-
/*** ipc_target-related stuff ***/
/* ActPool this activation normally lives on, zero if none.
@@ -94,8 +85,6 @@ struct Act {
when we're not in use (thread == 0) and not suspended (suspend_count
== 0). */
struct Act *ipt_next;
-
-
/*** Thread linkage ***/
/* Thread this activation is in, zero if not in use.
@@ -116,8 +105,6 @@ struct Act {
/* Mask of alert bits to be allowed to pass through from lower levels.
*/
unsigned alert_mask;
-
-
/*** Control information ***/
/* Number of outstanding suspensions on this activation. */
@@ -133,21 +120,19 @@ struct Act {
/* A special ReturnHandler attached to the above chain to handle
suspension and such */
ReturnHandler special_handler;
-
-
/* Special ports attached to this activation */
struct ipc_port *self; /* not a right, doesn't hold
ref */
struct ipc_port *self_port; /* a send right */
struct ipc_port *exception_port; /* a send right */
struct ipc_port *syscall_port; /* a send right */
};
+
typedef struct Act Act;
typedef struct Act *act_t;
typedef mach_port_t *act_array_t;
#define ACT_NULL ((Act*)0)
-
/* Exported to world */
kern_return_t act_create(struct task *task, vm_offset_t user_stack,
vm_offset_t user_rbuf, vm_size_t user_rbuf_size, struct Act **new_act);
kern_return_t act_alert_mask(struct Act *act, unsigned alert_mask);
@@ -181,15 +166,12 @@ kern_return_t act_create_kernel(Act **out_act);
/* Exported to machine-dependent activation code */
void act_execute_returnhandlers(void);
-
-
/* System-dependent functions */
kern_return_t act_machine_create(struct task *task, Act *inc, vm_offset_t
user_stack, vm_offset_t user_rbuf, vm_size_t user_rbuf_size);
void act_machine_destroy(Act *inc);
kern_return_t act_machine_set_state(Act *inc, int flavor, int *tstate,
unsigned count);
kern_return_t act_machine_get_state(Act *inc, int flavor, int *tstate,
unsigned *count);
-
-
#endif /* MIGRATING_THREADS */
+
#endif _KERN_ACT_H_
diff --git a/kern/ast.c b/kern/ast.c
index e8e8c1b..b3f82bd 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -52,7 +52,6 @@
#include <mach/policy.h>
#endif /* MACH_FIXPRI */
-
volatile ast_t need_ast[NCPUS];
void
diff --git a/kern/boot_script.c b/kern/boot_script.c
index b2e9393..8b2165e 100644
--- a/kern/boot_script.c
+++ b/kern/boot_script.c
@@ -6,7 +6,6 @@
#include <string.h>
#include "boot_script.h"
-
/* This structure describes a symbol. */
struct sym
{
diff --git a/kern/boot_script.h b/kern/boot_script.h
index c5ad673..d4ef742 100644
--- a/kern/boot_script.h
+++ b/kern/boot_script.h
@@ -54,7 +54,6 @@ struct cmd
int exec_funcs_index;
};
-
/* The user must define these functions, we work like malloc and free. */
void *boot_script_malloc (unsigned int);
void boot_script_free (void *, unsigned int);
@@ -85,7 +84,6 @@ int boot_script_insert_task_port (struct cmd *, task_t,
mach_port_t *namep);
returned by boot_script_task_create. */
void boot_script_free_task (task_t task, int aborting);
-
/* Parse the command line LINE. This causes the command line to be
converted into an internal format. Returns 0 for success, non-zero
otherwise.
@@ -111,5 +109,4 @@ int boot_script_define_function (const char *name, int
ret_type,
/* Returns a string describing the error ERR. */
char *boot_script_error_string (int err);
-
#endif /* _boot_script_h */
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 41b02fe..484094c 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -76,7 +76,6 @@ extern struct multiboot_info boot_info; /* XXX put this
in a header! */
#include "boot_script.h"
-
static mach_port_t boot_device_port; /* local name */
static mach_port_t boot_host_port; /* local name */
@@ -409,8 +408,6 @@ static boolean_t load_bootstrap_symbols = FALSE;
#endif
#endif
-
-
static int
boot_read(void *handle, vm_offset_t file_ofs, void *buf, vm_size_t size,
vm_size_t *out_actual)
@@ -640,7 +637,6 @@ build_args_and_stack(struct exec_info *boot_exec_info,
(void) copyout((char *)&zero, arg_pos, sizeof(char *));
}
-
static void
user_bootstrap_compat()
{
@@ -701,7 +697,6 @@ $0 ${boot-args} ${host-port} ${device-port} ${root-device}
$(task-create) $(task
/*NOTREACHED*/
}
-
struct user_bootstrap_info
{
struct multiboot_module *mod;
diff --git a/kern/counters.c b/kern/counters.c
index a9d450e..bdfc81f 100644
--- a/kern/counters.c
+++ b/kern/counters.c
@@ -77,4 +77,5 @@ mach_counter_t c_net_thread_block = 0;
mach_counter_t c_reaper_thread_block = 0;
mach_counter_t c_swapin_thread_block = 0;
mach_counter_t c_action_thread_block = 0;
+
#endif /* MACH_COUNTERS */
diff --git a/kern/debug.h b/kern/debug.h
index e429bdd..32c130b 100644
--- a/kern/debug.h
+++ b/kern/debug.h
@@ -25,6 +25,7 @@
* which are compiled in on the DEBUG symbol.
*
*/
+
#ifndef _mach_debug__debug_
#define _mach_debug__debug_
diff --git a/kern/ipc_host.c b/kern/ipc_host.c
index cd1c11a..6382c3d 100644
--- a/kern/ipc_host.c
+++ b/kern/ipc_host.c
@@ -45,8 +45,6 @@
#include <machine/machspl.h> /* for spl */
-
-
/*
* ipc_host_init: set up various things.
*/
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index d5b9263..0974289 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -38,8 +38,6 @@
#include <machine/machspl.h> /* for splsched/splx */
#include <machine/pmap.h>
-
-
/*
* These functions really belong in kern/sched_prim.c.
*/
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index e5d928d..4d402db 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -48,8 +48,6 @@
#include <ipc/ipc_entry.h>
#include <ipc/ipc_object.h>
-
-
/*
* Routine: ipc_task_init
* Purpose:
diff --git a/kern/lock.c b/kern/lock.c
index fb5e344..1a46982 100644
--- a/kern/lock.c
+++ b/kern/lock.c
@@ -46,7 +46,6 @@
#include <ddb/db_sym.h>
#endif
-
#if NCPUS > 1
/*
diff --git a/kern/lock.h b/kern/lock.h
index 4f38ea3..36d35ce 100644
--- a/kern/lock.h
+++ b/kern/lock.h
@@ -110,7 +110,6 @@ extern void check_simple_locks(void);
#endif /* MACH_SLOCKS */
-
#define decl_mutex_data(class,name) decl_simple_lock_data(class,name)
#define mutex_try(l) simple_lock_try(l)
#define mutex_lock(l) simple_lock(l)
diff --git a/kern/lock_mon.c b/kern/lock_mon.c
index 80c50b5..eeaa100 100644
--- a/kern/lock_mon.c
+++ b/kern/lock_mon.c
@@ -47,7 +47,6 @@
#include <kern/lock.h>
#include <kern/time_stamp.h>
-
decl_simple_lock_data(extern , kdb_lock)
decl_simple_lock_data(extern , printf_lock)
@@ -87,8 +86,6 @@ unsigned default_lock_stack = 0;
extern int curr_ipl[];
-
-
struct lock_info *
locate_lock_info(lock)
decl_simple_lock_data(, **lock)
@@ -111,7 +108,6 @@ decl_simple_lock_data(, **lock)
return(li);
}
-
simple_lock(lock)
decl_simple_lock_data(, *lock)
{
diff --git a/kern/mach_clock.h b/kern/mach_clock.h
index 94e0a11..d7adb21 100644
--- a/kern/mach_clock.h
+++ b/kern/mach_clock.h
@@ -36,7 +36,6 @@ extern unsigned long elapsed_ticks; /* number of ticks
elapsed since bootup */
extern int hz; /* number of ticks per second */
extern int tick; /* number of usec per tick */
-
typedef void timer_func_t(void *);
/* Time-out element. */
@@ -47,6 +46,7 @@ struct timer_elt {
unsigned long ticks; /* expiration time, in ticks */
int set; /* unset | set | allocated */
};
+
#define TELT_UNSET 0 /* timer not set */
#define TELT_SET 1 /* timer set */
#define TELT_ALLOC 2 /* timer allocated from pool */
@@ -54,7 +54,6 @@ struct timer_elt {
typedef struct timer_elt timer_elt_data_t;
typedef struct timer_elt *timer_elt_t;
-
extern void clock_interrupt(
int usec,
boolean_t usermode,
diff --git a/kern/machine.c b/kern/machine.c
index 3dadeb5..4b097d6 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -54,8 +54,6 @@
#include <machine/model_dep.h>
#include <sys/reboot.h>
-
-
/*
* Exported variables:
*/
diff --git a/kern/pc_sample.h b/kern/pc_sample.h
index 3c64068..afe06d9 100644
--- a/kern/pc_sample.h
+++ b/kern/pc_sample.h
@@ -43,6 +43,7 @@
/*
* Kernel definitions for PC sampling.
*/
+
#ifndef _KERN_PC_SAMPLE_H_
#define _KERN_PC_SAMPLE_H_
diff --git a/kern/printf.c b/kern/printf.c
index af59d5a..0fd4007 100644
--- a/kern/printf.c
+++ b/kern/printf.c
@@ -128,7 +128,6 @@
#define MAXBUF (sizeof(long int) * 8) /* enough for binary */
-
void printnum(
unsigned long u,
int base,
diff --git a/kern/priority.c b/kern/priority.c
index ddb8fd6..a9c08b3 100644
--- a/kern/priority.c
+++ b/kern/priority.c
@@ -47,8 +47,6 @@
#include <kern/time_stamp.h>
#include <machine/machspl.h>
-
-
/*
* USAGE_THRESHOLD is the amount by which usage must change to
* cause a priority shift that moves a thread between run queues.
diff --git a/kern/processor.c b/kern/processor.c
index 865c324..9478b09 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -51,7 +51,6 @@
struct kmem_cache pset_cache;
#endif /* MACH_HOST */
-
/*
* Exported variables.
*/
diff --git a/kern/processor.h b/kern/processor.h
index b81526c..f164a3c 100644
--- a/kern/processor.h
+++ b/kern/processor.h
@@ -228,7 +228,6 @@ typedef mach_port_t *processor_array_t;
typedef mach_port_t *processor_set_array_t;
typedef mach_port_t *processor_set_name_array_t;
-
/*
* Exported functions
*/
diff --git a/kern/queue.c b/kern/queue.c
index d9396e5..e094b9e 100644
--- a/kern/queue.c
+++ b/kern/queue.c
@@ -29,8 +29,6 @@
#include <kern/queue.h>
-
-
/*
* Insert element at head of queue.
*/
diff --git a/kern/shuttle.h b/kern/shuttle.h
index e8e574b..a4e6b9c 100644
--- a/kern/shuttle.h
+++ b/kern/shuttle.h
@@ -31,8 +31,6 @@
#include <kern/lock.h>
-
-
struct Shuttle {
/* XXX must be first in thread */
/*
@@ -58,14 +56,8 @@ struct Shuttle {
};
typedef struct Shuttle Shuttle;
-
-
/* Exported functions */
-
-
/* Machine-dependent code must define the following functions */
-
-
#endif _KERN_SHUTTLE_H_
diff --git a/kern/syscall_emulation.c b/kern/syscall_emulation.c
index 0f4a2be..6ed9c9d 100644
--- a/kern/syscall_emulation.c
+++ b/kern/syscall_emulation.c
@@ -36,8 +36,6 @@
/* XXX */
#define syscall_emulation_sync(task)
-
-
/*
* WARNING:
* This code knows that kalloc() allocates memory most efficiently
@@ -86,7 +84,6 @@ void eml_task_reference(task, parent)
task->eml_dispatch = eml;
}
-
/*
* eml_task_deallocate() [Exported]
*
diff --git a/kern/thread_swap.c b/kern/thread_swap.c
index e76511e..9fd9fce 100644
--- a/kern/thread_swap.c
+++ b/kern/thread_swap.c
@@ -57,8 +57,6 @@
#include <kern/thread_swap.h>
#include <machine/machspl.h> /* for splsched */
-
-
queue_head_t swapin_queue;
decl_simple_lock_data(, swapper_lock_data)
diff --git a/vm/memory_object.c b/vm/memory_object.c
index 404ae73..e77e146 100644
--- a/vm/memory_object.c
+++ b/vm/memory_object.c
@@ -71,7 +71,6 @@
typedef int memory_object_lock_result_t; /* moved from
below */
-
ipc_port_t memory_manager_default = IP_NULL;
decl_simple_lock_data(,memory_manager_default_lock)
diff --git a/vm/memory_object_proxy.c b/vm/memory_object_proxy.c
index 4fed312..06f9547 100644
--- a/vm/memory_object_proxy.c
+++ b/vm/memory_object_proxy.c
@@ -59,7 +59,6 @@ struct memory_object_proxy
};
typedef struct memory_object_proxy *memory_object_proxy_t;
-
void
memory_object_proxy_init (void)
{
@@ -85,7 +84,6 @@ memory_object_proxy_port_lookup (ipc_port_t port)
return proxy;
}
-
/* Process a no-sender notification for the proxy memory object
port. */
boolean_t
@@ -110,7 +108,6 @@ memory_object_proxy_notify (mach_msg_header_t *msg)
return FALSE;
}
-
/* Create a new proxy memory object from [START;START+LEN) in the
given OBJECT at OFFSET in the new object with the maximum
protection MAX_PROTECTION and return it in *PORT. */
@@ -172,7 +169,6 @@ memory_object_create_proxy (ipc_space_t space, vm_prot_t
max_protection,
return KERN_SUCCESS;
}
-
/* Lookup the real memory object and maximum protection for the proxy
memory object port PORT, for which the caller holds a reference.
*OBJECT is only guaranteed to be valid as long as the caller holds
diff --git a/vm/pmap.h b/vm/pmap.h
index 59fd03a..efb5ced 100644
--- a/vm/pmap.h
+++ b/vm/pmap.h
@@ -116,7 +116,6 @@ extern void pmap_destroy(pmap_t pmap);
extern void pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa,
vm_prot_t prot, boolean_t wired);
-
/*
* Routines that operate on ranges of virtual addresses.
*/
@@ -135,7 +134,6 @@ extern void pmap_activate(pmap_t, thread_t, int);
/* Release pmap_t from use on processor. */
extern void pmap_deactivate(pmap_t, thread_t, int);
-
/*
* Routines that operate on physical addresses.
*/
@@ -163,7 +161,6 @@ void pmap_clear_modify(vm_offset_t pa);
/* Return modify bit */
boolean_t pmap_is_modified(vm_offset_t pa);
-
/*
* Statistics routines
*/
diff --git a/vm/vm_external.c b/vm/vm_external.c
index e9643ff..9ff8b23 100644
--- a/vm/vm_external.c
+++ b/vm/vm_external.c
@@ -36,8 +36,6 @@
#include <mach/vm_param.h>
#include <kern/assert.h>
-
-
boolean_t vm_external_unsafe = FALSE;
struct kmem_cache vm_external_cache;
diff --git a/vm/vm_external.h b/vm/vm_external.h
index 55c9e48..6009ee0 100644
--- a/vm/vm_external.h
+++ b/vm/vm_external.h
@@ -65,7 +65,6 @@ typedef int vm_external_state_t;
#define VM_EXTERNAL_STATE_UNKNOWN 2
#define VM_EXTERNAL_STATE_ABSENT 3
-
/*
* Routines exported by this module.
*/
diff --git a/vm/vm_fault.c b/vm/vm_fault.c
index 96c8387..38467aa 100644
--- a/vm/vm_fault.c
+++ b/vm/vm_fault.c
@@ -58,8 +58,6 @@
#include <kern/pc_sample.h>
#endif
-
-
/*
* State needed by vm_fault_continue.
* This is a little hefty to drop directly
@@ -139,7 +137,6 @@ vm_fault_cleanup(object, top_page)
}
}
-
#if MACH_PCSAMPLE
/*
* Do PC sampling on current thread, assuming
@@ -161,8 +158,6 @@ vm_fault_cleanup(object, top_page)
#define vm_stat_sample(x)
#endif /* MACH_PCSAMPLE */
-
-
/*
* Routine: vm_fault_page
* Purpose:
@@ -1670,7 +1665,6 @@ kern_return_t vm_fault_wire_fast(map, va, entry)
return(KERN_FAILURE); \
}
-
/*
* If this entry is not directly to a vm_object, bail out.
*/
@@ -1995,10 +1989,6 @@ kern_return_t vm_fault_copy(
/*NOTREACHED*/
}
-
-
-
-
#ifdef notdef
/*
diff --git a/vm/vm_kern.c b/vm/vm_kern.c
index 7e377ef..5d095a2 100644
--- a/vm/vm_kern.c
+++ b/vm/vm_kern.c
@@ -52,8 +52,6 @@
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
-
-
/*
* Variables exported by this module.
*/
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 914741e..d994ae1 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -1776,7 +1776,6 @@ kern_return_t vm_map_remove(map, start, end)
return(result);
}
-
/*
* vm_map_copy_steal_pages:
*
@@ -4669,7 +4668,6 @@ void vm_map_simplify(map, start)
vm_map_unlock(map);
}
-
/*
* Routine: vm_map_machine_attribute
* Purpose:
@@ -4706,7 +4704,6 @@ kern_return_t vm_map_machine_attribute(map, address,
size, attribute, value)
return ret;
}
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/vm/vm_page.h b/vm/vm_page.h
index 4536d1c..b691108 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -190,8 +190,6 @@ int vm_page_external_limit; /* Max number of pages for
external objects */
extern
int vm_page_external_count; /* How many pages for external objects? */
-
-
decl_simple_lock_data(extern,vm_page_queue_lock)/* lock on active and inactive
page queues */
decl_simple_lock_data(extern,vm_page_queue_free_lock)
diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
index 46ba56b..a6e80fa 100644
--- a/vm/vm_pageout.c
+++ b/vm/vm_pageout.c
@@ -53,8 +53,6 @@
#include <vm/vm_pageout.h>
#include <machine/locore.h>
-
-
#ifndef VM_PAGEOUT_BURST_MAX
#define VM_PAGEOUT_BURST_MAX 10 /* number of pages */
#endif /* VM_PAGEOUT_BURST_MAX */
diff --git a/vm/vm_resident.c b/vm/vm_resident.c
index f0f31f6..1108b8f 100644
--- a/vm/vm_resident.c
+++ b/vm/vm_resident.c
@@ -63,7 +63,6 @@
#include <vm/vm_print.h>
#endif /* MACH_KDB */
-
/*
* Associated with eacn page of user-allocatable memory is a
* page structure.
@@ -165,7 +164,6 @@ int vm_page_free_reserved = 0;
int vm_page_laundry_count = 0;
int vm_page_external_limit = 0;
-
/*
* The VM system has a couple of heuristics for deciding
* that pages are "uninteresting" and should be placed
@@ -1497,7 +1495,6 @@ vm_page_info(
}
#endif /* MACH_VM_DEBUG */
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/vm/vm_types.h b/vm/vm_types.h
index f64ebee..f3092ac 100644
--- a/vm/vm_types.h
+++ b/vm/vm_types.h
@@ -38,5 +38,4 @@ typedef struct vm_object *vm_object_t;
typedef struct vm_page *vm_page_t;
#define VM_PAGE_NULL ((vm_page_t) 0)
-
#endif /* VM_VM_TYPES_H */
diff --git a/vm/vm_user.c b/vm/vm_user.c
index f721e87..2323577 100644
--- a/vm/vm_user.c
+++ b/vm/vm_user.c
@@ -48,8 +48,6 @@
#include <vm/memory_object_proxy.h>
#include <vm/vm_page.h>
-
-
vm_statistics_data_t vm_stat;
/*
@@ -299,7 +297,6 @@ kern_return_t vm_copy(map, source_address, size,
dest_address)
return KERN_SUCCESS;
}
-
/*
* Routine: vm_map
*/
--
1.8.1.4
- [PATCH 43/68] kern/thread.c: remove forward declaration, (continued)
- [PATCH 43/68] kern/thread.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 44/68] kern: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 45/68] ipc/ipc_kmsg.h: update comment, Marin Ramesa, 2013/11/29
- [PATCH 46/68] kern/ipc_kobject.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 47/68] vm/vm_fault.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 48/68] vm/vm_kern.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 50/68] vm/vm_pageout.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 49/68] vm/vm_map.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 52/68] vm/vm_user.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 51/68] vm/vm_resident.c: correct comment, Marin Ramesa, 2013/11/29
- [PATCH 53/68] Normalize whitespace,
Marin Ramesa <=
- [PATCH 56/68] Remove unnecessary files, Marin Ramesa, 2013/11/29
- [PATCH 58/68] kern/time_stamp.c: remove multimax code, Marin Ramesa, 2013/11/29
- [PATCH 59/68] Type definition, Marin Ramesa, 2013/11/29
- [PATCH 60/68] device/net_io.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 61/68] i386/i386at/kd.c: remove forward declarations, Marin Ramesa, 2013/11/29
- [PATCH 62/68] i386/i386at/model_dep.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 63/68] ipc/ipc_entry.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 65/68] kern/mach_clock.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 64/68] ipc/mach_port.c: remove forward declaration, Marin Ramesa, 2013/11/29
- [PATCH 66/68] ddb/db_variables.c: fix near initialization, Marin Ramesa, 2013/11/29