From b42bd0d675ec7d1e1fbbf274fadbea984c8dab22 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 5 Apr 2001 06:39:21 +0000 Subject: 2001-04-04 Roland McGrath * 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. --- i386/i386at/kd_mouse.c | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'i386/i386at/kd_mouse.c') diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c index 28114d4..0c104d3 100644 --- a/i386/i386at/kd_mouse.c +++ b/i386/i386at/kd_mouse.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -69,7 +69,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef MACH_KERNEL #include #include -#else MACH_KERNEL +#else /* MACH_KERNEL */ #include #include #include @@ -78,7 +78,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#endif MACH_KERNEL +#endif /* MACH_KERNEL */ #include #include #include @@ -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 */ } -- cgit v1.2.3