summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2001-04-05 06:39:21 +0000
committerRoland McGrath <roland@gnu.org>2001-04-05 06:39:21 +0000
commitb42bd0d675ec7d1e1fbbf274fadbea984c8dab22 (patch)
treea7f61083f2dfa365d5d9e7101c72e8cb5b3b16a9 /i386
parent2d43f4abdedd003eb070d633bac0e3a6fb3a746b (diff)
2001-04-04 Roland McGrath <roland@frob.com>
* ddb/db_access.h: Fix obsolescent #else/#endif syntax. * ddb/db_aout.c: Likewise. * ddb/db_break.c: Likewise. * ddb/db_break.h: Likewise. * ddb/db_command.c: Likewise. * ddb/db_command.h: Likewise. * ddb/db_cond.c: Likewise. * ddb/db_examine.c: Likewise. * ddb/db_expr.c: Likewise. * ddb/db_ext_symtab.c: Likewise. * ddb/db_input.c: Likewise. * ddb/db_lex.c: Likewise. * ddb/db_macro.c: Likewise. * ddb/db_mp.c: Likewise. * ddb/db_output.c: Likewise. * ddb/db_print.c: Likewise. * ddb/db_run.c: Likewise. * ddb/db_sym.c: Likewise. * ddb/db_task_thread.c: Likewise. * ddb/db_task_thread.h: Likewise. * ddb/db_trap.c: Likewise. * ddb/db_variables.c: Likewise. * ddb/db_watch.c: Likewise. * ddb/db_watch.h: Likewise. * ddb/db_write_cmd.c: Likewise. * device/dev_pager.c: Likewise. * device/device_port.h: Likewise. * device/device_types_kernel.h: Likewise. * device/ds_routines.h: Likewise. * device/errno.h: Likewise. * device/if_ether.h: Likewise. * device/if_hdr.h: Likewise. * device/io_req.h: Likewise. * device/net_io.c: Likewise. * device/net_io.h: Likewise. * i386/i386/ast_check.c: Likewise. * i386/i386/cswitch.S: Likewise. * i386/i386/db_disasm.c: Likewise. * i386/i386/db_interface.c: Likewise. * i386/i386/db_trace.c: Likewise. * i386/i386/debug.h: Likewise. * i386/i386/debug_i386.c: Likewise. * i386/i386/debug_trace.S: Likewise. * i386/i386/eflags.h: Likewise. * i386/i386/gdt.h: Likewise. * i386/i386/hardclock.c: Likewise. * i386/i386/idt-gen.h: Likewise. * i386/i386/ipl.h: Likewise. * i386/i386/ktss.h: Likewise. * i386/i386/kttd_interface.c: Likewise. * i386/i386/ldt.h: Likewise. * i386/i386/lock.h: Likewise. * i386/i386/locore.S: Likewise. * i386/i386/mp_desc.h: Likewise. * i386/i386/pic.c: Likewise. * i386/i386/pic.h: Likewise. * i386/i386/pio.h: Likewise. * i386/i386/pit.h: Likewise. * i386/i386/seg.h: Likewise. * i386/i386/thread.h: Likewise. * i386/i386/trap.c: Likewise. * i386/i386/trap.h: Likewise. * i386/i386/vm_param.h: Likewise. * i386/i386/vm_tuning.h: Likewise. * i386/i386at/autoconf.c: Likewise. * i386/i386at/blit.c: Likewise. * i386/i386at/conf.c: Likewise. * i386/i386at/fd.c: Likewise. * i386/i386at/idt.h: Likewise. * i386/i386at/immc.c: Likewise. * i386/i386at/kd.c: Likewise. * i386/i386at/kd_event.c: Likewise. * i386/i386at/kd_mouse.c: Likewise. * i386/i386at/model_dep.c: Likewise. * i386/i386at/rtc.c: Likewise. * i386/include/mach/i386/asm.h: Likewise. * i386/include/mach/i386/eflags.h: Likewise. * i386/include/mach/i386/mach_i386.defs: Likewise. * i386/include/mach/i386/multiboot.h: Likewise. * i386/include/mach/i386/trap.h: Likewise. * i386/include/mach/i386/vm_types.h: Likewise. * i386/include/mach/sa/stdarg.h: Likewise. * i386/intel/pmap.c: Likewise. * i386/intel/pmap.h: Likewise. * include/alloca.h: Likewise. * include/device/device_types.defs: Likewise. * include/device/device_types.h: Likewise. * include/device/disk_status.h: Likewise. * include/device/net_status.h: Likewise. * include/mach/mach.defs: Likewise. * include/mach/memory_object.defs: Likewise. * include/mach/std_types.defs: Likewise. * include/mach_debug/hash_info.h: Likewise. * include/mach_debug/ipc_info.h: Likewise. * include/mach_debug/mach_debug.defs: Likewise. * include/mach_debug/mach_debug_types.defs: Likewise. * include/mach_debug/mach_debug_types.h: Likewise. * include/mach_debug/vm_info.h: Likewise. * include/mach_debug/zone_info.h: Likewise. * include/sys/ioctl.h: Likewise. * include/sys/time.h: Likewise. * ipc/ipc_entry.h: Likewise. * ipc/ipc_hash.h: Likewise. * ipc/ipc_init.c: Likewise. * ipc/ipc_kmsg.c: Likewise. * ipc/ipc_kmsg.h: Likewise. * ipc/ipc_marequest.c: Likewise. * ipc/ipc_marequest.h: Likewise. * ipc/ipc_mqueue.c: Likewise. * ipc/ipc_mqueue.h: Likewise. * ipc/ipc_notify.c: Likewise. * ipc/ipc_notify.h: Likewise. * ipc/ipc_object.c: Likewise. * ipc/ipc_object.h: Likewise. * ipc/ipc_port.c: Likewise. * ipc/ipc_port.h: Likewise. * ipc/ipc_pset.c: Likewise. * ipc/ipc_pset.h: Likewise. * ipc/ipc_right.c: Likewise. * ipc/ipc_right.h: Likewise. * ipc/ipc_space.c: Likewise. * ipc/ipc_space.h: Likewise. * ipc/mach_debug.c: Likewise. * ipc/mach_msg.c: Likewise. * ipc/mach_msg.h: Likewise. * ipc/mach_port.c: Likewise. * kern/act.c: Likewise. * kern/assert.h: Likewise. * kern/ast.c: Likewise. * kern/ast.h: Likewise. * kern/bootstrap.c: Likewise. * kern/counters.c: Likewise. * kern/counters.h: Likewise. * kern/debug.h: Likewise. * kern/exception.c: Likewise. * kern/host.h: Likewise. * kern/ipc_host.c: Likewise. * kern/ipc_host.h: Likewise. * kern/ipc_kobject.c: Likewise. * kern/ipc_mig.c: Likewise. * kern/ipc_tt.c: Likewise. * kern/ipc_tt.h: Likewise. * kern/kalloc.h: Likewise. * kern/lock_mon.c: Likewise. * kern/mach_clock.c: Likewise. * kern/mach_factor.c: Likewise. * kern/mach_param.h: Likewise. * kern/machine.c: Likewise. * kern/processor.c: Likewise. * kern/profile.c: Likewise. * kern/queue.h: Likewise. * kern/sched.h: Likewise. * kern/startup.c: Likewise. * kern/syscall_emulation.h: Likewise. * kern/syscall_subr.c: Likewise. * kern/syscall_subr.h: Likewise. * kern/syscall_sw.c: Likewise. * kern/syscall_sw.h: Likewise. * kern/task.h: Likewise. * kern/thread_swap.h: Likewise. * kern/time_out.h: Likewise. * kern/time_stamp.c: Likewise. * kern/time_stamp.h: Likewise. * kern/timer.c: Likewise. * kern/timer.h: Likewise. * kern/xpr.c: Likewise. * kern/xpr.h: Likewise. * kern/zalloc.c: Likewise. * kern/zalloc.h: Likewise. * linux/dev/drivers/block/ide.c: Likewise. * linux/dev/include/linux/blk.h: Likewise. * linux/src/include/linux/cdrom.h: Likewise. * linux/src/include/linux/md.h: Likewise. * util/cpu.h: Likewise. * vm/memory_object.c: Likewise. * vm/memory_object.h: Likewise. * vm/pmap.h: Likewise. * vm/vm_debug.c: Likewise. * vm/vm_external.h: Likewise. * vm/vm_fault.c: Likewise. * vm/vm_fault.h: Likewise. * vm/vm_kern.h: Likewise. * vm/vm_map.c: Likewise. * vm/vm_map.h: Likewise. * vm/vm_object.h: Likewise. * vm/vm_pageout.c: Likewise. * vm/vm_pageout.h: Likewise. * vm/vm_user.h: Likewise.
Diffstat (limited to 'i386')
-rw-r--r--i386/i386/ast_check.c16
-rw-r--r--i386/i386/cswitch.S9
-rw-r--r--i386/i386/db_disasm.c14
-rw-r--r--i386/i386/db_interface.c28
-rw-r--r--i386/i386/db_trace.c2
-rw-r--r--i386/i386/debug.h10
-rw-r--r--i386/i386/debug_i386.c5
-rw-r--r--i386/i386/debug_trace.S4
-rw-r--r--i386/i386/eflags.h14
-rw-r--r--i386/i386/gdt.h2
-rw-r--r--i386/i386/hardclock.c2
-rw-r--r--i386/i386/idt-gen.h4
-rw-r--r--i386/i386/ipl.h4
-rw-r--r--i386/i386/ktss.h4
-rw-r--r--i386/i386/kttd_interface.c24
-rw-r--r--i386/i386/ldt.h4
-rw-r--r--i386/i386/lock.h14
-rw-r--r--i386/i386/locore.S8
-rw-r--r--i386/i386/mp_desc.h2
-rw-r--r--i386/i386/pic.c50
-rw-r--r--i386/i386/pic.h40
-rw-r--r--i386/i386/pio.h14
-rw-r--r--i386/i386/pit.h28
-rw-r--r--i386/i386/seg.h20
-rw-r--r--i386/i386/thread.h2
-rw-r--r--i386/i386/trap.c16
-rw-r--r--i386/i386/trap.h16
-rw-r--r--i386/i386/vm_param.h2
-rw-r--r--i386/i386/vm_tuning.h14
-rw-r--r--i386/i386at/autoconf.c24
-rw-r--r--i386/i386at/blit.c116
-rw-r--r--i386/i386at/conf.c52
-rw-r--r--i386/i386at/fd.c106
-rw-r--r--i386/i386at/idt.h4
-rw-r--r--i386/i386at/immc.c5
-rw-r--r--i386/i386at/kd.c226
-rw-r--r--i386/i386at/kd_event.c54
-rw-r--r--i386/i386at/kd_mouse.c64
-rw-r--r--i386/i386at/model_dep.c20
-rw-r--r--i386/i386at/rtc.c44
-rw-r--r--i386/include/mach/i386/asm.h20
-rw-r--r--i386/include/mach/i386/eflags.h14
-rw-r--r--i386/include/mach/i386/mach_i386.defs16
-rw-r--r--i386/include/mach/i386/multiboot.h4
-rw-r--r--i386/include/mach/i386/trap.h14
-rw-r--r--i386/include/mach/i386/vm_types.h15
-rw-r--r--i386/include/mach/sa/stdarg.h2
-rw-r--r--i386/intel/pmap.c52
-rw-r--r--i386/intel/pmap.h32
49 files changed, 626 insertions, 630 deletions
diff --git a/i386/i386/ast_check.c b/i386/i386/ast_check.c
index faa3b8e..37071c2 100644
--- a/i386/i386/ast_check.c
+++ b/i386/i386/ast_check.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -44,7 +44,7 @@ init_ast_check(processor)
{
#ifdef lint
processor++;
-#endif lint
+#endif /* lint */
}
/*
@@ -55,7 +55,7 @@ cause_ast_check(processor)
{
#ifdef lint
processor++;
-#endif lint
+#endif /* lint */
}
#endif /* NCPUS > 1 */
diff --git a/i386/i386/cswitch.S b/i386/i386/cswitch.S
index 8187980..4e94f37 100644
--- a/i386/i386/cswitch.S
+++ b/i386/i386/cswitch.S
@@ -14,12 +14,12 @@
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -129,7 +129,7 @@ ENTRY(switch_to_shutdown_context)
movl _interrupt_stack(,%edx,4),%ecx /* point to its interrupt stack */
lea INTSTACK_SIZE(%ecx),%esp /* switch to it (top) */
-
+
pushl %eax /* push thread */
call EXT(thread_dispatch) /* reschedule thread */
addl $4,%esp /* clean stack */
@@ -138,5 +138,4 @@ ENTRY(switch_to_shutdown_context)
call *%ebx /* call routine to run */
hlt /* (should never return) */
-#endif NCPUS > 1
-
+#endif /* NCPUS > 1 */
diff --git a/i386/i386/db_disasm.c b/i386/i386/db_disasm.c
index dfb85e2..293a1c0 100644
--- a/i386/i386/db_disasm.c
+++ b/i386/i386/db_disasm.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1994,1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -1420,4 +1420,4 @@ db_disasm(
return loc;
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c
index 30b0b0f..2897beb 100644
--- a/i386/i386/db_interface.c
+++ b/i386/i386/db_interface.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1993,1992,1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -255,7 +255,7 @@ kdb_kentry(
}
boolean_t db_no_vm_fault = TRUE;
-
+
int
db_user_to_kernel_address(
task_t task,
@@ -265,7 +265,7 @@ db_user_to_kernel_address(
{
register pt_entry_t *ptp;
boolean_t faulted = FALSE;
-
+
retry:
ptp = pmap_pte(task->map->pmap, addr);
if (ptp == PT_ENTRY_NULL || (*ptp & INTEL_PTE_VALID) == 0) {
@@ -290,7 +290,7 @@ db_user_to_kernel_address(
*kaddr = (unsigned)ptetokv(*ptp) + (addr & (INTEL_PGBYTES-1));
return(0);
}
-
+
/*
* Read bytes from kernel address space for debugger.
*/
@@ -354,7 +354,7 @@ db_write_bytes(
extern char etext;
void db_write_bytes_user_space();
- if ((addr < VM_MIN_KERNEL_ADDRESS) ^
+ if ((addr < VM_MIN_KERNEL_ADDRESS) ^
((addr + size) <= VM_MIN_KERNEL_ADDRESS)) {
db_error("\ncannot write data into mixed space\n");
/* NOTREACHED */
@@ -369,7 +369,7 @@ db_write_bytes(
/* NOTREACHED */
}
}
-
+
if (addr >= VM_MIN_KERNEL_ADDRESS &&
addr <= (vm_offset_t)&etext)
{
@@ -401,7 +401,7 @@ db_write_bytes(
flush_tlb();
}
}
-
+
void
db_write_bytes_user_space(
vm_offset_t addr,
@@ -543,7 +543,7 @@ db_task_name(
n = DB_TASK_NAME_LEN-1;
p = (char *)kaddr + sizeof(unsigned);
- for (vaddr += sizeof(int); vaddr < DB_USER_STACK_ADDR && n > 0;
+ for (vaddr += sizeof(int); vaddr < DB_USER_STACK_ADDR && n > 0;
vaddr++, p++, n--) {
if (vaddr % INTEL_PGBYTES == 0) {
(void)db_user_to_kernel_address(task, vaddr, &kaddr, 0);
@@ -555,4 +555,4 @@ db_task_name(
db_printf(" ");
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c
index 7d0cff1..41e7bd6 100644
--- a/i386/i386/db_trace.c
+++ b/i386/i386/db_trace.c
@@ -672,4 +672,4 @@ void db_all_cprocs(
#endif /* CTHREADS_SUPPORT */
-#endif MACH_KDB
+#endif /* MACH_KDB */
diff --git a/i386/i386/debug.h b/i386/i386/debug.h
index 99108b6..37b2d40 100644
--- a/i386/i386/debug.h
+++ b/i386/i386/debug.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -51,7 +51,7 @@ void debug_trace_reset(void);
Also clears the trace buffer. */
void debug_trace_dump(void);
-#else ASSEMBLER
+#else /* ASSEMBLER */
#define DEBUG_TRACE \
pushl $__LINE__ ;\
@@ -62,11 +62,11 @@ void debug_trace_dump(void);
9: .ascii __FILE__"\0" ;\
.text
-#endif ASSEMBLER
+#endif /* ASSEMBLER */
-#endif DEBUG
+#endif /* DEBUG */
/* XXX #include_next "debug.h" */
-#endif _I386_DEBUG_
+#endif /* _I386_DEBUG_ */
diff --git a/i386/i386/debug_i386.c b/i386/i386/debug_i386.c
index c8cd563..ae77779 100644
--- a/i386/i386/debug_i386.c
+++ b/i386/i386/debug_i386.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -143,5 +143,4 @@ syscall_trace_print(int syscallvec, ...)
return syscallvec;
}
-#endif DEBUG
-
+#endif /* DEBUG */
diff --git a/i386/i386/debug_trace.S b/i386/i386/debug_trace.S
index a263bcf..e741516 100644
--- a/i386/i386/debug_trace.S
+++ b/i386/i386/debug_trace.S
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -48,7 +48,7 @@ ENTRY(_debug_trace)
popf
ret
-#endif DEBUG
+#endif /* DEBUG */
/* XXX gas bug? need at least one symbol... */
foo:
diff --git a/i386/i386/eflags.h b/i386/i386/eflags.h
index 26ce3d9..58ad968 100644
--- a/i386/i386/eflags.h
+++ b/i386/i386/eflags.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -32,4 +32,4 @@
#define EFL_USER_SET (EFL_IF)
#define EFL_USER_CLEAR (EFL_IOPL|EFL_NT|EFL_RF)
-#endif _KERNEL_I386_EFLAGS_H_
+#endif /* _KERNEL_I386_EFLAGS_H_ */
diff --git a/i386/i386/gdt.h b/i386/i386/gdt.h
index 10d4762..24bb45c 100644
--- a/i386/i386/gdt.h
+++ b/i386/i386/gdt.h
@@ -69,4 +69,4 @@ extern struct real_descriptor gdt[GDTSZ];
#define fill_gdt_descriptor(segment, base, limit, access, sizebits) \
fill_descriptor(&gdt[segment/8], base, limit, access, sizebits)
-#endif _I386_GDT_
+#endif /* _I386_GDT_ */
diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
index b4804da..6d47537 100644
--- a/i386/i386/hardclock.c
+++ b/i386/i386/hardclock.c
@@ -46,7 +46,7 @@
#ifdef PS2
#include <i386/pic.h>
#include <i386/pio.h>
-#endif PS2
+#endif /* PS2 */
extern void clock_interrupt();
extern char return_to_iret[];
diff --git a/i386/i386/idt-gen.h b/i386/i386/idt-gen.h
index 4663593..f86afb4 100644
--- a/i386/i386/idt-gen.h
+++ b/i386/i386/idt-gen.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -44,4 +44,4 @@ extern struct real_gate idt[IDTSZ];
#define fill_idt_gate(int_num, entry, selector, access, dword_count) \
fill_gate(&idt[int_num], entry, selector, access, dword_count)
-#endif _I386_IDT_
+#endif /* _I386_IDT_ */
diff --git a/i386/i386/ipl.h b/i386/i386/ipl.h
index 06ee58a..4ef9857 100644
--- a/i386/i386/ipl.h
+++ b/i386/i386/ipl.h
@@ -73,5 +73,5 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern int (*ivect[])();
extern int iunit[];
extern int intpri[];
-#endif ASSEMBLER
-#endif KERNEL
+#endif /* ASSEMBLER */
+#endif /* KERNEL */
diff --git a/i386/i386/ktss.h b/i386/i386/ktss.h
index 021f47f..8979115 100644
--- a/i386/i386/ktss.h
+++ b/i386/i386/ktss.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -27,4 +27,4 @@
extern struct i386_tss ktss;
-#endif _I386_KTSS_
+#endif /* _I386_KTSS_ */
diff --git a/i386/i386/kttd_interface.c b/i386/i386/kttd_interface.c
index 3f2f390..298ffac 100644
--- a/i386/i386/kttd_interface.c
+++ b/i386/i386/kttd_interface.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1993,1992 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -179,7 +179,7 @@ void kttd_machine_setregs(struct i386_gdb_register_state *ttd_state)
kttd_regs.edx = ttd_state->edx;
}
if (kttd_regs.ecx != ttd_state->ecx) {
- if (kttd_debug)
+ if (kttd_debug)
printf("ecx 0x%x:0x%x, ", kttd_regs.ecx, ttd_state->ecx);
kttd_regs.ecx = ttd_state->ecx;
}
@@ -212,7 +212,7 @@ void kttd_machine_setregs(struct i386_gdb_register_state *ttd_state)
printf("ss 0x%x:0x%x, ", kttd_regs.ss, ttd_state->ss);
kttd_regs.ss = ttd_state->ss;
}
-#endif 0
+#endif /* 0 */
}
@@ -238,14 +238,14 @@ boolean_t kttd_mem_access(vm_offset_t offset, vm_prot_t access)
if (kttd_debug)
printf(">>>>>>>>>>Faulting in memory: 0x%x, 0x%x\n",
trunc_page(offset), access);
- code = vm_fault(kernel_map, trunc_page(offset), access, FALSE,
+ code = vm_fault(kernel_map, trunc_page(offset), access, FALSE,
FALSE, (void (*)()) 0);
}else{
/*
* Check for user thread
*/
#if 1
- if ((current_thread() != THREAD_NULL) &&
+ if ((current_thread() != THREAD_NULL) &&
(current_thread()->task->map->pmap != kernel_pmap) &&
(current_thread()->task->map->pmap != PMAP_NULL)) {
code = vm_fault(current_thread()->task->map,
@@ -372,7 +372,7 @@ boolean_t kttd_trap(int type, int code, struct i386_saved_state *regs)
* Otherwise just hang (this might be panic).
*
* Check to make sure that TTD is supported.
- * (Both by the machine's driver's, and bootp if using ether).
+ * (Both by the machine's driver's, and bootp if using ether).
*/
if (!kttd_supported()) {
kttd_enabled = FALSE;
@@ -574,4 +574,4 @@ kttd_netentry(int_regs)
(void) splx(s);
}
-#endif MACH_TTD
+#endif /* MACH_TTD */
diff --git a/i386/i386/ldt.h b/i386/i386/ldt.h
index da0b0af..dd2d129 100644
--- a/i386/i386/ldt.h
+++ b/i386/i386/ldt.h
@@ -61,6 +61,6 @@ extern struct real_descriptor ldt[LDTSZ];
fill_gate((struct real_gate*)&ldt[selector/8], \
offset, dest_selector, access, word_count)
-#endif !ASSEMBLER
+#endif /* !ASSEMBLER */
-#endif _I386_LDT_
+#endif /* _I386_LDT_ */
diff --git a/i386/i386/lock.h b/i386/i386/lock.h
index 053a3ea..6ed243b 100644
--- a/i386/i386/lock.h
+++ b/i386/i386/lock.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -121,7 +121,7 @@
extern void simple_lock_pause();
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#include_next "lock.h"
diff --git a/i386/i386/locore.S b/i386/i386/locore.S
index c709562..c5a3577 100644
--- a/i386/i386/locore.S
+++ b/i386/i386/locore.S
@@ -867,7 +867,7 @@ kdb_from_iret_i: /* on interrupt stack */
addl $8,%esp
iret
-#endif MACH_KDB
+#endif /* MACH_KDB */
#if MACH_TTD
/*
@@ -1071,7 +1071,7 @@ mach_call_call:
/* will return with syscallofs still (or again) in eax */
addl $4,%esp
0:
-#endif DEBUG
+#endif /* DEBUG */
call *EXT(mach_trap_table)+4(%eax)
/* call procedure */
@@ -1480,7 +1480,7 @@ ENTRY(outb)
outb %al,%dx /* send it out */
#ifdef iPSC386
mull %ecx /* Delay a little to make H/W happy */
-#endif iPSC386
+#endif /* iPSC386 */
ret
/*
@@ -1498,7 +1498,7 @@ ENTRY(inb)
pushl %eax
mull %ecx
popl %eax
-#endif iPSC386
+#endif /* iPSC386 */
ret
/*
diff --git a/i386/i386/mp_desc.h b/i386/i386/mp_desc.h
index dbc3f5e..96a0ca7 100644
--- a/i386/i386/mp_desc.h
+++ b/i386/i386/mp_desc.h
@@ -79,6 +79,6 @@ extern struct real_descriptor *mp_gdt[NCPUS];
extern struct mp_desc_table * mp_desc_init(/* int */);
-#endif MULTIPROCESSOR
+#endif /* MULTIPROCESSOR */
#endif /* _I386_MP_DESC_H_ */
diff --git a/i386/i386/pic.c b/i386/i386/pic.c
index 8380db8..18162fc 100644
--- a/i386/i386/pic.c
+++ b/i386/i386/pic.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -73,15 +73,15 @@ u_short PICM_ICW3, PICM_OCW3, PICS_ICW3, PICS_OCW3 ;
u_short PICM_ICW4, PICS_ICW4 ;
/*
-** picinit() - This routine
+** picinit() - This routine
** * Establishes a table of interrupt vectors
** * Establishes a table of interrupt priority levels
** * Establishes a table of interrupt masks to be put
** in the PICs.
-** * Establishes location of PICs in the system
+** * Establishes location of PICs in the system
** * Initialises them
**
-** At this stage the interrupt functionality of this system should be
+** At this stage the interrupt functionality of this system should be
** coplete.
**
*/
@@ -93,8 +93,8 @@ u_short PICM_ICW4, PICS_ICW4 ;
** of pic masks, as there are only 7 interrupt priority levels.
**
** 2. The next thing we must do is to determine which of the PIC interrupt
-** request lines have to be masked out, this is done by calling
-** form_pic_mask() with a (int_lev) of zero, this will find all the
+** request lines have to be masked out, this is done by calling
+** form_pic_mask() with a (int_lev) of zero, this will find all the
** interrupt lines that have priority 0, (ie to be ignored).
** Then we split this up for the master/slave PICs.
**
@@ -142,10 +142,10 @@ picinit()
** 3. Select options for each ICW and each OCW for each PIC.
*/
- PICM_ICW1 =
+ PICM_ICW1 =
(ICW_TEMPLATE | EDGE_TRIGGER | ADDR_INTRVL8 | CASCADE_MODE | ICW4__NEEDED);
- PICS_ICW1 =
+ PICS_ICW1 =
(ICW_TEMPLATE | EDGE_TRIGGER | ADDR_INTRVL8 | CASCADE_MODE | ICW4__NEEDED);
PICM_ICW2 = PICM_VECTBASE;
@@ -154,11 +154,11 @@ picinit()
#ifdef AT386
PICM_ICW3 = ( SLAVE_ON_IR2 );
PICS_ICW3 = ( I_AM_SLAVE_2 );
-#endif AT386
+#endif /* AT386 */
#ifdef iPSC386
PICM_ICW3 = ( SLAVE_ON_IR7 );
PICS_ICW3 = ( I_AM_SLAVE_7 );
-#endif iPSC386
+#endif /* iPSC386 */
#ifdef iPSC386
/* Use Buffered mode for iPSC386 */
@@ -166,12 +166,12 @@ picinit()
NRML_EOI_MOD | I8086_EMM_MOD);
PICS_ICW4 = (SNF_MODE_DIS | BUFFERD_MODE | I_AM_A_SLAVE |
NRML_EOI_MOD | I8086_EMM_MOD);
-#else iPSC386
- PICM_ICW4 =
+#else /* iPSC386 */
+ PICM_ICW4 =
(SNF_MODE_DIS | NONBUFD_MODE | NRML_EOI_MOD | I8086_EMM_MOD);
- PICS_ICW4 =
+ PICS_ICW4 =
(SNF_MODE_DIS | NONBUFD_MODE | NRML_EOI_MOD | I8086_EMM_MOD);
-#endif iPSC386
+#endif /* iPSC386 */
PICM_OCW1 = (curr_pic_mask & 0x00FF);
PICS_OCW1 = ((curr_pic_mask & 0xFF00)>>8);
@@ -183,9 +183,9 @@ picinit()
PICS_OCW3 = (OCW_TEMPLATE | READ_NEXT_RD | READ_IR_ONRD );
- /*
+ /*
** 4. Initialise master - send commands to master PIC
- */
+ */
outb ( master_icw, PICM_ICW1 );
outb ( master_ocw, PICM_ICW2 );
@@ -223,9 +223,9 @@ picinit()
/*
-** form_pic_mask(int_lvl)
+** form_pic_mask(int_lvl)
**
-** For a given interrupt priority level (int_lvl), this routine goes out
+** For a given interrupt priority level (int_lvl), this routine goes out
** and scans through the interrupt level table, and forms a mask based on the
** entries it finds there that have the same or lower interrupt priority level
** as (int_lvl). It returns a 16-bit mask which will have to be split up between
@@ -238,7 +238,7 @@ picinit()
#endif /* defined(AT386) || defined(PS2) */
#ifdef iPSC386
#define SLAVEMASK (0xFFFF ^ SLAVE_ON_IR7)
-#endif iPSC386
+#endif /* iPSC386 */
#define SLAVEACTV 0xFF00
@@ -251,7 +251,7 @@ form_pic_mask()
if (intpri[j] <= i)
mask |= bit;
- if ((mask & SLAVEACTV) != SLAVEACTV )
+ if ((mask & SLAVEACTV) != SLAVEACTV )
mask &= SLAVEMASK;
pic_mask[i] = mask;
diff --git a/i386/i386/pic.h b/i386/i386/pic.h
index 66b92d8..1703192 100644
--- a/i386/i386/pic.h
+++ b/i386/i386/pic.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -73,7 +73,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define OFF_ICW 0x00
#define OFF_OCW 0x02
#define SIZE_PIC 0x04
-#endif iPSC386
+#endif /* iPSC386 */
#define PIC_MASTER_ICW (ADDR_PIC_BASE + OFF_ICW)
#define PIC_MASTER_OCW (ADDR_PIC_BASE + OFF_OCW)
@@ -82,11 +82,11 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
** The following banks of definitions ICW1, ICW2, ICW3, and ICW4 are used
-** to define the fields of the various ICWs for initialisation of the PICs
+** to define the fields of the various ICWs for initialisation of the PICs
*/
/*
-** ICW1
+** ICW1
*/
#define ICW_TEMPLATE 0x10
@@ -105,17 +105,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#if defined(AT386) || defined(PS2)
-#define PICM_VECTBASE 0x40
+#define PICM_VECTBASE 0x40
#define PICS_VECTBASE PICM_VECTBASE + 0x08
#endif /* defined(AT386) || defined(PS2) */
#ifdef iPSC386
-#define PICM_VECTBASE 0x40
+#define PICM_VECTBASE 0x40
#define PICS_VECTBASE PICM_VECTBASE + 0x08
-#endif iPSC386
+#endif /* iPSC386 */
/*
-** ICW3
+** ICW3
*/
#define SLAVE_ON_IR0 0x01
@@ -137,7 +137,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define I_AM_SLAVE_7 0x07
/*
-** ICW4
+** ICW4
*/
#define SNF_MODE_ENA 0x10
@@ -147,19 +147,19 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#if iPSC386
#define I_AM_A_SLAVE 0x00
#define I_AM_A_MASTR 0x04
-#endif iPSC386
+#endif /* iPSC386 */
#define AUTO_EOI_MOD 0x02
#define NRML_EOI_MOD 0x00
#define I8086_EMM_MOD 0x01
#define SET_MCS_MODE 0x00
/*
-** OCW1
+** OCW1
*/
#define PICM_MASK 0xFF
#define PICS_MASK 0xFF
/*
-** OCW2
+** OCW2
*/
#define NON_SPEC_EOI 0x20
@@ -179,9 +179,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define SEND_EOI_IR5 0x05
#define SEND_EOI_IR6 0x06
#define SEND_EOI_IR7 0x07
-
+
/*
-** OCW3
+** OCW3
*/
#define OCW_TEMPLATE 0x08
@@ -194,4 +194,4 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define READ_IR_ONRD 0x00
#define READ_IS_ONRD 0x01
-#endif _I386_PIC_H_
+#endif /* _I386_PIC_H_ */
diff --git a/i386/i386/pio.h b/i386/i386/pio.h
index b2427f9..3b22aee 100644
--- a/i386/i386/pio.h
+++ b/i386/i386/pio.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -29,7 +29,7 @@
#ifndef __GNUC__
#error You do not stand a chance. This file is gcc only.
-#endif __GNUC__
+#endif /* __GNUC__ */
#define inl(y) \
({ unsigned long _tmp__; \
diff --git a/i386/i386/pit.h b/i386/i386/pit.h
index 79a8757..082bb15 100644
--- a/i386/i386/pit.h
+++ b/i386/i386/pit.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -48,15 +48,15 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <platforms.h>
#if defined(MB1) || defined(MB2) || EXL > 0 || iPSC386
/* Definitions for 8254 Programmable Interrupt Timer ports on 386/20 */
-#define PITCTR0_PORT 0xD0 /* counter 0 port */
-#define PITCTR1_PORT 0xD2 /* counter 1 port */
-#define PITCTR2_PORT 0xD4 /* counter 2 port */
+#define PITCTR0_PORT 0xD0 /* counter 0 port */
+#define PITCTR1_PORT 0xD2 /* counter 1 port */
+#define PITCTR2_PORT 0xD4 /* counter 2 port */
#define PITCTL_PORT 0xD6 /* PIT control port */
#else /* defined(AT386) || defined(PS2) */
/* Definitions for 8254 Programmable Interrupt Timer ports on AT 386 */
-#define PITCTR0_PORT 0x40 /* counter 0 port */
-#define PITCTR1_PORT 0x41 /* counter 1 port */
-#define PITCTR2_PORT 0x42 /* counter 2 port */
+#define PITCTR0_PORT 0x40 /* counter 0 port */
+#define PITCTR1_PORT 0x41 /* counter 1 port */
+#define PITCTR2_PORT 0x42 /* counter 2 port */
#define PITCTL_PORT 0x43 /* PIT control port */
#define PITAUX_PORT 0x61 /* PIT auxiliary port */
/* bits used in auxiliary control port for timer 2 */
@@ -92,7 +92,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#if iPSC386
#define CLKNUM 1000000
-#endif iPSC386
+#endif /* iPSC386 */
#if EXL
/* added micro-timer support. --- csy */
@@ -117,4 +117,4 @@ asm int intr_restore()
popfl
}
-#endif EXL
+#endif /* EXL */
diff --git a/i386/i386/seg.h b/i386/i386/seg.h
index b86e967..a71611d 100644
--- a/i386/i386/seg.h
+++ b/i386/i386/seg.h
@@ -1,29 +1,29 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
- * Copyright (c) 1991 IBM Corporation
+ * Copyright (c) 1991 IBM Corporation
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation,
- * and that the name IBM not be used in advertising or publicity
+ * and that the name IBM not be used in advertising or publicity
* pertaining to distribution of the software without specific, written
* prior permission.
- *
+ *
* CARNEGIE MELLON AND IBM ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON AND IBM DISCLAIM ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -61,7 +61,7 @@ struct real_gate {
offset_high:16; /* offset 16..31 */
};
-#endif !ASSEMBLER
+#endif /* !ASSEMBLER */
#define SZ_32 0x4 /* 32-bit segment */
#define SZ_16 0x0 /* 16-bit segment */
@@ -179,6 +179,6 @@ fill_gate(struct real_gate *gate, unsigned offset, unsigned short selector,
gate->offset_high = (offset >> 16) & 0xffff;
}
-#endif !ASSEMBLER
+#endif /* !ASSEMBLER */
#endif /* _I386_SEG_H_ */
diff --git a/i386/i386/thread.h b/i386/i386/thread.h
index c911127..027193a 100644
--- a/i386/i386/thread.h
+++ b/i386/i386/thread.h
@@ -195,4 +195,4 @@ typedef struct pcb {
/* #include_next "thread.h" */
-#endif _I386_THREAD_H_
+#endif /* _I386_THREAD_H_ */
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index e46f6b0..ea7a097 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -77,12 +77,12 @@ thread_kdb_return()
/*NOTREACHED*/
}
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
#if MACH_TTD
extern boolean_t kttd_enabled;
boolean_t debug_all_traps_with_kttd = TRUE;
-#endif MACH_TTD
+#endif /* MACH_TTD */
void
user_page_fault_continue(kr)
@@ -100,7 +100,7 @@ user_page_fault_continue(kr)
(vm_offset_t)regs->cr2,
regs))
kdb_trap(T_WATCHPOINT, 0, regs);
-#endif MACH_KDB
+#endif /* MACH_KDB */
thread_exception_return();
/*NOTREACHED*/
}
@@ -111,7 +111,7 @@ user_page_fault_continue(kr)
thread_exception_return();
/*NOTREACHED*/
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
i386_exception(EXC_BAD_ACCESS, kr, regs->cr2);
/*NOTREACHED*/
@@ -271,7 +271,7 @@ dump_ss(regs);
kdb_trap(T_WATCHPOINT, 0, regs);
}
else
-#endif MACH_KDB
+#endif /* MACH_KDB */
if ((code & T_PF_WRITE) == 0 &&
result == KERN_PROTECTION_FAILURE)
{
@@ -348,7 +348,7 @@ dump_ss(regs);
#if MACH_KDB
if (kdb_trap(type, code, regs))
return;
-#endif MACH_KDB
+#endif /* MACH_KDB */
splhigh();
printf("kernel trap, type %d, code = %x\n",
type, code);
@@ -554,7 +554,7 @@ printf("user trap %d error %d sub %08x\n", type, code, subcode);
#if MACH_KDB
if (kdb_trap(type, regs->err, regs))
return 0;
-#endif MACH_KDB
+#endif /* MACH_KDB */
splhigh();
printf("user trap, type %d, code = %x\n",
type, regs->err);
@@ -571,7 +571,7 @@ printf("user trap %d error %d sub %08x\n", type, code, subcode);
if (debug_all_traps_with_kdb &&
kdb_trap(type, regs->err, regs))
return 0;
-#endif MACH_KDB
+#endif /* MACH_KDB */
i386_exception(exc, code, subcode);
/*NOTREACHED*/
diff --git a/i386/i386/trap.h b/i386/i386/trap.h
index f4dcbd5..13ded30 100644
--- a/i386/i386/trap.h
+++ b/i386/i386/trap.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -33,6 +33,6 @@
char *trap_name(unsigned int trapnum);
-#endif !ASSEMBLER
+#endif /* !ASSEMBLER */
-#endif _I386_TRAP_H_
+#endif /* _I386_TRAP_H_ */
diff --git a/i386/i386/vm_param.h b/i386/i386/vm_param.h
index 30e9418..96fc8ba 100644
--- a/i386/i386/vm_param.h
+++ b/i386/i386/vm_param.h
@@ -61,4 +61,4 @@ extern vm_offset_t phys_mem_va;
#define kvtolin(a) ((vm_offset_t)(a) + LINEAR_MIN_KERNEL_ADDRESS)
#define lintokv(a) ((vm_offset_t)(a) - LINEAR_MIN_KERNEL_ADDRESS)
-#endif _I386_KERNEL_I386_VM_PARAM_
+#endif /* _I386_KERNEL_I386_VM_PARAM_ */
diff --git a/i386/i386/vm_tuning.h b/i386/i386/vm_tuning.h
index a5091fb..f54e110 100644
--- a/i386/i386/vm_tuning.h
+++ b/i386/i386/vm_tuning.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -32,4 +32,4 @@
#ifndef _I386_VM_TUNING_H_
#define _I386_VM_TUNING_H_
-#endif _I386_VM_TUNING_H_
+#endif /* _I386_VM_TUNING_H_ */
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 50eec98..8542a96 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -1,29 +1,29 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1993,1992,1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
-
+
#ifdef MACH_KERNEL
#include <mach_ttd.h>
#include <mach/std_types.h>
@@ -81,7 +81,7 @@ extern int pc586intr();
#if NNE > 0
extern struct bus_driver nedriver;
extern int neintr();
-#endif NNE
+#endif /* NNE */
#include <ns8390.h>
#if NNS8390 > 0
@@ -133,7 +133,7 @@ extern int wtintr();
struct bus_ctlr bus_master_init[] = {
-/* driver name unit intr address len phys_address
+/* driver name unit intr address len phys_address
adaptor alive flags spl pic */
#ifndef LINUX_DEV
@@ -226,7 +226,7 @@ struct bus_ctlr bus_master_init[] = {
struct bus_device bus_device_init[] = {
-/* driver name unit intr address am phys_address
+/* driver name unit intr address am phys_address
adaptor alive ctlr slave flags *mi *next sysdep sysdep */
#ifndef LINUX_DEV
@@ -331,7 +331,7 @@ struct bus_device bus_device_init[] = {
'?', 0, -1, -1, 0, 0, 0, SPL_SIX, 5},
{&nedriver, "ne", 1, neintr, 0x300,0x4000,0xd0000,
'?', 0, -1, -1, 0, 0, 0, SPL_SIX, 10},
-#endif NNE > 0
+#endif /* NNE > 0 */
#if NNS8390 > 0
/* "wd" and "el" */
@@ -463,7 +463,7 @@ void take_dev_irq(
dev->sysdep, dev->sysdep1);
while (1);
}
-
+
}
void take_ctlr_irq(
diff --git a/i386/i386at/blit.c b/i386/i386at/blit.c
index e97b0ee..32cc0a2 100644
--- a/i386/i386at/blit.c
+++ b/i386/i386at/blit.c
@@ -1,29 +1,29 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
-
+
/* **********************************************************************
File: blit.c
Description: Device Driver for Bell Tech Blit card
@@ -81,14 +81,14 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef MACH_KERNEL
#include <sys/types.h>
#include <device/errno.h>
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/param.h>
#include <sys/dir.h>
#include <sys/signal.h>
#include <sys/user.h>
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#include <vm/vm_kern.h>
#include <mach/vm_param.h>
#include <machine/machspl.h>
@@ -115,7 +115,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#define MAXBLITS 1
-#if NBLIT > MAXBLITS
+#if NBLIT > MAXBLITS
/* oh, no, you don't want to do this...; */
#else
@@ -166,14 +166,14 @@ struct mb_driver blitdriver = {
/*
* Per-card bookkeeping information for driver.
- *
- * "scrstrip" and "dpctlregs" point to data areas that are passed to
- * the Display Processor. They are allocated out of the spare
- * graphics memory. "scrstrip" is used to describe an entire screen.
- * "dpctlregs" contains assorted parameters for the display
- * controller.
- *
- * "firstfree" is an offset into the graphics memory. Memory starting
+ *
+ * "scrstrip" and "dpctlregs" point to data areas that are passed to
+ * the Display Processor. They are allocated out of the spare
+ * graphics memory. "scrstrip" is used to describe an entire screen.
+ * "dpctlregs" contains assorted parameters for the display
+ * controller.
+ *
+ * "firstfree" is an offset into the graphics memory. Memory starting
* there can be allocated by users.
*/
@@ -187,7 +187,7 @@ struct blitsoft {
} blitsoft[NBLIT];
-/*
+/*
* The following array contains the initial settings for
* the Display Processor Control Block Registers.
* The video timing signals in this array are for the
@@ -221,9 +221,9 @@ DPCONTROLBLK blit_mparm = {
DP_CURSOR_CROSSHAIR, /* cursor style & mode */
0x00A0, 0x0050, /* cursor x & y loc. */
/* cursor pattern */
- 0xfffe, 0xfffc, 0xc018, 0xc030, 0xc060, 0xc0c0, 0xc0c0, 0xc060,
- 0xc430, 0xce18, 0xdb0c, 0xf186, 0xe0c3, 0xc066, 0x803c, 0x0018
-};
+ 0xfffe, 0xfffc, 0xc018, 0xc030, 0xc060, 0xc0c0, 0xc0c0, 0xc060,
+ 0xc430, 0xce18, 0xdb0c, 0xf186, 0xe0c3, 0xc066, 0x803c, 0x0018
+};
void blitreboot();
@@ -234,7 +234,7 @@ void blitreboot();
***********/
-/*
+/*
* Probe - is the board there?
*
* in: reg = start of mapped Blit memory.
@@ -242,7 +242,7 @@ void blitreboot();
* out: returns size of mapped Blit memory if the board is present,
* 0 otherwise.
*
- * effects: if the board is present, it is reset and left visible in
+ * effects: if the board is present, it is reset and left visible in
* Unix mode.
*/
@@ -277,7 +277,7 @@ blitinit()
}
-/*
+/*
* Allocate needed objects from Blit's memory.
*/
blit_memory_init(bs)
@@ -311,14 +311,14 @@ blit_memory_init(bs)
}
-/*
+/*
* Reset the Blit board and leave it visible.
*/
blit_reset_board()
{
union blit_config_reg config;
-
+
config.byte = inb(BLIT_CONFIG_ADDR);
config.reg.reset = 1;
outb(BLIT_CONFIG_ADDR, config.byte);
@@ -331,7 +331,7 @@ blit_reset_board()
#if AUTOINIT
-/*
+/*
* Attach - finish initialization by setting up the 786.
*/
@@ -357,7 +357,7 @@ init_biu(blt)
/* WRITEREG16(blt, DRAM_REFRESH, 0x003f); */
WRITEREG16(blt, DRAM_REFRESH, 0x0018); /* refresh rate */
- WRITEREG16(blt, DRAM_CONTROL,
+ WRITEREG16(blt, DRAM_CONTROL,
MEMROWS1 | FASTPG_INTERLV | HEIGHT_256K);
WRITEREG16(blt, DP_PRIORITY, (7 << 3) | 7); /* max pri */
WRITEREG16(blt, GP_PRIORITY, (1 << 3) | 1); /* almost min pri */
@@ -371,7 +371,7 @@ init_biu(blt)
}
-/*
+/*
* Initialize the Display Processor.
* XXX - assumes only 1 card is installed, assumes monochrome display.
*/
@@ -383,9 +383,9 @@ init_dp(bs)
struct blitmem *bm = (struct blitmem *)blt->graphmem;
/*
- * Set up strip header and tile descriptor for the whole
- * screen. It's not clear why the C bit should be turned on,
- * but it seems to get rid of the nasty flickering you can get
+ * Set up strip header and tile descriptor for the whole
+ * screen. It's not clear why the C bit should be turned on,
+ * but it seems to get rid of the nasty flickering you can get
* by positioning an xterm window along the top of the screen.
*/
bs->scrstrip->strip.lines = BLIT_MONOHEIGHT - 1;
@@ -398,7 +398,7 @@ init_dp(bs)
BLIT_MONOWIDTH, /* width of bitmap */
VM_TO_ADDR786(bm->fb.mono_fb, blt), /* the actual bitmap */
1); /* bits per pixel */
-
+
/* Copy into DP register block. */
*(bs->dpctlregs) = blit_mparm;
bs->dpctlregs->descl = DP_ADDRLOW(VM_TO_ADDR786(bs->scrstrip, blt));
@@ -448,7 +448,7 @@ tiledesc(tile, x, y, w, ww, adx, bpp)
/*
- * Cause the Display Processor to load its Control Registers from
+ * Cause the Display Processor to load its Control Registers from
* "vm_addr".
*/
@@ -463,7 +463,7 @@ DPCONTROLBLK *vm_addr;
/* set up dp address */
WRITEREG16(blt, DP_PARM1_REG, DP_ADDRLOW(blit_addr));
WRITEREG16(blt, DP_PARM2_REG, DP_ADDRHIGH(blit_addr));
-
+
/* set blanking video */
WRITEREG16(blt, DEF_VIDEO_REG, 0);
@@ -556,9 +556,9 @@ int length; /* num bytes to map */
vm_offset_t vmaddr;
#ifdef MACH_KERNEL
vm_offset_t io_map();
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
vm_offset_t pmap_map_bd();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
if (physaddr != (caddr_t)trunc_page(physaddr))
panic("Blit card not on page boundary");
@@ -566,11 +566,11 @@ int length; /* num bytes to map */
#ifdef MACH_KERNEL
vmaddr = io_map((vm_offset_t)physaddr, length);
if (vmaddr == 0)
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (kmem_alloc_pageable(kernel_map,
&vmaddr, round_page(BLIT_MAPPED_SIZE))
!= KERN_SUCCESS)
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
panic("can't alloc VM for Blit card");
(void)pmap_map_bd(vmaddr, (vm_offset_t)physaddr,
@@ -595,8 +595,8 @@ int length;
/*
* blit_init: initialize globals & hardware, and set cursor. Could be
* called twice, once as part of kd initialization and once as part of
- * blit initialization. Should not be called before blit_present() is
- * called.
+ * blit initialization. Should not be called before blit_present() is
+ * called.
*/
void
@@ -644,7 +644,7 @@ blit_init()
/*
* Use generic bitmap routines, no 786 assist (see
- * blit_memory_init).
+ * blit_memory_init).
*/
kd_dput = bmpput;
kd_dmvup = bmpmvup;
@@ -723,7 +723,7 @@ getfontinfo(blt)
char_white = BLIT_WHITE_BYTE;
font_start = rom + fontoffset;
-
+
/*
* Check byte-alignment assumption.
* XXX - does it do any good to panic when initializing the
@@ -755,8 +755,8 @@ pick_cursor_height()
int scl_avail; /* scan lines available for console */
int scl_per_line; /* scan lines per console line */
- /*
- * scan lines avail. = total lines - top margin;
+ /*
+ * scan lines avail. = total lines - top margin;
* no bottom margin (XXX).
*/
scl_avail = BLIT_MONOHEIGHT - ystart;
@@ -769,9 +769,9 @@ pick_cursor_height()
}
-/*
- * setstatus: Give a status indication to the user. Ideally, we'd
- * just set the 3 user-controlled LED's. Unfortunately, that doesn't
+/*
+ * setstatus: Give a status indication to the user. Ideally, we'd
+ * just set the 3 user-controlled LED's. Unfortunately, that doesn't
* seem to work. So, we ring the bell.
*/
@@ -780,7 +780,7 @@ setstatus(val)
int val;
{
union blit_diag_reg diag;
-
+
diag.byte = inb(BLIT_DIAG_ADDR);
diag.reg.led0 = (val & 1) ? BLIT_LED_ON : BLIT_LED_OFF;
diag.reg.led1 = (val & 2) ? BLIT_LED_ON : BLIT_LED_OFF;
@@ -807,8 +807,8 @@ setstatus(val)
***********/
-/*
- * Open - Verify that minor device is OK and not in use, then clear
+/*
+ * Open - Verify that minor device is OK and not in use, then clear
* the screen.
*/
@@ -850,7 +850,7 @@ blitclose(dev, flag)
}
-/*
+/*
* Mmap.
*/
@@ -869,7 +869,7 @@ blitmmap(dev, off, prot)
}
-/*
+/*
* Ioctl.
*/
@@ -894,7 +894,7 @@ io_return_t blit_get_stat(dev, flavor, data, count)
}
return (D_SUCCESS);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*ARGSUSED*/
int
blitioctl(dev, cmd, data, flag)
@@ -916,7 +916,7 @@ blitioctl(dev, cmd, data, flag)
return(err);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
* clear_blit: clear blit's screen.
@@ -929,7 +929,7 @@ clear_blit(blt)
(*kd_dclear)(0, kd_lines*kd_cols, KA_NORMAL);
}
-/*
+/*
* Put the board into DOS mode in preparation for rebooting.
*/
@@ -937,7 +937,7 @@ void
blitreboot()
{
union blit_config_reg config;
-
+
config.byte = inb(BLIT_CONFIG_ADDR);
config.reg.mode = BLIT_DOS_MODE;
config.reg.invisible = BLIT_VISIBLE;
diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index 1fc0dfa..40df714 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1993-1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -47,7 +47,7 @@ extern int pchdopen(),pchdread(),pchdwrite(),pchdgetstat(),pchdsetstat();
#define pchdname "pchd"
#endif
-#endif NHD > 0
+#endif /* NHD > 0 */
#include <aha.h>
#if NAHA > 0
@@ -66,20 +66,20 @@ int cd_open(), cd_close(), cd_read(), cd_write();
extern int fdopen(), fdclose(), fdread(), fdwrite();
extern int fdgetstat(), fdsetstat(), fddevinfo();
#define fdname "fd"
-#endif NFD > 0
+#endif /* NFD > 0 */
#include <wt.h>
#if NWT > 0
extern int wtopen(), wtread(), wtwrite(), wtclose();
#define wtname "wt"
-#endif NWT > 0
+#endif /* NWT > 0 */
#include <pc586.h>
#if NPC586 > 0
extern int pc586open(), pc586output(), pc586getstat(), pc586setstat(),
pc586setinput();
#define pc586name "pc"
-#endif NPC586 > 0
+#endif /* NPC586 > 0 */
#include <ne.h>
#if NNE > 0
@@ -88,16 +88,16 @@ extern int neopen(), neoutput(), negetstat(), nesetstat(), nesetinput();
extern int nefoutput();
#endif /* FIPC */
#define nename "ne"
-#endif NNE > 0
+#endif /* NNE > 0 */
#include <ns8390.h>
#if NNS8390 > 0
extern int wd8003open(), eliiopen();
-extern int ns8390output(), ns8390getstat(), ns8390setstat(),
+extern int ns8390output(), ns8390getstat(), ns8390setstat(),
ns8390setinput();
#define ns8390wdname "wd"
#define ns8390elname "el"
-#endif NNS8390 > 0
+#endif /* NNS8390 > 0 */
#include <at3c501.h>
#if NAT3C501 > 0
@@ -105,21 +105,21 @@ extern int at3c501open(), at3c501output(),
at3c501getstat(), at3c501setstat(),
at3c501setinput();
#define at3c501name "et"
-#endif NAT3C501 > 0
+#endif /* NAT3C501 > 0 */
#include <ul.h>
#if NUL > 0
extern int ulopen(), uloutput(), ulgetstat(), ulsetstat(),
ulsetinput();
#define ulname "ul"
-#endif NUL > 0
+#endif /* NUL > 0 */
#include <wd.h>
#if NWD > 0
extern int wdopen(), wdoutput(), wdgetstat(), wdsetstat(),
wdsetinput();
#define wdname "wd"
-#endif NWD > 0
+#endif /* NWD > 0 */
#include <hpp.h>
#if NHPP > 0
@@ -133,14 +133,14 @@ extern int hppopen(), hppoutput(), hppgetstat(), hppsetstat(),
extern int paropen(), paroutput(), pargetstat(), parsetstat(),
parsetinput();
#define parname "par"
-#endif NPAR > 0
+#endif /* NPAR > 0 */
#include <de6c.h>
#if NDE6C > 0
extern int de6copen(), de6coutput(), de6cgetstat(), de6csetstat(),
de6csetinput();
#define de6cname "de"
-#endif NDE6C > 0
+#endif /* NDE6C > 0 */
extern int kdopen(), kdclose(), kdread(), kdwrite();
extern int kdgetstat(), kdsetstat(), kdportdeath();
@@ -152,14 +152,14 @@ extern vm_offset_t kdmmap();
extern int comopen(), comclose(), comread(), comwrite();
extern int comgetstat(), comsetstat(), comportdeath();
#define comname "com"
-#endif NCOM > 0
+#endif /* NCOM > 0 */
#include <lpr.h>
#if NLPR > 0
extern int lpropen(), lprclose(), lprread(), lprwrite();
extern int lprgetstat(), lprsetstat(), lprportdeath();
#define lprname "lpr"
-#endif NLPR > 0
+#endif /* NLPR > 0 */
#include <blit.h>
#if NBLIT > 0
@@ -219,7 +219,7 @@ struct dev_ops dev_name_list[] =
hdwrite, hdgetstat, hdsetstat, nomap,
nodev, nulldev, nulldev, 1024,
hddevinfo },
-#endif NHD > 0
+#endif /* NHD > 0 */
#if NAHA > 0
{ rzname, rz_open, rz_close, rz_read,
@@ -249,14 +249,14 @@ struct dev_ops dev_name_list[] =
fdwrite, fdgetstat, fdsetstat, nomap,
nodev, nulldev, nulldev, 64,
fddevinfo },
-#endif NFD > 0
+#endif /* NFD > 0 */
#if NWT > 0
{ wtname, wtopen, wtclose, wtread,
wtwrite, nulldev, nulldev, nomap,
nodev, nulldev, nulldev, 0,
nodev },
-#endif NWT > 0
+#endif /* NWT > 0 */
#if NPC586 > 0
{ pc586name, pc586open, nulldev, nulldev,
@@ -373,7 +373,7 @@ struct dev_ops dev_name_list[] =
pchdwrite, pchdgetstat, pchdsetstat, nomap,
nodev, nulldev, nulldev, 16,
hddevinfo },
-#endif NHD > 0
+#endif /* NHD > 0 */
#endif
#if 0
@@ -382,8 +382,8 @@ struct dev_ops dev_name_list[] =
hdwrite, hdgetstat, hdsetstat, nomap,
nodev, nulldev, nulldev, 16,
hddevinfo },
-#endif NHD > 0
-#endif 0 /* Kevin doesn't know why this was here. */
+#endif /* NHD > 0 */
+#endif /* Kevin doesn't know why this was here. */
#ifdef MACH_KMSG
{ kmsgname, kmsgopen, kmsgclose, kmsgread,
diff --git a/i386/i386at/fd.c b/i386/i386at/fd.c
index 773411b..82c4077 100644
--- a/i386/i386at/fd.c
+++ b/i386/i386at/fd.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1993,1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -57,12 +57,12 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/ioctl.h>
#include <device/buf.h>
#include <device/errno.h>
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
#include <sys/buf.h>
#include <sys/errno.h>
#include <sys/user.h>
#include <sys/ioctl.h>
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#include <i386/pio.h>
#include <i386/machspl.h>
#include <chips/busses.h>
@@ -127,15 +127,15 @@ vm_offset_t FdDmaPage = (vm_offset_t) 0;
vm_offset_t fd_std[NFD] = { 0 };
struct bus_device *fd_dinfo[NFD*2];
struct bus_ctlr *fd_minfo[NFD];
-struct bus_driver fddriver =
+struct bus_driver fddriver =
{fdprobe, fdslave, fdattach, 0, fd_std, "fd", fd_dinfo, "fdc", fd_minfo, 0};
int m765verify[MAXUNIT] = {1,1,1,1}; /* write after read flag */
- /* 0 != verify mode */
+ /* 0 != verify mode */
/* 0 == not verify mode */
#ifdef MACH_KERNEL
extern struct buf *geteblk();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#define trfrate(uip, type) outb(VFOREG(uip->addr),(((type)&RATEMASK)>>6))
#define rbskrate(uip, type) trfrate(uip,(type)&RAPID?RPSEEK:NMSEEK)
@@ -170,7 +170,7 @@ struct bus_ctlr *ctlr;
return 0;
}
(void)pmap_map(cip->b_vbuf,
- (vm_offset_t)cip->b_pbuf,
+ (vm_offset_t)cip->b_pbuf,
(vm_offset_t)cip->b_pbuf+PAGE_SIZE,
VM_PROT_READ | VM_PROT_WRITE);
}
@@ -208,7 +208,7 @@ struct bus_device *dev;
uip->b_unitf=uip;
cip->b_unitf=uip;
}
- uip->d_drtab.dr_type &= ~OKTYPE;
+ uip->d_drtab.dr_type &= ~OKTYPE;
printf(", port = %x, spl = %d, pic = %d.",
dev->address, dev->sysdep, dev->sysdep1);
@@ -220,7 +220,7 @@ struct bus_device *dev;
*
* TITLE: fdopen
*
- * ABSTRACT: Open a unit.
+ * ABSTRACT: Open a unit.
*
****************************************************************************/
fdopen(dev, flag, otyp)
@@ -247,7 +247,7 @@ int otyp; /* not used */
chkbusy(cmdp);
cmdp->c_stsflag |= MTRFLAG;
mtr_on(uip);
- if(inb(VFOREG(uip->addr))&OPENBIT ||
+ if(inb(VFOREG(uip->addr))&OPENBIT ||
!(uip->d_drtab.dr_type&OKTYPE)){
uip->d_drtab.dr_type &= ~OKTYPE;
if(!rbrate(RAPID, uip))
@@ -290,7 +290,7 @@ int otyp; /* not used */
* Called on last close. mark the unit closed and not-ready.
*
* Unix doesn't actually "open" an inode for rootdev, swapdev or pipedev.
- * If UNIT(swapdev) != UNIT(rootdev), then must add code in init() to
+ * If UNIT(swapdev) != UNIT(rootdev), then must add code in init() to
* "open" swapdev. These devices should never be closed.
*
*****************************************************************************/
@@ -305,10 +305,10 @@ off_t offset; /* not used */
spl_t s;
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if ((dev == rootdev) || (dev == swapdev)) /* never close these */
return(0);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/* Clear the bit.
* If last close of drive insure drtab queue is empty before returning.
@@ -321,9 +321,9 @@ off_t offset; /* not used */
splx(s);
#ifdef MACH_KERNEL
return(0);
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
close(0);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
/*****************************************************************************
*
@@ -357,7 +357,7 @@ struct buf *bp; /* buffer header */
bp->b_error = 0;
/* set b_resid to b_bcount because we haven't done anything yet */
bp->b_resid = bp->b_bcount;
- if (!(dr->dr_type & OKTYPE) ||
+ if (!(dr->dr_type & OKTYPE) ||
((sdr = getparm(MEDIATYPE(bp->b_dev)))==(struct fddrtab *)ERROR) ||
/* wrong parameters */
(sdr->dr_ncyl != dr->dr_ncyl) || (sdr->dr_nsec != dr->dr_nsec) ||
@@ -433,7 +433,7 @@ struct fdcmd *cmdp;
while(cmdp->c_devflag & STRCHK){
cmdp->c_devflag |= STRWAIT;
sleep(&cmdp->c_devflag,PZERO);
- }
+ }
}
/***************************************************************************
*
@@ -446,7 +446,7 @@ struct fdcmd *cmdp;
while(cmdp->c_devflag & FDMCHK ){
cmdp->c_devflag |= FDWAIT;
sleep(&cmdp->c_devflag,PZERO);
- }
+ }
}
/***************************************************************************
*
@@ -538,12 +538,12 @@ struct unit_info *uip;
cmdp->c_rwdata[0] = RDMV;
break;
case B_FORMAT:
- cmdp->c_dcount = FMTCNT;
+ cmdp->c_dcount = FMTCNT;
cmdp->c_rwdata[0] = FMTM;
cmdp->c_saddr = cip->b_sector / uip->d_drtab.dr_spc;
resid = cip->b_sector % uip->d_drtab.dr_spc;
cmdp->c_rwdata[1] = slave|((resid/uip->d_drtab.dr_nsec)<<2);
- cmdp->c_rwdata[2] =
+ cmdp->c_rwdata[2] =
((struct fmttbl *)cip->b_buf->b_un.b_addr)->s_type;
cmdp->c_rwdata[3] = uip->d_drtab.dr_nsec;
cmdp->c_rwdata[4] = uip->d_drtab.dr_fgpl;
@@ -563,7 +563,7 @@ struct unit_info *uip;
resid = cip->b_sector % uip->d_drtab.dr_spc;
cmdp->c_rwdata[3] = resid / uip->d_drtab.dr_nsec;
cmdp->c_rwdata[1] = slave|(cmdp->c_rwdata[3]<<2);
- cmdp->c_rwdata[2] = cmdp->c_saddr =
+ cmdp->c_rwdata[2] = cmdp->c_saddr =
cip->b_sector / uip->d_drtab.dr_spc;
cmdp->c_rwdata[4] = (resid % uip->d_drtab.dr_nsec) + 1;
cmdp->c_rwdata[5] = 2;
@@ -591,13 +591,13 @@ struct unit_info *uip;
fdread(dev, uio)
register dev_t dev;
struct uio *uio;
-{
+{
#ifdef MACH_KERNEL
/* no need for page-size restriction */
return (block_io(fdstrategy, minphys, uio));
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
return(physio(fdstrategy,&fdrbuf[UNIT(dev)],dev,B_READ,fdminphys,uio));
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
/*****************************************************************************
*
@@ -615,9 +615,9 @@ struct uio *uio;
#ifdef MACH_KERNEL
/* no need for page-size restriction */
return (block_io(fdstrategy, minphys, uio));
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
return(physio(fdstrategy,&fdrbuf[UNIT(dev)],dev,B_WRITE,fdminphys,uio));
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
/*****************************************************************************
*
@@ -720,7 +720,7 @@ char *info;
return(result);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*****************************************************************************
*
* TITLE: fdioctl
@@ -730,7 +730,7 @@ char *info;
* CALLING ROUTINES: kernel
*
****************************************************************************/
-int
+int
fdioctl(dev, cmd, cmdarg, flag)
dev_t dev; /* major, minor numbers */
int cmd; /* command code */
@@ -751,10 +751,10 @@ int flag; /* not used */
}
return(EINVAL);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/****************************************************************************
*
- * set fd parameters
+ * set fd parameters
*
****************************************************************************/
int
@@ -782,7 +782,7 @@ long cmdarg;
}
/****************************************************************************
*
- * get fd parameters
+ * get fd parameters
*
****************************************************************************/
int
@@ -821,7 +821,7 @@ int *cmdarg;
register struct fddrtab *dr = &unit_info[UNIT(dev)].d_drtab;
if(!(dr->dr_type & OKTYPE))
- return(EINVAL);
+ return(EINVAL);
varg = (union io_arg *)cmdarg;
num_trks = varg->ia_fmt.num_trks;
track = (daddr_t)(varg->ia_fmt.start_trk*dr->dr_nsec);
@@ -832,7 +832,7 @@ int *cmdarg;
bp->b_flags &= ~B_DONE;
bp->b_dev = dev;
bp->b_error = 0; bp->b_resid = 0;
- bp->b_flags = B_FORMAT;
+ bp->b_flags = B_FORMAT;
bp->b_bcount = dr->dr_nsec * FMTID;
bp->b_blkno = (daddr_t)((track << 9) / NBPSCTR);
if(makeidtbl(bp->b_un.b_addr,dr,
@@ -841,7 +841,7 @@ int *cmdarg;
fdstrategy(bp);
biowait(bp);
if(bp->b_error)
- if((bp->b_error == (char)EBBHARD) ||
+ if((bp->b_error == (char)EBBHARD) ||
(bp->b_error == (char)EBBSOFT))
return(EIO);
else
@@ -904,11 +904,11 @@ int ctrl;
struct fdcmd *cmdp = &ctrl_info[ctrl].b_cmd;
if(cmdp->c_stsflag & INTROUT)
untimeout(fdintr, ctrl);
- cmdp->c_stsflag &= ~INTROUT;
+ cmdp->c_stsflag &= ~INTROUT;
switch(cmdp->c_intr){
case RWFLAG:
rwintr(uip);
- break;
+ break;
case SKFLAG:
case SKEFLAG|SKFLAG:
case RBFLAG:
@@ -1000,7 +1000,7 @@ rwend: outb(0x0a, 0x06);
D(printf("\n->rwierr %x ", rtn));
rwierr(uip);
} else { /* write command */
- if(((cip->b_buf->b_flags&(B_FORMAT|B_READ|B_WRITE))==B_WRITE)
+ if(((cip->b_buf->b_flags&(B_FORMAT|B_READ|B_WRITE))==B_WRITE)
&& !(cip->b_buf->b_flags & B_VERIFY)) {
D(printf("->w/v "));
cip->b_buf->b_flags |= B_VERIFY;
@@ -1175,7 +1175,7 @@ register char seekpoint;
*
* TITLE: m765sweep
*
- * ABSTRACT: Perform an initialization sweep.
+ * ABSTRACT: Perform an initialization sweep.
*
**************************************************************************/
m765sweep(uip, cdr)
@@ -1248,7 +1248,7 @@ struct unit_info *uip;
cmdp->c_intr = CMDRST;
if(((cip->b_buf->b_flags&(B_READ|B_VERIFY))!=(B_READ|B_VERIFY)) &&
uip->dev->slave)
- dr->dr_type &= ~OKTYPE;
+ dr->dr_type &= ~OKTYPE;
bp = cip->b_buf;
bp->b_flags |= B_ERROR;
switch(cip->b_status&BYTEMASK){
@@ -1438,7 +1438,7 @@ register int cylno;
cmdp->c_intr |= WUPFLAG;
outb(DATAREG(uip->addr), cylno); /* seek count */
rtn = ERROR;
- while(rtn){
+ while(rtn){
uip->wakeme = 1;
sleep(uip, PZERO);
if((rtn = sis(uip)) == ST0OK)
@@ -1455,7 +1455,7 @@ register int cylno;
* seek commnd routine(use interrupt)
*
*****************************************************************************/
-fdiseek(uip, cylno)
+fdiseek(uip, cylno)
struct unit_info *uip;
int cylno;
{
@@ -1476,7 +1476,7 @@ int cylno;
cylno = cylno * 2;
uip->b_cmd->c_intr |= SKFLAG;
outb(DATAREG(uip->addr), cylno); /* seek count */
-fdiend:
+fdiend:
if(rtn)
rtn |= SEEKCMD<<8;
return(rtn);
@@ -1542,7 +1542,7 @@ struct unit_info *uip;
dmalen = i386_trunc_page(address) + I386_PGBYTES - address;
if ( (cip->b_rwerr&MRMASK) >= 0x10)
dmalen = 0x200;
- if (dmalen<=cip->b_xferdma)
+ if (dmalen<=cip->b_xferdma)
cip->b_xferdma = dmalen;
else
dmalen = cip->b_xferdma;
@@ -1588,9 +1588,9 @@ struct unit_info *uip;
(B_READ|B_VERIFY))?TOUT:ITOUT;
#ifdef MACH_KERNEL
timeout(fdintr,uip->dev->ctlr,cnt0);
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
cmdp->c_timeid = timeout(fdintr,uip->dev->ctlr,cnt0);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
return(rtn);
}
@@ -1631,7 +1631,7 @@ struct unit_info *uip;
int cnt0 = STSCHKCNT;
while(cnt0--)
- if(((ind=inb(STSREG(uip->addr))) & DATAOK) &&
+ if(((ind=inb(STSREG(uip->addr))) & DATAOK) &&
((ind & DTOCPU) == mode))
return(0);
return(TIMEOUT);
@@ -1655,9 +1655,9 @@ struct unit_info *uip;
cmdp->c_stsflag |= MTROFF;
#ifdef MACH_KERNEL
timeout(mtr_off,uip,MTRSTOP);
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
cmdp->c_mtrid = timeout(mtr_off,uip,MTRSTOP);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
/*****************************************************************************
*
diff --git a/i386/i386at/idt.h b/i386/i386at/idt.h
index 7903310..72c4ad0 100644
--- a/i386/i386at/idt.h
+++ b/i386/i386at/idt.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -34,4 +34,4 @@
#include "idt-gen.h"
-#endif _I386AT_IDT_
+#endif /* _I386AT_IDT_ */
diff --git a/i386/i386at/immc.c b/i386/i386at/immc.c
index d6756e3..a59209e 100644
--- a/i386/i386at/immc.c
+++ b/i386/i386at/immc.c
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1995-1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -73,5 +73,4 @@ int immc_cnmaygetc(void)
return -1;
}
-#endif ENABLE_IMMEDIATE_CONSOLE
-
+#endif /* ENABLE_IMMEDIATE_CONSOLE */
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 7c87729..f17c48b 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -1,34 +1,34 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
-/*
+/*
* Olivetti Mach Console driver v0.0
* Copyright Ing. C. Olivetti & C. S.p.A. 1988, 1989
* All rights reserved.
*
- */
+ */
/*
Copyright 1988, 1989 by Olivetti Advanced Technology Center, Inc.,
Cupertino, California.
@@ -132,7 +132,7 @@ int kdcninit(struct consdev *cp);
int kdcngetc(dev_t dev, int wait);
int kdcnputc(dev_t dev, int c);
-/*
+/*
* These routines define the interface to the device-specific layer.
* See kdsoft.h for a more complete description of what each routine does.
*/
@@ -154,15 +154,15 @@ unsigned char kd_getdata(), state2leds();
*/
vm_offset_t kd_bitmap_start = (vm_offset_t)0xa0000; /* XXX - put in kd.h */
-u_char *vid_start = (u_char *)EGA_START;
+u_char *vid_start = (u_char *)EGA_START;
/* VM start of video RAM or frame buffer */
csrpos_t kd_curpos = 0; /* set indirectly by kd_setpos--see kdsoft.h */
short kd_lines = 25;
short kd_cols = 80;
char kd_attr = KA_NORMAL; /* current attribute */
-/*
- * kd_state shows the state of the modifier keys (ctrl, caps lock,
+/*
+ * kd_state shows the state of the modifier keys (ctrl, caps lock,
* etc.) It should normally be changed by calling set_kd_state(), so
* that the keyboard status LEDs are updated correctly.
*/
@@ -176,18 +176,18 @@ int kd_kbd_mouse = 0;
int kd_kbd_magic_scale = 6;
int kd_kbd_magic_button = 0;
-/*
- * Some keyboard commands work by sending a command, waiting for an
- * ack (handled by kdintr), then sending data, which generates a
+/*
+ * Some keyboard commands work by sending a command, waiting for an
+ * ack (handled by kdintr), then sending data, which generates a
* second ack. If we are in the middle of such a sequence, kd_ack
* shows what the ack is for.
- *
- * When a byte is sent to the keyboard, it is kept around in last_sent
+ *
+ * When a byte is sent to the keyboard, it is kept around in last_sent
* in case it needs to be resent.
- *
+ *
* The rest of the variables here hold the data required to complete
* the sequence.
- *
+ *
* XXX - the System V driver keeps a command queue, I guess in case we
* want to start a command while another is in progress. Is this
* something we should worry about?
@@ -214,7 +214,7 @@ u_char *esc_spt = (u_char *)0;
/*
* This array maps scancodes to Ascii characters (or character
- * sequences).
+ * sequences).
* Each row corresponds to one key. There are NUMOUTPUT bytes per key
* state. The states are ordered: Normal, SHIFT, CTRL, ALT,
* SHIFT/ALT.
@@ -400,10 +400,10 @@ short font_byte_width = 0; /* num bytes in 1 scan line of font */
int kd_pollc = 0;
#ifdef DEBUG
-/*
+/*
* feep:
*
- * Ring the bell for a short time.
+ * Ring the bell for a short time.
* Warning: uses outb(). You may prefer to use kd_debug_put.
*/
feep()
@@ -424,9 +424,9 @@ pause()
;
}
-/*
+/*
* Put a debugging character on the screen.
- * LOC=0 means put it in the bottom right corner, LOC=1 means put it
+ * LOC=0 means put it in the bottom right corner, LOC=1 means put it
* one column to the left, etc.
*/
kd_debug_put(loc, c)
@@ -505,7 +505,7 @@ kdopen(dev, flag, ior)
/*
* Special support for boot-time rc scripts, which don't
* stty the console.
- */
+ */
tp->t_oproc = kdstart;
tp->t_stop = kdstop;
tp->t_ospeed = tp->t_ispeed = B9600;
@@ -531,7 +531,7 @@ kdopen(dev, flag, ior)
* closing the line discipline.
*
* input: device number 'dev', and flag
- *
+ *
* output: device is closed
*
*/
@@ -575,7 +575,7 @@ int dev;
struct uio *uio;
{
struct tty *tp;
-
+
tp = &kd_tty;
tp->t_state |= TS_CARR_ON;
return((*linesw[kd_tty.t_line].l_read)(tp, uio));
@@ -601,7 +601,7 @@ struct uio *uio;
return((*linesw[kd_tty.t_line].l_write)(&kd_tty, uio));
}
-/*
+/*
* Mmap.
*/
@@ -687,10 +687,10 @@ io_return_t kdsetstat(dev, flavor, data, count)
-/*
+/*
* kdsetbell:
- *
- * Turn the bell on or off. Returns error code, if given bogus
+ *
+ * Turn the bell on or off. Returns error code, if given bogus
* on/off value.
*/
kdsetbell(val, flags)
@@ -711,9 +711,9 @@ int flags; /* flags set for console */
}
-/*
+/*
* kdgetkbent:
- *
+ *
* Get entry from key mapping table. Returns error code, if any.
*/
kdgetkbent(kbent)
@@ -731,9 +731,9 @@ struct kbentry * kbent;
}
-/*
+/*
* kdsetkbent:
- *
+ *
* Set entry in key mapping table. Return error code, if any.
*/
int
@@ -758,8 +758,8 @@ int flags; /* flags set for console */
*
* This function is the interrupt code for the driver. Since this is
* a special tty (console), interrupts are only for input, so we read in
- * the character. If in ascii mode, we then do the mapping translation
- * from the keyboard switch table and place the characters on the tty's
+ * the character. If in ascii mode, we then do the mapping translation
+ * from the keyboard switch table and place the characters on the tty's
* input switch table. If in event mode, we create and queue a kd_event.
*
* input: interrupt vector 'vec'
@@ -785,29 +785,29 @@ int regs;
tp = &kd_tty;
#ifdef old
while ((inb(K_STATUS) & K_OBUF_FUL) == 0); /* this should never loop */
-#else old
+#else /* old */
{
/*
- * Allow for keyboards that raise interrupt before
+ * Allow for keyboards that raise interrupt before
* the character gets to the buffer. But don't wait
* forever if grabbing the character by polling leaves
* the interrupt on but buffer empty.
*/
/*
- * Micronics VLB motherboard with 486DX2 can report keyboard
+ * Micronics VLB motherboard with 486DX2 can report keyboard
* interrupt before K_STATUS register indicates that the
* output buffer is full. Moreover, the bus won't settle w
* while we poll K_STATUS at speed. Temporary fix is to break
- * out after safety runs out and pick up keyboard event. This
- * should be fixed eventually by putting a 1us timout between
- * inb's to K_STATUS and fix the pic initialization order to
+ * out after safety runs out and pick up keyboard event. This
+ * should be fixed eventually by putting a 1us timout between
+ * inb's to K_STATUS and fix the pic initialization order to
* avoid bootup keyboard wedging (ie make kd a real device)
*/
int safety = 1000;
while ((inb(K_STATUS) & K_OBUF_FUL) == 0)
if (!safety--) break; /* XXX */
}
-#endif old
+#endif /* old */
/*
* We may have seen a mouse event.
*/
@@ -885,13 +885,13 @@ int regs;
}
}
- /*
+ /*
* here's where we actually put the char (or
* char sequence, for function keys) onto the
* input queue.
*/
- for ( ; (c != K_DONE) && (char_idx <= max);
- c = key_map[scancode][char_idx++]) {
+ for ( ; (c != K_DONE) && (char_idx <= max);
+ c = key_map[scancode][char_idx++]) {
(*linesw[tp->t_line].l_rint)(c, tp);
}
kd_extended = FALSE;
@@ -902,10 +902,10 @@ int regs;
return;
}
-/*
+/*
* kd_handle_ack:
- *
- * For pending commands, complete the command. For data bytes,
+ *
+ * For pending commands, complete the command. For data bytes,
* drop the ack on the floor.
*/
kd_handle_ack()
@@ -927,14 +927,14 @@ kd_handle_ack()
}
}
-/*
+/*
* kd_resend:
*
* Resend a missed keyboard command or data byte.
*/
kd_resend()
{
- if (kd_ack == NOT_WAITING)
+ if (kd_ack == NOT_WAITING)
printf("unexpected RESEND from keyboard\n");
else
kd_senddata(last_sent);
@@ -947,9 +947,9 @@ kd_resend()
* Change keyboard state according to which modifier key and
* whether it went down or up.
*
- * input: the current state, the key, and the key's direction.
+ * input: the current state, the key, and the key's direction.
* The key can be any key, not just a modifier key.
- *
+ *
* output: the new state
*/
do_modifier(state, c, up)
@@ -967,7 +967,7 @@ boolean_t up;
break;
#ifndef ORC
case (K_CLCKSC):
-#endif ORC
+#endif /* ORC */
case (K_CTLSC):
if (up)
state &= ~KS_CTLED;
@@ -980,7 +980,7 @@ boolean_t up;
if (!up)
state ^= KS_CLKED;
break;
-#endif ORC
+#endif /* ORC */
case (K_NLCKSC):
if (!up)
state ^= KS_NLKED;
@@ -999,21 +999,21 @@ boolean_t up;
}
-/*
+/*
* kdcheckmagic:
- *
- * Check for magic keystrokes for invoking the debugger or
+ *
+ * Check for magic keystrokes for invoking the debugger or
* rebooting or ...
*
* input: an unprocessed scancode
- *
- * output: TRUE if a magic key combination was recognized and
+ *
+ * output: TRUE if a magic key combination was recognized and
* processed. FALSE otherwise.
*
- * side effects:
+ * side effects:
* various actions possible, depending on which keys are
- * pressed. If the debugger is called, steps are taken
- * to ensure that the system doesn't think the magic keys
+ * pressed. If the debugger is called, steps are taken
+ * to ensure that the system doesn't think the magic keys
* are still held down.
*/
boolean_t
@@ -1056,7 +1056,7 @@ int *regs;
}
return(TRUE);
break;
-#endif MACH_KDB
+#endif /* MACH_KDB */
case K_DELSC: /* ctl-alt-del */
/* if rebootflag is on, reboot the system */
if (rebootflag)
@@ -1071,7 +1071,7 @@ int *regs;
/*
* kdstate2idx:
*
- * Return the value for the 2nd index into key_map that
+ * Return the value for the 2nd index into key_map that
* corresponds to the given state.
*/
kdstate2idx(state, extended)
@@ -1119,11 +1119,11 @@ struct tty *tp;
spl_t o_pri;
int ch;
unsigned char c;
-
+
if (tp->t_state & TS_TTSTOP)
return;
for ( ; ; ) {
- tp->t_state &= ~TS_BUSY;
+ tp->t_state &= ~TS_BUSY;
if (tp->t_state & TS_TTSTOP)
break;
if ((tp->t_outq.c_cc <= 0) || (ch = getc(&tp->t_outq)) == -1)
@@ -1177,7 +1177,7 @@ kdstop(tp, flags)
* kdinit:
*
* This code initializes the structures and sets up the port registers
- * for the console driver.
+ * for the console driver.
*
* Each bitmap-based graphics card is likely to require a unique
* way to determine the card's presence. The driver runs through
@@ -1207,7 +1207,7 @@ kdinit()
if (!evc1init())
if (blit_present())
blit_init();
- else
+ else
kd_xga_init();
/* get rid of any garbage in output buffer */
@@ -1309,11 +1309,11 @@ u_char ch;
if ((!ch) && sit_for_0)
return;
- switch (ch) {
+ switch (ch) {
case ((K_LF)):
kd_down();
break;
- case ((K_CR)):
+ case ((K_CR)):
kd_cr();
break;
case ((K_BS)):
@@ -1428,7 +1428,7 @@ kd_scrolldn()
count = ONE_LINE/ONE_SPACE;
(*kd_dclear)(to, count, kd_attr);
return;
-
+
}
@@ -1436,7 +1436,7 @@ kd_scrolldn()
* kd_parseesc:
*
* This routine begins the parsing of an escape sequence. It uses the
- * escape sequence array and the escape spot pointer to handle
+ * escape sequence array and the escape spot pointer to handle
* asynchronous parsing of escape sequences.
*
* input : String of characters prepended by an escape
@@ -1598,14 +1598,14 @@ u_char *cp;
if (newpos < 0)
newpos = 0; /* upper left */
if (newpos > ONE_PAGE)
- newpos = (ONE_PAGE - ONE_SPACE);
+ newpos = (ONE_PAGE - ONE_SPACE);
/* lower right */
if (*cp == '\0')
break; /* not ready yet */
if (*cp == 'H') {
kd_setpos(newpos);
esc_spt = esc_seq; /* done, reset */
- }
+ }
else
esc_spt = esc_seq;
break; /* done or not ready */
@@ -1615,12 +1615,12 @@ u_char *cp;
case 0:
kd_cltobcur(); /* clears from current
pos to bottom.
- */
+ */
break;
case 1:
kd_cltopcur(); /* clears from top to
current pos.
- */
+ */
break;
case 2:
kd_cls();
@@ -1636,7 +1636,7 @@ u_char *cp;
case 0:
kd_cltoecur(); /* clears from current
pos to eoln.
- */
+ */
break;
case 1:
kd_clfrbcur(); /* clears from begin
@@ -1695,7 +1695,7 @@ u_char *cp;
else
kd_erase(number);
esc_spt = esc_seq;
- break;
+ break;
case '\0':
break; /* not enough yet */
default:
@@ -1919,7 +1919,7 @@ kd_cltopcur()
/*
* kd_cltoecur:
*
- * This function clears from the current cursor position to eoln.
+ * This function clears from the current cursor position to eoln.
*
* input : None
* output : Line is cleared from current cursor position to eoln
@@ -2037,7 +2037,7 @@ int number;
/*
* kd_delch:
*
- * This function deletes a number of characters from the current
+ * This function deletes a number of characters from the current
* position in the line.
*
* input : number of characters to delete
@@ -2091,7 +2091,7 @@ int number;
csrpos_t i;
csrpos_t stop;
- stop = kd_curpos + (ONE_SPACE * number);
+ stop = kd_curpos + (ONE_SPACE * number);
if (stop > BEG_OF_LINE(kd_curpos) + ONE_LINE)
stop = BEG_OF_LINE(kd_curpos) + ONE_LINE;
for (i = kd_curpos; i < stop; i += ONE_SPACE) {
@@ -2116,7 +2116,7 @@ kd_eraseln()
csrpos_t stop;
stop = BEG_OF_LINE(kd_curpos) + ONE_LINE;
- for (i = BEG_OF_LINE(kd_curpos); i < stop; i += ONE_SPACE) {
+ for (i = BEG_OF_LINE(kd_curpos); i < stop; i += ONE_SPACE) {
(*kd_dput)(i, K_SPACE, kd_attr);
}
return;
@@ -2225,12 +2225,12 @@ unsigned char ch;
}
-/*
+/*
* kd_getdata:
- *
- * This function returns a data byte from the keyboard RDWR port,
- * after waiting until the port is flagged as having something to
- * read.
+ *
+ * This function returns a data byte from the keyboard RDWR port,
+ * after waiting until the port is flagged as having something to
+ * read.
*/
unsigned char
kd_getdata()
@@ -2269,9 +2269,9 @@ kd_mouse_drain()
printf("kbd: S = %x D = %x\n", i, inb(K_RDWR));
}
-/*
+/*
* set_kd_state:
- *
+ *
* Set kd_state and update the keyboard status LEDs.
*/
@@ -2282,10 +2282,10 @@ int newstate;
kd_setleds1(state2leds(newstate));
}
-/*
+/*
* state2leds:
- *
- * Return a byte containing LED settings for the keyboard, given
+ *
+ * Return a byte containing LED settings for the keyboard, given
* a state vector.
*/
u_char
@@ -2301,10 +2301,10 @@ int state;
return(result);
}
-/*
+/*
* kd_setleds[12]:
- *
- * Set the keyboard LEDs according to the given byte.
+ *
+ * Set the keyboard LEDs according to the given byte.
*/
kd_setleds1(val)
u_char val;
@@ -2325,11 +2325,11 @@ kd_setleds2()
}
-/*
+/*
* cnsetleds:
- *
+ *
* like kd_setleds[12], but not interrupt-based.
- * Currently disabled because cngetc ignores caps lock and num
+ * Currently disabled because cngetc ignores caps lock and num
* lock anyway.
*/
cnsetleds(val)
@@ -2349,9 +2349,9 @@ kdreboot()
kd_sendcmd(0xFE); /* XXX - magic # */
delay(1000000); /* wait to see if anything happens */
#endif
- /*
+ /*
* If that didn't work, then we'll just have to try and
- * do it the hard way.
+ * do it the hard way.
*/
cpu_shutdown();
}
@@ -2472,7 +2472,7 @@ kd_xga_init()
* memory location for these cards.
*
*/
-
+
vid_start = (u_char *)phystokv(EGA_START);
kd_index_reg = EGA_IDX_REG;
kd_io_reg = EGA_IO_REG;
@@ -2623,9 +2623,9 @@ char chattr;
}
-/*
+/*
* kd_noopreset:
- *
+ *
* No-op reset routine for kd_dreset.
*/
static void
@@ -2726,7 +2726,7 @@ int count;
count /= kd_cols; /* num lines */
count *= fb_byte_width * (char_height+cursor_height);
kd_slmscu(bit2fbptr(from_xbit, from_ybit),
- bit2fbptr(to_xbit, to_ybit),
+ bit2fbptr(to_xbit, to_ybit),
count/SLAMBPW);
bmppaintcsr(kd_curpos, char_white);
} else {
@@ -2795,7 +2795,7 @@ char chattr; /* reverse or normal */
/* fast case - entire page */
kd_slmwd(vid_start, (fb_byte_width * fb_height)/SLAMBPW,
clearval);
- } else
+ } else
/* slow case */
for (i = 0; i < count; ++i) {
bmpput(to, K_SPACE, chattr);
@@ -2884,7 +2884,7 @@ kdcnprobe(struct consdev *cp)
maj = 0;
unit = 0;
pri = CN_INTERNAL;
-
+
cp->cn_dev = makedev(maj, unit);
cp->cn_pri = pri;
}
@@ -2923,13 +2923,13 @@ kdcnputc(dev_t dev, int c)
kd_putc(c);
}
-/*
+/*
* kdcnmaygetc:
- *
- * Get one character using polling, rather than interrupts. Used
+ *
+ * Get one character using polling, rather than interrupts. Used
* by the kernel debugger. Note that Caps Lock is ignored.
- * Normally this routine is called with interrupts already
- * disabled, but there is code in place so that it will be more
+ * Normally this routine is called with interrupts already
+ * disabled, but there is code in place so that it will be more
* likely to work even if interrupts are turned on.
*/
int
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 304bd7f..898fd24 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -59,7 +59,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef MACH_KERNEL
#include <device/errno.h>
#include <device/io_req.h>
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
#include <sys/file.h>
#include <sys/errno.h>
#include <kern/thread.h>
@@ -68,7 +68,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#include <i386/machspl.h>
#include <i386at/kd.h>
#include <i386at/kd_queue.h>
@@ -87,7 +87,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
kd_event_queue kbd_queue; /* queue of keyboard events */
#ifdef MACH_KERNEL
queue_head_t kbd_read_queue = { &kbd_read_queue, &kbd_read_queue };
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
struct proc *kbd_sel = 0; /* selecting process, if any */
short kbdpgrp = 0; /* process group leader when dev is open */
@@ -95,14 +95,14 @@ int kbdflag = 0;
#define KBD_COLL 1 /* select collision */
#define KBD_ASYNC 2 /* user wants asynch notification */
#define KBD_NBIO 4 /* user wants non-blocking I/O */
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
void kbd_enqueue();
#ifdef MACH_KERNEL
io_return_t X_kdb_enter_init();
io_return_t X_kdb_exit_init();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
static boolean_t initialized = FALSE;
@@ -114,7 +114,7 @@ static boolean_t initialized = FALSE;
kbdinit()
{
spl_t s = SPLKD();
-
+
if (!initialized) {
kdq_reset(&kbd_queue);
initialized = TRUE;
@@ -136,13 +136,13 @@ kbdopen(dev, flags)
kbdinit();
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (flags & FWRITE)
return(ENODEV);
-
+
if (kbdpgrp == 0)
kbdpgrp = u.u_procp->p_pgrp;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
return(0);
}
@@ -161,11 +161,11 @@ kbdclose(dev, flags)
kb_mode = KB_ASCII;
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
kbdpgrp = 0;
kbdflag = 0;
kbd_sel = 0;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
kdq_reset(&kbd_queue);
splx(s);
}
@@ -220,7 +220,7 @@ io_return_t kbdsetstat(dev, flavor, data, count)
return (D_SUCCESS);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*
* kbdioctl - handling for asynch & non-blocking I/O.
*/
@@ -291,11 +291,11 @@ kbdselect(dev, rw)
else
kbd_sel = (struct proc *)current_thread();
/* eeeyuck */
-
+
splx(s);
return(0);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
@@ -374,7 +374,7 @@ boolean_t kbd_read_done(ior)
return (TRUE);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*ARGSUSED*/
kbdread(dev, uio)
dev_t dev;
@@ -390,7 +390,7 @@ kbdread(dev, uio)
if (kbdflag & KBD_NBIO) {
err = EWOULDBLOCK;
goto done;
- } else
+ } else
while (kdq_empty(&kbd_queue)) {
splx(s);
sleep((caddr_t)&kbd_queue, TTIPRI);
@@ -411,7 +411,7 @@ done:
splx(s);
return(err);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
@@ -451,7 +451,7 @@ kbd_enqueue(ev)
while ((ior = (io_req_t)dequeue_head(&kbd_read_queue)) != 0)
iodone(ior);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (kbd_sel) {
selwakeup(kbd_sel, kbdflag & KBD_COLL);
kbd_sel = 0;
@@ -460,7 +460,7 @@ kbd_enqueue(ev)
if (kbdflag & KBD_ASYNC)
gsignal(kbdpgrp, SIGIO);
wakeup((caddr_t)&kbd_queue);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
u_int X_kdb_enter_str[512], X_kdb_exit_str[512];
@@ -544,7 +544,7 @@ X_kdb_exit_init(data, count)
X_kdb_exit_len = count;
return D_SUCCESS;
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
X_kdb_enter_init(kp)
struct X_kdb *kp;
{
@@ -566,4 +566,4 @@ struct X_kdb *kp;
X_kdb_exit_len = kp->size>>2;
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index 28114d4..0c104d3 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -69,7 +69,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef MACH_KERNEL
#include <device/errno.h>
#include <device/io_req.h>
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
#include <sys/file.h>
#include <sys/errno.h>
#include <kern/thread.h>
@@ -78,7 +78,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#include <i386/ipl.h>
#include <chips/busses.h>
#include <i386at/kd.h>
@@ -94,18 +94,18 @@ kd_event_queue mouse_queue; /* queue of mouse events */
boolean_t mouse_in_use = FALSE;
#ifdef MACH_KERNEL
queue_head_t mouse_read_queue = { &mouse_read_queue, &mouse_read_queue };
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
struct proc *mouse_sel = 0; /* selecting process, if any */
short mousepgrp = 0; /* process group leader when dev is open */
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
int mouseflag = 0;
#define MOUSE_COLL 1 /* select collision */
#define MOUSE_ASYNC 2 /* user wants asynch notification */
#define MOUSE_NBIO 4 /* user wants non-blocking I/O */
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
* The state of the 3 buttons is encoded in the low-order 3 bits (both
@@ -168,19 +168,19 @@ mouseopen(dev, flags)
int flags;
{
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (flags & FWRITE)
return(ENODEV);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
if (mouse_in_use)
return(EBUSY);
mouse_in_use = TRUE; /* locking? */
kdq_reset(&mouse_queue);
lastbuttons = MOUSE_ALL_UP;
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
mousepgrp = u.u_procp->p_pgrp;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
switch (mouse_type = ((minor(dev) & 0xf8) >> 3)) {
case MICROSOFT_MOUSE7:
@@ -203,7 +203,7 @@ mouseopen(dev, flags)
init_mouse_hw(dev&7, LC7);
track_man[0] = comgetc(dev&7);
track_man[1] = comgetc(dev&7);
- if (track_man[0] != 0x4d &&
+ if (track_man[0] != 0x4d &&
track_man[1] != 0x33) {
printf("LOGITECH_TRACKMAN: NOT M3");
}
@@ -252,7 +252,7 @@ kd_mouse_open(dev, mouse_pic)
}
/*
- * mouseclose - Disable interrupts on the serial port, reset driver flags,
+ * mouseclose - Disable interrupts on the serial port, reset driver flags,
* and restore the serial port interrupt vector.
*/
mouseclose(dev, flags)
@@ -277,11 +277,11 @@ mouseclose(dev, flags)
kdq_reset(&mouse_queue); /* paranoia */
mouse_in_use = FALSE;
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
mousepgrp = 0;
mouseflag = 0;
mouse_sel = 0;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
/*ARGSUSED*/
@@ -334,7 +334,7 @@ io_return_t mousegetstat(dev, flavor, data, count)
return D_SUCCESS;
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*
* mouseioctl - handling for asynch & non-blocking I/O.
*/
@@ -391,11 +391,11 @@ mouseselect(dev, rw)
else
mouse_sel = (struct proc *)current_thread();
/* eeeyuck */
-
+
splx(s);
return(0);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
* mouseread - dequeue and return any queued events.
@@ -472,7 +472,7 @@ boolean_t mouse_read_done(ior)
return (TRUE);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
/*ARGSUSED*/
mouseread(dev, uio)
dev_t dev;
@@ -488,7 +488,7 @@ mouseread(dev, uio)
if (mouseflag & MOUSE_NBIO) {
err = EWOULDBLOCK;
goto done;
- } else
+ } else
while (kdq_empty(&mouse_queue)) {
splx(s);
sleep((caddr_t)&mouse_queue, TTIPRI);
@@ -509,7 +509,7 @@ done:
splx(s);
return(err);
}
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
/*
@@ -547,7 +547,7 @@ mouseintr(unit)
*/
int show_mouse_byte = 0;
/*
- X down; middle down; middle up; X up 50 0 0; 50 0 0 22; 50 0 0 02; 40 0 0
+ X down; middle down; middle up; X up 50 0 0; 50 0 0 22; 50 0 0 02; 40 0 0
X down; middle down; X up; middle up 50 0 0; 50 0 0 22; 40 0 0 22; 40 0 0 2
*
* The trick here is that all the while the middle button is down you get 4 byte
@@ -616,7 +616,7 @@ mouse_handle_byte(ch)
mousebuf[mousebufindex++] = ch;
if (mousebufindex < mousebufsize)
return;
-
+
/* got a packet */
mousebufindex = 0;
@@ -752,9 +752,9 @@ int kd_mouse_read(void)
#ifdef MACH_KERNEL
assert_wait((event_t) &mouse_char, FALSE);
thread_block((void (*)()) 0);
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
sleep(&mouse_char, PZERO);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
ch = mouse_char;
@@ -910,7 +910,7 @@ mouse_enqueue(ev)
while ((ior = (io_req_t)dequeue_head(&mouse_read_queue)) != 0)
iodone(ior);
}
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
if (mouse_sel) {
selwakeup(mouse_sel, mouseflag & MOUSE_COLL);
mouse_sel = 0;
@@ -919,5 +919,5 @@ mouse_enqueue(ev)
if (mouseflag & MOUSE_ASYNC)
gsignal(mousepgrp, SIGIO);
wakeup((caddr_t)&mouse_queue);
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
}
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 21f0785..f730c5b 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989, 1988 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -330,7 +330,7 @@ void c_boot_entry(vm_offset_t bi)
kern_sym_start, kern_sym_end,
symtab_size, strtab_size);
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
/*
* Do basic VM initialization
@@ -356,7 +356,7 @@ void c_boot_entry(vm_offset_t bi)
cninit(); /* need console for debugger */
Debugger();
}
-#endif MACH_KDB
+#endif /* MACH_KDB */
machine_slot[0].is_cpu = TRUE;
machine_slot[0].running = TRUE;
@@ -381,7 +381,7 @@ void c_boot_entry(vm_offset_t bi)
}
#else
machine_slot[0].cpu_type = CPU_TYPE_I386;
-#endif
+#endif
/*
@@ -402,7 +402,7 @@ timemmap(dev,off,prot)
#ifdef lint
dev++; off++;
-#endif lint
+#endif /* lint */
if (prot & VM_PROT_WRITE) return (-1);
diff --git a/i386/i386at/rtc.c b/i386/i386at/rtc.c
index 7a8d1d7..96aa86d 100644
--- a/i386/i386at/rtc.c
+++ b/i386/i386at/rtc.c
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -72,14 +72,14 @@ unsigned char *regs;
rtcinit();
first_rtcopen_ever = 0;
}
- outb(RTC_ADDR, RTC_D);
+ outb(RTC_ADDR, RTC_D);
if (inb(RTC_DATA) & RTC_VRT == 0) return(-1);
- outb(RTC_ADDR, RTC_A);
+ outb(RTC_ADDR, RTC_A);
while (inb(RTC_DATA) & RTC_UIP) /* busy wait */
- outb(RTC_ADDR, RTC_A);
+ outb(RTC_ADDR, RTC_A);
load_rtc(regs);
return(0);
-}
+}
rtcput(regs)
unsigned char *regs;
@@ -93,10 +93,10 @@ unsigned char *regs;
outb(RTC_ADDR, RTC_B);
x = inb(RTC_DATA);
outb(RTC_ADDR, RTC_B);
- outb(RTC_DATA, x | RTC_SET);
+ outb(RTC_DATA, x | RTC_SET);
save_rtc(regs);
outb(RTC_ADDR, RTC_B);
- outb(RTC_DATA, x & ~RTC_SET);
+ outb(RTC_DATA, x & ~RTC_SET);
}
@@ -136,9 +136,9 @@ readtodc(tp)
#ifdef MACH_KERNEL
ospl = splclock();
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
ospl = spl5();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
if (rtcget(&rtclk)) {
splx(ospl);
return(-1);
@@ -166,11 +166,11 @@ readtodc(tp)
n += days * 3600 * 24;
#ifdef MACH_KERNEL
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
n += tz.tz_minuteswest * 60;
if (tz.tz_dsttime)
n -= 3600;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
*tp = n;
@@ -186,9 +186,9 @@ writetodc()
#ifdef MACH_KERNEL
ospl = splclock();
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
ospl = spl5();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
if (rtcget(&rtclk)) {
splx(ospl);
return(-1);
@@ -197,11 +197,11 @@ writetodc()
#ifdef MACH_KERNEL
diff = 0;
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
diff = tz.tz_minuteswest * 60;
if (tz.tz_dsttime)
diff -= 3600;
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
n = (time.tv_sec - diff) % (3600 * 24); /* hrs+mins+secs */
rtclk.rtc_sec = dectohexdec(n%60);
n /= 60;
@@ -227,9 +227,9 @@ writetodc()
#ifdef MACH_KERNEL
ospl = splclock();
-#else MACH_KERNEL
+#else /* MACH_KERNEL */
ospl = spl5();
-#endif MACH_KERNEL
+#endif /* MACH_KERNEL */
rtcput(&rtclk);
splx(ospl);
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
index c775535..b4aaca5 100644
--- a/i386/include/mach/i386/asm.h
+++ b/i386/include/mach/i386/asm.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -65,7 +65,7 @@
#define gLB(n) n ## :
#define LBb(x,n) n ## b
#define LBf(x,n) n ## f
-#else __STDC__
+#else /* __STDC__ */
#error XXX elf
#define EXT(x) _/**/x
#define LEXT(x) _/**/x/**/:
@@ -73,7 +73,7 @@
#define gLB(n) n/**/:
#define LBb(x,n) n/**/b
#define LBf(x,n) n/**/f
-#endif __STDC__
+#endif /* __STDC__ */
#define SVC .byte 0x9a; .long 0; .word 0x7
#define String .ascii
@@ -101,14 +101,14 @@
#define ASENTRY(x) .globl x; .p2align TEXT_ALIGN; gLB(x) ; \
pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
-#else GPROF
+#else /* GPROF */
#define MCOUNT
#define ENTRY(x) .globl EXT(x); .p2align TEXT_ALIGN; LEXT(x)
#define ENTRY2(x,y) .globl EXT(x); .globl EXT(y); \
.p2align TEXT_ALIGN; LEXT(x) LEXT(y)
#define ASENTRY(x) .globl x; .p2align TEXT_ALIGN; gLB(x)
-#endif GPROF
+#endif /* GPROF */
#define Entry(x) .globl EXT(x); .p2align TEXT_ALIGN; LEXT(x)
#define DATA(x) .globl EXT(x); .p2align DATA_ALIGN; LEXT(x)
diff --git a/i386/include/mach/i386/eflags.h b/i386/include/mach/i386/eflags.h
index d7d54b2..72bf9d4 100644
--- a/i386/include/mach/i386/eflags.h
+++ b/i386/include/mach/i386/eflags.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990,1989 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -46,4 +46,4 @@
#define EFL_RF 0x00010000 /* resume without tracing */
#define EFL_VM 0x00020000 /* virtual 8086 mode */
-#endif _MACH_I386_EFLAGS_H_
+#endif /* _MACH_I386_EFLAGS_H_ */
diff --git a/i386/include/mach/i386/mach_i386.defs b/i386/include/mach/i386/mach_i386.defs
index 5c30b67..55121b6 100644
--- a/i386/include/mach/i386/mach_i386.defs
+++ b/i386/include/mach/i386/mach_i386.defs
@@ -1,26 +1,26 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
/*
@@ -30,7 +30,7 @@
subsystem
#if KERNEL_SERVER
KernelServer
-#endif KERNEL_SERVER
+#endif /* KERNEL_SERVER */
mach_i386 3800;
#include <mach/std_types.defs>
diff --git a/i386/include/mach/i386/multiboot.h b/i386/include/mach/i386/multiboot.h
index e0db823..7aa0b1c 100644
--- a/i386/include/mach/i386/multiboot.h
+++ b/i386/include/mach/i386/multiboot.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1995-1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
@@ -179,4 +179,4 @@ struct AddrRangeDesc
#define MB_ARD_MEMORY 1
-#endif _MACH_I386_MULTIBOOT_H_
+#endif /* _MACH_I386_MULTIBOOT_H_ */
diff --git a/i386/include/mach/i386/trap.h b/i386/include/mach/i386/trap.h
index 58dc266..70b28fe 100644
--- a/i386/include/mach/i386/trap.h
+++ b/i386/include/mach/i386/trap.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1991,1990 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -57,4 +57,4 @@
#define T_PF_USER 0x4 /* from user state */
-#endif _MACH_I386_TRAP_H_
+#endif /* _MACH_I386_TRAP_H_ */
diff --git a/i386/include/mach/i386/vm_types.h b/i386/include/mach/i386/vm_types.h
index 51fdca8..603bf0c 100644
--- a/i386/include/mach/i386/vm_types.h
+++ b/i386/include/mach/i386/vm_types.h
@@ -1,25 +1,25 @@
-/*
+/*
* Mach Operating System
* Copyright (c) 1992,1991,1990,1989,1988 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -35,7 +35,7 @@
#define _MACHINE_VM_TYPES_H_ 1
#ifdef ASSEMBLER
-#else ASSEMBLER
+#else /* ASSEMBLER */
/*
* A natural_t is the type for the native
@@ -105,4 +105,3 @@ typedef double float64_t;
#define MACH_MSG_TYPE_INTEGER_T MACH_MSG_TYPE_INTEGER_32
#endif /* _MACHINE_VM_TYPES_H_ */
-
diff --git a/i386/include/mach/sa/stdarg.h b/i386/include/mach/sa/stdarg.h
index 3288b93..01b2dc7 100644
--- a/i386/include/mach/sa/stdarg.h
+++ b/i386/include/mach/sa/stdarg.h
@@ -43,4 +43,4 @@ typedef char *va_list;
((pvar) += __va_size(type), \
*((type *)((pvar) - __va_size(type))))
-#endif _MACH_SA_STDARG_H_
+#endif /* _MACH_SA_STDARG_H_ */
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 2d66bf1..fc56e87 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -83,12 +83,12 @@
#ifdef ORC
#define OLIVETTICACHE 1
-#endif ORC
+#endif /* ORC */
#ifndef OLIVETTICACHE
#define WRITE_PTE(pte_p, pte_entry) *(pte_p) = (pte_entry);
#define WRITE_PTE_FAST(pte_p, pte_entry) *(pte_p) = (pte_entry);
-#else OLIVETTICACHE
+#else /* OLIVETTICACHE */
#error might not work anymore
/* This gross kludgery is needed for Olivetti XP7 & XP9 boxes to get
@@ -125,7 +125,7 @@ pt_entry_t *pte_p, pte_entry;
#define WRITE_PTE_FAST(pte_p, pte_entry)*pte_p = pte_entry;
-#endif OLIVETTICACHE
+#endif /* OLIVETTICACHE */
/*
* Private data structures.
@@ -349,7 +349,7 @@ lock_data_t pmap_system_lock;
} \
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
#define SPLVM(spl)
#define SPLX(spl)
@@ -370,7 +370,7 @@ lock_data_t pmap_system_lock;
} \
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#define MAX_TBIS_SIZE 32 /* > this -> TBIA */ /* XXX */
@@ -380,11 +380,11 @@ lock_data_t pmap_system_lock;
flush(); \
flush_tlb(); \
}
-#else i860
+#else /* i860 */
#define INVALIDATE_TLB(s, e) { \
flush_tlb(); \
}
-#endif i860
+#endif /* i860 */
#if NCPUS > 1
@@ -415,7 +415,7 @@ typedef struct pmap_update_list *pmap_update_list_t;
struct pmap_update_list cpu_update_list[NCPUS];
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Other useful macros.
@@ -450,7 +450,7 @@ pt_entry_t *kernel_page_dir;
void pmap_remove_range(); /* forward */
#if NCPUS > 1
void signal_cpus(); /* forward */
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#if i860
/*
@@ -520,7 +520,7 @@ void ptep_check(ptep)
panic("pte count");
}
}
-#endif DEBUG_PTE_PAGE
+#endif /* DEBUG_PTE_PAGE */
/*
* Map memory at initialization. The physical addresses being
@@ -614,7 +614,7 @@ void pmap_bootstrap()
#if NCPUS > 1
lock_init(&pmap_system_lock, FALSE); /* NOT a sleep lock */
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
simple_lock_init(&kernel_pmap->lock);
@@ -852,7 +852,7 @@ void pmap_init()
simple_lock_init(&up->lock);
up->count = 0;
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Indicate that the PMAP module is now fully initialized.
@@ -1126,7 +1126,7 @@ void pmap_remove_range(pmap, va, spte, epte)
#if DEBUG_PTE_PAGE
if (pmap != kernel_pmap)
ptep_check(get_pte_page(spte));
-#endif DEBUG_PTE_PAGE
+#endif /* DEBUG_PTE_PAGE */
num_removed = 0;
num_unwired = 0;
@@ -1730,7 +1730,7 @@ Retry:
e = e->next;
}
}
-#endif DEBUG
+#endif /* DEBUG */
/*
* Add new pv_entry after header.
@@ -1888,9 +1888,9 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
{
#ifdef lint
dst_pmap++; src_pmap++; dst_addr++; len++; src_addr++;
-#endif lint
+#endif /* lint */
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_collect
@@ -2014,7 +2014,7 @@ void pmap_activate(my_pmap, th, my_cpu)
{
PMAP_ACTIVATE(my_pmap, th, my_cpu);
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_deactivate
@@ -2031,10 +2031,10 @@ void pmap_deactivate(pmap, th, which_cpu)
{
#ifdef lint
pmap++; th++; which_cpu++;
-#endif lint
+#endif /* lint */
PMAP_DEACTIVATE(pmap, th, which_cpu);
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_kernel
@@ -2046,7 +2046,7 @@ pmap_t pmap_kernel()
{
return (kernel_pmap);
}
-#endif 0
+#endif /* 0 */
/*
* pmap_zero_page zeros the specified (machine independent) page.
@@ -2065,7 +2065,7 @@ pmap_zero_page(phys)
while (i--)
zero_phys(phys++);
}
-#endif 0
+#endif /* 0 */
/*
* pmap_copy_page copies the specified (machine independent) page.
@@ -2087,7 +2087,7 @@ pmap_copy_page(src, dst)
dst += INTEL_PGBYTES;
}
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_pageable
@@ -2111,7 +2111,7 @@ pmap_pageable(pmap, start, end, pageable)
{
#ifdef lint
pmap++; start++; end++; pageable++;
-#endif lint
+#endif /* lint */
}
/*
@@ -2528,7 +2528,7 @@ void pmap_update_interrupt()
splx(s);
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
/*
* Dummy routine to satisfy external reference.
*/
@@ -2536,7 +2536,7 @@ void pmap_update_interrupt()
{
/* should never be called. */
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#if i860 /* akp */
void set_dirbase(dirbase)
@@ -2546,7 +2546,7 @@ void set_dirbase(dirbase)
/*flush_tlb();*/
flush_and_ctxsw(dirbase);
}
-#endif i860
+#endif /* i860 */
#ifdef i386
/* Unmap page 0 to trap NULL references. */
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index 6e759a6..a638f22 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -2,24 +2,24 @@
* Mach Operating System
* Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -57,7 +57,7 @@
#define trunc_intel_to_vm(x) trunc_i386_to_vm(x)
#define round_intel_to_vm(x) round_i386_to_vm(x)
#define vm_to_intel(x) vm_to_i386(x)
-#endif i386
+#endif /* i386 */
#if i860
#define INTEL_PGBYTES I860_PGBYTES
#define INTEL_PGSHIFT I860_PGSHIFT
@@ -68,7 +68,7 @@
#define trunc_intel_to_vm(x) trunc_i860_to_vm(x)
#define round_intel_to_vm(x) round_i860_to_vm(x)
#define vm_to_intel(x) vm_to_i860(x)
-#endif i860
+#endif /* i860 */
/*
* i386/i486/i860 Page Table Entry
@@ -77,7 +77,7 @@
typedef unsigned int pt_entry_t;
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
-#endif ASSEMBLER
+#endif /* ASSEMBLER */
#define INTEL_OFFMASK 0xfff /* offset within page */
#define PDESHIFT 22 /* page descriptor shift */
@@ -130,13 +130,13 @@ typedef unsigned int pt_entry_t;
|INTEL_PTE_REF \
|INTEL_PTE_MOD \
)
-#else NOCACHE
+#else /* NOCACHE */
#define INTEL_PTE_VALID (INTEL_PTE_valid \
|INTEL_PTE_REF \
|INTEL_PTE_MOD \
)
-#endif NOCACHE
-#endif i860
+#endif /* NOCACHE */
+#endif /* i860 */
#define pa_to_pte(a) ((a) & INTEL_PTE_PFN)
#define pte_to_pa(p) ((p) & INTEL_PTE_PFN)
@@ -199,7 +199,7 @@ void process_pmap_updates();
void pmap_update_interrupt();
extern pmap_t kernel_pmap;
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Machine dependent routines that are used only for i386/i486/i860.
@@ -355,7 +355,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
splx(s); \
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
/*
* With only one CPU, we just have to indicate whether the pmap is
@@ -384,7 +384,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
(pmap)->cpus_using = FALSE; \
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#define PMAP_CONTEXT(pmap, thread)
@@ -396,6 +396,6 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
#define pmap_attribute(pmap,addr,size,attr,value) \
(KERN_INVALID_ADDRESS)
-#endif ASSEMBLER
+#endif /* ASSEMBLER */
-#endif _PMAP_MACHINE_
+#endif /* _PMAP_MACHINE_ */