diff options
| author | Roland McGrath <roland@gnu.org> | 2001-04-05 06:39:21 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-04-05 06:39:21 +0000 |
| commit | b42bd0d675ec7d1e1fbbf274fadbea984c8dab22 (patch) | |
| tree | a7f61083f2dfa365d5d9e7101c72e8cb5b3b16a9 | |
| parent | 2d43f4abdedd003eb070d633bac0e3a6fb3a746b (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.
188 files changed, 1843 insertions, 1852 deletions
diff --git a/ddb/db_access.h b/ddb/db_access.h index c01b6ce9..10418931 100644 --- a/ddb/db_access.h +++ b/ddb/db_access.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. */ @@ -42,7 +42,7 @@ #ifndef DB_ACCESS_LEVEL #define DB_ACCESS_LEVEL DB_ACCESS_KERNEL -#endif DB_ACCESS_LEVEL +#endif /* DB_ACCESS_LEVEL */ #ifndef DB_VALID_KERN_ADDR #define DB_VALID_KERN_ADDR(addr) ((addr) >= VM_MIN_KERNEL_ADDRESS \ @@ -50,7 +50,7 @@ #define DB_VALID_ADDRESS(addr,user) ((user != 0) ^ DB_VALID_KERN_ADDR(addr)) #define DB_PHYS_EQ(task1,addr1,task2,addr2) 0 #define DB_CHECK_ACCESS(addr,size,task) db_is_current_task(task) -#endif DB_VALID_KERN_ADDR +#endif /* DB_VALID_KERN_ADDR */ extern int db_access_level; diff --git a/ddb/db_aout.c b/ddb/db_aout.c index 6cb8294c..7c2b2ab5 100644 --- a/ddb/db_aout.c +++ b/ddb/db_aout.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. */ @@ -162,7 +162,7 @@ aout_db_eq_name(sp, name) /* * check .c .o file name comparison case */ - if (*s2 == 0 && sp->n_un.n_name <= s1 - 2 + if (*s2 == 0 && sp->n_un.n_name <= s1 - 2 && s1[-2] == '.' && s1[-1] == 'o') return(TRUE); return(FALSE); @@ -173,7 +173,7 @@ aout_db_eq_name(sp, name) * xxx:yyy for N_FUN * xxx.ttt for N_DATA and N_BSS */ - return(*s1 == 0 || (*s1 == ':' && sp->n_type == N_FUN) || + return(*s1 == 0 || (*s1 == ':' && sp->n_type == N_FUN) || (*s1 == '.' && (sp->n_type == N_DATA || sp->n_type == N_BSS))); } @@ -284,7 +284,7 @@ aout_db_qualified_search(stab, file, sym, line) */ in_file = TRUE; for (sp++; sp < ep; sp++) { - if (sp->n_type == N_TEXT + if (sp->n_type == N_TEXT && aout_db_is_filename(sp->n_un.n_name)) break; /* enter into another file */ if (sp->n_type == N_SOL) { @@ -504,4 +504,4 @@ aout_db_line_at_pc(stab, sym, file, line, pc) #endif /* DB_NO_AOUT */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_break.c b/ddb/db_break.c index d0ce1fc2..54339eef 100644 --- a/ddb/db_break.c +++ b/ddb/db_break.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. */ @@ -93,7 +93,7 @@ db_add_thread_breakpoint(bkpt, task_thd, count, task_bpt) register db_thread_breakpoint_t tp; if (db_thread_break_init == FALSE) { - for (tp = db_thread_break_list; + for (tp = db_thread_break_list; tp < &db_thread_break_list[NTHREAD_LIST-1]; tp++) tp->tb_next = tp+1; tp->tb_next = 0; @@ -242,11 +242,11 @@ db_check_breakpoint_valid() tbp_next = tbp->tb_next; if (tbp->tb_task_thd == 0) continue; - if ((tbp->tb_is_task && + if ((tbp->tb_is_task && db_lookup_task((task_t)(tbp->tb_task_thd)) < 0) || - (!tbp->tb_is_task && + (!tbp->tb_is_task && db_lookup_thread((thread_t)(tbp->tb_task_thd)) < 0)) { - db_force_delete_breakpoint(bkpt, + db_force_delete_breakpoint(bkpt, tbp->tb_task_thd, tbp->tb_is_task); } } @@ -414,7 +414,7 @@ db_set_breakpoints() BKPT_SET(bkpt->bkpt_inst), task); bkpt->flags |= BKPT_SET_IN_MEM; } else { - db_printf("Warning: cannot set breakpoint at %X ", + db_printf("Warning: cannot set breakpoint at %X ", bkpt->address); if (task) db_printf("in task %X\n", task); @@ -448,7 +448,7 @@ db_clear_breakpoints() } if ((bkpt->flags & BKPT_SET_IN_MEM) && DB_CHECK_ACCESS(bkpt->address, BKPT_SIZE, task)) { - inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, + inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); if (inst != BKPT_SET(inst)) { if (bkpt->flags & BKPT_USR_GLOBAL) { @@ -497,9 +497,9 @@ db_set_temp_breakpoint(task, addr) db_printf("Too many thread_breakpoints.\n"); return 0; } - bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE, + bkpt->bkpt_inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); - db_put_task_value(bkpt->address, BKPT_SIZE, + db_put_task_value(bkpt->address, BKPT_SIZE, BKPT_SET(bkpt->bkpt_inst), task); return bkpt; } @@ -564,7 +564,7 @@ db_list_breakpoints() if (task_id < 0 || thread_id < 0) db_printf("%0*X ", 2*sizeof(vm_offset_t), tp->tb_task_thd); - else + else db_printf("task%03d.%-3d ", task_id, thread_id); } } @@ -603,7 +603,7 @@ db_delete_cmd() boolean_t thd_bpt = FALSE; db_expr_t addr; int t; - + t = db_read_token(); if (t == tSLASH) { t = db_read_token(); @@ -645,7 +645,7 @@ db_delete_cmd() user_space = TRUE; } if (!DB_VALID_ADDRESS((vm_offset_t) addr, user_space)) { - db_printf("Address %#X is not in %s space\n", addr, + db_printf("Address %#X is not in %s space\n", addr, (user_space)? "user": "kernel"); db_error(0); } @@ -711,7 +711,7 @@ db_breakpoint_cmd(addr, have_addr, count, modif) if (db_access_level <= DB_ACCESS_CURRENT && user_space && thread->task != db_current_task()) db_error("Cannot set break point in inactive user space\n"); - db_set_breakpoint(db_target_space(thread, user_space), + db_set_breakpoint(db_target_space(thread, user_space), (db_addr_t)addr, count, (user_global)? THREAD_NULL: thread, task_bpt); @@ -730,4 +730,4 @@ db_listbreak_cmd() db_list_breakpoints(); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_break.h b/ddb/db_break.h index 4d4bd2cf..5909a629 100644 --- a/ddb/db_break.h +++ b/ddb/db_break.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. */ @@ -83,4 +83,4 @@ extern db_breakpoint_t db_set_temp_breakpoint( task_t task, db_addr_t addr); extern void db_delete_temp_breakpoint ( task_t task, db_breakpoint_t bkpt); -#endif _DDB_DB_BREAK_H_ +#endif /* _DDB_DB_BREAK_H_ */ diff --git a/ddb/db_command.c b/ddb/db_command.c index 50a02bd4..e29e5ff0 100644 --- a/ddb/db_command.c +++ b/ddb/db_command.c @@ -1,25 +1,25 @@ -/* +/* * 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 * the rights to redistribute these changes. */ @@ -314,10 +314,10 @@ void db_show_help(); extern void netipc_packet_print(), netipc_pcs_print(), db_show_all_uids(); extern void db_show_all_proxies(), db_show_all_principals(); extern void db_show_all_uids_verbose(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ #if NORMA_VM extern void xmm_obj_print(), xmm_reply_print(); -#endif NORMA_VM +#endif /* NORMA_VM */ struct db_command db_show_all_cmds[] = { { "threads", db_show_all_threads, 0, 0 }, @@ -327,7 +327,7 @@ struct db_command db_show_all_cmds[] = { { "proxies", db_show_all_proxies, 0, 0 }, { "principals", db_show_all_principals, 0, 0 }, { "vuids", db_show_all_uids_verbose, 0, 0 }, -#endif NORMA_IPC +#endif /* NORMA_IPC */ { (char *)0 } }; @@ -351,11 +351,11 @@ struct db_command db_show_cmds[] = { #if NORMA_IPC { "packet", netipc_packet_print, 0, 0 }, { "pcs", netipc_pcs_print, 0, 0 }, -#endif NORMA_IPC +#endif /* NORMA_IPC */ #if NORMA_VM { "xmm_obj", xmm_obj_print, 0, 0 }, { "xmm_reply", xmm_reply_print, 0, 0 }, -#endif NORMA_VM +#endif /* NORMA_VM */ { (char *)0, } }; @@ -449,7 +449,7 @@ db_command_loop() extern int db_macro_level; #if NORMA_IPC extern int _node_self; /* node_self() may not be callable yet */ -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Initialize 'prev' and 'next' to dot. @@ -594,4 +594,4 @@ db_option(modif, option) return(FALSE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_command.h b/ddb/db_command.h index 60762b21..b7324f0f 100644 --- a/ddb/db_command.h +++ b/ddb/db_command.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 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. */ @@ -67,4 +67,4 @@ struct db_command { struct db_command *more; /* another level of command */ }; -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_cond.c b/ddb/db_cond.c index c78f03c1..deaa6999 100644 --- a/ddb/db_cond.c +++ b/ddb/db_cond.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. */ @@ -178,4 +178,4 @@ db_cond_cmd() bkpt->tb_cond = (cp - db_cond) + 1; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_examine.c b/ddb/db_examine.c index c996fd18..9e45bd16 100644 --- a/ddb/db_examine.c +++ b/ddb/db_examine.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 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. */ @@ -76,19 +76,19 @@ db_examine_cmd(addr, have_addr, count, modif) if (count == -1) count = 1; db_examine_count = count; - if (db_option(modif, 't')) + if (db_option(modif, 't')) { if (!db_get_next_thread(&thread, 0)) return; } - else + else if (db_option(modif,'u')) thread = current_thread(); else thread = THREAD_NULL; - + db_examine_thread = thread; - db_examine((db_addr_t) addr, db_examine_format, count, + db_examine((db_addr_t) addr, db_examine_format, count, db_thread_to_task(thread)); } @@ -157,7 +157,7 @@ db_examine(addr, fmt, count, task) if (db_print_position() != 0) db_printf("\n"); db_prev = addr; - db_task_printsym(addr, + db_task_printsym(addr, (c == 'a')?DB_STGY_ANY:DB_STGY_PROC, task); db_printf(":\t"); @@ -278,7 +278,7 @@ db_print_cmd() task = db_default_thread->task; } else db_unread_token(t); - + for ( ; ; ) { t = db_read_token(); if (t == tSTRING) { @@ -503,4 +503,4 @@ db_xcdump(addr, size, count, task) return(addr); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_expr.c b/ddb/db_expr.c index b9848bb6..23b4ef8a 100644 --- a/ddb/db_expr.c +++ b/ddb/db_expr.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. */ @@ -388,4 +388,4 @@ db_expression(valuep) return (db_logical_or_expr(valuep)); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_ext_symtab.c b/ddb/db_ext_symtab.c index 1a8ea8b6..7d85252a 100644 --- a/ddb/db_ext_symtab.c +++ b/ddb/db_ext_symtab.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. */ @@ -120,4 +120,4 @@ host_load_symbol_table(host, task, name, symtab, symtab_count) #endif /* MACH_DEBUG */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_input.c b/ddb/db_input.c index c175ae15..f45d4f92 100644 --- a/ddb/db_input.c +++ b/ddb/db_input.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 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. */ @@ -38,7 +38,7 @@ #ifndef DB_HISTORY_SIZE #define DB_HISTORY_SIZE 4000 -#endif DB_HISTORY_SIZE +#endif /* DB_HISTORY_SIZE */ /* * Character input and editing. @@ -60,7 +60,7 @@ char * db_history_curr = db_history; /* start of current line */ char * db_history_last = db_history; /* start of last line */ char * db_history_prev = (char *) 0; /* start of previous line */ #endif - + #define CTRL(c) ((c) & 0x1f) #define isspace(c) ((c) == ' ' || (c) == '\t') #define BLANK ' ' @@ -133,7 +133,7 @@ db_delete_line() db_history_size - 1; \ } while (0) #endif - + /* returns TRUE at end-of-line */ boolean_t db_inputchar(c) @@ -375,4 +375,4 @@ db_check_interrupt() } } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_lex.c b/ddb/db_lex.c index 617f1237..783f4ee7 100644 --- a/ddb/db_lex.c +++ b/ddb/db_lex.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. */ @@ -121,7 +121,7 @@ db_read_char() } else if (db_lp >= db_endlp) c = -1; - else + else c = *db_lp++; return (c); } @@ -260,7 +260,7 @@ db_lex() (c >= 'a' && c <= 'z') || (c == '_')) { - db_printf("Bad character '%c' after number %s\n", + db_printf("Bad character '%c' after number %s\n", c, db_tok_string); db_error(0); db_flush_lex(); @@ -452,4 +452,4 @@ db_lex() return (tEOF); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_macro.c b/ddb/db_macro.c index c186ac6a..5a7e8c2a 100644 --- a/ddb/db_macro.c +++ b/ddb/db_macro.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. */ @@ -104,7 +104,7 @@ db_del_macro_cmd() { register struct db_user_macro *mp; - if (db_read_token() != tIDENT + if (db_read_token() != tIDENT || (mp = db_lookup_macro(db_tok_string)) == 0) { db_printf("No such macro \"%s\"\n", db_tok_string); db_error(0); @@ -134,7 +134,7 @@ db_show_macro() db_printf("%s: %s", mp->m_name, mp->m_lbuf); } } - + int db_exec_macro(name) char *name; @@ -150,7 +150,7 @@ db_exec_macro(name) /* NOTREACHED */ } for (n = 0; - n < DB_NARGS && + n < DB_NARGS && db_expression(&db_macro_args[db_macro_level+1][n]); n++); while (n < DB_NARGS) @@ -180,4 +180,4 @@ db_arg_variable(vp, valuep, flag, ap) return(0); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_mp.c b/ddb/db_mp.c index 607c24db..3e4f6edb 100644 --- a/ddb/db_mp.c +++ b/ddb/db_mp.c @@ -1,26 +1,26 @@ -/* +/* * 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 + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ #include "mach_kdb.h" @@ -145,7 +145,7 @@ db_leave() /* - * invoke kernel debugger on slave processors + * invoke kernel debugger on slave processors */ void @@ -336,4 +336,4 @@ db_console() #endif /* NCPUS > 1 */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_output.c b/ddb/db_output.c index adaf249c..de3b370c 100644 --- a/ddb/db_output.c +++ b/ddb/db_output.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. */ @@ -57,7 +57,7 @@ #ifndef DB_MAX_LINE #define DB_MAX_LINE 24 /* maximum line */ #define DB_MAX_WIDTH 80 /* maximum width */ -#endif DB_MAX_LINE +#endif /* DB_MAX_LINE */ #define DB_MIN_MAX_WIDTH 20 /* minimum max width */ #define DB_MIN_MAX_LINE 3 /* minimum max line */ @@ -233,4 +233,4 @@ kdbprintf(const char *fmt, ...) va_end(listp); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_print.c b/ddb/db_print.c index 727af233..2dee9cc7 100644 --- a/ddb/db_print.c +++ b/ddb/db_print.c @@ -2,24 +2,24 @@ * 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. */ @@ -90,12 +90,12 @@ db_show_regs(addr, have_addr, count, modif) aux_param.suffix[0] = i; db_read_write_variable(regp, &value, DB_VAR_GET, &aux_param); if (regp->max_level > 0) - db_printf("%s%d%*s", regp->name, i, + db_printf("%s%d%*s", regp->name, i, 12-strlen(regp->name)-((i<10)?1:2), ""); else db_printf("%-12s", regp->name); db_printf("%#*N", 2+2*sizeof(vm_offset_t), value); - db_find_xtrn_task_sym_and_offset((db_addr_t)value, &name, + db_find_xtrn_task_sym_and_offset((db_addr_t)value, &name, &offset, task); if (name != 0 && offset <= db_maxoff && offset != value) { db_printf("\t%s", name); @@ -116,7 +116,7 @@ db_show_regs(addr, have_addr, count, modif) #ifndef DB_TASK_NAME #define DB_TASK_NAME(task) /* no task name */ #define DB_TASK_NAME_TITLE "" /* no task name */ -#endif DB_TASK_NAME +#endif /* DB_TASK_NAME */ #ifndef db_thread_fp_used #define db_thread_fp_used(thread) FALSE @@ -128,7 +128,7 @@ db_thread_stat(thread, status) char *status; { register char *p = status; - + *p++ = (thread->state & TH_RUN) ? 'R' : '.'; *p++ = (thread->state & TH_WAIT) ? 'W' : '.'; *p++ = (thread->state & TH_SUSP) ? 'S' : '.'; @@ -180,7 +180,7 @@ db_print_thread(thread, thread_id, flag) db_printf("\n "); } else db_printf(" "); - db_printf("%3d%c(%0*X,%s)", thread_id, + db_printf("%3d%c(%0*X,%s)", thread_id, (thread == current_thread())? '#': ':', 2*sizeof(vm_offset_t), thread, db_thread_stat(thread, status)); @@ -200,7 +200,7 @@ db_print_thread(thread, thread_id, flag) if (thread->state & TH_SWAPPED) { if (thread->swap_func) { db_printf("("); - db_task_printsym((db_addr_t)thread->swap_func, + db_task_printsym((db_addr_t)thread->swap_func, DB_STGY_ANY, kernel_task); db_printf(")"); } else { @@ -209,7 +209,7 @@ db_print_thread(thread, thread_id, flag) } if (thread->state & TH_WAIT) { db_printf(" "); - db_task_printsym((db_addr_t)thread->wait_event, + db_task_printsym((db_addr_t)thread->wait_event, DB_STGY_ANY, kernel_task); } db_printf("\n"); @@ -227,7 +227,7 @@ db_print_task(task, task_id, flag) if (flag & OPTION_USER) { if (flag & OPTION_TASK_TITLE) { - db_printf(" ID: TASK MAP THD SUS PR %s", + db_printf(" ID: TASK MAP THD SUS PR %s", DB_TASK_NAME_TITLE); if ((flag & OPTION_LONG) == 0) db_printf(" THREADS"); @@ -508,4 +508,4 @@ db_show_port_id(addr, have_addr, count, modif) db_printf("\n"); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_run.c b/ddb/db_run.c index 47c39c28..c6feb246 100644 --- a/ddb/db_run.c +++ b/ddb/db_run.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993-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. */ @@ -240,7 +240,7 @@ db_single_step(regs, task) * db_getreg_val(); return the value of a user register, * as indicated in the hardware instruction * encoding, e.g. 8 for r8 - * + * * next_instr_address(pc,bd,task) returns the address of the first * instruction following the one at "pc", * which is either in the taken path of @@ -252,7 +252,7 @@ db_single_step(regs, task) * If one of these addresses does not already have a breakpoint, * we allocate a breakpoint and save it here. * These breakpoints are deleted on return. - */ + */ db_breakpoint_t db_not_taken_bkpt = 0; db_breakpoint_t db_taken_bkpt = 0; @@ -294,18 +294,18 @@ db_set_task_single_step(regs, task) db_taken_bkpt = 0; pc = next_instr_address(pc,1,task); } - + /* check if this control flow instruction is an unconditional transfer */ unconditional = inst_unconditional_flow_transfer(inst); pc = next_instr_address(pc,0,task); - /* + /* We only set the sequential breakpoint if previous instruction was not an unconditional change of flow of control. If the previous instruction is an unconditional change of flow of control, setting a breakpoint in the next sequential location may set a breakpoint in data or in another routine, - which could screw up either the program or the debugger. - (Consider, for instance, that the next sequential instruction is the + which could screw up either the program or the debugger. + (Consider, for instance, that the next sequential instruction is the start of a routine needed by the debugger.) */ if (!unconditional && db_find_breakpoint_here(task, pc) == 0) { @@ -438,4 +438,4 @@ db_in_single_step() return(db_run_mode != STEP_NONE && db_run_mode != STEP_CONTINUE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_sym.c b/ddb/db_sym.c index c48a48fd..8641ce19 100644 --- a/ddb/db_sym.c +++ b/ddb/db_sym.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 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. */ @@ -187,7 +187,7 @@ db_lookup(symstr) * handler supports qualified search with a file name or a line number. * It parses the symbol string, and call an object dependent routine * with parsed file name, symbol name and line number. - */ + */ db_sym_t db_sym_parse_and_lookup(func, symtab, symstr) db_sym_t (*func)(); @@ -247,7 +247,7 @@ db_sym_parse_and_lookup(func, symtab, symstr) sym_name = component[1]; } found = func(symtab, file_name, sym_name, line_number); - + out: while (--n >= 1) component[n][-1] = ':'; @@ -290,8 +290,8 @@ db_sym_t db_search_in_task_symbol(); * * Logic change. If the task argument is non NULL and a * matching symbol is found in a symbol table which explictly - * specifies its map to be task->map, that symbol will have - * precedence over any symbol from a symbol table will a null + * specifies its map to be task->map, that symbol will have + * precedence over any symbol from a symbol table will a null * map. This allows overlapping kernel/user maps to work correctly. * */ @@ -309,9 +309,9 @@ db_search_task_symbol(val, strategy, offp, task) else { ret = db_search_in_task_symbol(val, strategy, offp, task); - /* - db_search_in_task_symbol will return success with - a very large offset when it should have failed. + /* + db_search_in_task_symbol will return success with + a very large offset when it should have failed. */ if (ret == DB_SYM_NULL || (*offp) > 0x1000000) { @@ -340,11 +340,11 @@ db_search_in_task_symbol(val, strategy, offp, task) map_for_val = (task == TASK_NULL)? VM_MAP_NULL: task->map; newdiff = diff = ~0; db_last_symtab = (db_symtab_t *) 0; - for (sp = &db_symtabs[0], i = 0; i < db_nsymtab; sp++, i++) + for (sp = &db_symtabs[0], i = 0; i < db_nsymtab; sp++, i++) { newdiff = ~0; if ((vm_map_t)sp->map_pointer == VM_MAP_NULL || - (vm_map_t)sp->map_pointer == map_for_val) + (vm_map_t)sp->map_pointer == map_for_val) { sym = X_db_search_symbol(sp, val, strategy, (db_expr_t*)&newdiff); if (sym == DB_SYM_NULL) @@ -356,7 +356,7 @@ db_search_in_task_symbol(val, strategy, offp, task) ret = sym; continue; } - if ((vm_map_t) sp->map_pointer == VM_MAP_NULL && + if ((vm_map_t) sp->map_pointer == VM_MAP_NULL && (vm_map_t) db_last_symtab->map_pointer == VM_MAP_NULL && newdiff < diff ) { /* closer null map match */ @@ -364,23 +364,23 @@ db_search_in_task_symbol(val, strategy, offp, task) diff = newdiff; ret = sym; continue; - } - if ((vm_map_t) sp->map_pointer != VM_MAP_NULL && + } + if ((vm_map_t) sp->map_pointer != VM_MAP_NULL && (newdiff < 0x100000) && ((vm_map_t) db_last_symtab->map_pointer == VM_MAP_NULL || newdiff < diff )) - { /* update if new is in matching map and symbol is "close", - and - old is VM_MAP_NULL or old in is matching map but is further away + { /* update if new is in matching map and symbol is "close", + and + old is VM_MAP_NULL or old in is matching map but is further away */ db_last_symtab = sp; diff = newdiff; ret = sym; continue; - } + } } } - + *offp = diff; return ret; } @@ -520,4 +520,4 @@ struct db_sym_switch x_db[] = { }; -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c index 8ab8cde0..8a62e234 100644 --- a/ddb/db_task_thread.c +++ b/ddb/db_task_thread.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. */ @@ -184,7 +184,7 @@ db_lookup_thread_id(task, thread_id) { register thread_t thread; - + if (thread_id > DB_MAX_THREADID) return(THREAD_NULL); if (queue_first(&task->thread_list) == 0) @@ -291,7 +291,7 @@ db_get_task_thread(vp, valuep, flag, ap) return(0); } if ((thread = db_lookup_thread_id(task, ap->suffix[1])) == THREAD_NULL){ - db_printf("no such thread($task%d.%d)\n", + db_printf("no such thread($task%d.%d)\n", ap->suffix[0], ap->suffix[1]); db_error(0); /* NOTREACHED */ @@ -300,4 +300,4 @@ db_get_task_thread(vp, valuep, flag, ap) return(0); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_task_thread.h b/ddb/db_task_thread.h index 26a071cf..867cee68 100644 --- a/ddb/db_task_thread.h +++ b/ddb/db_task_thread.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. */ @@ -48,4 +48,4 @@ extern boolean_t db_check_thread_address_valid(/* db_expr_t */); extern boolean_t db_get_next_thread(/* thread_t *, int */); extern void db_init_default_thread(); -#endif _DDB_DB_TASK_THREAD_H_ +#endif /* _DDB_DB_TASK_THREAD_H_ */ diff --git a/ddb/db_trap.c b/ddb/db_trap.c index dbb58920..367670b2 100644 --- a/ddb/db_trap.c +++ b/ddb/db_trap.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. */ @@ -104,4 +104,4 @@ db_trap(type, code) db_task_trap(type, code, !DB_VALID_KERN_ADDR(PC_REGS(DDB_REGS))); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_variables.c b/ddb/db_variables.c index 541dca1c..96f2c5c4 100644 --- a/ddb/db_variables.c +++ b/ddb/db_variables.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. */ @@ -84,7 +84,7 @@ db_get_suffix(suffix, suffix_value) suffix++; return(suffix); } - + static boolean_t db_cmp_variable_name(vp, name, ap) struct db_variable *vp; @@ -93,7 +93,7 @@ db_cmp_variable_name(vp, name, ap) { register char *var_np, *np; register level; - + for (np = name, var_np = vp->name; *var_np; ) { if (*np++ != *var_np++) return(FALSE); @@ -103,7 +103,7 @@ db_cmp_variable_name(vp, name, ap) return(FALSE); } if ((*np && *np != ':') || level < vp->min_level - || (level > 0 && (ap->suffix[0] < vp->low + || (level > 0 && (ap->suffix[0] < vp->low || (vp->high >= 0 && ap->suffix[0] > vp->high)))) return(FALSE); db_strcpy(ap->modif, (*np)? np+1: ""); @@ -238,4 +238,4 @@ db_set_cmd() db_read_write_variable(vp, &value, DB_VAR_SET, &aux_param); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_watch.c b/ddb/db_watch.c index 410c0a25..95852866 100644 --- a/ddb/db_watch.c +++ b/ddb/db_watch.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. */ @@ -202,7 +202,7 @@ db_get_task(modif, taskp, addr) } } if (!DB_VALID_ADDRESS(addr, user_space)) { - db_printf("Address %#X is not in %s space\n", addr, + db_printf("Address %#X is not in %s space\n", addr, (user_space)? "user": "kernel"); return(-1); } @@ -315,4 +315,4 @@ db_find_watchpoint(map, addr, regs) return (FALSE); } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_watch.h b/ddb/db_watch.h index 9192bbd4..6e284037 100644 --- a/ddb/db_watch.h +++ b/ddb/db_watch.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. */ @@ -58,6 +58,6 @@ extern void db_set_watchpoint(/* task_t task, db_addr_t addr, vm_size_t size */) extern void db_delete_watchpoint(/* task_t task, db_addr_t addr */); extern void db_list_watchpoints(); -#endif _DDB_DB_WATCH_ +#endif /* _DDB_DB_WATCH_ */ -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ddb/db_write_cmd.c b/ddb/db_write_cmd.c index a72102b2..a8cf2727 100644 --- a/ddb/db_write_cmd.c +++ b/ddb/db_write_cmd.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 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. */ @@ -68,7 +68,7 @@ db_write_cmd(address, have_addr, count, modif) addr = (db_addr_t) address; size = db_size_option(modif, &u_opt, &t_opt); - if (t_opt) + if (t_opt) { if (!db_get_next_thread(&thread, 0)) return; @@ -76,8 +76,8 @@ db_write_cmd(address, have_addr, count, modif) } else task = db_current_task(); - - /* if user space is not explicitly specified, + + /* if user space is not explicitly specified, look in the kernel */ if (!u_opt) task = TASK_NULL; @@ -106,4 +106,4 @@ db_write_cmd(address, have_addr, count, modif) db_prev = addr - size; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/device/dev_pager.c b/device/dev_pager.c index 007942d3..2e76ed2c 100644 --- a/device/dev_pager.c +++ b/device/dev_pager.c @@ -333,7 +333,7 @@ kern_return_t device_pager_data_request( #ifdef lint protection_required++; -#endif lint +#endif /* lint */ if (device_pager_debug) printf("(device_pager)data_request: pager=%d, offset=0x%x, length=0x%x\n", @@ -700,7 +700,7 @@ kern_return_t device_pager_data_unlock( { #ifdef lint memory_object++; memory_control_port++; offset++; length++; desired_access++; -#endif lint +#endif /* lint */ panic("(device_pager)data_unlock: called"); return (KERN_FAILURE); @@ -714,7 +714,7 @@ kern_return_t device_pager_lock_completed( { #ifdef lint memory_object++; pager_request_port++; offset++; length++; -#endif lint +#endif /* lint */ panic("(device_pager)lock_completed: called"); return (KERN_FAILURE); diff --git a/device/device_port.h b/device/device_port.h index 980a7095..8f8aaaaf 100644 --- a/device/device_port.h +++ b/device/device_port.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. */ @@ -38,4 +38,4 @@ */ extern ipc_port_t master_device_port; -#endif _DEVICE_DEVICE_PORT_H_ +#endif /* _DEVICE_DEVICE_PORT_H_ */ diff --git a/device/device_types_kernel.h b/device/device_types_kernel.h index dd7b63e8..c9698b15 100644 --- a/device/device_types_kernel.h +++ b/device/device_types_kernel.h @@ -41,4 +41,4 @@ extern device_t dev_port_lookup(/* struct ipc_port * */); extern struct ipc_port *convert_device_to_port(/* device_t */); -#endif _DEVICE_DEVICE_TYPES_KERNEL_H_ +#endif /* _DEVICE_DEVICE_TYPES_KERNEL_H_ */ diff --git a/device/ds_routines.h b/device/ds_routines.h index fff21fbe..111505d1 100644 --- a/device/ds_routines.h +++ b/device/ds_routines.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. */ @@ -49,4 +49,4 @@ boolean_t ds_open_done(); boolean_t ds_read_done(); boolean_t ds_write_done(); -#endif DS_ROUTINES_H +#endif /* DS_ROUTINES_H */ diff --git a/device/errno.h b/device/errno.h index 35e31e5e..e65aa984 100644 --- a/device/errno.h +++ b/device/errno.h @@ -2,7 +2,7 @@ * 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 @@ -42,4 +42,4 @@ #define ENOTTY D_INVALID_OPERATION #define ENOMEM D_NO_MEMORY -#endif _ERRNO_ +#endif /* _ERRNO_ */ diff --git a/device/if_ether.h b/device/if_ether.h index da83fcfe..5da40d62 100644 --- a/device/if_ether.h +++ b/device/if_ether.h @@ -2,7 +2,7 @@ * 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 @@ -52,6 +52,6 @@ struct ether_header { u_char etherbroadcastaddr[6]; extern char * ether_sprintf(); -#endif KERNEL +#endif /* KERNEL */ #endif /*_DEVICE_IF_ETHER_H_*/ diff --git a/device/if_hdr.h b/device/if_hdr.h index 64defb71..fa53fd33 100644 --- a/device/if_hdr.h +++ b/device/if_hdr.h @@ -147,4 +147,4 @@ struct ifnet { #define IFNET_SLOWHZ 1 /* granularity is 1 second */ -#endif _IF_HDR_ +#endif /* _IF_HDR_ */ diff --git a/device/io_req.h b/device/io_req.h index 76e55b69..2bb4a99b 100644 --- a/device/io_req.h +++ b/device/io_req.h @@ -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. */ @@ -138,4 +138,4 @@ void iodone(/* io_req_t */); zone_t io_inband_zone; /* for inband reads */ -#endif _IO_REQ_ +#endif /* _IO_REQ_ */ diff --git a/device/net_io.c b/device/net_io.c index 7714ebe3..5762c88c 100644 --- a/device/net_io.c +++ b/device/net_io.c @@ -651,7 +651,7 @@ net_packet(ifp, kmsg, count, priority) if (netipc_net_packet(kmsg, count)) { return; } -#endif NORMA_ETHER +#endif /* NORMA_ETHER */ #if MACH_TTD /* diff --git a/device/net_io.h b/device/net_io.h index 2228e72b..789614ed 100644 --- a/device/net_io.h +++ b/device/net_io.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. */ @@ -77,4 +77,4 @@ extern vm_size_t net_kmsg_size; #define net_kmsg_alloc() ((ipc_kmsg_t) kalloc(net_kmsg_size)) #define net_kmsg_free(kmsg) kfree((vm_offset_t) (kmsg), net_kmsg_size) -#endif _DEVICE_NET_IO_H_ +#endif /* _DEVICE_NET_IO_H_ */ diff --git a/i386/i386/ast_check.c b/i386/i386/ast_check.c index faa3b8ed..37071c2e 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 8187980f..4e94f37c 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 dfb85e2c..293a1c0a 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 30b0b0f3..2897beb9 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 7d0cff11..41e7bd69 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 99108b69..37b2d40f 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 c8cd5635..ae777797 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 a263bcfd..e741516f 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 26ce3d91..58ad9689 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 10d47624..24bb45cf 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 b4804da3..6d475379 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 4663593e..f86afb41 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 06ee58a0..4ef98573 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 021f47fd..89791153 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 3f2f3900..298ffac8 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 da0b0af3..dd2d129d 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 053a3ea6..6ed243bc 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 c7095620..c5a35770 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 dbc3f5ea..96a0ca73 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 8380db84..18162fc5 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 66b92d80..17031928 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 b2427f92..3b22aee9 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 79a87576..082bb158 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 b86e967c..a71611df 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 c9111271..027193a5 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 e46f6b00..ea7a0972 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 f4dcbd57..13ded301 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 30e9418e..96fc8bac 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 a5091fb7..f54e110a 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 50eec98b..8542a969 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 e97b0eea..32cc0a27 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 1fc0dfad..40df714b 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 773411b4..82c4077e 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 7903310b..72c4ad07 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 d6756e31..a59209e1 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 7c87729b..f17c48ba 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 304bd7f5..898fd24e 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 28114d4f..0c104d3e 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 21f07856..f730c5bf 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 7a8d1d7b..96aa86dc 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 c7755359..b4aaca5e 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 d7d54b2d..72bf9d4e 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 5c30b67a..55121b6c 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 e0db8237..7aa0b1c4 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 58dc266c..70b28fe5 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 51fdca87..603bf0c7 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 3288b932..01b2dc76 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 2d66bf15..fc56e873 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 6e759a6d..a638f221 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_ */ diff --git a/include/alloca.h b/include/alloca.h index 0a476b4f..29081cad 100644 --- a/include/alloca.h +++ b/include/alloca.h @@ -22,4 +22,4 @@ #define alloca(size) __builtin_alloca(size) -#endif _MACH_ALLOCA_H_ +#endif /* _MACH_ALLOCA_H_ */ diff --git a/include/device/device_types.defs b/include/device/device_types.defs index c5d8e9d5..79e4c5b0 100644 --- a/include/device/device_types.defs +++ b/include/device/device_types.defs @@ -2,31 +2,31 @@ * 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. */ /* * Author: David B. Golub, Carnegie Mellon University * Date: 3/89 - * + * * Common definitions for device interface types. */ @@ -61,4 +61,4 @@ type device_t = mach_port_t import <device/device_types.h>; import <device/net_status.h>; -#endif _DEVICE_DEVICE_TYPES_DEFS_ +#endif /* _DEVICE_DEVICE_TYPES_DEFS_ */ diff --git a/include/device/device_types.h b/include/device/device_types.h index 08eec4a5..caf4fc04 100644 --- a/include/device/device_types.h +++ b/include/device/device_types.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. */ @@ -135,4 +135,4 @@ typedef int io_return_t; #define D_NO_MEMORY 2508 /* memory allocation failure */ #define D_READ_ONLY 2509 /* device cannot be written to */ -#endif DEVICE_TYPES_H +#endif /* DEVICE_TYPES_H */ diff --git a/include/device/disk_status.h b/include/device/disk_status.h index 868e06ef..6db790a5 100644 --- a/include/device/disk_status.h +++ b/include/device/disk_status.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. */ @@ -66,7 +66,7 @@ struct disklabel { short d_type; /* drive type */ short d_subtype; /* controller/d_type specific */ char d_typename[16]; /* type name, e.g. "eagle" */ - /* + /* * d_packname contains the pack identifier and is returned when * the disklabel is read off the disk or in-core copy. * d_boot0 and d_boot1 are the (optional) names of the @@ -75,15 +75,15 @@ struct disklabel { * getdiskbyname(3) to retrieve the values from /etc/disktab. */ #if defined(MACH_KERNEL) || defined(STANDALONE) - char d_packname[16]; /* pack identifier */ + char d_packname[16]; /* pack identifier */ #else union { - char un_d_packname[16]; /* pack identifier */ + char un_d_packname[16]; /* pack identifier */ struct { char *un_d_boot0; /* primary bootstrap name */ char *un_d_boot1; /* secondary bootstrap name */ - } un_b; - } d_un; + } un_b; + } d_un; #define d_packname d_un.un_d_packname #define d_boot0 d_un.un_b.un_d_boot0 #define d_boot1 d_un.un_b.un_d_boot1 @@ -168,7 +168,7 @@ struct disklabel { int bugfix; #endif }; -#else LOCORE +#else /* LOCORE */ /* * offsets for asm boot files. */ @@ -179,7 +179,7 @@ struct disklabel { .set d_secpercyl,56 .set d_secperunit,60 .set d_end_,276 /* size of disk label */ -#endif LOCORE +#endif /* LOCORE */ /* d_type values: */ #define DTYPE_SMD 1 /* SMD, XSMD; VAX hp/up */ @@ -301,6 +301,6 @@ struct format_op { #define DIOCSBAD _IOW('d', 110, struct dkbad) /* set kernel dkbad */ -#endif LOCORE +#endif /* LOCORE */ #endif /* _DISK_STATUS_H_ */ diff --git a/include/device/net_status.h b/include/device/net_status.h index 2b29b327..dbf5e39f 100644 --- a/include/device/net_status.h +++ b/include/device/net_status.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. */ @@ -83,7 +83,7 @@ struct net_status { * We allow specification of up to NET_MAX_FILTER (short) words of a filter * command list to be applied to incoming packets to determine if * those packets should be given to a particular network input filter. - * + * * Each network filter specifies the filter command list via net_add_filter. * Each filter command list specifies a sequences of actions which leave a * boolean value on the top of an internal stack. Each word of the @@ -94,10 +94,10 @@ struct net_status { * top two elements of the stack and replaces them with its result. The * special action NOPUSH and the special operator NOP can be used to only * perform the binary operation or to only push a value on the stack. - * + * * If the final value of the filter operation is true, then the packet is * accepted for the filter. - * + * */ typedef unsigned short filter_t; @@ -184,4 +184,4 @@ typedef struct net_rcv_msg *net_rcv_msg_t; -#endif _DEVICE_NET_STATUS_H_ +#endif /* _DEVICE_NET_STATUS_H_ */ diff --git a/include/mach/mach.defs b/include/mach/mach.defs index 1e4429d6..36d42776 100644 --- a/include/mach/mach.defs +++ b/include/mach/mach.defs @@ -164,13 +164,13 @@ skip; /* old thread_mutate */ */ #ifdef EMULATOR skip; /* the emulator redefines vm_allocate using vm_map */ -#else EMULATOR +#else /* EMULATOR */ routine vm_allocate( target_task : vm_task_t; inout address : vm_address_t; size : vm_size_t; anywhere : boolean_t); -#endif EMULATOR +#endif /* EMULATOR */ skip; /* old vm_allocate_with_pager */ @@ -582,21 +582,21 @@ routine xxx_thread_info( routine task_set_emulation( target_port : task_t; routine_entry_pt: vm_address_t; - routine_number : int); + routine_number : int); /* * Establish restart pc for interrupted atomic sequences. * This reuses the message number for the old task_get_io_port. * See task_info.h for description of flavors. - * + * */ routine task_ras_control( target_task : task_t; basepc : vm_address_t; boundspc : vm_address_t; flavor : int); - - + + skip; /* old host_ipc_statistics */ @@ -764,7 +764,7 @@ routine port_extract_receive( his_name : port_name_t; out his_port : port_all_t); -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ skip; /* old port_names */ skip; /* old port_type */ @@ -783,7 +783,7 @@ skip; /* old port_extract_send */ skip; /* old port_insert_receive */ skip; /* old port_extract_receive */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Map a user-defined memory object into the virtual address @@ -829,7 +829,7 @@ routine htg_vm_map( cur_protection : vm_prot_t; max_protection : vm_prot_t; inheritance : vm_inherit_t); -#else EMULATOR +#else /* EMULATOR */ routine vm_map( target_task : vm_task_t; inout address : vm_address_t; @@ -842,7 +842,7 @@ routine vm_map( cur_protection : vm_prot_t; max_protection : vm_prot_t; inheritance : vm_inherit_t); -#endif EMULATOR +#endif /* EMULATOR */ /* * Indicate that a range of the specified memory object cannot @@ -933,15 +933,15 @@ routine port_set_backup( ctype: mach_port_t; out previous : port_t); -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ skip; /* old port_set_backup */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Set/Get special properties of memory associated - * to some virtual address range, such as cachability, + * to some virtual address range, such as cachability, * migrability, replicability. Machine-dependent. */ routine vm_machine_attribute( diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs index e64be877..e7fc12fc 100644 --- a/include/mach/memory_object.defs +++ b/include/mach/memory_object.defs @@ -2,24 +2,24 @@ * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,18 +33,18 @@ subsystem #if KERNEL_USER KernelUser -#endif KERNEL_USER +#endif /* KERNEL_USER */ #if KERNEL_SERVER KernelServer -#endif KERNEL_SERVER +#endif /* KERNEL_SERVER */ memory_object 2200; #ifdef KERNEL #include <norma_vm.h> #if NORMA_VM userprefix k_; -#endif NORMA_VM -#endif KERNEL +#endif /* NORMA_VM */ +#endif /* KERNEL */ #include <mach/std_types.defs> #include <mach/mach_types.defs> @@ -52,7 +52,7 @@ userprefix k_; #if SEQNOS serverprefix seqnos_; serverdemux seqnos_memory_object_server; -#endif SEQNOS +#endif /* SEQNOS */ /* * Initialize the specified memory object, providing @@ -69,7 +69,7 @@ simpleroutine memory_object_init( memory_object : memory_object_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ memory_control : memory_object_control_t = MACH_MSG_TYPE_MAKE_SEND ctype: mach_port_t; @@ -95,7 +95,7 @@ simpleroutine memory_object_terminate( ctype: mach_port_t; #if SEQNOS msgseqno seqno : mach_port_seqno_t; -#endif SEQNOS +#endif /* SEQNOS */ memory_control : memory_object_control_t = MACH_MSG_TYPE_MOVE_RECEIVE ctype: mach_port_t diff --git a/include/mach/std_types.defs b/include/mach/std_types.defs index aef7dba8..b0011f1b 100644 --- a/include/mach/std_types.defs +++ b/include/mach/std_types.defs @@ -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. */ @@ -124,8 +124,8 @@ type port_rcv_t = MACH_MSG_TYPE_MOVE_RECEIVE type port_array_t = ^array[] of port_t ctype: mach_port_array_t; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ import <mach/std_types.h>; -#endif _MACH_STD_TYPES_DEFS_ +#endif /* _MACH_STD_TYPES_DEFS_ */ diff --git a/include/mach_debug/hash_info.h b/include/mach_debug/hash_info.h index 19a039f4..6944277d 100644 --- a/include/mach_debug/hash_info.h +++ b/include/mach_debug/hash_info.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. */ @@ -38,4 +38,4 @@ typedef struct hash_info_bucket { typedef hash_info_bucket_t *hash_info_bucket_array_t; -#endif _MACH_DEBUG_HASH_INFO_H_ +#endif /* _MACH_DEBUG_HASH_INFO_H_ */ diff --git a/include/mach_debug/ipc_info.h b/include/mach_debug/ipc_info.h index 8d2cafeb..ef0b0c6a 100644 --- a/include/mach_debug/ipc_info.h +++ b/include/mach_debug/ipc_info.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. */ @@ -97,4 +97,4 @@ typedef ipc_info_tree_name_t *ipc_info_tree_name_array_t; #define IPC_INFO_TYPE_XMM_PAGER 11 #define IPC_INFO_TYPE_PAGING_NAME 12 -#endif _MACH_DEBUG_IPC_INFO_H_ +#endif /* _MACH_DEBUG_IPC_INFO_H_ */ diff --git a/include/mach_debug/mach_debug.defs b/include/mach_debug/mach_debug.defs index 72210346..dc4050fd 100644 --- a/include/mach_debug/mach_debug.defs +++ b/include/mach_debug/mach_debug.defs @@ -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. */ @@ -36,7 +36,7 @@ subsystem #if KERNEL_SERVER KernelServer -#endif KERNEL_SERVER +#endif /* KERNEL_SERVER */ mach_debug 3000; #include <mach/std_types.defs> @@ -115,13 +115,13 @@ routine mach_port_dnrequest_info( out total : unsigned; /* total size of table */ out used : unsigned); /* amount used */ -#else !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG +#else /* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */ skip; /* mach_port_get_srights */ skip; /* host_ipc_hash_info */ skip; /* host_ipc_marequest_info */ skip; /* mach_port_space_info */ skip; /* mach_port_dnrequest_info */ -#endif !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG +#endif /* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */ skip; /* mach_vm_region_info */ skip; /* vm_mapped_pages_info */ @@ -164,9 +164,9 @@ routine host_virtual_physical_table_info( out info : hash_info_bucket_array_t, CountInOut, Dealloc); -#else !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG +#else /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */ skip; /* host_virtual_physical_table_info */ -#endif !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG +#endif /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */ #if !defined(MACH_KDB) || MACH_KDB /* @@ -181,9 +181,9 @@ routine host_load_symbol_table( name : symtab_name_t; symtab : pointer_t); -#else !defined(MACH_KDB) || MACH_KDB +#else /* !defined(MACH_KDB) || MACH_KDB */ skip; /* host_load_symbol_table */ -#endif !defined(MACH_KDB) || MACH_KDB +#endif /* !defined(MACH_KDB) || MACH_KDB */ #if !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG @@ -198,9 +198,9 @@ routine mach_port_kernel_object( out object_type : unsigned; out object_addr : vm_offset_t); -#else !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG +#else /* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */ skip; /* mach_port_kernel_object */ -#endif !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG +#endif /* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */ #if !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG @@ -234,8 +234,8 @@ routine mach_vm_object_pages( out pages : vm_page_info_array_t, CountInOut, Dealloc); -#else !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG +#else /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */ skip; /* mach_vm_region_info */ skip; /* mach_vm_object_info */ skip; /* mach_vm_object_pages */ -#endif !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG +#endif /* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */ diff --git a/include/mach_debug/mach_debug_types.defs b/include/mach_debug/mach_debug_types.defs index 64564ab2..9f1976fe 100644 --- a/include/mach_debug/mach_debug_types.defs +++ b/include/mach_debug/mach_debug_types.defs @@ -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. */ @@ -62,4 +62,4 @@ type symtab_name_t = (MACH_MSG_TYPE_STRING_C, 8*32); import <mach_debug/mach_debug_types.h>; -#endif _MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_ +#endif /* _MACH_DEBUG_MACH_DEBUG_TYPES_DEFS_ */ diff --git a/include/mach_debug/mach_debug_types.h b/include/mach_debug/mach_debug_types.h index 9eb89548..2ba0cb1f 100644 --- a/include/mach_debug/mach_debug_types.h +++ b/include/mach_debug/mach_debug_types.h @@ -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. */ @@ -37,4 +37,4 @@ typedef char symtab_name_t[32]; -#endif _MACH_DEBUG_MACH_DEBUG_TYPES_H_ +#endif /* _MACH_DEBUG_MACH_DEBUG_TYPES_H_ */ diff --git a/include/mach_debug/vm_info.h b/include/mach_debug/vm_info.h index 3800cbd6..70ba8878 100644 --- a/include/mach_debug/vm_info.h +++ b/include/mach_debug/vm_info.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. */ @@ -129,4 +129,4 @@ typedef struct vm_page_info { typedef vm_page_info_t *vm_page_info_array_t; -#endif _MACH_DEBUG_VM_INFO_H_ +#endif /* _MACH_DEBUG_VM_INFO_H_ */ diff --git a/include/mach_debug/zone_info.h b/include/mach_debug/zone_info.h index 623bd58d..1b36fe02 100644 --- a/include/mach_debug/zone_info.h +++ b/include/mach_debug/zone_info.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. */ @@ -58,4 +58,4 @@ typedef struct zone_info { typedef zone_info_t *zone_info_array_t; -#endif _MACH_DEBUG_ZONE_INFO_H_ +#endif /* _MACH_DEBUG_ZONE_INFO_H_ */ diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h index 732494dc..1df6b732 100644 --- a/include/sys/ioctl.h +++ b/include/sys/ioctl.h @@ -2,7 +2,7 @@ * 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 @@ -49,4 +49,4 @@ #define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t)) #define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t)) -#endif _MACH_SYS_IOCTL_H_ +#endif /* _MACH_SYS_IOCTL_H_ */ diff --git a/include/sys/time.h b/include/sys/time.h index ab96678e..de97d325 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -2,7 +2,7 @@ * 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 @@ -50,4 +50,4 @@ extern time_value_t time; (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec) #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 -#endif _MACH_SA_SYS_TIME_H_ +#endif /* _MACH_SA_SYS_TIME_H_ */ diff --git a/ipc/ipc_entry.h b/ipc/ipc_entry.h index ea0c0a24..6e316bdc 100644 --- a/ipc/ipc_entry.h +++ b/ipc/ipc_entry.h @@ -155,4 +155,4 @@ ipc_entry_dealloc(/* ipc_space_t space, mach_port_t name, extern kern_return_t ipc_entry_grow_table(/* ipc_space_t space */); -#endif _IPC_IPC_ENTRY_H_ +#endif /* _IPC_IPC_ENTRY_H_ */ diff --git a/ipc/ipc_hash.h b/ipc/ipc_hash.h index f4c2f55f..bf5e9ac3 100644 --- a/ipc/ipc_hash.h +++ b/ipc/ipc_hash.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. */ @@ -47,7 +47,7 @@ ipc_hash_init(); extern unsigned int ipc_hash_info(/* hash_info_bucket_t *, unsigned int */); -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ extern boolean_t ipc_hash_lookup(/* ipc_space_t space, ipc_object_t obj, @@ -91,4 +91,4 @@ extern void ipc_hash_local_delete(/* ipc_space_t space, ipc_object_t obj, mach_port_index_t index, ipc_entry_t entry */); -#endif _IPC_IPC_HASH_H_ +#endif /* _IPC_IPC_HASH_H_ */ diff --git a/ipc/ipc_init.c b/ipc/ipc_init.c index 371a06f4..e94705cb 100644 --- a/ipc/ipc_init.c +++ b/ipc/ipc_init.c @@ -111,7 +111,7 @@ ipc_bootstrap(void) #if NORMA_IPC kr = ipc_space_create_special(&ipc_space_remote); assert(kr == KERN_SUCCESS); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* initialize modules with hidden data structures */ diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c index d860fd18..21a3ecfc 100644 --- a/ipc/ipc_kmsg.c +++ b/ipc/ipc_kmsg.c @@ -473,7 +473,7 @@ ipc_kmsg_free(kmsg) /* return it to the norma ipc code */ norma_kmsg_put(kmsg); break; -#endif NORMA_IPC +#endif /* NORMA_IPC */ case IKM_SIZE_NETWORK: /* return it to the network code */ @@ -1251,9 +1251,9 @@ ipc_kmsg_copyin_header(msg, space, notify) reply_soright = IP_NULL; goto skip_reply_checks; } -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ assert(kr == KERN_SUCCESS); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((saved_reply != IP_NULL) && (reply_port == IO_DEAD)) { ipc_port_t dest = (ipc_port_t) dest_port; @@ -1321,7 +1321,7 @@ ipc_kmsg_copyin_header(msg, space, notify) * and the port died on us. In this case, the copyin * code already deallocated reply_entry. */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE) ipc_entry_dealloc(space, dest_name, dest_entry); @@ -1398,7 +1398,7 @@ ipc_kmsg_copyin_body(kmsg, space, map) use_page_lists = TRUE; steal_pages = TRUE; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ saddr = (vm_offset_t) (&kmsg->ikm_header + 1); eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size; @@ -1482,7 +1482,7 @@ ipc_kmsg_copyin_body(kmsg, space, map) if (sizeof(vm_offset_t) > sizeof(mach_msg_type_t)) saddr = ptr_align(saddr); - + if ((eaddr - saddr) < sizeof(vm_offset_t)) { ipc_kmsg_clean_partial(kmsg, taddr, FALSE, 0); return MACH_SEND_MSG_TOO_SMALL; @@ -1786,7 +1786,7 @@ ipc_kmsg_copyin_from_kernel( * Nothing locked. * Returns: * MACH_MSG_SUCCESS Copied out port rights. - * MACH_RCV_INVALID_NOTIFY + * MACH_RCV_INVALID_NOTIFY * Notify is non-null and doesn't name a receive right. * (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.) * MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE @@ -2746,7 +2746,7 @@ ipc_kmsg_copyout_to_kernel(kmsg, space) kmsg->ikm_header.msgh_local_port = dest_name; kmsg->ikm_header.msgh_remote_port = reply_name; } -#endif NORMA_IPC || NORMA_VM +#endif /* NORMA_IPC || NORMA_VM */ #if MACH_IPC_COMPAT @@ -2829,7 +2829,7 @@ ipc_kmsg_copyin_compat(kmsg, space, map) use_page_lists = TRUE; steal_pages = TRUE; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ saddr = (vm_offset_t) (&kmsg->ikm_header + 1); eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size; @@ -3211,7 +3211,7 @@ ipc_kmsg_copyout_compat(kmsg, space, map) return MACH_MSG_SUCCESS; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> #if MACH_KDB @@ -3224,66 +3224,66 @@ ipc_type_name(type_name, received) switch (type_name) { case MACH_MSG_TYPE_BOOLEAN: return "boolean"; - + case MACH_MSG_TYPE_INTEGER_16: return "short"; - + case MACH_MSG_TYPE_INTEGER_32: return "int32"; case MACH_MSG_TYPE_INTEGER_64: return "int64"; - + case MACH_MSG_TYPE_CHAR: return "char"; - + case MACH_MSG_TYPE_BYTE: return "byte"; - + case MACH_MSG_TYPE_REAL: return "real"; - + case MACH_MSG_TYPE_STRING: return "string"; - + case MACH_MSG_TYPE_PORT_NAME: return "port_name"; - + case MACH_MSG_TYPE_MOVE_RECEIVE: if (received) { return "port_receive"; } else { return "move_receive"; } - + case MACH_MSG_TYPE_MOVE_SEND: if (received) { return "port_send"; } else { return "move_send"; } - + case MACH_MSG_TYPE_MOVE_SEND_ONCE: if (received) { return "port_send_once"; } else { return "move_send_once"; } - + case MACH_MSG_TYPE_COPY_SEND: return "copy_send"; - + case MACH_MSG_TYPE_MAKE_SEND: return "make_send"; - + case MACH_MSG_TYPE_MAKE_SEND_ONCE: return "make_send_once"; - + default: return (char *) 0; } } - + void ipc_print_type_name( int type_name) @@ -3313,9 +3313,9 @@ ipc_kmsg_print(kmsg) db_printf(",page=0x%x,copy=0x%x\n", kmsg->ikm_page, kmsg->ikm_copy); -#else NORMA_IPC +#else /* NORMA_IPC */ db_printf("\n"); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_msg_print(&kmsg->ikm_header); } @@ -3481,4 +3481,4 @@ ipc_msg_print(msgh) } } } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_kmsg.h b/ipc/ipc_kmsg.h index 8fdbeb5a..2ec8c585 100644 --- a/ipc/ipc_kmsg.h +++ b/ipc/ipc_kmsg.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,7 +48,7 @@ #if NORMA_IPC #include <vm/vm_page.h> #include <vm/vm_map.h> -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * This structure is only the header for a kmsg buffer; @@ -70,7 +70,7 @@ typedef struct ipc_kmsg { vm_page_t ikm_page; vm_map_copy_t ikm_copy; unsigned long ikm_source_node; -#endif NORMA_IPC +#endif /* NORMA_IPC */ mach_msg_header_t ikm_header; } *ipc_kmsg_t; @@ -287,5 +287,5 @@ ipc_kmsg_copyin_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */); extern mach_msg_return_t ipc_kmsg_copyout_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_KMSG_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_KMSG_H_ */ diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c index 6ddffa04..b5abc580 100644 --- a/ipc/ipc_marequest.c +++ b/ipc/ipc_marequest.c @@ -189,7 +189,7 @@ ipc_marequest_create(space, port, notify, marequestp) #if !MACH_IPC_COMPAT assert(notify != MACH_PORT_NULL); -#endif !MACH_IPC_COMPAT +#endif /* !MACH_IPC_COMPAT */ marequest = imar_alloc(); if (marequest == IMAR_NULL) @@ -229,7 +229,7 @@ ipc_marequest_create(space, port, notify, marequestp) if (notify == MACH_PORT_NULL) soright = IP_NULL; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((soright = ipc_port_lookup_notify(space, notify)) == IP_NULL) { is_write_unlock(space); @@ -256,7 +256,7 @@ ipc_marequest_create(space, port, notify, marequestp) if (notify == MACH_PORT_NULL) soright = IP_NULL; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((soright = ipc_port_lookup_notify(space, notify)) == IP_NULL) { is_write_unlock(space); @@ -373,7 +373,7 @@ ipc_marequest_destroy(marequest) ipc_port_t soright; #if MACH_IPC_COMPAT ipc_port_t sright = IP_NULL; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_lock(space); @@ -411,7 +411,7 @@ ipc_marequest_destroy(marequest) #if MACH_IPC_COMPAT if (soright == IP_NULL) sright = ipc_space_make_notify(space); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } else name = MACH_PORT_NULL; } @@ -431,7 +431,7 @@ ipc_marequest_destroy(marequest) return; } assert(sright == IP_NULL); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert(soright != IP_NULL); ipc_notify_msg_accepted(soright, name); @@ -482,4 +482,4 @@ ipc_marequest_info(maxp, info, count) return ipc_marequest_size; } -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ diff --git a/ipc/ipc_marequest.h b/ipc/ipc_marequest.h index 0e0380ed..5ea18581 100644 --- a/ipc/ipc_marequest.h +++ b/ipc/ipc_marequest.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. */ @@ -79,7 +79,7 @@ ipc_marequest_init(); extern unsigned int ipc_marequest_info(/* unsigned int *, hash_info_bucket_t *, unsigned int */); -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ extern mach_msg_return_t ipc_marequest_create(/* ipc_space_t space, mach_port_t name, @@ -95,4 +95,4 @@ ipc_marequest_rename(/* ipc_space_t space, extern void ipc_marequest_destroy(/* ipc_marequest_t marequest */); -#endif _IPC_IPC_MAREQUEST_H_ +#endif /* _IPC_IPC_MAREQUEST_H_ */ diff --git a/ipc/ipc_mqueue.c b/ipc/ipc_mqueue.c index 5447c49b..17af1ff8 100644 --- a/ipc/ipc_mqueue.c +++ b/ipc/ipc_mqueue.c @@ -59,7 +59,7 @@ extern ipc_kmsg_t norma_ipc_handoff_msg; extern mach_msg_size_t norma_ipc_handoff_max_size; extern mach_msg_size_t norma_ipc_handoff_msg_size; extern ipc_kmsg_t norma_ipc_kmsg_accept(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Routine: ipc_mqueue_init @@ -220,7 +220,7 @@ ipc_mqueue_send(kmsg, option, time_out) ip_unlock(port); return mr; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ for (;;) { ipc_thread_t self; @@ -245,7 +245,7 @@ ipc_mqueue_send(kmsg, option, time_out) #if NORMA_IPC /* XXX until ipc_kmsg_destroy is fixed... */ norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -332,7 +332,7 @@ ipc_mqueue_send(kmsg, option, time_out) #if NORMA_IPC /* XXX until ipc_kmsg_destroy is fixed... */ norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -379,7 +379,7 @@ ipc_mqueue_send(kmsg, option, time_out) } norma_ipc_handoff_msg_size = kmsg->ikm_header.msgh_size; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ for (;;) { receiver = ipc_thread_queue_first(receivers); if (receiver == ITH_NULL) { @@ -595,7 +595,7 @@ ipc_mqueue_receive( return MACH_RCV_TOO_LARGE; } } -#endif NORMA_IPC +#endif /* NORMA_IPC */ if (kmsg != IKM_NULL) { /* check space requirements */ @@ -747,7 +747,7 @@ ipc_mqueue_receive( #if NORMA_IPC norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ *kmsgp = kmsg; *seqnop = seqno; return MACH_MSG_SUCCESS; diff --git a/ipc/ipc_mqueue.h b/ipc/ipc_mqueue.h index 690fe28c..5c284a33 100644 --- a/ipc/ipc_mqueue.h +++ b/ipc/ipc_mqueue.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. */ @@ -95,7 +95,7 @@ MACRO_BEGIN \ assert(mr == MACH_MSG_SUCCESS); \ MACRO_END -#else MACH_ASSERT +#else /* MACH_ASSERT */ #define ipc_mqueue_send_always(kmsg) \ MACRO_BEGIN \ diff --git a/ipc/ipc_notify.c b/ipc/ipc_notify.c index 870f301f..e789edf9 100644 --- a/ipc/ipc_notify.c +++ b/ipc/ipc_notify.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. */ @@ -61,9 +61,9 @@ mach_dead_name_notification_t ipc_notify_dead_name_template; */ #define NOTIFY_MSGH_SEQNO MSG_TYPE_EMERGENCY -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ #define NOTIFY_MSGH_SEQNO 0 -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Routine: ipc_notify_init_port_deleted @@ -388,7 +388,7 @@ ipc_notify_no_senders(port, mscount) norma_ipc_notify_no_senders(ip_nsproxy(port)); return; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ kmsg = ikm_alloc(sizeof *n); if (kmsg == IKM_NULL) { printf("dropped no-senders (0x%08x, %u)\n", port, mscount); @@ -590,4 +590,4 @@ ipc_notify_port_destroyed_compat(port, right) ipc_mqueue_send_always(kmsg); } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/ipc_notify.h b/ipc/ipc_notify.h index 66e0633d..4e5b2e47 100644 --- a/ipc/ipc_notify.h +++ b/ipc/ipc_notify.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. */ @@ -68,5 +68,5 @@ ipc_notify_msg_accepted_compat(/* ipc_port_t, mach_port_t */); extern void ipc_notify_port_destroyed_compat(/* ipc_port_t, ipc_port_t */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_NOTIFY_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_NOTIFY_H_ */ diff --git a/ipc/ipc_object.c b/ipc/ipc_object.c index cdef3cde..caa56fb5 100644 --- a/ipc/ipc_object.c +++ b/ipc/ipc_object.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. */ @@ -373,7 +373,7 @@ ipc_object_copyin_type( case MSG_TYPE_PORT_ALL: return MACH_MSG_TYPE_PORT_RECEIVE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ default: #if MACH_ASSERT @@ -727,7 +727,7 @@ ipc_object_copyout_multiname(space, object, namep) *namep = name; return kr; } -#endif 0 +#endif /* 0 */ /* * Routine: ipc_object_copyout_name @@ -1279,7 +1279,7 @@ ipc_object_copyout_name_compat(space, object, msgt_name, name) return kr; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> diff --git a/ipc/ipc_object.h b/ipc/ipc_object.h index dccec59c..892d3eaa 100644 --- a/ipc/ipc_object.h +++ b/ipc/ipc_object.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. */ @@ -184,9 +184,9 @@ extern kern_return_t ipc_object_copyout_name_compat(/* ipc_space_t, ipc_object_t, mach_msg_type_name_t, mach_port_t */); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ extern void ipc_object_print(/* ipc_object_t */); -#endif _IPC_IPC_OBJECT_H_ +#endif /* _IPC_IPC_OBJECT_H_ */ diff --git a/ipc/ipc_port.c b/ipc/ipc_port.c index 770e7807..73009b1d 100644 --- a/ipc/ipc_port.c +++ b/ipc/ipc_port.c @@ -51,7 +51,7 @@ #include <ipc/ipc_notify.h> #if NORMA_IPC #include <norma/ipc_node.h> -#endif NORMA_IPC +#endif /* NORMA_IPC */ @@ -221,7 +221,7 @@ ipc_port_dngrow(port) return KERN_SUCCESS; } - + /* * Routine: ipc_port_dncancel * Purpose: @@ -508,7 +508,7 @@ ipc_port_init( port->ip_norma_spare2 = 0L; port->ip_norma_spare3 = 0L; port->ip_norma_spare4 = 0L; -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_mqueue_init(&port->ip_messages); ipc_thread_queue_init(&port->ip_blocked); @@ -637,7 +637,7 @@ ipc_port_delete_compat(port, space, name) is_release(space); } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Routine: ipc_port_destroy @@ -702,7 +702,7 @@ ipc_port_destroy( ipc_port_release_send(sright); } } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (!ipc_port_check_circularity(port, pdrequest)) { /* consumes our refs for port and pdrequest */ @@ -730,7 +730,7 @@ ipc_port_destroy( * destroy any NORMA_IPC state associated with port */ norma_ipc_port_destroy(port); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * rouse all blocked senders @@ -804,7 +804,7 @@ ipc_port_destroy( ipr_space(soright), name); continue; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ ipc_notify_dead_name(soright, name); } @@ -1247,7 +1247,7 @@ ipc_port_alloc_special(space) int ret = (int) ipc_port_alloc_special; #endif extern int input_msgh_id; -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_port_t port; port = (ipc_port_t) io_alloc(IOT_PORT); @@ -1274,7 +1274,7 @@ ipc_port_alloc_special(space) #if NORMA_IPC port->ip_norma_spare1 = ret; port->ip_norma_spare2 = input_msgh_id; -#endif NORMA_IPC +#endif /* NORMA_IPC */ return port; } @@ -1472,7 +1472,7 @@ ipc_port_copyout_receiver(port, space) return name; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> @@ -1537,9 +1537,9 @@ ipc_port_print(port) printf(", norma_spare2=0x%x", port->ip_norma_spare2); printf(", norma_spare3=0x%x", port->ip_norma_spare3); printf(", norma_spare4=0x%x\n", port->ip_norma_spare4); -#endif NORMA_IPC +#endif /* NORMA_IPC */ indent -=2; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_port.h b/ipc/ipc_port.h index 21d4309e..6b6fac09 100644 --- a/ipc/ipc_port.h +++ b/ipc/ipc_port.h @@ -116,7 +116,7 @@ struct ipc_port { long ip_norma_spare2; long ip_norma_spare3; long ip_norma_spare4; -#endif NORMA_IPC +#endif /* NORMA_IPC */ }; #define ip_object ip_target.ipt_object @@ -191,7 +191,7 @@ typedef struct ipc_port_request { #define ipr_spacep(soright) ((unsigned int)(soright) & 1) #define ipr_space(soright) ((ipc_space_t)((unsigned int)(soright) &~ 1)) #define ipr_spacem(space) ((ipc_port_t)((unsigned int)(space) | 1)) -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Taking the ipc_port_multiple lock grants the privilege @@ -381,7 +381,7 @@ ipc_port_copyout_send_compat(/* ipc_port_t, ipc_space_t */); extern mach_port_t ipc_port_copyout_receiver(/* ipc_port_t, ipc_space_t */); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ extern void ipc_port_print(/* ipc_port_t */); @@ -402,6 +402,6 @@ ipc_port_print(/* ipc_port_t */); #define ip_nsproxy(nsrequest) ((ipc_port_t)((unsigned int)(nsrequest) &~ 1)) #define ip_nsproxym(proxy) ((ipc_port_t)((unsigned int)(proxy) | 1)) -#endif NORMA_IPC +#endif /* NORMA_IPC */ -#endif _IPC_IPC_PORT_H_ +#endif /* _IPC_IPC_PORT_H_ */ diff --git a/ipc/ipc_pset.c b/ipc/ipc_pset.c index 57705d6c..d916f0c7 100644 --- a/ipc/ipc_pset.c +++ b/ipc/ipc_pset.c @@ -346,4 +346,4 @@ ipc_pset_print( indent -=2; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_pset.h b/ipc/ipc_pset.h index 23e3e25d..e6cdd5bb 100644 --- a/ipc/ipc_pset.h +++ b/ipc/ipc_pset.h @@ -92,4 +92,4 @@ ipc_pset_destroy(/* ipc_pset_t */); extern void ipc_pset_print(/* ipc_pset_t */); -#endif _IPC_IPC_PSET_H_ +#endif /* _IPC_IPC_PSET_H_ */ diff --git a/ipc/ipc_right.c b/ipc/ipc_right.c index 54cd99f5..72d8cc0f 100644 --- a/ipc/ipc_right.c +++ b/ipc/ipc_right.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. */ @@ -221,7 +221,7 @@ ipc_right_dnrequest( previous = IP_NULL; } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ previous = ipc_right_dncancel_macro( space, port, name, entry); @@ -263,7 +263,7 @@ ipc_right_dnrequest( entry->ie_request = request; #if MACH_IPC_COMPAT entry->ie_bits = bits &~ IE_BITS_COMPAT; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_unlock(space); break; } @@ -273,7 +273,7 @@ ipc_right_dnrequest( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(bits & MACH_PORT_TYPE_DEAD_NAME); @@ -346,7 +346,7 @@ ipc_right_dncancel( is_release(space); dnrequest = IP_NULL; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ return dnrequest; } @@ -419,7 +419,7 @@ ipc_right_inuse(space, name, entry) return FALSE; } } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_unlock(space); return TRUE; @@ -498,7 +498,7 @@ ipc_right_check(space, port, name, entry) return TRUE; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* convert entry to dead name */ @@ -727,7 +727,7 @@ ipc_right_destroy( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ break; } @@ -843,7 +843,7 @@ ipc_right_dealloc(space, name, entry) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -882,7 +882,7 @@ ipc_right_dealloc(space, name, entry) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -976,7 +976,7 @@ ipc_right_dealloc(space, name, entry) invalid_name: is_write_unlock(space); return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1086,7 +1086,7 @@ ipc_right_delta(space, name, entry, right, delta) entry->ie_object = IO_NULL; ipc_entry_dealloc(space, name, entry); } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (bits & MACH_PORT_TYPE_SEND) { assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_SEND_RECEIVE); @@ -1152,7 +1152,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert(!(entry->ie_bits & MACH_PORT_TYPE_SEND_ONCE)); goto invalid_right; @@ -1198,7 +1198,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; } else if ((bits & MACH_PORT_TYPE_DEAD_NAME) == 0) @@ -1250,7 +1250,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert((entry->ie_bits & MACH_PORT_TYPE_SEND) == 0); goto invalid_right; @@ -1337,7 +1337,7 @@ ipc_right_delta(space, name, entry, right, delta) invalid_name: is_write_unlock(space); return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1372,7 +1372,7 @@ ipc_right_info( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -1387,7 +1387,7 @@ ipc_right_info( if (bits & IE_BITS_COMPAT) type |= MACH_PORT_TYPE_COMPAT; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (request != 0) type |= MACH_PORT_TYPE_DNREQUEST; if (bits & IE_BITS_MAREQUEST) @@ -1449,7 +1449,7 @@ ipc_right_copyin_check( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ break; } @@ -1631,7 +1631,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto copy_dead; @@ -1678,7 +1678,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto move_dead; @@ -1754,7 +1754,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto move_dead; @@ -1834,7 +1834,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT invalid_name: return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1963,7 +1963,7 @@ ipc_right_copyin_two( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ goto invalid_right; } @@ -2017,7 +2017,7 @@ ipc_right_copyin_two( #if MACH_IPC_COMPAT invalid_name: return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -2258,7 +2258,7 @@ ipc_right_rename( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = oentry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -2759,4 +2759,4 @@ ipc_right_copyin_header(space, name, entry, objectp, msgt_namep) return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/ipc_right.h b/ipc/ipc_right.h index 7c0f2a39..f0281e6d 100644 --- a/ipc/ipc_right.h +++ b/ipc/ipc_right.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. */ @@ -120,5 +120,5 @@ extern kern_return_t ipc_right_copyin_header(/* ipc_space_t, mach_port_t, ipc_entry_t, ipc_object_t *, mach_msg_type_name_t * */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_RIGHT_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_RIGHT_H_ */ diff --git a/ipc/ipc_space.c b/ipc/ipc_space.c index 7e3cba96..cd40b581 100644 --- a/ipc/ipc_space.c +++ b/ipc/ipc_space.c @@ -61,7 +61,7 @@ ipc_space_t ipc_space_kernel; ipc_space_t ipc_space_reply; #if NORMA_IPC ipc_space_t ipc_space_remote; -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Routine: ipc_space_reference @@ -178,7 +178,7 @@ ipc_space_create( ip_unlock(port); space->is_notify = port; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ *spacep = space; return KERN_SUCCESS; @@ -305,7 +305,7 @@ ipc_space_destroy( #if MACH_IPC_COMPAT if (IP_VALID(space->is_notify)) ipc_port_release_send(space->is_notify); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Because the space is now dead, diff --git a/ipc/ipc_space.h b/ipc/ipc_space.h index 430971f7..e242911f 100644 --- a/ipc/ipc_space.h +++ b/ipc/ipc_space.h @@ -82,7 +82,7 @@ struct ipc_space { #if MACH_IPC_COMPAT struct ipc_port *is_notify; /* notification port */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ }; #define IS_NULL ((ipc_space_t) 0) @@ -96,7 +96,7 @@ extern struct ipc_space *ipc_space_kernel; extern struct ipc_space *ipc_space_reply; #if NORMA_IPC extern struct ipc_space *ipc_space_remote; -#endif NORMA_IPC +#endif /* NORMA_IPC */ #define is_ref_lock_init(is) simple_lock_init(&(is)->is_ref_lock_data) @@ -160,5 +160,5 @@ void ipc_space_destroy(struct ipc_space *); #define ipc_space_make_notify(space) \ ipc_port_copy_send(space->is_notify) -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_SPACE_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_SPACE_H_ */ diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c index cd8fad04..49530cf6 100644 --- a/ipc/mach_debug.c +++ b/ipc/mach_debug.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. */ @@ -383,9 +383,9 @@ mach_port_space_info( iin->iin_collision = (bits & IE_BITS_COLLISION) ? TRUE : FALSE; #if MACH_IPC_COMPAT iin->iin_compat = (bits & IE_BITS_COMPAT) ? TRUE : FALSE; -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ iin->iin_compat = FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ iin->iin_marequest = (bits & IE_BITS_MAREQUEST) ? TRUE : FALSE; iin->iin_type = IE_BITS_TYPE(bits); iin->iin_urefs = IE_BITS_UREFS(bits); @@ -408,9 +408,9 @@ mach_port_space_info( iin->iin_collision = (bits & IE_BITS_COLLISION) ? TRUE : FALSE; #if MACH_IPC_COMPAT iin->iin_compat = (bits & IE_BITS_COMPAT) ? TRUE : FALSE; -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ iin->iin_compat = FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ iin->iin_marequest = (bits & IE_BITS_MAREQUEST) ? TRUE : FALSE; iin->iin_type = IE_BITS_TYPE(bits); iin->iin_urefs = IE_BITS_UREFS(bits); diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c index ffcccf4a..ab132af9 100644 --- a/ipc/mach_msg.c +++ b/ipc/mach_msg.c @@ -641,7 +641,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ip_unlock(reply_port); goto norma_send; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ if (dest_port->ip_msgcount >= dest_port->ip_qlimit) goto abort_request_send_receive; @@ -760,7 +760,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ip_unlock(dest_port); goto norma_send; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* optimized ipc_entry_lookup/ipc_mqueue_copyin */ @@ -861,7 +861,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) assert(dest_port->ip_receiver != ipc_space_kernel); #if NORMA_IPC assert(! IP_NORMA_IS_PROXY(dest_port)); -#endif NORMA_IPC +#endif /* NORMA_IPC */ assert((dest_port->ip_msgcount < dest_port->ip_qlimit) || (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) == MACH_MSG_TYPE_PORT_SEND_ONCE)); @@ -1343,7 +1343,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) if (ip_active(dest_port) && #if NORMA_IPC (! IP_NORMA_IS_PROXY(dest_port)) && -#endif NORMA_IPC +#endif /* NORMA_IPC */ ((dest_port->ip_msgcount < dest_port->ip_qlimit) || (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) == MACH_MSG_TYPE_PORT_SEND_ONCE))) @@ -1400,7 +1400,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) } goto slow_get_rcv_port; -#endif NORMA_IPC +#endif /* NORMA_IPC */ kernel_send: /* @@ -2276,4 +2276,4 @@ msg_receive_continue() } #endif /* CONTINUATIONS */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/mach_msg.h b/ipc/mach_msg.h index 55c3526f..c5dc3ce0 100644 --- a/ipc/mach_msg.h +++ b/ipc/mach_msg.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. */ @@ -64,5 +64,5 @@ mach_msg_interrupt(/* thread_t */); extern void msg_receive_continue(); -#endif MACH_IPC_COMPAT -#endif _IPC_MACH_MSG_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_MACH_MSG_H_ */ diff --git a/ipc/mach_port.c b/ipc/mach_port.c index b26c96be..6dc83adb 100644 --- a/ipc/mach_port.c +++ b/ipc/mach_port.c @@ -105,7 +105,7 @@ mach_port_names_helper( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* pretend this is a dead-name entry */ @@ -122,7 +122,7 @@ mach_port_names_helper( if (bits & IE_BITS_COMPAT) type |= MACH_PORT_TYPE_COMPAT; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (request != 0) type |= MACH_PORT_TYPE_DNREQUEST; if (bits & IE_BITS_MAREQUEST) @@ -1239,7 +1239,7 @@ mach_port_request_notification( ipc_port_release_send(ip_pdsend(previous)); previous = IP_NULL; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ *previousp = previous; break; @@ -2502,4 +2502,4 @@ port_extract_receive(space, name, portp) return kr; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ @@ -934,7 +934,7 @@ act_get_special_port(Act *act, int which, ipc_port_t *portp) case THREAD_REPLY_PORT: whichp = &act->reply_port; break; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case THREAD_KERNEL_PORT: whichp = &act->self_port; @@ -994,7 +994,7 @@ act_set_special_port(Act *act, int which, ipc_port_t port) case THREAD_REPLY_PORT: whichp = &act->reply_port; break; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case THREAD_KERNEL_PORT: whichp = &act->self_port; diff --git a/kern/assert.h b/kern/assert.h index f98662ba..26214e31 100644 --- a/kern/assert.h +++ b/kern/assert.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,13 +46,13 @@ MACRO_END #ifdef lint #define assert_static(x) -#else lint +#else /* lint */ #define assert_static(x) assert(x) -#endif lint +#endif /* lint */ -#else MACH_ASSERT +#else /* MACH_ASSERT */ #define assert(ex) #define assert_static(ex) -#endif MACH_ASSERT +#endif /* MACH_ASSERT */ -#endif _KERN_ASSERT_H_ +#endif /* _KERN_ASSERT_H_ */ @@ -52,7 +52,7 @@ #if MACH_FIXPRI #include <mach/policy.h> -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ volatile ast_t need_ast[NCPUS]; @@ -65,7 +65,7 @@ ast_init() for (i=0; i<NCPUS; i++) need_ast[i] = 0; -#endif MACHINE_AST +#endif /* MACHINE_AST */ } void @@ -93,7 +93,7 @@ ast_taken() #if NORMA_IPC if (reasons & AST_NETIPC) netipc_ast(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Make darn sure that we don't call thread_halt_self @@ -152,7 +152,7 @@ ast_check() */ ast_on(mycpu, AST_BLOCK); break; -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ case PROCESSOR_RUNNING: @@ -194,7 +194,7 @@ ast_check() } } else { -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ rq = &(myprocessor->processor_set->runq); if (!(myprocessor->first_quantum) && (rq->count > 0)) { register queue_t q; @@ -230,7 +230,7 @@ ast_check() } #if MACH_FIXPRI } -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ break; default: @@ -78,12 +78,12 @@ extern volatile ast_t need_ast[NCPUS]; /* * machine/ast.h is responsible for defining aston and astoff. */ -#else MACHINE_AST +#else /* MACHINE_AST */ #define aston(mycpu) #define astoff(mycpu) -#endif MACHINE_AST +#endif /* MACHINE_AST */ extern void ast_taken(); @@ -129,4 +129,4 @@ MACRO_END * be followed by ast_propagate(). */ -#endif _KERN_AST_H_ +#endif /* _KERN_AST_H_ */ diff --git a/kern/bootstrap.c b/kern/bootstrap.c index d6dcad46..159276bf 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -325,7 +325,7 @@ static void copy_bootstrap(void *e, struct exec_info *boot_exec_info) } } #endif -#endif MACH_KDB +#endif /* MACH_KDB */ } /* diff --git a/kern/counters.c b/kern/counters.c index 5b606f50..d10aa812 100644 --- a/kern/counters.c +++ b/kern/counters.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -79,4 +79,4 @@ mach_counter_t c_net_thread_block = 0; mach_counter_t c_reaper_thread_block = 0; mach_counter_t c_swapin_thread_block = 0; mach_counter_t c_action_thread_block = 0; -#endif MACH_COUNTERS +#endif /* MACH_COUNTERS */ diff --git a/kern/counters.h b/kern/counters.h index 1f13ac57..be5d8bb1 100644 --- a/kern/counters.h +++ b/kern/counters.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -43,11 +43,11 @@ #define counter(code) counter_always(code) -#else MACH_COUNTERS +#else /* MACH_COUNTERS */ #define counter(code) -#endif MACH_COUNTERS +#endif /* MACH_COUNTERS */ /* * We define the counters with individual integers, @@ -102,6 +102,6 @@ extern mach_counter_t c_net_thread_block; extern mach_counter_t c_reaper_thread_block; extern mach_counter_t c_swapin_thread_block; extern mach_counter_t c_action_thread_block; -#endif MACH_COUNTERS +#endif /* MACH_COUNTERS */ -#endif _KERN_COUNTERS_ +#endif /* _KERN_COUNTERS_ */ diff --git a/kern/debug.h b/kern/debug.h index 35201408..0c4ddf27 100644 --- a/kern/debug.h +++ b/kern/debug.h @@ -46,7 +46,7 @@ __FILE__, __LINE__, (p), (id), (p->struct_id)); \ }) -#else !DEBUG +#else /* !DEBUG */ #define otsan() @@ -55,6 +55,6 @@ #define struct_id_denit(p) #define struct_id_verify(p,id) -#endif !DEBUG +#endif /* !DEBUG */ -#endif _mach_debug__debug_ +#endif /* _mach_debug__debug_ */ diff --git a/kern/exception.c b/kern/exception.c index c7e03264..6820bbf5 100644 --- a/kern/exception.c +++ b/kern/exception.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993,1992,1991,1990,1989,1988,1987 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. */ @@ -76,7 +76,7 @@ boolean_t debug_user_with_kdb = FALSE; * The exception function is expected to return. * So the return statements along the slow paths are important. */ -#endif KEEP_STACKS +#endif /* KEEP_STACKS */ /* * Routine: exception @@ -260,7 +260,7 @@ exception_no_server() db_printf("No exception server, calling kdb...\n"); thread_kdb_return(); } -#endif MACH_KDB +#endif /* MACH_KDB */ /* * All else failed; terminate task. @@ -422,7 +422,7 @@ exception_raise(dest_port, thread_port, task_port, if (!ip_active(dest_port) || #if NORMA_IPC IP_NORMA_IS_PROXY(dest_port) || -#endif NORMA_IPC +#endif /* NORMA_IPC */ (dest_port->ip_receiver == ipc_space_kernel)) { imq_unlock(reply_mqueue); ip_unlock(dest_port); diff --git a/kern/host.h b/kern/host.h index 0807f99f..5771da16 100644 --- a/kern/host.h +++ b/kern/host.h @@ -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. */ @@ -45,4 +45,4 @@ typedef struct host host_data_t; extern host_data_t realhost; -#endif _KERN_HOST_H_ +#endif /* _KERN_HOST_H_ */ diff --git a/kern/ipc_host.c b/kern/ipc_host.c index 4dbf9fc9..d4049d24 100644 --- a/kern/ipc_host.c +++ b/kern/ipc_host.c @@ -126,7 +126,7 @@ host_self(void) ipc_port_copyout_send_compat(sright, current_space()); } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * ipc_processor_init: diff --git a/kern/ipc_host.h b/kern/ipc_host.h index 13c54cf9..cd2ffaa2 100644 --- a/kern/ipc_host.h +++ b/kern/ipc_host.h @@ -69,4 +69,4 @@ convert_port_to_pset_name(struct ipc_port *); extern struct ipc_port * convert_pset_name_to_port(processor_set_t); -#endif _KERN_IPC_HOST_H_ +#endif /* _KERN_IPC_HOST_H_ */ diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c index 2b372053..5c6e0116 100644 --- a/kern/ipc_kobject.c +++ b/kern/ipc_kobject.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. */ @@ -176,18 +176,18 @@ ipc_kobject_server(request) || (routine = device_pager_server_routine(&request->ikm_header)) != 0 #if MACH_DEBUG || (routine = mach_debug_server_routine(&request->ikm_header)) != 0 -#endif MACH_DEBUG +#endif /* MACH_DEBUG */ #if NORMA_TASK || (routine = mach_norma_server_routine(&request->ikm_header)) != 0 || (routine = norma_internal_server_routine(&request->ikm_header)) != 0 -#endif NORMA_TASK +#endif /* NORMA_TASK */ #if NORMA_VM || (routine = proxy_server_routine(&request->ikm_header)) != 0 -#endif NORMA_VM +#endif /* NORMA_VM */ || (routine = mach4_server_routine(&request->ikm_header)) != 0 #if MACH_MACHINE_ROUTINES || (routine = MACHINE_SERVER_ROUTINE(&request->ikm_header)) != 0 -#endif MACH_MACHINE_ROUTINES +#endif /* MACH_MACHINE_ROUTINES */ ) { (*routine)(&request->ikm_header, &reply->ikm_header); } @@ -197,7 +197,7 @@ ipc_kobject_server(request) #if MACH_IPC_TEST printf("ipc_kobject_server: bogus kernel message, id=%d\n", request->ikm_header.msgh_id); -#endif MACH_IPC_TEST +#endif /* MACH_IPC_TEST */ } } check_simple_locks(); @@ -218,11 +218,11 @@ ipc_kobject_server(request) case MACH_MSG_TYPE_PORT_SEND: ipc_port_release_send(*destp); break; - + case MACH_MSG_TYPE_PORT_SEND_ONCE: ipc_port_release_sonce(*destp); break; - + default: #if MACH_ASSERT assert(!"ipc_object_destroy: strange destination rights"); @@ -336,7 +336,7 @@ ipc_kobject_destroy( #if MACH_ASSERT printf("ipc_kobject_destroy: port 0x%x, kobj 0x%x, type %d\n", port, port->ip_kobject, ip_kotype(port)); -#endif MACH_ASSERT +#endif /* MACH_ASSERT */ break; } } @@ -380,7 +380,7 @@ ipc_kobject_notify(request_header, reply_header) case IKOT_XMM_REPLY: return xmm_reply_notify(request_header); -#endif NORMA_VM +#endif /* NORMA_VM */ case IKOT_DEVICE: return ds_notify(request_header); diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c index ed5df1fe..f90c5128 100644 --- a/kern/ipc_mig.c +++ b/kern/ipc_mig.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. */ @@ -208,7 +208,7 @@ mach_msg_rpc_from_kernel( ipc_kmsg_put_to_kernel(msg, kmsg, kmsg->ikm_header.msgh_size); return MACH_MSG_SUCCESS; } -#endif NORMA_VM +#endif /* NORMA_VM */ /* * Routine: mach_msg_abort_rpc @@ -371,7 +371,7 @@ mig_dealloc_reply_port( /* * Routine: mig_put_reply_port * Purpose: - * Called by client side interfaces after each RPC to + * Called by client side interfaces after each RPC to * let the client recycle the reply port if it wishes. */ void @@ -384,16 +384,16 @@ mig_put_reply_port( * mig_strncpy.c - by Joshua Block * * mig_strncp -- Bounded string copy. Does what the library routine strncpy - * OUGHT to do: Copies the (null terminated) string in src into dest, a + * OUGHT to do: Copies the (null terminated) string in src into dest, a * buffer of length len. Assures that the copy is still null terminated * and doesn't overflow the buffer, truncating the copy if necessary. * * Parameters: - * + * * dest - Pointer to destination buffer. - * + * * src - Pointer to source string. - * + * * len - Length of destination buffer. */ void mig_strncpy(dest, src, len) @@ -444,10 +444,10 @@ port_name_to_device(name) { register ipc_port_t port; register device_t device; - + fast_send_right_lookup(name, port, goto abort); /* port is locked */ - + /* * Now map the port object to a device object. * This is an inline version of dev_port_lookup(). @@ -456,25 +456,25 @@ port_name_to_device(name) device = (device_t) port->ip_kobject; device_reference(device); ip_unlock(port); - return device; + return device; } - + ip_unlock(port); return DEVICE_NULL; - + /* * The slow case. The port wasn't easily accessible. */ abort: { ipc_port_t kern_port; kern_return_t kr; - + kr = ipc_object_copyin(current_space(), name, MACH_MSG_TYPE_COPY_SEND, (ipc_object_t *) &kern_port); if (kr != KERN_SUCCESS) return DEVICE_NULL; - + device = dev_port_lookup(kern_port); if (IP_VALID(kern_port)) ipc_port_release_send(kern_port); @@ -1130,5 +1130,3 @@ syscall_device_writev_request(mach_port_t device_name, device_deallocate(dev); return res; } - - diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c index d73b9034..816124f8 100644 --- a/kern/ipc_tt.c +++ b/kern/ipc_tt.c @@ -264,7 +264,7 @@ ipc_thread_init(thread) thread->ith_reply = port; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -380,7 +380,7 @@ ipc_thread_terminate(thread) * this behaviour, introducing a small incompatibility * with the old IPC code. */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* destroy the kernel port */ @@ -441,7 +441,7 @@ retrieve_thread_self(thread) return port; } -#endif 0 +#endif /* 0 */ /* * Routine: retrieve_task_self_fast @@ -573,7 +573,7 @@ retrieve_thread_exception(thread) return port; } -#endif 0 +#endif /* 0 */ /* * Routine: mach_task_self [mach trap] @@ -800,7 +800,7 @@ thread_reply() return (port_name_t) name; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Routine: task_get_special_port [kernel call] @@ -845,7 +845,7 @@ task_get_special_port( *portp = port; return KERN_SUCCESS; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case TASK_KERNEL_PORT: whichp = &task->itk_sself; @@ -922,7 +922,7 @@ task_set_special_port( ipc_port_release_send(old); return KERN_SUCCESS; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case TASK_KERNEL_PORT: whichp = &task->itk_sself; @@ -986,7 +986,7 @@ thread_get_special_port(thread, which, portp) case THREAD_REPLY_PORT: whichp = &thread->ith_reply; break; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case THREAD_KERNEL_PORT: whichp = &thread->ith_sself; @@ -1045,7 +1045,7 @@ thread_set_special_port(thread, which, port) case THREAD_REPLY_PORT: whichp = &thread->ith_reply; break; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ case THREAD_KERNEL_PORT: whichp = &thread->ith_sself; diff --git a/kern/ipc_tt.h b/kern/ipc_tt.h index d53fb7ca..0e6ce9dc 100644 --- a/kern/ipc_tt.h +++ b/kern/ipc_tt.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -85,4 +85,4 @@ convert_port_to_space(/* struct ipc_port * */); extern void space_deallocate(/* ipc_space_t */); -#endif _KERN_IPC_TT_H_ +#endif /* _KERN_IPC_TT_H_ */ diff --git a/kern/kalloc.h b/kern/kalloc.h index f36e4dc6..4b24b490 100644 --- a/kern/kalloc.h +++ b/kern/kalloc.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -37,4 +37,4 @@ extern void kfree(); extern void kalloc_init(); -#endif _KERN_KALLOC_H_ +#endif /* _KERN_KALLOC_H_ */ diff --git a/kern/lock_mon.c b/kern/lock_mon.c index ef443295..143d914b 100644 --- a/kern/lock_mon.c +++ b/kern/lock_mon.c @@ -1,4 +1,4 @@ -/* +/* * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University * Copyright (c) 1989 Carnegie-Mellon University @@ -10,7 +10,7 @@ * Grenoble, FRANCE * * All Rights Reserved - * + * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appears in all copies and @@ -19,7 +19,7 @@ * Foundation not be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. - * + * * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR @@ -58,10 +58,10 @@ decl_simple_lock_data(extern , printf_lock) #if TIME_STAMP extern time_stamp_t time_stamp; -#else TIME_STAMP +#else /* TIME_STAMP */ typedef unsigned int time_stamp_t; #define time_stamp 0 -#endif TIME_STAMP +#endif /* TIME_STAMP */ #define LOCK_INFO_MAX (1024*32) #define LOCK_INFO_HASH_COUNT 1024 @@ -74,7 +74,7 @@ struct lock_info { unsigned int success; unsigned int fail; unsigned int masked; - unsigned int stack; + unsigned int stack; time_stamp_t time; decl_simple_lock_data(, *lock) vm_offset_t caller; @@ -113,7 +113,7 @@ decl_simple_lock_data(, **lock) li = &default_lock_info; return(li); } - + simple_lock(lock) decl_simple_lock_data(, *lock) @@ -121,7 +121,7 @@ decl_simple_lock_data(, *lock) register struct lock_info *li = locate_lock_info(&lock); register my_cpu = cpu_number(); - if (current_thread()) + if (current_thread()) li->stack = current_thread()->lock_stack++; if (curr_ipl[my_cpu]) li->masked++; @@ -252,8 +252,8 @@ lock_info_sort(arg, abs, count) old_val = max_val; } db_printf("\n%d total locks, %d empty buckets", total, empty ); - if (default_lock_info.success) - db_printf(", default: %d", default_lock_info.success + default_lock_info.fail); + if (default_lock_info.success) + db_printf(", default: %d", default_lock_info.success + default_lock_info.fail); db_printf("\n"); print_lock_info(&mean); } @@ -271,7 +271,7 @@ lock_info_clear() bzero(li, sizeof(struct lock_info)); } } - bzero(&default_lock_info, sizeof(struct lock_info)); + bzero(&default_lock_info, sizeof(struct lock_info)); } print_lock_info(li) @@ -294,7 +294,7 @@ struct lock_info *li; db_printf("\n"); } -#endif NCPUS > 1 && MACH_LOCK_MON +#endif /* NCPUS > 1 && MACH_LOCK_MON */ #if TIME_STAMP @@ -327,9 +327,9 @@ time_lock(loops) } stamp = time_stamp - stamp; db_printf("%d stamps for _simple_locks\n", stamp/loops); -#endif MACH_LOCK_MON +#endif /* MACH_LOCK_MON */ } -#endif TIME_STAMP +#endif /* TIME_STAMP */ #if MACH_MP_DEBUG @@ -369,7 +369,4 @@ retry_bit_lock(index, addr) count = 0; } } -#endif MACH_MP_DEBUG - - - +#endif /* MACH_MP_DEBUG */ diff --git a/kern/mach_clock.c b/kern/mach_clock.c index ee9896a9..bfa6620f 100644 --- a/kern/mach_clock.c +++ b/kern/mach_clock.c @@ -141,7 +141,7 @@ void clock_interrupt(usec, usermode, basepri) else { timer_bump(&thread->system_timer, usec); } -#endif STAT_TIME +#endif /* STAT_TIME */ /* * Increment the CPU time statistics. @@ -193,7 +193,7 @@ void clock_interrupt(usec, usermode, basepri) * Increment the tick count for the timestamping routine. */ ts_tick_count++; -#endif TS_FORMAT == 1 +#endif /* TS_FORMAT == 1 */ /* * Update the tick count since bootup, and handle @@ -420,7 +420,7 @@ host_set_time(host, new_time) thread_bind(current_thread(), master_processor); if (current_processor() != master_processor) thread_block((void (*)) 0); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ s = splhigh(); time = new_time; @@ -433,7 +433,7 @@ host_set_time(host, new_time) * Switch off the master CPU. */ thread_bind(current_thread(), PROCESSOR_NULL); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ return (KERN_SUCCESS); } @@ -461,7 +461,7 @@ host_adjust_time(host, new_adjustment, old_adjustment) thread_bind(current_thread(), master_processor); if (current_processor() != master_processor) thread_block((void (*)) 0); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ s = splclock(); @@ -482,7 +482,7 @@ host_adjust_time(host, new_adjustment, old_adjustment) splx(s); #if NCPUS > 1 thread_bind(current_thread(), PROCESSOR_NULL); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ *old_adjustment = oadj; diff --git a/kern/mach_factor.c b/kern/mach_factor.c index 1a17213c..34a7d0c1 100644 --- a/kern/mach_factor.c +++ b/kern/mach_factor.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -41,7 +41,7 @@ #if MACH_KERNEL #include <mach/kern_return.h> #include <mach/port.h> -#endif MACH_KERNEL +#endif /* MACH_KERNEL */ long avenrun[3] = {0, 0, 0}; @@ -92,7 +92,7 @@ void compute_mach_factor() /* * account for threads on cpus. */ - nthreads += ncpus - pset->idle_count; + nthreads += ncpus - pset->idle_count; /* * The current thread (running this calculation) diff --git a/kern/mach_param.h b/kern/mach_param.h index 5fc20634..10376d81 100644 --- a/kern/mach_param.h +++ b/kern/mach_param.h @@ -64,4 +64,4 @@ #define IMAR_MAX (1 << 10) /* Max number of msg-accepted reqs */ -#endif _KERN_MACH_PARAM_H_ +#endif /* _KERN_MACH_PARAM_H_ */ diff --git a/kern/machine.c b/kern/machine.c index fef541e9..67bcbbb4 100644 --- a/kern/machine.c +++ b/kern/machine.c @@ -730,7 +730,7 @@ boolean_t wait; { #ifdef lint processor++; new_pset++; wait++; -#endif lint +#endif /* lint */ return(KERN_FAILURE); } diff --git a/kern/processor.c b/kern/processor.c index ad788a92..6066ecfc 100644 --- a/kern/processor.c +++ b/kern/processor.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993-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. */ @@ -329,7 +329,7 @@ void thread_change_psets( queue_enter(&new_pset->threads, thread, thread_t, pset_threads); thread->processor_set = new_pset; new_pset->thread_count++; -} +} /* * pset_deallocate: @@ -362,7 +362,7 @@ void pset_deallocate( */ pset->ref_count = 1; pset_ref_unlock(pset); - + simple_lock(&all_psets_lock); pset_ref_lock(pset); if (--pset->ref_count > 0) { @@ -440,7 +440,7 @@ processor_info( else basic_info->running = TRUE; basic_info->slot_num = slot_num; - if (processor == master_processor) + if (processor == master_processor) basic_info->is_master = TRUE; else basic_info->is_master = FALSE; @@ -613,7 +613,7 @@ kern_return_t processor_set_destroy( pset_lock(pset); } } - + if (pset->processor_count > 0) { list = &pset->processors; while(!queue_empty(list)) { @@ -639,7 +639,7 @@ kern_return_t processor_set_destroy( } #else /* MACH_HOST */ - + kern_return_t processor_set_create( host_t host, @@ -661,7 +661,7 @@ kern_return_t processor_set_destroy( return KERN_FAILURE; } -#endif MACH_HOST +#endif /* MACH_HOST */ kern_return_t processor_get_assignment( diff --git a/kern/profile.c b/kern/profile.c index 75139347..e14d4116 100644 --- a/kern/profile.c +++ b/kern/profile.c @@ -31,7 +31,7 @@ * Grenoble, FRANCE * * All Rights Reserved - * + * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appears in all copies and @@ -40,7 +40,7 @@ * Foundation not be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. - * + * * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR @@ -63,7 +63,7 @@ extern vm_map_t kernel_map; /* can be discarded, defined in <vm/vm_kern.h> */ thread_t profile_thread_id = THREAD_NULL; -void profile_thread() +void profile_thread() { struct message { mach_msg_header_t head; @@ -84,11 +84,11 @@ void profile_thread() /* Template initialisation of header and type structures */ msg.head.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, MACH_MSG_TYPE_MAKE_SEND_ONCE); - msg.head.msgh_size = sizeof(msg); + msg.head.msgh_size = sizeof(msg); msg.head.msgh_local_port = MACH_PORT_NULL; msg.head.msgh_kind = MACH_MSGH_KIND_NORMAL; msg.head.msgh_id = 666666; - + msg.type.msgt_name = MACH_MSG_TYPE_INTEGER_32; msg.type.msgt_size = 32; msg.type.msgt_number = SIZE_PROF_BUFFER+1; @@ -105,7 +105,7 @@ void profile_thread() splx(s); if ((buf_entry = (buf_to_send_t) prof_queue_entry) == NULLBTS) - { + { thread_sleep((event_t) profile_thread, lock, TRUE); if (current_thread()->wait_result != THREAD_AWAKENED) break; @@ -118,30 +118,30 @@ void profile_thread() int imax; curr_th = (thread_t) buf_entry->thread; - curr_buf = (int) buf_entry->number; + curr_buf = (int) buf_entry->number; pbuf = curr_th->profil_buffer; /* Set the remote port */ msg.head.msgh_remote_port = (mach_port_t) pbuf->prof_port; - + sample = pbuf->prof_area[curr_buf].p_zone; imax = pbuf->prof_area[curr_buf].p_index; for(j=0 ;j<imax; j++,sample++) - msg.arg[j] = *sample; + msg.arg[j] = *sample; /* Let hardclock() know you've finished the dirty job */ pbuf->prof_area[curr_buf].p_full = FALSE; /* - * Store the number of samples actually sent + * Store the number of samples actually sent * as the last element of the array. */ msg.arg[SIZE_PROF_BUFFER] = imax; - mr = mach_msg(&(msg.head), MACH_SEND_MSG, - sizeof(struct message), 0, - MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, + mr = mach_msg(&(msg.head), MACH_SEND_MSG, + sizeof(struct message), 0, + MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL); if (mr != MACH_MSG_SUCCESS) { @@ -192,10 +192,10 @@ thread_t th; /* Ask for the sending of the last PC buffer. * Make a request to the profile_thread by inserting - * the buffer in the send queue, and wake it up. + * the buffer in the send queue, and wake it up. * The last buffer must be inserted at the head of the - * send queue, so the profile_thread handles it immediatly. - */ + * send queue, so the profile_thread handles it immediatly. + */ if (kmem_alloc( kernel_map, &vm_buf_entry, sizeof(struct buf_to_send)) != KERN_SUCCESS) return; @@ -212,7 +212,7 @@ thread_t th; mpenqueue_tail( &prof_queue, &(buf_entry->list)); thread_wakeup((event_t) profile_thread); assert_wait((event_t) &buf_entry->wakeme, TRUE); - splx(s); + splx(s); thread_block((void (*)()) 0); } else { splx(s); @@ -228,26 +228,26 @@ profile(pc) { /* Find out which thread has been interrupted. */ thread_t it_thread = current_thread(); - int inout_val = pc; + int inout_val = pc; buf_to_send_t buf_entry; vm_offset_t vm_buf_entry; int *val; /* - * Test if the current thread is to be sampled + * Test if the current thread is to be sampled */ if (it_thread->thread_profiled) { /* Inserts the PC value in the buffer of the thread */ - set_pbuf_value(it_thread->profil_buffer, &inout_val); + set_pbuf_value(it_thread->profil_buffer, &inout_val); switch(inout_val) { - case 0: + case 0: if (profile_thread_id == THREAD_NULL) { reset_pbuf_area(it_thread->profil_buffer); } else printf("ERROR : hardclock : full buffer unsent\n"); break; - case 1: + case 1: /* Normal case, value successfully inserted */ break; - case 2 : + case 2 : /* * The value we have just inserted caused the * buffer to be full, and ready to be sent. @@ -279,8 +279,8 @@ profile(pc) { thread_wakeup((event_t) profile_thread); break; - default: - printf("ERROR: profile : unexpected case\n"); + default: + printf("ERROR: profile : unexpected case\n"); } } } @@ -295,12 +295,12 @@ ipc_space_t task; ipc_object_t reply; thread_t cur_thread; { -/* +/* * This routine is called every time that a new thread has made - * a request for the sampling service. We must keep track of the + * a request for the sampling service. We must keep track of the * correspondance between it's identity (cur_thread) and the port - * we are going to use as a reply port to send out the samples resulting - * from its execution. + * we are going to use as a reply port to send out the samples resulting + * from its execution. */ prof_data_t pbuf; vm_offset_t vmpbuf; @@ -341,7 +341,7 @@ printf("ERROR:mach_sample_thread:cannot set pbuf_nb\n"); cur_thread->thread_profiled_own = FALSE; cur_thread->thread_profiled = FALSE; - dealloc_pbuf_area(cur_thread->profil_buffer); + dealloc_pbuf_area(cur_thread->profil_buffer); cur_thread->profil_buffer = NULLPBUF; } @@ -385,8 +385,8 @@ task_t cur_task; if (turnon && profile_thread_id == THREAD_NULL) profile_thread_id = kernel_thread(current_task(), profile_thread); - cur_task->task_profiled = turnon; - actual = cur_task->thread_count; + cur_task->task_profiled = turnon; + actual = cur_task->thread_count; sentone = 0; for (i=0, thread=(thread_t) queue_first(&cur_task->thread_list); i < actual; @@ -402,7 +402,7 @@ task_t cur_task; } } if (!turnon) { - dealloc_pbuf_area(pbuf); + dealloc_pbuf_area(pbuf); cur_task->profil_buffer = NULLPBUF; } } @@ -410,4 +410,4 @@ task_t cur_task; return KERN_SUCCESS; } -#endif 0 +#endif /* 0 */ diff --git a/kern/queue.h b/kern/queue.h index 2f8f792d..3481db31 100644 --- a/kern/queue.h +++ b/kern/queue.h @@ -1,18 +1,18 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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 @@ -366,4 +366,4 @@ typedef struct mpqueue_head mpqueue_head_t; * Old queue stuff, will go away soon. */ -#endif _KERN_QUEUE_H_ +#endif /* _KERN_QUEUE_H_ */ diff --git a/kern/sched.h b/kern/sched.h index 756384b0..6616e0f8 100644 --- a/kern/sched.h +++ b/kern/sched.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,7 +46,7 @@ #if MACH_FIXPRI #include <mach/policy.h> -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ #if STAT_TIME @@ -56,14 +56,14 @@ */ #define PRI_SHIFT 18 -#else STAT_TIME +#else /* STAT_TIME */ /* * Otherwise machine provides shift(s) based on time units it uses. */ #include <machine/sched_param.h> -#endif STAT_TIME +#endif /* STAT_TIME */ #define NRQS 32 /* 32 run queues per cpu */ struct run_queue { @@ -98,14 +98,14 @@ typedef struct run_queue *run_queue_t; ((processor)->processor_set->runq.low < \ (thread)->sched_pri)))) -#else MACH_FIXPRI +#else /* MACH_FIXPRI */ #define csw_needed(thread, processor) ((thread)->state & TH_SUSP || \ ((processor)->runq.count > 0) || \ ((processor)->first_quantum == FALSE && \ ((processor)->processor_set->runq.count > 0 && \ (processor)->processor_set->runq.low <= \ ((thread)->sched_pri)))) -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ /* * Scheduler routines. @@ -176,6 +176,6 @@ MACRO_END */ extern int sched_usec; -#endif SIMPLE_CLOCK +#endif /* SIMPLE_CLOCK */ -#endif _KERN_SCHED_H_ +#endif /* _KERN_SCHED_H_ */ diff --git a/kern/startup.c b/kern/startup.c index 0e1c701d..5a2171e4 100644 --- a/kern/startup.c +++ b/kern/startup.c @@ -78,7 +78,7 @@ void start_kernel_threads(); /* forward */ #if NCPUS > 1 extern void start_other_cpus(); extern void action_thread(); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ /* XX */ extern vm_offset_t phys_first_addr, phys_last_addr; @@ -113,7 +113,7 @@ void setup_main() #if XPR_DEBUG xprbootstrap(); -#endif XPR_DEBUG +#endif /* XPR_DEBUG */ timestamp_init(); @@ -135,7 +135,7 @@ void setup_main() swapper_init(); #if MACH_HOST pset_sys_init(); -#endif MACH_HOST +#endif /* MACH_HOST */ /* * Kick off the time-out driven routines by calling @@ -218,7 +218,7 @@ void start_kernel_threads() * Allow other CPUs to run. */ start_other_cpus(); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ /* * Create the device service. @@ -230,14 +230,14 @@ void start_kernel_threads() */ #if NORMA_IPC norma_ipc_init(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Initialize NORMA vm system. */ #if NORMA_VM norma_vm_init(); -#endif NORMA_VM +#endif /* NORMA_VM */ /* @@ -256,7 +256,7 @@ void start_kernel_threads() #if XPR_DEBUG xprinit(); /* XXX */ -#endif XPR_DEBUG +#endif /* XPR_DEBUG */ /* * Become the pageout daemon. @@ -271,7 +271,7 @@ void slave_main() { cpu_launch_first_thread(THREAD_NULL); } -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ /* * Start up the first thread on a CPU. diff --git a/kern/syscall_emulation.h b/kern/syscall_emulation.h index 91b3ed71..5ebe2e1f 100644 --- a/kern/syscall_emulation.h +++ b/kern/syscall_emulation.h @@ -56,6 +56,6 @@ typedef vm_offset_t *emulation_vector_t; /* Variable-length array */ #define EML_MOD (err_kern|err_sub(2)) #define EML_BAD_TASK (EML_MOD|0x0001) #define EML_BAD_CNT (EML_MOD|0x0002) -#endif ASSEMBLER +#endif /* ASSEMBLER */ -#endif _KERN_SYSCALL_EMULATION_H_ +#endif /* _KERN_SYSCALL_EMULATION_H_ */ diff --git a/kern/syscall_subr.c b/kern/syscall_subr.c index a040d71d..8c5b38a4 100644 --- a/kern/syscall_subr.c +++ b/kern/syscall_subr.c @@ -47,7 +47,7 @@ #if MACH_FIXPRI #include <mach/policy.h> -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ @@ -91,7 +91,7 @@ boolean_t swtch() if (myprocessor->runq.count == 0 && myprocessor->processor_set->runq.count == 0) return(FALSE); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ counter(c_swtch_block++); thread_block(swtch_continue); @@ -125,14 +125,14 @@ boolean_t swtch_pri(pri) #ifdef lint pri++; -#endif lint +#endif /* lint */ #if NCPUS > 1 myprocessor = current_processor(); if (myprocessor->runq.count == 0 && myprocessor->processor_set->runq.count == 0) return(FALSE); -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ /* * XXX need to think about depression duration. @@ -158,7 +158,7 @@ void thread_switch_continue() register thread_t cur_thread = current_thread(); /* - * Restore depressed priority + * Restore depressed priority */ if (cur_thread->depress_priority >= 0) (void) thread_depress_abort(cur_thread); @@ -210,7 +210,7 @@ mach_msg_timeout_t option_time; default: return(KERN_INVALID_ARGUMENT); } - + #ifndef MIGRATING_THREADS /* XXX thread_run defunct */ /* * Check and act on thread hint if appropriate. @@ -250,11 +250,11 @@ mach_msg_timeout_t option_time; myprocessor->quantum = thread->sched_data; myprocessor->first_quantum = TRUE; } -#endif MACH_FIXPRI +#endif /* MACH_FIXPRI */ counter(c_thread_switch_handoff++); thread_run(thread_switch_continue, thread); /* - * Restore depressed priority + * Restore depressed priority */ if (cur_thread->depress_priority >= 0) (void) thread_depress_abort(cur_thread); @@ -280,14 +280,14 @@ mach_msg_timeout_t option_time; myprocessor = current_processor(); if (myprocessor->processor_set->runq.count > 0 || myprocessor->runq.count > 0) -#endif NCPUS > 1 +#endif /* NCPUS > 1 */ { counter(c_thread_switch_block++); thread_block(thread_switch_continue); } /* - * Restore depressed priority + * Restore depressed priority */ if (cur_thread->depress_priority >= 0) (void) thread_depress_abort(cur_thread); @@ -335,7 +335,7 @@ mach_msg_timeout_t depress_time; thread_unlock(thread); (void) splx(s); -} +} /* * thread_depress_timeout: diff --git a/kern/syscall_subr.h b/kern/syscall_subr.h index 921c2b23..8790d739 100644 --- a/kern/syscall_subr.h +++ b/kern/syscall_subr.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 @@ extern int swtch_pri(); extern int thread_switch(); extern void thread_depress_timeout(); -#endif _KERN_SYSCALL_SUBR_H_ +#endif /* _KERN_SYSCALL_SUBR_H_ */ diff --git a/kern/syscall_sw.c b/kern/syscall_sw.c index 41c8b2f1..07590652 100644 --- a/kern/syscall_sw.c +++ b/kern/syscall_sw.c @@ -96,7 +96,7 @@ extern kern_return_t syscall_device_writev_request(); #ifdef FIPC extern kern_return_t syscall_fipc_send(); extern kern_return_t syscall_fipc_recv(); -#endif FIPC +#endif /* FIPC */ mach_trap_t mach_trap_table[] = { MACH_TRAP(kern_invalid, 0), /* 0 */ /* Unix */ @@ -247,7 +247,7 @@ mach_trap_t mach_trap_table[] = { #else MACH_TRAP(kern_invalid, 0), /* 96 */ MACH_TRAP(kern_invalid, 0), /* 97 */ -#endif FIPC +#endif /* FIPC */ MACH_TRAP(kern_invalid, 0), /* 98 */ MACH_TRAP(kern_invalid, 0), /* 99 */ diff --git a/kern/syscall_sw.h b/kern/syscall_sw.h index 6a21ff56..87fc1bb5 100644 --- a/kern/syscall_sw.h +++ b/kern/syscall_sw.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,4 +48,4 @@ extern int mach_trap_count; #define MACH_TRAP_STACK(name, arg_count) \ { (arg_count), (int (*)()) (name), TRUE, 0 } -#endif _KERN_SYSCALL_SW_H_ +#endif /* _KERN_SYSCALL_SW_H_ */ diff --git a/kern/task.h b/kern/task.h index ec800589..df6560c8 100644 --- a/kern/task.h +++ b/kern/task.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993-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. */ @@ -109,7 +109,7 @@ struct task { #endif /* NORMA_TASK */ #if FAST_TAS -#define TASK_FAST_TAS_NRAS 8 +#define TASK_FAST_TAS_NRAS 8 vm_offset_t fast_tas_base[TASK_FAST_TAS_NRAS]; vm_offset_t fast_tas_end[TASK_FAST_TAS_NRAS]; #endif /* FAST_TAS */ @@ -182,4 +182,4 @@ extern task_t kernel_task_create(); extern task_t kernel_task; -#endif _KERN_TASK_H_ +#endif /* _KERN_TASK_H_ */ diff --git a/kern/thread_swap.h b/kern/thread_swap.h index e390ac4a..c08f39f8 100644 --- a/kern/thread_swap.h +++ b/kern/thread_swap.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -41,4 +41,4 @@ extern void thread_doswapin( /* thread_t thread */ ); extern void swapin_thread(); extern void thread_swapout( /* thread_t thread */ ); -#endif _KERN_THREAD_SWAP_H_ +#endif /* _KERN_THREAD_SWAP_H_ */ diff --git a/kern/time_out.h b/kern/time_out.h index c03f4c62..4907e5b1 100644 --- a/kern/time_out.h +++ b/kern/time_out.h @@ -84,4 +84,4 @@ extern boolean_t untimeout(); reset_timeout((t)); \ MACRO_END -#endif _KERN_TIME_OUT_H_ +#endif /* _KERN_TIME_OUT_H_ */ diff --git a/kern/time_stamp.c b/kern/time_stamp.c index 6e22155a..fdb02fca 100644 --- a/kern/time_stamp.c +++ b/kern/time_stamp.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,7 +33,7 @@ */ #ifdef multimax #include <mmax/timer.h> -#endif multimax +#endif /* multimax */ @@ -45,14 +45,14 @@ struct tsval *tsp; struct tsval temp; temp.low_val = FRcounter; temp.high_val = 0; -#else multimax +#else /* multimax */ /* temp.low_val = 0; temp.high_val = ts_tick_count; */ time_value_t temp; temp = time; -#endif multimax +#endif /* multimax */ if (copyout((char *)&temp, (char *)tsp, @@ -68,7 +68,7 @@ struct tsval *tsp; void timestamp_init() { #ifdef multimax -#else multimax +#else /* multimax */ ts_tick_count = 0; -#endif multimax +#endif /* multimax */ } diff --git a/kern/time_stamp.h b/kern/time_stamp.h index 81711f61..480d2f1d 100644 --- a/kern/time_stamp.h +++ b/kern/time_stamp.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -51,10 +51,10 @@ struct tsval { */ #define TS_FORMAT 1 -#if KERNEL +#if KERNEL unsigned ts_tick_count; -#endif KERNEL -#endif TS_FORMAT +#endif /* KERNEL */ +#endif /* TS_FORMAT */ /* * List of all format definitions for convert_ts_to_tv. @@ -62,4 +62,4 @@ unsigned ts_tick_count; #define TS_FORMAT_DEFAULT 1 #define TS_FORMAT_MMAX 2 -#endif _KERN_TIME_STAMP_H_ +#endif /* _KERN_TIME_STAMP_H_ */ diff --git a/kern/timer.c b/kern/timer.c index 57772ee5..326d3405 100644 --- a/kern/timer.c +++ b/kern/timer.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -82,7 +82,7 @@ timer_t this_timer; } #if STAT_TIME -#else STAT_TIME +#else /* STAT_TIME */ #ifdef MACHINE_TIMER_ROUTINES @@ -126,7 +126,7 @@ unsigned ts; elapsed = ts - mytimer->tstamp; #ifdef TIMER_MAX if (elapsed < 0) elapsed += TIMER_MAX; -#endif TIMER_MAX +#endif /* TIMER_MAX */ /* * Update current timer. @@ -167,7 +167,7 @@ time_trap_uexit(ts) elapsed = ts - mytimer->tstamp; #ifdef TIMER_MAX if (elapsed < 0) elapsed += TIMER_MAX; -#endif TIMER_MAX +#endif /* TIMER_MAX */ /* * Update current timer. @@ -214,7 +214,7 @@ timer_t new_timer; elapsed = ts - mytimer->tstamp; #ifdef TIMER_MAX if (elapsed < 0) elapsed += TIMER_MAX; -#endif TIMER_MAX +#endif /* TIMER_MAX */ /* * Update current timer. @@ -254,7 +254,7 @@ timer_t old_timer; elapsed = ts - mytimer->tstamp; #ifdef TIMER_MAX if (elapsed < 0) elapsed += TIMER_MAX; -#endif TIMER_MAX +#endif /* TIMER_MAX */ /* * Update current timer. @@ -302,7 +302,7 @@ timer_t new_timer; elapsed = ts - mytimer->tstamp; #ifdef TIMER_MAX if (elapsed < 0) elapsed += TIMER_MAX; -#endif TIMER_MAX +#endif /* TIMER_MAX */ /* * Update current timer. @@ -325,7 +325,7 @@ timer_t new_timer; } #endif /* MACHINE_TIMER_ROUTINES */ -#endif STAT_TIME +#endif /* STAT_TIME */ /* * timer_normalize normalizes the value of a timer. It is @@ -355,7 +355,7 @@ timer_t timer; * * Critical scheduling code uses TIMER_DELTA macro in timer.h * (called from thread_timer_delta in sched.h). - * + * * Keep coherent with db_time_grab below. */ @@ -382,7 +382,7 @@ timer_save_t save; #if MACH_ASSERT passes++; assert((passes < 10000) ? (1) : ((timer->high_bits_check = save->high), 0)); -#endif +#endif } while ( (save)->high != (timer)->high_bits_check); } @@ -425,7 +425,7 @@ time_value_t *tv; */ #ifdef TIMER_ADJUST TIMER_ADJUST(&temp); -#endif TIMER_ADJUST +#endif /* TIMER_ADJUST */ tv->seconds = temp.high + temp.low/1000000; tv->microseconds = temp.low%1000000; @@ -452,7 +452,7 @@ void thread_read_times(thread, user_time_p, system_time_p) #ifdef TIMER_ADJUST TIMER_ADJUST(&temp); -#endif TIMER_ADJUST +#endif /* TIMER_ADJUST */ user_time_p->seconds = temp.high + temp.low/1000000; user_time_p->microseconds = temp.low % 1000000; @@ -461,7 +461,7 @@ void thread_read_times(thread, user_time_p, system_time_p) #ifdef TIMER_ADJUST TIMER_ADJUST(&temp); -#endif TIMER_ADJUST +#endif /* TIMER_ADJUST */ system_time_p->seconds = temp.high + temp.low/1000000; system_time_p->microseconds = temp.low % 1000000; } @@ -486,7 +486,7 @@ void db_thread_read_times(thread, user_time_p, system_time_p) #ifdef TIMER_ADJUST TIMER_ADJUST(&temp); -#endif TIMER_ADJUST +#endif /* TIMER_ADJUST */ user_time_p->seconds = temp.high + temp.low/1000000; user_time_p->microseconds = temp.low % 1000000; @@ -495,7 +495,7 @@ void db_thread_read_times(thread, user_time_p, system_time_p) #ifdef TIMER_ADJUST TIMER_ADJUST(&temp); -#endif TIMER_ADJUST +#endif /* TIMER_ADJUST */ system_time_p->seconds = temp.high + temp.low/1000000; system_time_p->microseconds = temp.low % 1000000; } diff --git a/kern/timer.h b/kern/timer.h index fe60e268..45739362 100644 --- a/kern/timer.h +++ b/kern/timer.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -43,14 +43,14 @@ #define TIMER_HIGH_UNIT TIMER_RATE #undef TIMER_ADJUST -#else STAT_TIME +#else /* STAT_TIME */ /* * Machine dependent definitions based on hardware support. */ #include <machine/timer.h> -#endif STAT_TIME +#endif /* STAT_TIME */ /* * Definitions for accurate timers. high_bits_check is a copy of @@ -99,10 +99,10 @@ typedef struct timer_save timer_save_data_t, *timer_save_t; #if STAT_TIME #define start_timer(timer) #define timer_switch(timer) -#else STAT_TIME +#else /* STAT_TIME */ extern void start_timer(); extern void timer_switch(); -#endif STAT_TIME +#endif /* STAT_TIME */ extern void timer_read(); extern void thread_read_times(); @@ -111,7 +111,7 @@ extern unsigned timer_delta(); #if STAT_TIME /* * Macro to bump timer values. - */ + */ #define timer_bump(timer, usec) \ MACRO_BEGIN \ (timer)->low_bits += usec; \ @@ -120,7 +120,7 @@ MACRO_BEGIN \ } \ MACRO_END -#else STAT_TIME +#else /* STAT_TIME */ /* * Exported hardware interface to timers */ @@ -128,7 +128,7 @@ extern void time_trap_uentry(); extern void time_trap_uexit(); extern timer_t time_int_entry(); extern void time_int_exit(); -#endif STAT_TIME +#endif /* STAT_TIME */ /* * TIMER_DELTA finds the difference between a timer and a saved value, @@ -154,4 +154,4 @@ MACRO_BEGIN \ } \ MACRO_END -#endif _KERN_TIMER_H_ +#endif /* _KERN_TIMER_H_ */ @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -189,4 +189,4 @@ void xpr_dump(base, nbufs) (void) splx(s); } } -#endif MACH_KDB +#endif /* MACH_KDB */ @@ -1,34 +1,34 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ /* - * Include file for xpr circular buffer silent tracing. + * Include file for xpr circular buffer silent tracing. * */ /* - * If the kernel flag XPRDEBUG is set, the XPR macro is enabled. The + * If the kernel flag XPRDEBUG is set, the XPR macro is enabled. The * macro should be invoked something like the following: * XPR(XPR_SYSCALLS, ("syscall: %d, 0x%x\n", syscallno, arg1); * which will expand into the following code: @@ -41,7 +41,7 @@ * of the kernel can easily be reconstructed in a post-processor which * performs the printf processing. * - * If the XPRDEBUG compilation switch is not set, the XPR macro expands + * If the XPRDEBUG compilation switch is not set, the XPR macro expands * to nothing. */ @@ -50,9 +50,9 @@ #ifdef KERNEL #include <xpr_debug.h> -#else KERNEL +#else /* KERNEL */ #include <sys/features.h> -#endif KERNEL +#endif /* KERNEL */ #include <machine/xpr.h> @@ -80,9 +80,9 @@ extern int xprflags; #define XPR_INODE_PAGER (1 << 14) #define XPR_INODE_PAGER_DATA (1 << 15) -#else XPR_DEBUG +#else /* XPR_DEBUG */ #define XPR(flags,xprargs) -#endif XPR_DEBUG +#endif /* XPR_DEBUG */ struct xprbuf { char *msg; @@ -98,4 +98,4 @@ extern void xpr_dump(); extern void xprinit(); extern void xprbootstrap(); -#endif _KERN_XPR_H_ +#endif /* _KERN_XPR_H_ */ diff --git a/kern/zalloc.c b/kern/zalloc.c index 41f638e0..0e62b018 100644 --- a/kern/zalloc.c +++ b/kern/zalloc.c @@ -972,4 +972,4 @@ kern_return_t host_zone_info(host, namesp, namesCntp, infop, infoCntp) return KERN_SUCCESS; } -#endif MACH_DEBUG +#endif /* MACH_DEBUG */ diff --git a/kern/zalloc.h b/kern/zalloc.h index 2e9b4b38..9e44a6d1 100644 --- a/kern/zalloc.h +++ b/kern/zalloc.h @@ -132,4 +132,4 @@ static __inline void ZFREE(zone_t zone, vm_offset_t element) -#endif _KERN_ZALLOC_H_ +#endif /* _KERN_ZALLOC_H_ */ diff --git a/linux/dev/drivers/block/ide.c b/linux/dev/drivers/block/ide.c index ee3c8785..9444653c 100644 --- a/linux/dev/drivers/block/ide.c +++ b/linux/dev/drivers/block/ide.c @@ -1606,7 +1606,7 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq) printk("%s: drive not ready for command\n", drive->name); return; } - + if (!drive->special.all) { if (rq->cmd == IDE_DRIVE_CMD) { execute_drive_cmd(drive, rq); @@ -1646,7 +1646,7 @@ static inline void do_request (ide_hwif_t *hwif, struct request *rq) #else do_rw_disk (drive, rq, block); /* simpler and faster */ return; -#endif /* CONFIG_BLK_DEV_IDEATAPI */; +#endif /* CONFIG_BLK_DEV_IDEATAPI */ } do_special(drive); return; @@ -1696,7 +1696,7 @@ void ide_do_request (ide_hwgroup_t *hwgroup) hwgroup->active = 0; return; /* no work left for this hwgroup */ } - got_rq: + got_rq: do_request(hwgroup->hwif = hwgroup->next_hwif = hwif, hwgroup->rq = rq); cli(); } while (hwgroup->handler == NULL); @@ -2429,7 +2429,7 @@ static inline void do_identify (ide_drive_t *drive, byte cmd) #if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA) /* - * EATA SCSI controllers do a hardware ATA emulation: + * EATA SCSI controllers do a hardware ATA emulation: * Ignore them if there is a driver for them available. */ if ((id->model[0] == 'P' && id->model[1] == 'M') @@ -3321,7 +3321,7 @@ done: * This routine is called from the partition-table code in genhd.c * to "convert" a drive to a logical geometry with fewer than 1024 cyls. * - * The second parameter, "xparm", determines exactly how the translation + * The second parameter, "xparm", determines exactly how the translation * will be handled: * 0 = convert to CHS with fewer than 1024 cyls * using the same method as Ontrack DiskManager. @@ -3329,7 +3329,7 @@ done: * -1 = similar to "0", plus redirect sector 0 to sector 1. * >1 = convert to a CHS geometry with "xparm" heads. * - * Returns 0 if the translation was not possible, if the device was not + * Returns 0 if the translation was not possible, if the device was not * an IDE disk drive, or if a geometry was "forced" on the commandline. * Returns 1 if the geometry translation was successful. */ @@ -3640,7 +3640,7 @@ static int hwif_init (int h) { ide_hwif_t *hwif = &ide_hwifs[h]; void (*rfn)(void); - + if (!hwif->present) return 0; if (!hwif->irq) { @@ -3655,7 +3655,7 @@ static int hwif_init (int h) return (hwif->present = 0); } #endif /* CONFIG_BLK_DEV_HD */ - + hwif->present = 0; /* we set it back to 1 if all is ok below */ switch (hwif->major) { case IDE0_MAJOR: rfn = &do_ide0_request; break; @@ -3710,7 +3710,7 @@ int ide_init (void) #ifdef CONFIG_BLK_DEV_IDETAPE idetape_register_chrdev(); /* Register character device interface to the ide tape */ #endif /* CONFIG_BLK_DEV_IDETAPE */ - + return 0; } diff --git a/linux/dev/include/linux/blk.h b/linux/dev/include/linux/blk.h index ff4e46b9..852853c5 100644 --- a/linux/dev/include/linux/blk.h +++ b/linux/dev/include/linux/blk.h @@ -42,37 +42,37 @@ #ifdef CONFIG_CDU31A extern int cdu31a_init(void); -#endif CONFIG_CDU31A +#endif /* CONFIG_CDU31A */ #ifdef CONFIG_MCD extern int mcd_init(void); -#endif CONFIG_MCD +#endif /* CONFIG_MCD */ #ifdef CONFIG_MCDX extern int mcdx_init(void); -#endif CONFIG_MCDX +#endif /* CONFIG_MCDX */ #ifdef CONFIG_SBPCD extern int sbpcd_init(void); -#endif CONFIG_SBPCD +#endif /* CONFIG_SBPCD */ #ifdef CONFIG_AZTCD extern int aztcd_init(void); -#endif CONFIG_AZTCD +#endif /* CONFIG_AZTCD */ #ifdef CONFIG_CDU535 extern int sony535_init(void); -#endif CONFIG_CDU535 +#endif /* CONFIG_CDU535 */ #ifdef CONFIG_GSCD extern int gscd_init(void); -#endif CONFIG_GSCD +#endif /* CONFIG_GSCD */ #ifdef CONFIG_CM206 extern int cm206_init(void); -#endif CONFIG_CM206 +#endif /* CONFIG_CM206 */ #ifdef CONFIG_OPTCD extern int optcd_init(void); -#endif CONFIG_OPTCD +#endif /* CONFIG_OPTCD */ #ifdef CONFIG_SJCD extern int sjcd_init(void); -#endif CONFIG_SJCD +#endif /* CONFIG_SJCD */ #ifdef CONFIG_CDI_INIT extern int cdi_init(void); -#endif CONFIG_CDI_INIT +#endif /* CONFIG_CDI_INIT */ #ifdef CONFIG_BLK_DEV_HD extern int hd_init(void); #endif @@ -87,7 +87,7 @@ extern int loop_init(void); #endif #ifdef CONFIG_BLK_DEV_MD extern int md_init(void); -#endif CONFIG_BLK_DEV_MD +#endif /* CONFIG_BLK_DEV_MD */ extern void set_device_ro(kdev_t dev,int flag); void add_blkdev_randomness(int major); @@ -115,7 +115,7 @@ void initrd_init(void); if (!__err) set_device_ro((dev),get_fs_long((long *) (where))); return __err; } \ case BLKROGET: { int __err = verify_area(VERIFY_WRITE, (void *) (where), sizeof(long)); \ if (!__err) put_fs_long(0!=is_read_only(dev),(long *) (where)); return __err; } - + #if defined(MAJOR_NR) || defined(IDE_DRIVER) /* @@ -134,7 +134,7 @@ void initrd_init(void); #define DEVICE_NAME "ramdisk" #define DEVICE_REQUEST rd_request #define DEVICE_NR(device) (MINOR(device)) -#define DEVICE_ON(device) +#define DEVICE_ON(device) #define DEVICE_OFF(device) #define DEVICE_NO_RANDOM @@ -164,7 +164,7 @@ static void floppy_off(unsigned int nr); #elif (MAJOR_NR == SCSI_DISK_MAJOR) #define DEVICE_NAME "scsidisk" -#define DEVICE_INTR do_sd +#define DEVICE_INTR do_sd #define TIMEOUT_VALUE (2*HZ) #define DEVICE_REQUEST do_sd_request #define DEVICE_NR(device) (MINOR(device) >> 4) @@ -183,7 +183,7 @@ static void floppy_off(unsigned int nr); #elif (MAJOR_NR == SCSI_TAPE_MAJOR) #define DEVICE_NAME "scsitape" -#define DEVICE_INTR do_st +#define DEVICE_INTR do_st #define DEVICE_NR(device) (MINOR(device) & 0x7f) #define DEVICE_ON(device) #define DEVICE_OFF(device) @@ -347,7 +347,7 @@ else \ #endif /* DEVICE_TIMEOUT */ static void (DEVICE_REQUEST)(void); - + #ifdef DEVICE_INTR #define CLEAR_INTR SET_INTR(NULL) #else @@ -415,11 +415,11 @@ static void end_request(int uptodate) { if ((bh = req->bh) != NULL) { req->bh = bh->b_reqnext; bh->b_reqnext = NULL; - + /* * This is our 'MD IO has finished' event handler. * note that b_state should be cached in a register - * anyways, so the overhead if this checking is almost + * anyways, so the overhead if this checking is almost * zero. But anyways .. we never get OO for free :) */ if (test_bit(BH_MD, &bh->b_state)) { diff --git a/linux/src/include/linux/cdrom.h b/linux/src/include/linux/cdrom.h index 24aced5f..022d6e18 100644 --- a/linux/src/include/linux/cdrom.h +++ b/linux/src/include/linux/cdrom.h @@ -67,14 +67,14 @@ * CDROM IOCTL structures */ -struct cdrom_blk +struct cdrom_blk { unsigned from; unsigned short len; }; -struct cdrom_msf +struct cdrom_msf { u_char cdmsf_min0; /* start minute */ u_char cdmsf_sec0; /* start second */ @@ -84,7 +84,7 @@ struct cdrom_msf u_char cdmsf_frame1; /* end frame */ }; -struct cdrom_ti +struct cdrom_ti { u_char cdti_trk0; /* start track */ u_char cdti_ind0; /* start index */ @@ -92,7 +92,7 @@ struct cdrom_ti u_char cdti_ind1; /* end index */ }; -struct cdrom_tochdr +struct cdrom_tochdr { u_char cdth_trk0; /* start track */ u_char cdth_trk1; /* end track */ @@ -111,7 +111,7 @@ union cdrom_addr /* address in either MSF or logical format */ int lba; }; -struct cdrom_tocentry +struct cdrom_tocentry { u_char cdte_track; u_char cdte_adr :4; @@ -137,7 +137,7 @@ struct cdrom_tocentry */ #define CDROM_LEADOUT 0xAA -struct cdrom_subchnl +struct cdrom_subchnl { u_char cdsc_format; u_char cdsc_audiostatus; @@ -171,7 +171,7 @@ struct cdrom_volctrl u_char channel3; }; -struct cdrom_read +struct cdrom_read { int cdread_lba; caddr_t cdread_bufaddr; @@ -206,7 +206,7 @@ struct cdrom_multisession #define CDROM_MODE1_SIZE 512 #else #define CDROM_MODE1_SIZE 2048 -#endif FIVETWELVE +#endif /* FIVETWELVE */ #define CDROM_MODE2_SIZE 2336 /* @@ -243,7 +243,7 @@ struct cdrom_multisession * enable (1) / disable (0) auto-ejecting */ #define CDROMEJECT_SW 0x530f /* arg: 0 or 1 */ - + /* * obtain the start-of-last-session address of multi session disks */ @@ -259,19 +259,19 @@ struct cdrom_multisession #define CDROMVOLREAD 0x5313 /* let the drive tell its volume setting */ /* (struct cdrom_volctrl) */ -/* +/* * these ioctls are used in aztcd.c and optcd.c */ #define CDROMREADRAW 0x5314 /* read data in raw mode */ #define CDROMREADCOOKED 0x5315 /* read data in cooked mode */ #define CDROMSEEK 0x5316 /* seek msf address */ - + /* * for playing audio in logical block addressing mode */ #define CDROMPLAYBLK 0x5317 /* (struct cdrom_blk) */ -/* +/* * these ioctls are used in optcd.c */ #define CDROMREADALL 0x5318 /* read all 2646 bytes */ @@ -316,7 +316,7 @@ struct cdrom_multisession /* * CD-ROM capacity structure. */ -struct scsi_capacity +struct scsi_capacity { u_long capacity; u_long lbasize; @@ -335,7 +335,7 @@ struct scsi_capacity /* * standard mode-select header prepended to all mode-select commands */ -struct ccs_modesel_head +struct ccs_modesel_head { u_char _r1; /* reserved */ u_char medium; /* device-specific medium type */ @@ -353,7 +353,7 @@ struct ccs_modesel_head /* * error recovery parameters */ -struct ccs_err_recovery +struct ccs_err_recovery { u_char _r1 : 2; /* reserved */ u_char page_code : 6; /* page code */ @@ -376,7 +376,7 @@ struct ccs_err_recovery /* * disco/reco parameters */ -struct ccs_disco_reco +struct ccs_disco_reco { u_char _r1 : 2; /* reserved */ u_char page_code : 6; /* page code */ @@ -392,7 +392,7 @@ struct ccs_disco_reco /* * drive geometry parameters */ -struct ccs_geometry +struct ccs_geometry { u_char _r1 : 2; /* reserved */ u_char page_code : 6; /* page code */ @@ -419,7 +419,7 @@ struct ccs_geometry /* * cache parameters */ -struct ccs_cache +struct ccs_cache { u_char _r1 : 2; /* reserved */ u_char page_code : 6; /* page code */ @@ -433,13 +433,13 @@ struct ccs_cache u_char _r2[8]; }; -#endif _LINUX_CDROM_H +#endif /* _LINUX_CDROM_H */ /*==========================================================================*/ /* * Overrides for Emacs so that we follow Linus's tabbing style. * Emacs will notice this stuff at the end of the file and automatically * adjust the settings for this buffer only. This must remain at the end - * of the file. + * of the file. * --------------------------------------------------------------------------- * Local variables: * c-indent-level: 8 diff --git a/linux/src/include/linux/md.h b/linux/src/include/linux/md.h index 1c5680a0..413beb75 100644 --- a/linux/src/include/linux/md.h +++ b/linux/src/include/linux/md.h @@ -3,15 +3,15 @@ Copyright (C) 1994-96 Marc ZYNGIER <zyngier@ufr-info-p7.ibp.fr> or <maz@gloups.fdn.fr> - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + You should have received a copy of the GNU General Public License (for example /usr/src/linux/COPYING); if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef _MD_H @@ -271,5 +271,5 @@ extern void md_unregister_thread (struct md_thread *thread); extern void md_wakeup_thread(struct md_thread *thread); extern int md_update_sb (int minor); -#endif __KERNEL__ -#endif _MD_H +#endif /* __KERNEL__ */ +#endif /* _MD_H */ @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 1995 The University of Utah and * the Computer Systems Laboratory at the University of Utah (CSL). * All rights reserved. @@ -38,4 +38,4 @@ int dummy; extern struct cpu cpu[NCPUS]; -#endif _UTIL_CPU_H_ +#endif /* _UTIL_CPU_H_ */ diff --git a/vm/memory_object.c b/vm/memory_object.c index a2b0bed8..c01b740b 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -67,11 +67,11 @@ #include <norma_ipc.h> #if NORMA_VM #include <norma/xmm_server_rename.h> -#endif NORMA_VM +#endif /* NORMA_VM */ #include <mach_pagemap.h> #if MACH_PAGEMAP -#include <vm/vm_external.h> -#endif MACH_PAGEMAP +#include <vm/vm_external.h> +#endif /* MACH_PAGEMAP */ typedef int memory_object_lock_result_t; /* moved from below */ @@ -102,7 +102,7 @@ kern_return_t memory_object_data_provided(object, offset, data, data_cnt, data_cnt, lock_value, FALSE, IP_NULL, 0); } -#endif !NORMA_VM +#endif /* !NORMA_VM */ kern_return_t memory_object_data_supply(object, offset, data_copy, data_cnt, @@ -382,7 +382,7 @@ kern_return_t memory_object_data_unavailable(object, offset, size) { #if MACH_PAGEMAP vm_external_t existence_info = VM_EXTERNAL_NULL; -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ if (object == VM_OBJECT_NULL) return(KERN_INVALID_ARGUMENT); @@ -391,11 +391,11 @@ kern_return_t memory_object_data_unavailable(object, offset, size) return(KERN_INVALID_ARGUMENT); #if MACH_PAGEMAP - if ((offset == 0) && (size > VM_EXTERNAL_LARGE_SIZE) && + if ((offset == 0) && (size > VM_EXTERNAL_LARGE_SIZE) && (object->existence_info == VM_EXTERNAL_NULL)) { existence_info = vm_external_create(VM_EXTERNAL_SMALL_SIZE); } -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ vm_object_lock(object); #if MACH_PAGEMAP @@ -407,7 +407,7 @@ kern_return_t memory_object_data_unavailable(object, offset, size) vm_object_deallocate(object); return(KERN_SUCCESS); } -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ offset -= object->paging_offset; while (size != 0) { @@ -500,7 +500,7 @@ memory_object_lock_result_t memory_object_lock_page(m, should_return, * Page is not dirty [2 checks] AND ( * Page is not precious OR * No request to return precious pages )) - * + * * Now isn't that straightforward and obvious ?? ;-) * * XXX This doesn't handle sending a copy of a wired @@ -898,7 +898,7 @@ MACRO_END #if !NORMA_VM /* - * Old version of memory_object_lock_request. + * Old version of memory_object_lock_request. */ kern_return_t xxx_memory_object_lock_request(object, offset, size, @@ -924,8 +924,8 @@ xxx_memory_object_lock_request(object, offset, size, should_return, should_flush, prot, reply_to, reply_to_type)); } -#endif !NORMA_VM - +#endif /* !NORMA_VM */ + kern_return_t memory_object_set_attributes_common(object, object_ready, may_cache, copy_strategy, use_old_pageout) @@ -1052,7 +1052,7 @@ kern_return_t memory_object_ready(object, may_cache, copy_strategy) may_cache, copy_strategy, FALSE); } -#endif !NORMA_VM +#endif /* !NORMA_VM */ kern_return_t memory_object_get_attributes(object, object_ready, may_cache, copy_strategy) diff --git a/vm/memory_object.h b/vm/memory_object.h index 9afa0623..bce3f29e 100644 --- a/vm/memory_object.h +++ b/vm/memory_object.h @@ -1,25 +1,25 @@ -/* +/* * 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 + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS * 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 the * rights to redistribute these changes. */ @@ -40,4 +40,4 @@ extern void memory_manager_default_init(); extern struct ipc_port *memory_manager_default; -#endif _VM_MEMORY_OBJECT_H_ +#endif /* _VM_MEMORY_OBJECT_H_ */ @@ -103,7 +103,7 @@ extern void pmap_virtual_space(); /* During VM initialization, * report virtual space * available for the kernel. */ -#endif MACHINE_PAGES +#endif /* MACHINE_PAGES */ /* * Routines to manage the physical map data structure. @@ -115,10 +115,10 @@ pmap_t pmap_create(vm_size_t size); /* Return the kernel's pmap_t. */ #ifndef pmap_kernel extern pmap_t pmap_kernel(void); -#endif pmap_kernel +#endif /* pmap_kernel */ /* Gain and release a reference. */ -extern void pmap_reference(pmap_t pmap); +extern void pmap_reference(pmap_t pmap); extern void pmap_destroy(pmap_t pmap); /* Enter a mapping */ @@ -166,7 +166,7 @@ void pmap_clear_reference(vm_offset_t pa); /* Return reference bit */ #ifndef pmap_is_referenced boolean_t pmap_is_referenced(vm_offset_t pa); -#endif pmap_is_referenced +#endif /* pmap_is_referenced */ /* Clear modify bit */ void pmap_clear_modify(vm_offset_t pa); @@ -182,7 +182,7 @@ extern void pmap_statistics(); /* Return statistics */ #ifndef pmap_resident_count extern int pmap_resident_count(); -#endif pmap_resident_count +#endif /* pmap_resident_count */ /* * Sundry required routines @@ -206,7 +206,7 @@ extern vm_offset_t pmap_phys_address(); /* Transform address * to physical address * known to this module. */ -#endif pmap_phys_address +#endif /* pmap_phys_address */ #ifndef pmap_phys_to_frame extern int pmap_phys_to_frame(); /* Inverse of * pmap_phys_address, @@ -215,7 +215,7 @@ extern int pmap_phys_to_frame(); /* Inverse of * machine-independent * pseudo-devices. */ -#endif pmap_phys_to_frame +#endif /* pmap_phys_to_frame */ /* * Optional routines @@ -224,12 +224,12 @@ extern int pmap_phys_to_frame(); /* Inverse of extern void pmap_copy(); /* Copy range of * mappings, if desired. */ -#endif pmap_copy +#endif /* pmap_copy */ #ifndef pmap_attribute extern kern_return_t pmap_attribute(); /* Get/Set special * memory attributes */ -#endif pmap_attribute +#endif /* pmap_attribute */ /* * Routines defined as macros. @@ -239,24 +239,24 @@ extern kern_return_t pmap_attribute(); /* Get/Set special if ((pmap) != kernel_pmap) \ PMAP_ACTIVATE(pmap, thread, cpu); \ } -#endif PMAP_ACTIVATE_USER +#endif /* PMAP_ACTIVATE_USER */ #ifndef PMAP_DEACTIVATE_USER #define PMAP_DEACTIVATE_USER(pmap, thread, cpu) { \ if ((pmap) != kernel_pmap) \ PMAP_DEACTIVATE(pmap, thread, cpu); \ } -#endif PMAP_DEACTIVATE_USER +#endif /* PMAP_DEACTIVATE_USER */ #ifndef PMAP_ACTIVATE_KERNEL #define PMAP_ACTIVATE_KERNEL(cpu) \ PMAP_ACTIVATE(kernel_pmap, THREAD_NULL, cpu) -#endif PMAP_ACTIVATE_KERNEL +#endif /* PMAP_ACTIVATE_KERNEL */ #ifndef PMAP_DEACTIVATE_KERNEL #define PMAP_DEACTIVATE_KERNEL(cpu) \ PMAP_DEACTIVATE(kernel_pmap, THREAD_NULL, cpu) -#endif PMAP_DEACTIVATE_KERNEL +#endif /* PMAP_DEACTIVATE_KERNEL */ /* * Exported data structures @@ -264,4 +264,4 @@ extern kern_return_t pmap_attribute(); /* Get/Set special extern pmap_t kernel_pmap; /* The kernel's map */ -#endif _VM_PMAP_H_ +#endif /* _VM_PMAP_H_ */ diff --git a/vm/vm_debug.c b/vm/vm_debug.c index 17c8c311..16165ca0 100644 --- a/vm/vm_debug.c +++ b/vm/vm_debug.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. */ @@ -417,7 +417,7 @@ mach_vm_object_pages(object, pagesp, countp) return KERN_SUCCESS; } -#endif MACH_VM_DEBUG +#endif /* MACH_VM_DEBUG */ /* * Routine: host_virtual_physical_table_info diff --git a/vm/vm_external.h b/vm/vm_external.h index 70ffd650..b2636798 100644 --- a/vm/vm_external.h +++ b/vm/vm_external.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. */ @@ -86,4 +86,4 @@ extern void vm_external_state_set();/* Set state of a page. */ extern vm_external_state_t _vm_external_state_get(); /* HIDDEN routine */ -#endif _VM_VM_EXTERNAL_H_ +#endif /* _VM_VM_EXTERNAL_H_ */ diff --git a/vm/vm_fault.c b/vm/vm_fault.c index a74d41b9..42108ed3 100644 --- a/vm/vm_fault.c +++ b/vm/vm_fault.c @@ -100,7 +100,7 @@ boolean_t software_reference_bits = TRUE; #if MACH_KDB extern struct db_watchpoint *db_watchpoint_list; -#endif MACH_KDB +#endif /* MACH_KDB */ /* * Routine: vm_fault_init @@ -286,7 +286,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, * so that the watchpoint code notices the access. */ || db_watchpoint_list -#endif MACH_KDB +#endif /* MACH_KDB */ ) { /* * If we aren't asking for write permission, @@ -481,7 +481,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, vm_page_zero_fill(m); vm_stat_sample(SAMPLED_PC_VM_ZFILL_FAULTS); - + vm_stat.zero_fill_count++; vm_object_lock(object); pmap_clear_modify(m->phys_addr); @@ -519,7 +519,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, if ((access_required & m->unlock_request) != access_required) { vm_prot_t new_unlock_request; kern_return_t rc; - + if (!object->pager_ready) { vm_object_assert_wait(object, VM_OBJECT_EVENT_PAGER_READY, @@ -581,7 +581,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, #if MACH_PAGEMAP && (vm_external_state_get(object->existence_info, offset + object->paging_offset) != VM_EXTERNAL_STATE_ABSENT) -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ ; if ((look_for_page || (object == first_object)) @@ -664,16 +664,16 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, vm_stat.pageins++; vm_stat_sample(SAMPLED_PC_VM_PAGEIN_FAULTS); - if ((rc = memory_object_data_request(object->pager, + if ((rc = memory_object_data_request(object->pager, object->pager_request, - m->offset + object->paging_offset, + m->offset + object->paging_offset, PAGE_SIZE, access_required)) != KERN_SUCCESS) { if (rc != MACH_SEND_INTERRUPTED) printf("%s(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) failed, %d\n", "memory_object_data_request", object->pager, object->pager_request, - m->offset + object->paging_offset, + m->offset + object->paging_offset, PAGE_SIZE, access_required, rc); /* * Don't want to leave a busy page around, @@ -689,7 +689,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, VM_FAULT_INTERRUPTED : VM_FAULT_MEMORY_ERROR); } - + /* * Retry with same object/offset, since new data may * be in a different page (i.e., m is meaningless at @@ -789,7 +789,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, assert((first_m == VM_PAGE_NULL) || (first_m->busy && !first_m->absent && !first_m->active && !first_m->inactive)); -#endif EXTRA_ASSERTIONS +#endif /* EXTRA_ASSERTIONS */ /* * If the page is being written, but isn't @@ -983,7 +983,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, */ vm_page_copy(m, copy_m); - + /* * If the old page was in use by any users * of the copy-object, it must be removed @@ -1059,7 +1059,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, * wait result]. Can't turn off the page's * busy bit because we're not done with it. */ - + if (m->wanted) { m->wanted = FALSE; thread_wakeup_with_result((event_t) m, @@ -1749,7 +1749,7 @@ kern_return_t vm_fault_wire_fast(map, va, entry) /* * Wire the page down now. All bail outs beyond this - * point must unwire the page. + * point must unwire the page. */ vm_page_lock_queues(); @@ -1774,7 +1774,7 @@ kern_return_t vm_fault_wire_fast(map, va, entry) /* * Put this page into the physical map. * We have to unlock the object because pmap_enter - * may cause other faults. + * may cause other faults. */ vm_object_unlock(object); @@ -1865,7 +1865,7 @@ kern_return_t vm_fault_copy( { vm_page_t result_page; vm_prot_t prot; - + vm_page_t src_page; vm_page_t src_top_page; @@ -2020,7 +2020,7 @@ kern_return_t vm_fault_copy( RETURN(KERN_SUCCESS); #undef RETURN - /*NOTREACHED*/ + /*NOTREACHED*/ } @@ -2179,4 +2179,4 @@ vm_fault_return_t vm_fault_page_overwrite(dst_object, dst_offset, result_page) #undef DISCARD_PAGE } -#endif notdef +#endif /* notdef */ diff --git a/vm/vm_fault.h b/vm/vm_fault.h index eee39994..5be18e5c 100644 --- a/vm/vm_fault.h +++ b/vm/vm_fault.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -61,4 +61,4 @@ extern void vm_fault_unwire(); extern kern_return_t vm_fault_copy(); /* Copy pages from * one object to another */ -#endif _VM_VM_FAULT_H_ +#endif /* _VM_VM_FAULT_H_ */ diff --git a/vm/vm_kern.h b/vm/vm_kern.h index 8e00fcce..3ae46414 100644 --- a/vm/vm_kern.h +++ b/vm/vm_kern.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -60,4 +60,4 @@ extern vm_map_t kernel_map; extern vm_map_t kernel_pageable_map; extern vm_map_t ipc_kernel_map; -#endif _VM_VM_KERN_H_ +#endif /* _VM_VM_KERN_H_ */ diff --git a/vm/vm_map.c b/vm/vm_map.c index 8d17a49a..c060196c 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -89,7 +89,7 @@ MACRO_END * selected by the (new) use_shared_copy bit in the object. See * vm_object_copy_temporary in vm_object.c for details. All maps * are now "top level" maps (either task map, kernel map or submap - * of the kernel map). + * of the kernel map). * * Since portions of maps are specified by start/end addreses, * which may not align with existing map entries, all @@ -644,7 +644,7 @@ int vm_map_pmap_enter_enable = FALSE; * As soon as a page not found in the object the scan ends. * * Returns: - * Nothing. + * Nothing. * * In/out conditions: * The source map should not be locked on entry. @@ -797,7 +797,7 @@ kern_return_t vm_map_enter( goto StartAgain; } } - + RETURN(KERN_NO_SPACE); } @@ -895,7 +895,7 @@ kern_return_t vm_map_enter( (entry->protection == cur_protection) && (entry->max_protection == max_protection) && (entry->wired_count == 0) && /* implies user_wired_count == 0 */ - (entry->projected_on == 0)) { + (entry->projected_on == 0)) { if (vm_object_coalesce(entry->object.vm_object, VM_OBJECT_NULL, entry->offset, @@ -966,9 +966,9 @@ kern_return_t vm_map_enter( if ((object != VM_OBJECT_NULL) && (vm_map_pmap_enter_enable) && (!anywhere) && - (!needs_copy) && + (!needs_copy) && (size < (128*1024))) { - vm_map_pmap_enter(map, start, end, + vm_map_pmap_enter(map, start, end, object, offset, cur_protection); } @@ -1353,7 +1353,7 @@ kern_return_t vm_map_pageable_common(map, start, end, access_type, user_wire) (entry->vme_start < end)) { if ((entry->wired_count == 0) || - ((entry->vme_end < end) && + ((entry->vme_end < end) && ((entry->vme_next == vm_map_to_entry(map)) || (entry->vme_next->vme_start > entry->vme_end))) || (user_wire && (entry->user_wired_count == 0))) { @@ -1380,7 +1380,7 @@ kern_return_t vm_map_pageable_common(map, start, end, access_type, user_wire) else { entry->wired_count--; } - + if (entry->wired_count == 0) vm_fault_unwire(map, entry); @@ -1442,7 +1442,7 @@ kern_return_t vm_map_pageable_common(map, start, end, access_type, user_wire) if (entry->object.vm_object == VM_OBJECT_NULL) { entry->object.vm_object = vm_object_allocate( - (vm_size_t)(entry->vme_end + (vm_size_t)(entry->vme_end - entry->vme_start)); entry->offset = (vm_offset_t)0; } @@ -1464,7 +1464,7 @@ kern_return_t vm_map_pageable_common(map, start, end, access_type, user_wire) * this is the end of the region. * Protection: Access requested must be allowed. */ - if (((entry->vme_end < end) && + if (((entry->vme_end < end) && ((entry->vme_next == vm_map_to_entry(map)) || (entry->vme_next->vme_start > entry->vme_end))) || ((entry->protection & access_type) != access_type)) { @@ -1556,7 +1556,7 @@ kern_return_t vm_map_pageable_common(map, start, end, access_type, user_wire) * vm_map_entry_delete: [ internal use only ] * * Deallocate the given entry from the target map. - */ + */ void vm_map_entry_delete(map, entry) register vm_map_t map; register vm_map_entry_t entry; @@ -1717,7 +1717,7 @@ kern_return_t vm_map_delete(map, start, end) } return KERN_SUCCESS; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ vm_map_clip_start(map, entry, start); /* @@ -2202,7 +2202,7 @@ start_pass_1: /* * XXXO If there are no permanent objects in the destination, * XXXO and the source and destination map entry zones match, - * XXXO and the destination map entry is not shared, + * XXXO and the destination map entry is not shared, * XXXO then the map entries can be deleted and replaced * XXXO with those from the copy. The following code is the * XXXO basic idea of what to do, but there are lots of annoying @@ -2243,7 +2243,7 @@ start_pass_1: vm_map_entry_t copy_entry = vm_map_copy_first_entry(copy); vm_size_t copy_size = (copy_entry->vme_end - copy_entry->vme_start); vm_object_t object; - + entry = tmp_entry; size = (entry->vme_end - entry->vme_start); /* @@ -2428,7 +2428,7 @@ start_pass_1: /* * Macro: vm_map_copy_insert - * + * * Description: * Link a copy chain ("copy") into a map at the * specified location (after "where"). @@ -2811,7 +2811,7 @@ StartAgain: (last->wired_count != 0))) { goto create_object; } - + /* * If this entry needs an object, make one. */ @@ -2913,7 +2913,7 @@ create_object: entry->vme_start = start; entry->vme_end = start + size; - + entry->inheritance = VM_INHERIT_DEFAULT; entry->protection = VM_PROT_DEFAULT; entry->max_protection = VM_PROT_ALL; @@ -2937,7 +2937,7 @@ create_object: last = entry; /* - * Transfer pages into new object. + * Transfer pages into new object. * Scan page list in vm_map_copy. */ insert_pages: @@ -3028,7 +3028,7 @@ insert_pages: vm_object_unlock(object); *dst_addr = start + dst_offset; - + /* * Clear the in transition bits. This is easy if we * didn't have a continuation. @@ -3062,7 +3062,7 @@ error: entry = entry->vme_next; } } - + if (result != KERN_SUCCESS) vm_map_delete(dst_map, start, end); @@ -3080,7 +3080,7 @@ error: if (result == KERN_SUCCESS) { zfree(vm_map_copy_zone, (vm_offset_t) orig_copy); } - + return(result); } @@ -3151,7 +3151,7 @@ kern_return_t vm_map_copyin(src_map, src_addr, len, src_destroy, copy_result) /* * Allocate a header element for the list. * - * Use the start and end in the header to + * Use the start and end in the header to * remember the endpoints prior to rounding. */ @@ -3164,7 +3164,7 @@ kern_return_t vm_map_copyin(src_map, src_addr, len, src_destroy, copy_result) copy->offset = src_addr; copy->size = len; - + #define RETURN(x) \ MACRO_BEGIN \ vm_map_unlock(src_map); \ @@ -3345,7 +3345,7 @@ kern_return_t vm_map_copyin(src_map, src_addr, len, src_destroy, copy_result) &new_entry_needs_copy); new_entry->needs_copy = new_entry_needs_copy; - + if (result != KERN_SUCCESS) { vm_map_copy_entry_dispose(copy, new_entry); @@ -3427,7 +3427,7 @@ kern_return_t vm_map_copyin(src_map, src_addr, len, src_destroy, copy_result) vm_map_copy_entry_link(copy, vm_map_copy_last_entry(copy), new_entry); - + /* * Determine whether the entire region * has been copied. @@ -3447,7 +3447,7 @@ kern_return_t vm_map_copyin(src_map, src_addr, len, src_destroy, copy_result) /* * If the source should be destroyed, do it now, since the - * copy was successful. + * copy was successful. */ if (src_destroy) (void) vm_map_delete(src_map, trunc_page(src_addr), src_end); @@ -3498,7 +3498,7 @@ kern_return_t vm_map_copyin_object(object, offset, size, copy_result) * vm_map_copyin_page_list_cont: * * Continuation routine for vm_map_copyin_page_list. - * + * * If vm_map_copyin_page_list can't fit the entire vm range * into a single page list object, it creates a continuation. * When the target of the operation has used the pages in the @@ -3527,7 +3527,7 @@ vm_map_copy_t *copy_result; /* OUT */ src_destroy_only = (cont_args->src_len == (vm_size_t) 0); if (do_abort || src_destroy_only) { - if (src_destroy) + if (src_destroy) result = vm_map_remove(cont_args->map, cont_args->destroy_addr, cont_args->destroy_addr + cont_args->destroy_len); @@ -3551,7 +3551,7 @@ vm_map_copy_t *copy_result; /* OUT */ new_args->destroy_len = cont_args->destroy_len; } } - + vm_map_deallocate(cont_args->map); kfree((vm_offset_t)cont_args, sizeof(vm_map_copyin_args_data_t)); @@ -3644,7 +3644,7 @@ kern_return_t vm_map_copyin_page_list(src_map, src_addr, len, src_destroy, copy->size = len; copy->cpy_cont = ((kern_return_t (*)()) 0); copy->cpy_cont_args = (char *) VM_MAP_COPYIN_ARGS_NULL; - + /* * Find the beginning of the region. */ @@ -3717,7 +3717,7 @@ make_continuation: * something stupid. */ - cont_args = (vm_map_copyin_args_t) + cont_args = (vm_map_copyin_args_t) kalloc(sizeof(vm_map_copyin_args_data_t)); cont_args->map = src_map; vm_map_reference(src_map); @@ -3791,7 +3791,7 @@ make_continuation: vm_prot_t result_prot; vm_page_t top_page; kern_return_t kr; - + /* * Have to fault the page in; must * unlock the map to do so. While @@ -3803,7 +3803,7 @@ make_continuation: need_map_lookup = TRUE; retry: result_prot = VM_PROT_READ; - + kr = vm_fault_page(src_object, src_offset, VM_PROT_READ, FALSE, FALSE, &result_prot, &m, &top_page, @@ -3847,7 +3847,7 @@ retry: result = KERN_MEMORY_ERROR; goto error; } - + if (top_page != VM_PAGE_NULL) { vm_object_lock(src_object); VM_PAGE_FREE(top_page); @@ -3872,13 +3872,13 @@ retry: * we have a paging reference on it. Either * the map is locked, or need_map_lookup is * TRUE. - * + * * Put the page in the page list. */ copy->cpy_page_list[copy->cpy_npages++] = m; vm_object_unlock(m->object); } - + /* * DETERMINE whether the entire region * has been copied. @@ -3932,7 +3932,7 @@ retry: * Remove the page from its object if it * can be stolen. It can be stolen if: * - * (1) The source is being destroyed, + * (1) The source is being destroyed, * the object is temporary, and * not shared. * (2) The page is not precious. @@ -3950,7 +3950,7 @@ retry: * * Stealing wired pages requires telling the * pmap module to let go of them. - * + * * NOTE: stealing clean pages from objects * whose mappings survive requires a call to * the pmap module. Maybe later. @@ -3965,7 +3965,7 @@ retry: (!src_object->use_shared_copy) && !m->precious) { vm_offset_t page_vaddr; - + page_vaddr = src_start + (i * PAGE_SIZE); if (m->wire_count > 0) { @@ -4063,7 +4063,7 @@ retry: * a continuation to prevent this. */ if (src_destroy && !vm_map_copy_has_cont(copy)) { - cont_args = (vm_map_copyin_args_t) + cont_args = (vm_map_copyin_args_t) kalloc(sizeof(vm_map_copyin_args_data_t)); vm_map_reference(src_map); cont_args->map = src_map; @@ -4076,7 +4076,7 @@ retry: copy->cpy_cont_args = (char *) cont_args; copy->cpy_cont = vm_map_copyin_page_list_cont; } - + } vm_map_unlock(src_map); @@ -4165,7 +4165,7 @@ vm_map_t vm_map_fork(old_map) &old_entry->offset, (vm_size_t) (old_entry->vme_end - old_entry->vme_start)); - + /* * If we're making a shadow for other than * copy on write reasons, then we have @@ -4302,7 +4302,7 @@ vm_map_t vm_map_fork(old_map) start, entry_size, FALSE, - ©) + ©) != KERN_SUCCESS) { vm_map_lock(old_map); if (!vm_map_lookup_entry(old_map, start, &last)) @@ -4436,7 +4436,7 @@ kern_return_t vm_map_lookup(var_map, vaddr, fault_type, out_version, vm_map_unlock_read(old_map); goto RetryLookup; } - + /* * Check whether this task is allowed to have * this page. @@ -4444,7 +4444,7 @@ kern_return_t vm_map_lookup(var_map, vaddr, fault_type, out_version, prot = entry->protection; - if ((fault_type & (prot)) != fault_type) + if ((fault_type & (prot)) != fault_type) if ((prot & VM_PROT_NOTIFY) && (fault_type & VM_PROT_WRITE)) { RETURN(KERN_WRITE_PROTECTION_FAILURE); } else { @@ -4489,9 +4489,9 @@ kern_return_t vm_map_lookup(var_map, vaddr, fault_type, out_version, &entry->object.vm_object, &entry->offset, (vm_size_t) (entry->vme_end - entry->vme_start)); - + entry->needs_copy = FALSE; - + vm_map_lock_write_to_read(map); } else { @@ -4542,7 +4542,7 @@ kern_return_t vm_map_lookup(var_map, vaddr, fault_type, out_version, out_version->main_timestamp = map->timestamp; RETURN(KERN_SUCCESS); - + #undef RETURN } @@ -4692,7 +4692,7 @@ void vm_map_simplify(map, start) ((prev_entry->offset + (prev_entry->vme_end - prev_entry->vme_start)) == this_entry->offset) && (prev_entry->projected_on == 0) && - (this_entry->projected_on == 0) + (this_entry->projected_on == 0) ) { if (map->first_free == this_entry) map->first_free = prev_entry; @@ -4837,11 +4837,11 @@ void vm_map_copy_print(copy) case VM_MAP_COPY_ENTRY_LIST: printf("[entry_list]"); break; - + case VM_MAP_COPY_OBJECT: printf("[object]"); break; - + case VM_MAP_COPY_PAGE_LIST: printf("[page_list]"); break; @@ -4886,7 +4886,7 @@ void vm_map_copy_print(copy) indent -=2; } -#endif MACH_KDB +#endif /* MACH_KDB */ #if NORMA_IPC /* @@ -4904,7 +4904,7 @@ void vm_map_copy_print(copy) * We take responsibility for discarding the old structure and * use a continuation to do so. Postponing this discard ensures * that the objects containing the pages we've marked busy will stick - * around. + * around. */ kern_return_t vm_map_convert_to_page_list(caller_copy) @@ -5024,10 +5024,10 @@ vm_map_convert_to_page_list(caller_copy) vm_prot_t result_prot; vm_page_t top_page; kern_return_t kr; - + retry: result_prot = VM_PROT_READ; - + kr = vm_fault_page(object, offset, VM_PROT_READ, FALSE, FALSE, &result_prot, &m, &top_page, @@ -5104,7 +5104,7 @@ vm_map_convert_to_page_list_from_object(caller_copy) m = vm_page_lookup(object, offset); if ((m != VM_PAGE_NULL) && !m->busy && !m->fictitious && !m->absent && !m->error) { - + /* * This is the page. Mark it busy * and keep the paging reference on @@ -5116,10 +5116,10 @@ vm_map_convert_to_page_list_from_object(caller_copy) vm_prot_t result_prot; vm_page_t top_page; kern_return_t kr; - + retry: result_prot = VM_PROT_READ; - + kr = vm_fault_page(object, offset, VM_PROT_READ, FALSE, FALSE, &result_prot, &m, &top_page, @@ -5136,7 +5136,7 @@ retry: vm_object_paging_begin(object); goto retry; } - + if (top_page != VM_PAGE_NULL) { vm_object_lock(object); VM_PAGE_FREE(top_page); @@ -5241,4 +5241,4 @@ vm_map_convert_from_page_list(copy) vm_map_copy_entry_link(copy, vm_map_copy_last_entry(copy), new_entry); return(KERN_SUCCESS); } -#endif NORMA_IPC +#endif /* NORMA_IPC */ diff --git a/vm/vm_map.h b/vm/vm_map.h index 0bdb7d13..3e0246b8 100644 --- a/vm/vm_map.h +++ b/vm/vm_map.h @@ -209,7 +209,7 @@ typedef struct vm_map_version { * at a time. * * Implementation: - * There are three formats for map copy objects. + * There are three formats for map copy objects. * The first is very similar to the main * address map in structure, and as a result, some * of the internal maintenance functions/macros can @@ -230,9 +230,9 @@ typedef struct vm_map_version { #if iPSC386 || iPSC860 #define VM_MAP_COPY_PAGE_LIST_MAX 64 -#else iPSC386 || iPSC860 +#else /* iPSC386 || iPSC860 */ #define VM_MAP_COPY_PAGE_LIST_MAX 8 -#endif iPSC386 || iPSC860 +#endif /* iPSC386 || iPSC860 */ typedef struct vm_map_copy { int type; @@ -445,4 +445,4 @@ extern vm_object_t vm_submap_object; #define vm_map_entry_wakeup(map) thread_wakeup((event_t)&(map)->hdr) -#endif _VM_VM_MAP_H_ +#endif /* _VM_VM_MAP_H_ */ diff --git a/vm/vm_object.h b/vm/vm_object.h index d3d050a0..d710d990 100644 --- a/vm/vm_object.h +++ b/vm/vm_object.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1993-1987 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. */ @@ -74,7 +74,7 @@ struct vm_object { decl_simple_lock_data(, Lock) /* Synchronization */ #if VM_OBJECT_DEBUG thread_t LockHolder; /* Thread holding Lock */ -#endif VM_OBJECT_DEBUG +#endif /* VM_OBJECT_DEBUG */ vm_size_t size; /* Object size (only valid * if internal) */ @@ -152,7 +152,7 @@ struct vm_object { * progress restart search? */ /* boolean_t */ use_old_pageout : 1, - /* Use old pageout primitives? + /* Use old pageout primitives? */ /* boolean_t */ use_shared_copy : 1,/* Use shared (i.e., * delayed) copy on write */ @@ -237,10 +237,10 @@ extern void vm_object_pager_create( extern void vm_object_destroy( struct ipc_port *pager); -extern void vm_object_page_map( - vm_object_t, - vm_offset_t, - vm_size_t, +extern void vm_object_page_map( + vm_object_t, + vm_offset_t, + vm_size_t, vm_offset_t (*)(void *, vm_offset_t), void *); diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c index af605ac7..f15e5084 100644 --- a/vm/vm_pageout.c +++ b/vm/vm_pageout.c @@ -56,23 +56,23 @@ #ifndef VM_PAGEOUT_BURST_MAX #define VM_PAGEOUT_BURST_MAX 10 /* number of pages */ -#endif VM_PAGEOUT_BURST_MAX +#endif /* VM_PAGEOUT_BURST_MAX */ #ifndef VM_PAGEOUT_BURST_MIN #define VM_PAGEOUT_BURST_MIN 5 /* number of pages */ -#endif VM_PAGEOUT_BURST_MIN +#endif /* VM_PAGEOUT_BURST_MIN */ #ifndef VM_PAGEOUT_BURST_WAIT #define VM_PAGEOUT_BURST_WAIT 10 /* milliseconds per page */ -#endif VM_PAGEOUT_BURST_WAIT +#endif /* VM_PAGEOUT_BURST_WAIT */ #ifndef VM_PAGEOUT_EMPTY_WAIT #define VM_PAGEOUT_EMPTY_WAIT 75 /* milliseconds */ -#endif VM_PAGEOUT_EMPTY_WAIT +#endif /* VM_PAGEOUT_EMPTY_WAIT */ #ifndef VM_PAGEOUT_PAUSE_MAX #define VM_PAGEOUT_PAUSE_MAX 10 /* number of pauses */ -#endif VM_PAGEOUT_PAUSE_MAX +#endif /* VM_PAGEOUT_PAUSE_MAX */ /* * To obtain a reasonable LRU approximation, the inactive queue @@ -88,7 +88,7 @@ #ifndef VM_PAGE_INACTIVE_TARGET #define VM_PAGE_INACTIVE_TARGET(avail) ((avail) * 2 / 3) -#endif VM_PAGE_INACTIVE_TARGET +#endif /* VM_PAGE_INACTIVE_TARGET */ /* * Once the pageout daemon starts running, it keeps going @@ -97,7 +97,7 @@ #ifndef VM_PAGE_FREE_TARGET #define VM_PAGE_FREE_TARGET(free) (15 + (free) / 80) -#endif VM_PAGE_FREE_TARGET +#endif /* VM_PAGE_FREE_TARGET */ /* * The pageout daemon always starts running once vm_page_free_count @@ -106,7 +106,7 @@ #ifndef VM_PAGE_FREE_MIN #define VM_PAGE_FREE_MIN(free) (10 + (free) / 100) -#endif VM_PAGE_FREE_MIN +#endif /* VM_PAGE_FREE_MIN */ /* When vm_page_external_count exceeds vm_page_external_limit, * allocations of externally paged pages stops. @@ -114,14 +114,14 @@ #ifndef VM_PAGE_EXTERNAL_LIMIT #define VM_PAGE_EXTERNAL_LIMIT(free) ((free) / 2) -#endif VM_PAGE_EXTERNAL_LIMIT +#endif /* VM_PAGE_EXTERNAL_LIMIT */ /* Attempt to keep the number of externally paged pages less * than vm_pages_external_target. */ #ifndef VM_PAGE_EXTERNAL_TARGET #define VM_PAGE_EXTERNAL_TARGET(free) ((free) / 4) -#endif VM_PAGE_EXTERNAL_TARGET +#endif /* VM_PAGE_EXTERNAL_TARGET */ /* * When vm_page_free_count falls below vm_page_free_reserved, @@ -132,7 +132,7 @@ #ifndef VM_PAGE_FREE_RESERVED #define VM_PAGE_FREE_RESERVED 50 -#endif VM_PAGE_FREE_RESERVED +#endif /* VM_PAGE_FREE_RESERVED */ /* * When vm_page_free_count falls below vm_pageout_reserved_internal, @@ -144,7 +144,7 @@ #ifndef VM_PAGEOUT_RESERVED_INTERNAL #define VM_PAGEOUT_RESERVED_INTERNAL(reserve) ((reserve) - 25) -#endif VM_PAGEOUT_RESERVED_INTERNAL +#endif /* VM_PAGEOUT_RESERVED_INTERNAL */ /* * When vm_page_free_count falls below vm_pageout_reserved_really, @@ -156,7 +156,7 @@ #ifndef VM_PAGEOUT_RESERVED_REALLY #define VM_PAGEOUT_RESERVED_REALLY(reserve) ((reserve) - 40) -#endif VM_PAGEOUT_RESERVED_REALLY +#endif /* VM_PAGEOUT_RESERVED_REALLY */ extern void vm_pageout_continue(); extern void vm_pageout_scan_continue(); @@ -196,7 +196,7 @@ unsigned int vm_pageout_inactive_cleaned_external = 0; */ extern kern_return_t memory_object_data_initialize(); extern kern_return_t memory_object_data_write(); -#endif NORMA_VM +#endif /* NORMA_VM */ /* * Routine: vm_pageout_setup @@ -289,7 +289,7 @@ vm_pageout_setup(m, paging_offset, new_object, new_offset, flush) vm_external_state_set(old_object->existence_info, paging_offset, VM_EXTERNAL_STATE_EXISTS); -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ vm_object_unlock(old_object); @@ -336,7 +336,7 @@ vm_pageout_setup(m, paging_offset, new_object, new_offset, flush) vm_external_state_set(old_object->existence_info, paging_offset, VM_EXTERNAL_STATE_EXISTS); -#endif MACH_PAGEMAP +#endif /* MACH_PAGEMAP */ vm_object_unlock(old_object); diff --git a/vm/vm_pageout.h b/vm/vm_pageout.h index 5b47a5e0..946c68ba 100644 --- a/vm/vm_pageout.h +++ b/vm/vm_pageout.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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. */ @@ -43,4 +43,4 @@ extern vm_page_t vm_pageout_setup(); extern void vm_pageout_page(); -#endif _VM_VM_PAGEOUT_H_ +#endif /* _VM_VM_PAGEOUT_H_ */ diff --git a/vm/vm_user.h b/vm/vm_user.h index f8740107..85fc6a55 100644 --- a/vm/vm_user.h +++ b/vm/vm_user.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 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,4 +47,4 @@ extern kern_return_t vm_write(); extern kern_return_t vm_copy(); extern kern_return_t vm_map(); -#endif _VM_VM_USER_H_ +#endif /* _VM_VM_USER_H_ */ |