aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 08:16:23 +0000
committerRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 08:16:23 +0000
commit9b2e535452929d6f2f798a2c01b23b1f547a0b0f (patch)
tree176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys
parent44204187ec133a0ab7bd77c8d974ad5afd4d88b4 (diff)
downloadsrc-9b2e535452929d6f2f798a2c01b23b1f547a0b0f.tar.gz
src-9b2e535452929d6f2f798a2c01b23b1f547a0b0f.zip
Remove trailing whitespace.
Notes
Notes: svn path=/head/; revision=8876
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/include/console.h10
-rw-r--r--sys/amd64/amd64/autoconf.c6
-rw-r--r--sys/amd64/amd64/db_disasm.c16
-rw-r--r--sys/amd64/amd64/db_interface.c16
-rw-r--r--sys/amd64/amd64/db_trace.c26
-rw-r--r--sys/amd64/amd64/fpu.c6
-rw-r--r--sys/amd64/amd64/genassym.c6
-rw-r--r--sys/amd64/amd64/machdep.c20
-rw-r--r--sys/amd64/amd64/pmap.c6
-rw-r--r--sys/amd64/amd64/sys_machdep.c6
-rw-r--r--sys/amd64/amd64/trap.c20
-rw-r--r--sys/amd64/amd64/tsc.c18
-rw-r--r--sys/amd64/amd64/vm_machdep.c24
-rw-r--r--sys/amd64/include/cpufunc.h4
-rw-r--r--sys/amd64/include/db_machdep.h14
-rw-r--r--sys/amd64/include/md_var.h4
-rw-r--r--sys/amd64/include/pmap.h8
-rw-r--r--sys/amd64/include/segments.h8
-rw-r--r--sys/amd64/include/specialreg.h4
-rw-r--r--sys/amd64/include/tss.h14
-rw-r--r--sys/amd64/isa/clock.c18
-rw-r--r--sys/amd64/isa/isa.c40
-rw-r--r--sys/amd64/isa/npx.c6
-rw-r--r--sys/conf/Makefile.i3868
-rw-r--r--sys/conf/Makefile.powerpc8
-rw-r--r--sys/ddb/db_access.c18
-rw-r--r--sys/ddb/db_access.h16
-rw-r--r--sys/ddb/db_aout.c20
-rw-r--r--sys/ddb/db_break.c16
-rw-r--r--sys/ddb/db_break.h16
-rw-r--r--sys/ddb/db_command.c16
-rw-r--r--sys/ddb/db_command.h16
-rw-r--r--sys/ddb/db_examine.c16
-rw-r--r--sys/ddb/db_expr.c16
-rw-r--r--sys/ddb/db_input.c18
-rw-r--r--sys/ddb/db_lex.c18
-rw-r--r--sys/ddb/db_lex.h18
-rw-r--r--sys/ddb/db_output.c16
-rw-r--r--sys/ddb/db_output.h16
-rw-r--r--sys/ddb/db_print.c16
-rw-r--r--sys/ddb/db_ps.c4
-rw-r--r--sys/ddb/db_run.c22
-rw-r--r--sys/ddb/db_sym.c16
-rw-r--r--sys/ddb/db_sym.h16
-rw-r--r--sys/ddb/db_trap.c18
-rw-r--r--sys/ddb/db_variables.c16
-rw-r--r--sys/ddb/db_variables.h16
-rw-r--r--sys/ddb/db_watch.c16
-rw-r--r--sys/ddb/db_watch.h16
-rw-r--r--sys/ddb/db_write_cmd.c16
-rw-r--r--sys/ddb/ddb.h6
-rw-r--r--sys/dev/aic7xxx/aic7xxx_asm.c16
-rw-r--r--sys/dev/aic7xxx/aicasm.c16
-rw-r--r--sys/dev/aic7xxx/aicasm/aicasm.c16
-rw-r--r--sys/dev/cy/cy.c16
-rw-r--r--sys/dev/cy/cy_isa.c16
-rw-r--r--sys/dev/de/if_de.c50
-rw-r--r--sys/dev/ed/if_ed.c22
-rw-r--r--sys/dev/ed/if_edreg.h10
-rw-r--r--sys/dev/eisa/eisaconf.c4
-rw-r--r--sys/dev/eisa/eisaconf.h4
-rw-r--r--sys/dev/ep/if_ep.c30
-rw-r--r--sys/dev/ep/if_epreg.h26
-rw-r--r--sys/dev/fdc/fdc.c42
-rw-r--r--sys/dev/fe/if_fe.c18
-rw-r--r--sys/dev/ic/i8237.h4
-rw-r--r--sys/dev/ie/if_ie.c98
-rw-r--r--sys/dev/joy/joy.c12
-rw-r--r--sys/dev/lnc/if_lnc.c82
-rw-r--r--sys/dev/lnc/if_lncreg.h34
-rw-r--r--sys/dev/mcd/mcd.c44
-rw-r--r--sys/dev/mcd/mcdreg.h4
-rw-r--r--sys/dev/mse/mse.c20
-rw-r--r--sys/dev/pci/pci.c12
-rw-r--r--sys/dev/pci/pcivar.h6
-rw-r--r--sys/dev/ppbus/lptio.h8
-rw-r--r--sys/dev/scd/scd.c46
-rw-r--r--sys/dev/sio/sio.c24
-rw-r--r--sys/dev/snp/snp.c14
-rw-r--r--sys/dev/speaker/spkr.c6
-rw-r--r--sys/dev/syscons/syscons.c360
-rw-r--r--sys/dev/syscons/syscons.h4
-rw-r--r--sys/dev/vn/vn.c22
-rw-r--r--sys/fs/cd9660/cd9660_lookup.c38
-rw-r--r--sys/fs/cd9660/cd9660_node.c70
-rw-r--r--sys/fs/cd9660/cd9660_rrip.c122
-rw-r--r--sys/fs/cd9660/cd9660_util.c8
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c88
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c84
-rw-r--r--sys/fs/cd9660/iso.h18
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c20
-rw-r--r--sys/fs/fifofs/fifo_vnops.c8
-rw-r--r--sys/fs/msdosfs/bootsect.h10
-rw-r--r--sys/fs/msdosfs/bpb.h10
-rw-r--r--sys/fs/msdosfs/denode.h10
-rw-r--r--sys/fs/msdosfs/direntry.h10
-rw-r--r--sys/fs/msdosfs/fat.h10
-rw-r--r--sys/fs/msdosfs/msdosfs_conv.c10
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c42
-rw-r--r--sys/fs/msdosfs/msdosfs_fat.c64
-rw-r--r--sys/fs/msdosfs/msdosfs_lookup.c10
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c16
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c54
-rw-r--r--sys/fs/msdosfs/msdosfsmount.h36
-rw-r--r--sys/fs/nullfs/null_vfsops.c10
-rw-r--r--sys/fs/nullfs/null_vnops.c18
-rw-r--r--sys/fs/portalfs/portal_vfsops.c4
-rw-r--r--sys/fs/portalfs/portal_vnops.c8
-rw-r--r--sys/fs/procfs/procfs_mem.c6
-rw-r--r--sys/fs/procfs/procfs_status.c4
-rw-r--r--sys/fs/procfs/procfs_subr.c4
-rw-r--r--sys/fs/procfs/procfs_vnops.c4
-rw-r--r--sys/fs/umapfs/umap.h6
-rw-r--r--sys/fs/umapfs/umap_subr.c4
-rw-r--r--sys/fs/umapfs/umap_vfsops.c18
-rw-r--r--sys/fs/umapfs/umap_vnops.c44
-rw-r--r--sys/fs/unionfs/union_subr.c6
-rw-r--r--sys/fs/unionfs/union_vfsops.c10
-rw-r--r--sys/gnu/ext2fs/ext2_bmap.c8
-rw-r--r--sys/gnu/ext2fs/inode.h4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_bmap.c8
-rw-r--r--sys/gnu/fs/ext2fs/inode.h4
-rw-r--r--sys/gnu/i386/fpemul/control_w.h2
-rw-r--r--sys/gnu/i386/fpemul/fpu_arith.c4
-rw-r--r--sys/gnu/i386/fpemul/fpu_entry.c4
-rw-r--r--sys/gnu/i386/fpemul/fpu_system.h4
-rw-r--r--sys/gnu/i386/fpemul/poly_tan.c4
-rw-r--r--sys/gnu/i386/fpemul/reg_compare.c4
-rw-r--r--sys/gnu/i386/isa/nic3008.c9
-rw-r--r--sys/gnu/isdn/if_ii.c11
-rw-r--r--sys/gnu/isdn/isdn.c17
-rw-r--r--sys/i386/apm/apm.c108
-rw-r--r--sys/i386/apm/apm_init/Makefile10
-rw-r--r--sys/i386/apm/apm_init/bin2asm.c12
-rw-r--r--sys/i386/apm/apm_init/real_prot.h20
-rw-r--r--sys/i386/apm/apm_init/table.c8
-rw-r--r--sys/i386/apm/apm_setup.h8
-rw-r--r--sys/i386/bios/apm.c108
-rw-r--r--sys/i386/bios/apm_init/Makefile10
-rw-r--r--sys/i386/bios/apm_init/bin2asm.c12
-rw-r--r--sys/i386/bios/apm_init/real_prot.h20
-rw-r--r--sys/i386/bios/apm_init/table.c8
-rw-r--r--sys/i386/bios/apm_setup.h8
-rw-r--r--sys/i386/boot/biosboot/asm.h16
-rw-r--r--sys/i386/boot/biosboot/boot.c14
-rw-r--r--sys/i386/boot/biosboot/boot.h12
-rw-r--r--sys/i386/boot/biosboot/disk.c14
-rw-r--r--sys/i386/boot/biosboot/io.c12
-rw-r--r--sys/i386/boot/biosboot/sys.c14
-rw-r--r--sys/i386/boot/biosboot/table.c14
-rw-r--r--sys/i386/boot/dosboot/Makefile4
-rw-r--r--sys/i386/boot/kzipboot/boot.c2
-rw-r--r--sys/i386/boot/kzipboot/malloc.c2
-rw-r--r--sys/i386/boot/kzipboot/misc.c8
-rw-r--r--sys/i386/boot/kzipboot/unzip.c2
-rw-r--r--sys/i386/boot/netboot/3c509.c14
-rw-r--r--sys/i386/boot/netboot/3c509.h26
-rw-r--r--sys/i386/boot/netboot/bootmenu.c2
-rw-r--r--sys/i386/boot/netboot/main.c8
-rw-r--r--sys/i386/boot/netboot/ns8390.c4
-rw-r--r--sys/i386/conf/Makefile.i3868
-rw-r--r--sys/i386/eisa/aha1742.c28
-rw-r--r--sys/i386/eisa/aic7770.c24
-rw-r--r--sys/i386/eisa/eisaconf.c4
-rw-r--r--sys/i386/eisa/eisaconf.h4
-rw-r--r--sys/i386/i386/autoconf.c6
-rw-r--r--sys/i386/i386/conf.c36
-rw-r--r--sys/i386/i386/cons.c10
-rw-r--r--sys/i386/i386/db_disasm.c16
-rw-r--r--sys/i386/i386/db_interface.c16
-rw-r--r--sys/i386/i386/db_trace.c26
-rw-r--r--sys/i386/i386/genassym.c6
-rw-r--r--sys/i386/i386/in_cksum.c8
-rw-r--r--sys/i386/i386/machdep.c20
-rw-r--r--sys/i386/i386/math_emulate.c6
-rw-r--r--sys/i386/i386/pmap.c6
-rw-r--r--sys/i386/i386/sys_machdep.c6
-rw-r--r--sys/i386/i386/trap.c20
-rw-r--r--sys/i386/i386/tsc.c18
-rw-r--r--sys/i386/i386/userconfig.c6
-rw-r--r--sys/i386/i386/vm_machdep.c24
-rw-r--r--sys/i386/ibcs2/ibcs2.h6
-rw-r--r--sys/i386/ibcs2/ibcs2_dummy.c4
-rw-r--r--sys/i386/ibcs2/ibcs2_file.c34
-rw-r--r--sys/i386/ibcs2/ibcs2_ioctl.c72
-rw-r--r--sys/i386/ibcs2/ibcs2_ipc.c8
-rw-r--r--sys/i386/ibcs2/ibcs2_isc.c16
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c124
-rw-r--r--sys/i386/ibcs2/ibcs2_signal.c48
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.c8
-rw-r--r--sys/i386/ibcs2/ibcs2_socksys.h6
-rw-r--r--sys/i386/ibcs2/ibcs2_stats.c18
-rw-r--r--sys/i386/ibcs2/ibcs2_sysent.c4
-rw-r--r--sys/i386/ibcs2/ibcs2_sysi86.c4
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c106
-rw-r--r--sys/i386/ibcs2/imgact_coff.c14
-rw-r--r--sys/i386/include/ansi.h4
-rw-r--r--sys/i386/include/apm_bios.h8
-rw-r--r--sys/i386/include/apm_segments.h8
-rw-r--r--sys/i386/include/bootinfo.h4
-rw-r--r--sys/i386/include/console.h10
-rw-r--r--sys/i386/include/cpufunc.h4
-rw-r--r--sys/i386/include/cronyx.h2
-rw-r--r--sys/i386/include/db_machdep.h14
-rw-r--r--sys/i386/include/devconf.h4
-rw-r--r--sys/i386/include/ioctl_ctx.h8
-rw-r--r--sys/i386/include/lpt.h8
-rw-r--r--sys/i386/include/md_var.h4
-rw-r--r--sys/i386/include/pcaudioio.h4
-rw-r--r--sys/i386/include/pcvt_ioctl.h12
-rw-r--r--sys/i386/include/pmap.h8
-rw-r--r--sys/i386/include/pte.h8
-rw-r--r--sys/i386/include/segments.h8
-rw-r--r--sys/i386/include/soundcard.h50
-rw-r--r--sys/i386/include/specialreg.h4
-rw-r--r--sys/i386/include/spigot.h2
-rw-r--r--sys/i386/include/tss.h14
-rw-r--r--sys/i386/isa/aha1542.c46
-rw-r--r--sys/i386/isa/aha1742.c28
-rw-r--r--sys/i386/isa/aic6360.c160
-rw-r--r--sys/i386/isa/aic7770.c24
-rw-r--r--sys/i386/isa/b004.c20
-rw-r--r--sys/i386/isa/b004.h12
-rw-r--r--sys/i386/isa/bt742a.c52
-rw-r--r--sys/i386/isa/clock.c18
-rw-r--r--sys/i386/isa/cronyx.c14
-rw-r--r--sys/i386/isa/ctx.c20
-rw-r--r--sys/i386/isa/ctxreg.h8
-rw-r--r--sys/i386/isa/cx.c14
-rw-r--r--sys/i386/isa/cxreg.h2
-rw-r--r--sys/i386/isa/cy.c16
-rw-r--r--sys/i386/isa/elink.c4
-rw-r--r--sys/i386/isa/fd.c42
-rw-r--r--sys/i386/isa/ft.c30
-rw-r--r--sys/i386/isa/gpib.c110
-rw-r--r--sys/i386/isa/gpib.h26
-rw-r--r--sys/i386/isa/gpibreg.h2
-rw-r--r--sys/i386/isa/gsc.c68
-rw-r--r--sys/i386/isa/gscreg.h2
-rw-r--r--sys/i386/isa/ic/Am7990.h34
-rw-r--r--sys/i386/isa/ic/am7990.h2
-rw-r--r--sys/i386/isa/ic/i82365.h2
-rw-r--r--sys/i386/isa/ic/i8237.h4
-rw-r--r--sys/i386/isa/ic/lemac.h4
-rw-r--r--sys/i386/isa/ic/ncr5380.h6
-rw-r--r--sys/i386/isa/if_cx.c2
-rw-r--r--sys/i386/isa/if_ed.c22
-rw-r--r--sys/i386/isa/if_edreg.h10
-rw-r--r--sys/i386/isa/if_eg.c72
-rw-r--r--sys/i386/isa/if_egreg.h6
-rw-r--r--sys/i386/isa/if_el.c14
-rw-r--r--sys/i386/isa/if_ep.c30
-rw-r--r--sys/i386/isa/if_epreg.h26
-rw-r--r--sys/i386/isa/if_fe.c18
-rw-r--r--sys/i386/isa/if_ie.c98
-rw-r--r--sys/i386/isa/if_ix.c26
-rw-r--r--sys/i386/isa/if_ixreg.h6
-rw-r--r--sys/i386/isa/if_le.c58
-rw-r--r--sys/i386/isa/if_lnc.c82
-rw-r--r--sys/i386/isa/if_ze.c74
-rw-r--r--sys/i386/isa/if_zereg.h8
-rw-r--r--sys/i386/isa/if_zp.c26
-rw-r--r--sys/i386/isa/if_zpreg.h4
-rw-r--r--sys/i386/isa/isa.c40
-rw-r--r--sys/i386/isa/joy.c12
-rw-r--r--sys/i386/isa/kbd.h6
-rw-r--r--sys/i386/isa/labpc.c16
-rw-r--r--sys/i386/isa/lpt.c84
-rw-r--r--sys/i386/isa/matcd/audio.c8
-rw-r--r--sys/i386/isa/matcd/creative.h8
-rw-r--r--sys/i386/isa/matcd/matcd.c70
-rw-r--r--sys/i386/isa/matcd/matcd.h6
-rw-r--r--sys/i386/isa/matcd/options.h18
-rw-r--r--sys/i386/isa/mcd.c44
-rw-r--r--sys/i386/isa/mcdreg.h4
-rw-r--r--sys/i386/isa/mse.c20
-rw-r--r--sys/i386/isa/ncr5380.c2
-rw-r--r--sys/i386/isa/npx.c6
-rw-r--r--sys/i386/isa/pcaudio.c30
-rw-r--r--sys/i386/isa/pcic.c2
-rw-r--r--sys/i386/isa/pcic.h10
-rw-r--r--sys/i386/isa/pcvt/pcvt_conf.h28
-rw-r--r--sys/i386/isa/pcvt/pcvt_drv.c84
-rw-r--r--sys/i386/isa/pcvt/pcvt_ext.c554
-rw-r--r--sys/i386/isa/pcvt/pcvt_hdr.h16
-rw-r--r--sys/i386/isa/pcvt/pcvt_kbd.c168
-rw-r--r--sys/i386/isa/pcvt/pcvt_kbd.h272
-rw-r--r--sys/i386/isa/pcvt/pcvt_out.c380
-rw-r--r--sys/i386/isa/pcvt/pcvt_sup.c148
-rw-r--r--sys/i386/isa/pcvt/pcvt_tbl.h2
-rw-r--r--sys/i386/isa/pcvt/pcvt_vtf.c298
-rw-r--r--sys/i386/isa/psm.c18
-rw-r--r--sys/i386/isa/readMBR.c16
-rw-r--r--sys/i386/isa/scd.c46
-rw-r--r--sys/i386/isa/seagate.c4
-rw-r--r--sys/i386/isa/sio.c24
-rw-r--r--sys/i386/isa/sound/dev_table.h18
-rw-r--r--sys/i386/isa/sound/dmabuf.c12
-rw-r--r--sys/i386/isa/sound/finetune.h30
-rw-r--r--sys/i386/isa/sound/midi_ctrl.h2
-rw-r--r--sys/i386/isa/sound/opl3.h8
-rw-r--r--sys/i386/isa/sound/os.h28
-rw-r--r--sys/i386/isa/sound/pas.h10
-rw-r--r--sys/i386/isa/sound/pas2_card.c2
-rw-r--r--sys/i386/isa/sound/sb_mixer.h16
-rw-r--r--sys/i386/isa/sound/sound_calls.h4
-rw-r--r--sys/i386/isa/sound/sound_config.h10
-rw-r--r--sys/i386/isa/sound/soundcard.c12
-rw-r--r--sys/i386/isa/sound/tuning.h30
-rw-r--r--sys/i386/isa/sound/ulaw.h128
-rw-r--r--sys/i386/isa/sound/vat_audio.c6
-rw-r--r--sys/i386/isa/spigot.c6
-rw-r--r--sys/i386/isa/spkr.c6
-rw-r--r--sys/i386/isa/syscons.c360
-rw-r--r--sys/i386/isa/syscons.h4
-rw-r--r--sys/i386/isa/tw.c8
-rw-r--r--sys/i386/isa/ultra14f.c18
-rw-r--r--sys/i386/isa/wd7000.c64
-rw-r--r--sys/i386/isa/wt.c14
-rw-r--r--sys/i386/isa/wtreg.h12
-rw-r--r--sys/i386/scsi/aic7xxx.c452
-rw-r--r--sys/i386/scsi/aic7xxx.h18
-rw-r--r--sys/isa/atrtc.c18
-rw-r--r--sys/isa/fd.c42
-rw-r--r--sys/isa/joy.c12
-rw-r--r--sys/isa/sio.c24
-rw-r--r--sys/isa/syscons.c360
-rw-r--r--sys/isa/syscons.h4
-rw-r--r--sys/isofs/cd9660/cd9660_lookup.c38
-rw-r--r--sys/isofs/cd9660/cd9660_node.c70
-rw-r--r--sys/isofs/cd9660/cd9660_rrip.c122
-rw-r--r--sys/isofs/cd9660/cd9660_util.c8
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c88
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c84
-rw-r--r--sys/isofs/cd9660/iso.h18
-rw-r--r--sys/kern/imgact_aout.c6
-rw-r--r--sys/kern/imgact_gzip.c4
-rw-r--r--sys/kern/kern_clock.c12
-rw-r--r--sys/kern/kern_descrip.c6
-rw-r--r--sys/kern/kern_devconf.c6
-rw-r--r--sys/kern/kern_exec.c12
-rw-r--r--sys/kern/kern_exit.c4
-rw-r--r--sys/kern/kern_fork.c4
-rw-r--r--sys/kern/kern_ktrace.c18
-rw-r--r--sys/kern/kern_lkm.c18
-rw-r--r--sys/kern/kern_lockf.c6
-rw-r--r--sys/kern/kern_malloc.c4
-rw-r--r--sys/kern/kern_ntptime.c4
-rw-r--r--sys/kern/kern_physio.c6
-rw-r--r--sys/kern/kern_proc.c8
-rw-r--r--sys/kern/kern_resource.c10
-rw-r--r--sys/kern/kern_sig.c22
-rw-r--r--sys/kern/kern_synch.c4
-rw-r--r--sys/kern/kern_sysctl.c8
-rw-r--r--sys/kern/kern_tc.c12
-rw-r--r--sys/kern/kern_time.c4
-rw-r--r--sys/kern/kern_timeout.c12
-rw-r--r--sys/kern/kern_xxx.c4
-rw-r--r--sys/kern/subr_clist.c6
-rw-r--r--sys/kern/subr_disklabel.c10
-rw-r--r--sys/kern/subr_diskslice.c4
-rw-r--r--sys/kern/subr_log.c4
-rw-r--r--sys/kern/subr_rlist.c30
-rw-r--r--sys/kern/subr_trap.c20
-rw-r--r--sys/kern/sys_generic.c4
-rw-r--r--sys/kern/sys_process.c18
-rw-r--r--sys/kern/sys_socket.c6
-rw-r--r--sys/kern/sysv_msg.c4
-rw-r--r--sys/kern/sysv_sem.c4
-rw-r--r--sys/kern/sysv_shm.c14
-rw-r--r--sys/kern/tty.c4
-rw-r--r--sys/kern/tty_compat.c18
-rw-r--r--sys/kern/tty_conf.c4
-rw-r--r--sys/kern/tty_cons.c10
-rw-r--r--sys/kern/tty_pty.c8
-rw-r--r--sys/kern/tty_snoop.c14
-rw-r--r--sys/kern/tty_subr.c6
-rw-r--r--sys/kern/tty_tty.c4
-rw-r--r--sys/kern/uipc_sockbuf.c10
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/kern/uipc_socket2.c10
-rw-r--r--sys/kern/uipc_syscalls.c14
-rw-r--r--sys/kern/uipc_usrreq.c8
-rw-r--r--sys/kern/vfs_bio.c14
-rw-r--r--sys/kern/vfs_cache.c12
-rw-r--r--sys/kern/vfs_cluster.c6
-rw-r--r--sys/kern/vfs_init.c8
-rw-r--r--sys/kern/vfs_lookup.c6
-rw-r--r--sys/kern/vfs_vnops.c4
-rw-r--r--sys/libkern/inet_ntoa.c2
-rw-r--r--sys/libkern/mcount.c6
-rw-r--r--sys/libkern/muldi3.c4
-rw-r--r--sys/libkern/qdivrem.c4
-rw-r--r--sys/miscfs/devfs/devfs_back.c28
-rw-r--r--sys/miscfs/devfs/devfs_front.c14
-rw-r--r--sys/miscfs/devfs/devfs_vfsops.c4
-rw-r--r--sys/miscfs/devfs/devfs_vnops.c16
-rw-r--r--sys/miscfs/devfs/devfsdefs.h4
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c20
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c8
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c10
-rw-r--r--sys/miscfs/nullfs/null_vnops.c18
-rw-r--r--sys/miscfs/portal/portal_vfsops.c4
-rw-r--r--sys/miscfs/portal/portal_vnops.c8
-rw-r--r--sys/miscfs/procfs/procfs_mem.c6
-rw-r--r--sys/miscfs/procfs/procfs_status.c4
-rw-r--r--sys/miscfs/procfs/procfs_subr.c4
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c4
-rw-r--r--sys/miscfs/umapfs/umap.h6
-rw-r--r--sys/miscfs/umapfs/umap_subr.c4
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c18
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c44
-rw-r--r--sys/miscfs/union/union_subr.c6
-rw-r--r--sys/miscfs/union/union_vfsops.c10
-rw-r--r--sys/msdosfs/bootsect.h10
-rw-r--r--sys/msdosfs/bpb.h10
-rw-r--r--sys/msdosfs/denode.h10
-rw-r--r--sys/msdosfs/direntry.h10
-rw-r--r--sys/msdosfs/fat.h10
-rw-r--r--sys/msdosfs/msdosfs_conv.c10
-rw-r--r--sys/msdosfs/msdosfs_denode.c42
-rw-r--r--sys/msdosfs/msdosfs_fat.c64
-rw-r--r--sys/msdosfs/msdosfs_lookup.c10
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c16
-rw-r--r--sys/msdosfs/msdosfs_vnops.c54
-rw-r--r--sys/msdosfs/msdosfsmount.h36
-rw-r--r--sys/net/bpf.c4
-rw-r--r--sys/net/bpf.h10
-rw-r--r--sys/net/bpf_filter.c36
-rw-r--r--sys/net/fddi.h4
-rw-r--r--sys/net/if.c10
-rw-r--r--sys/net/if.h6
-rw-r--r--sys/net/if_disc.c4
-rw-r--r--sys/net/if_dl.h10
-rw-r--r--sys/net/if_ethersubr.c20
-rw-r--r--sys/net/if_fddisubr.c20
-rw-r--r--sys/net/if_loop.c4
-rw-r--r--sys/net/if_ppp.c10
-rw-r--r--sys/net/if_ppp.h4
-rw-r--r--sys/net/if_sl.c4
-rw-r--r--sys/net/if_slvar.h4
-rw-r--r--sys/net/if_tun.c4
-rw-r--r--sys/net/if_tun.h2
-rw-r--r--sys/net/pppcompress.c4
-rw-r--r--sys/net/pppcompress.h4
-rw-r--r--sys/net/radix.c26
-rw-r--r--sys/net/raw_cb.c4
-rw-r--r--sys/net/raw_usrreq.c4
-rw-r--r--sys/net/route.c18
-rw-r--r--sys/net/route.h4
-rw-r--r--sys/net/rtsock.c6
-rw-r--r--sys/net/slcompress.c4
-rw-r--r--sys/net/slcompress.h4
-rw-r--r--sys/netccitt/dll.h8
-rw-r--r--sys/netccitt/hd_debug.c22
-rw-r--r--sys/netccitt/hd_input.c132
-rw-r--r--sys/netccitt/hd_output.c16
-rw-r--r--sys/netccitt/hd_subr.c46
-rw-r--r--sys/netccitt/hd_timer.c16
-rw-r--r--sys/netccitt/if_x25subr.c12
-rw-r--r--sys/netccitt/llc_input.c50
-rw-r--r--sys/netccitt/llc_output.c36
-rw-r--r--sys/netccitt/llc_subr.c296
-rw-r--r--sys/netccitt/llc_timer.c14
-rw-r--r--sys/netccitt/llc_var.h48
-rw-r--r--sys/netccitt/pk.h26
-rw-r--r--sys/netccitt/pk_acct.c6
-rw-r--r--sys/netccitt/pk_input.c166
-rw-r--r--sys/netccitt/pk_llcsubr.c124
-rw-r--r--sys/netccitt/pk_output.c50
-rw-r--r--sys/netccitt/pk_subr.c168
-rw-r--r--sys/netccitt/pk_timer.c12
-rw-r--r--sys/netccitt/pk_usrreq.c74
-rw-r--r--sys/netccitt/pk_var.h12
-rw-r--r--sys/netccitt/x25.h6
-rw-r--r--sys/netccitt/x25err.h8
-rw-r--r--sys/netinet/if_ether.c4
-rw-r--r--sys/netinet/if_ether.h8
-rw-r--r--sys/netinet/if_fddi.h4
-rw-r--r--sys/netinet/igmp.c40
-rw-r--r--sys/netinet/igmp.h10
-rw-r--r--sys/netinet/in.c18
-rw-r--r--sys/netinet/in_cksum.c4
-rw-r--r--sys/netinet/in_pcb.c16
-rw-r--r--sys/netinet/in_proto.c4
-rw-r--r--sys/netinet/in_rmx.c14
-rw-r--r--sys/netinet/in_var.h6
-rw-r--r--sys/netinet/ip.h10
-rw-r--r--sys/netinet/ip_fw.c122
-rw-r--r--sys/netinet/ip_fw.h6
-rw-r--r--sys/netinet/ip_fwdef.c4
-rw-r--r--sys/netinet/ip_icmp.c12
-rw-r--r--sys/netinet/ip_icmp.h4
-rw-r--r--sys/netinet/ip_input.c18
-rw-r--r--sys/netinet/ip_mroute.c106
-rw-r--r--sys/netinet/ip_mroute.h14
-rw-r--r--sys/netinet/ip_output.c4
-rw-r--r--sys/netinet/ip_var.h6
-rw-r--r--sys/netinet/raw_ip.c8
-rw-r--r--sys/netinet/tcp.h6
-rw-r--r--sys/netinet/tcp_input.c70
-rw-r--r--sys/netinet/tcp_output.c22
-rw-r--r--sys/netinet/tcp_reass.c70
-rw-r--r--sys/netinet/tcp_subr.c8
-rw-r--r--sys/netinet/tcp_timer.c4
-rw-r--r--sys/netinet/tcp_timewait.c8
-rw-r--r--sys/netinet/tcp_usrreq.c8
-rw-r--r--sys/netinet/udp_usrreq.c4
-rw-r--r--sys/netiso/argo_debug.h34
-rw-r--r--sys/netiso/clnl.h10
-rw-r--r--sys/netiso/clnp.h28
-rw-r--r--sys/netiso/clnp_debug.c24
-rw-r--r--sys/netiso/clnp_er.c72
-rw-r--r--sys/netiso/clnp_frag.c78
-rw-r--r--sys/netiso/clnp_input.c42
-rw-r--r--sys/netiso/clnp_options.c60
-rw-r--r--sys/netiso/clnp_output.c42
-rw-r--r--sys/netiso/clnp_raw.c40
-rw-r--r--sys/netiso/clnp_stat.h14
-rw-r--r--sys/netiso/clnp_subr.c64
-rw-r--r--sys/netiso/clnp_timer.c26
-rw-r--r--sys/netiso/cltp_usrreq.c4
-rw-r--r--sys/netiso/cons.h12
-rw-r--r--sys/netiso/cons_pcb.h22
-rw-r--r--sys/netiso/eonvar.h14
-rw-r--r--sys/netiso/esis.c92
-rw-r--r--sys/netiso/esis.h12
-rw-r--r--sys/netiso/idrp_usrreq.c4
-rw-r--r--sys/netiso/if_cons.c88
-rw-r--r--sys/netiso/if_eon.c40
-rw-r--r--sys/netiso/iso.c72
-rw-r--r--sys/netiso/iso.h20
-rw-r--r--sys/netiso/iso_chksum.c34
-rw-r--r--sys/netiso/iso_errno.h16
-rw-r--r--sys/netiso/iso_pcb.c66
-rw-r--r--sys/netiso/iso_pcb.h14
-rw-r--r--sys/netiso/iso_proto.c18
-rw-r--r--sys/netiso/iso_snpac.c56
-rw-r--r--sys/netiso/iso_snpac.h12
-rw-r--r--sys/netiso/iso_var.h14
-rw-r--r--sys/netiso/tp_clnp.h18
-rw-r--r--sys/netiso/tp_cons.c28
-rw-r--r--sys/netiso/tp_driver.c214
-rw-r--r--sys/netiso/tp_emit.c158
-rw-r--r--sys/netiso/tp_events.h16
-rw-r--r--sys/netiso/tp_inet.c106
-rw-r--r--sys/netiso/tp_input.c250
-rw-r--r--sys/netiso/tp_ip.h16
-rw-r--r--sys/netiso/tp_iso.c46
-rw-r--r--sys/netiso/tp_meas.c22
-rw-r--r--sys/netiso/tp_meas.h14
-rw-r--r--sys/netiso/tp_output.c130
-rw-r--r--sys/netiso/tp_param.h46
-rw-r--r--sys/netiso/tp_pcb.c140
-rw-r--r--sys/netiso/tp_pcb.h24
-rw-r--r--sys/netiso/tp_seq.h18
-rw-r--r--sys/netiso/tp_stat.h40
-rw-r--r--sys/netiso/tp_subr.c100
-rw-r--r--sys/netiso/tp_subr2.c100
-rw-r--r--sys/netiso/tp_timer.c32
-rw-r--r--sys/netiso/tp_timer.h16
-rw-r--r--sys/netiso/tp_tpdu.h22
-rw-r--r--sys/netiso/tp_trace.c38
-rw-r--r--sys/netiso/tp_trace.h20
-rw-r--r--sys/netiso/tp_user.h34
-rw-r--r--sys/netiso/tp_usrreq.c76
-rw-r--r--sys/netiso/tuba_subr.c8
-rw-r--r--sys/netiso/tuba_usrreq.c6
-rw-r--r--sys/netiso/xebec/debug.h8
-rw-r--r--sys/netiso/xebec/llparse.c12
-rw-r--r--sys/netiso/xebec/llparse.h6
-rw-r--r--sys/netiso/xebec/llscan.c34
-rw-r--r--sys/netiso/xebec/main.c26
-rw-r--r--sys/netiso/xebec/main.h6
-rw-r--r--sys/netiso/xebec/malloc.c10
-rw-r--r--sys/netiso/xebec/procs.c54
-rw-r--r--sys/netiso/xebec/putdriver.c20
-rw-r--r--sys/netiso/xebec/sets.c44
-rw-r--r--sys/netiso/xebec/sets.h6
-rw-r--r--sys/netiso/xebec/xebec.c324
-rw-r--r--sys/netns/idp_usrreq.c8
-rw-r--r--sys/netns/ns.c6
-rw-r--r--sys/netns/ns_error.c6
-rw-r--r--sys/netns/ns_input.c6
-rw-r--r--sys/netns/ns_pcb.c12
-rw-r--r--sys/netns/ns_proto.c4
-rw-r--r--sys/netns/spp_usrreq.c12
-rw-r--r--sys/nfs/nfs_bio.c6
-rw-r--r--sys/nfs/nfs_common.c6
-rw-r--r--sys/nfs/nfs_common.h4
-rw-r--r--sys/nfs/nfs_nqlease.c6
-rw-r--r--sys/nfs/nfs_serv.c16
-rw-r--r--sys/nfs/nfs_socket.c14
-rw-r--r--sys/nfs/nfs_subs.c6
-rw-r--r--sys/nfs/nfs_syscalls.c4
-rw-r--r--sys/nfs/nfs_vfsops.c10
-rw-r--r--sys/nfs/nfs_vnops.c14
-rw-r--r--sys/nfs/nfsm_subs.h4
-rw-r--r--sys/nfsclient/nfs_bio.c6
-rw-r--r--sys/nfsclient/nfs_nfsiod.c4
-rw-r--r--sys/nfsclient/nfs_socket.c14
-rw-r--r--sys/nfsclient/nfs_subs.c6
-rw-r--r--sys/nfsclient/nfs_vfsops.c10
-rw-r--r--sys/nfsclient/nfs_vnops.c14
-rw-r--r--sys/nfsclient/nfsm_subs.h4
-rw-r--r--sys/nfsserver/nfs_serv.c16
-rw-r--r--sys/nfsserver/nfs_srvsock.c14
-rw-r--r--sys/nfsserver/nfs_srvsubs.c6
-rw-r--r--sys/nfsserver/nfs_syscalls.c4
-rw-r--r--sys/nfsserver/nfsm_subs.h4
-rw-r--r--sys/pci/aic7870.c16
-rw-r--r--sys/pci/if_de.c50
-rw-r--r--sys/pci/if_pdq.c4
-rw-r--r--sys/pci/ncr.c16
-rw-r--r--sys/pci/pci.c12
-rw-r--r--sys/pci/pcivar.h6
-rw-r--r--sys/pci/pdq.c25
-rw-r--r--sys/pci/pdqreg.h9
-rw-r--r--sys/scsi/cd.c56
-rw-r--r--sys/scsi/ch.c26
-rw-r--r--sys/scsi/pt.c12
-rw-r--r--sys/scsi/scsi_all.h6
-rw-r--r--sys/scsi/scsi_base.c50
-rw-r--r--sys/scsi/scsi_cd.h6
-rw-r--r--sys/scsi/scsi_changer.h10
-rw-r--r--sys/scsi/scsi_debug.h6
-rw-r--r--sys/scsi/scsi_disk.h8
-rw-r--r--sys/scsi/scsi_driver.c14
-rw-r--r--sys/scsi/scsi_driver.h4
-rw-r--r--sys/scsi/scsi_generic.h4
-rw-r--r--sys/scsi/scsi_ioctl.c6
-rw-r--r--sys/scsi/scsi_tape.h18
-rw-r--r--sys/scsi/scsiconf.c32
-rw-r--r--sys/scsi/scsiconf.h8
-rw-r--r--sys/scsi/sctarg.c12
-rw-r--r--sys/scsi/sd.c38
-rw-r--r--sys/scsi/st.c58
-rw-r--r--sys/scsi/uk.c4
-rw-r--r--sys/scsi/worm.c18
-rw-r--r--sys/sys/bio.h4
-rw-r--r--sys/sys/buf.h4
-rw-r--r--sys/sys/cdio.h16
-rw-r--r--sys/sys/chio.h8
-rw-r--r--sys/sys/conf.h6
-rw-r--r--sys/sys/dirent.h4
-rw-r--r--sys/sys/disklabel.h14
-rw-r--r--sys/sys/diskmbr.h14
-rw-r--r--sys/sys/diskpc98.h14
-rw-r--r--sys/sys/diskslice.h4
-rw-r--r--sys/sys/filedesc.h4
-rw-r--r--sys/sys/gmon.h10
-rw-r--r--sys/sys/imgact.h4
-rw-r--r--sys/sys/imgact_aout.h4
-rw-r--r--sys/sys/inflate.h4
-rw-r--r--sys/sys/linedisc.h6
-rw-r--r--sys/sys/mount.h4
-rw-r--r--sys/sys/queue.h4
-rw-r--r--sys/sys/snoop.h4
-rw-r--r--sys/sys/socketvar.h4
-rw-r--r--sys/sys/soundcard.h50
-rw-r--r--sys/sys/stat.h4
-rw-r--r--sys/sys/sysctl.h8
-rw-r--r--sys/sys/systm.h4
-rw-r--r--sys/sys/termios.h14
-rw-r--r--sys/sys/ttycom.h4
-rw-r--r--sys/sys/ttydefaults.h4
-rw-r--r--sys/sys/un.h6
-rw-r--r--sys/sys/user.h4
-rw-r--r--sys/sys/vlimit.h4
-rw-r--r--sys/sys/vsio.h10
-rw-r--r--sys/sys/wait.h10
-rw-r--r--sys/ufs/ffs/ffs_alloc.c38
-rw-r--r--sys/ufs/ffs/ffs_balloc.c4
-rw-r--r--sys/ufs/ffs/ffs_subr.c4
-rw-r--r--sys/ufs/ffs/ffs_tables.c4
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c8
-rw-r--r--sys/ufs/ffs/ffs_vnops.c4
-rw-r--r--sys/ufs/ffs/fs.h10
-rw-r--r--sys/ufs/lfs/lfs.h4
-rw-r--r--sys/ufs/lfs/lfs_balloc.c6
-rw-r--r--sys/ufs/lfs/lfs_cksum.c4
-rw-r--r--sys/ufs/lfs/lfs_debug.c6
-rw-r--r--sys/ufs/lfs/lfs_inode.c12
-rw-r--r--sys/ufs/lfs/lfs_segment.c32
-rw-r--r--sys/ufs/lfs/lfs_subr.c4
-rw-r--r--sys/ufs/lfs/lfs_syscalls.c8
-rw-r--r--sys/ufs/lfs/lfs_vnops.c4
-rw-r--r--sys/ufs/ufs/inode.h4
-rw-r--r--sys/ufs/ufs/ufs_bmap.c8
-rw-r--r--sys/ufs/ufs/ufs_disksubr.c10
-rw-r--r--sys/ufs/ufs/ufs_quota.c4
-rw-r--r--sys/ufs/ufs/ufs_vnops.c18
-rw-r--r--sys/vm/device_pager.c4
-rw-r--r--sys/vm/kern_lock.c34
-rw-r--r--sys/vm/swap_pager.c8
-rw-r--r--sys/vm/vm_fault.c26
-rw-r--r--sys/vm/vm_glue.c4
-rw-r--r--sys/vm/vm_kern.c20
-rw-r--r--sys/vm/vm_map.c64
-rw-r--r--sys/vm/vm_mmap.c6
-rw-r--r--sys/vm/vm_object.c38
-rw-r--r--sys/vm/vm_page.c34
-rw-r--r--sys/vm/vm_pageout.c8
-rw-r--r--sys/vm/vm_pageout.h4
-rw-r--r--sys/vm/vm_swap.c4
-rw-r--r--sys/vm/vnode_pager.c6
706 files changed, 9196 insertions, 9177 deletions
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h
index 4f6eccae856d..870c5de887ec 100644
--- a/sys/alpha/include/console.h
+++ b/sys/alpha/include/console.h
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: console.h,v 1.15 1995/01/20 08:35:18 sos Exp $
+ * $Id: console.h,v 1.18 1995/01/28 22:15:30 sos Exp $
*/
#ifndef _CONSOLE_H_
@@ -47,7 +47,7 @@
#define KIOCSOUND _IO('K', 63)
#define KDGKBTYPE _IOR('K', 64, int)
#define KDGETLED _IOR('K', 65, int)
-#define KDSETLED _IO('K', 66)
+#define KDSETLED _IO('K', 66)
#define KDSETRAD _IO('K', 67)
#define GETFKEY _IOWR('k', 0, fkeyarg_t)
@@ -79,14 +79,14 @@
#define CONS_GETVERS _IOR('c', 74, int)
#define VT_OPENQRY _IOR('v', 1, int)
-#define VT_SETMODE _IOW('v', 2, vtmode_t)
+#define VT_SETMODE _IOW('v', 2, vtmode_t)
#define VT_GETMODE _IOR('v', 3, vtmode_t)
#define VT_RELDISP _IO('v', 4)
#define VT_ACTIVATE _IO('v', 5)
#define VT_WAITACTIVE _IO('v', 6)
#define VT_GETACTIVE _IOR('v', 7, int)
-#define VT_FALSE 0
+#define VT_FALSE 0
#define VT_TRUE 1
#define VT_ACKACQ 2
@@ -135,7 +135,7 @@ struct mouse_info {
#define NLKED 2 /* Num locked */
#define SLKED 4 /* Scroll locked */
#define ALKED 8 /* AltGr locked */
-#define LED_CAP 1 /* Caps lock LED */
+#define LED_CAP 1 /* Caps lock LED */
#define LED_NUM 2 /* Num lock LED */
#define LED_SCR 4 /* Scroll lock LED */
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index e110eff3d464..f0648c9f4441 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,13 +34,13 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.31 1995/05/14 02:59:51 davidg Exp $
+ * $Id: autoconf.c,v 1.32 1995/05/29 04:08:13 davidg Exp $
*/
/*
* Setup the system to run on the current machine.
*
- * Configure() is called at boot time and initializes the vba
+ * Configure() is called at boot time and initializes the vba
* device tables and the memory controller monitoring. Available
* devices are determined (from possibilities mentioned in ioconf.c),
* and the drivers are initialized.
@@ -237,7 +237,7 @@ setdumpdev(dev)
dumpdev = dev;
dumplo = newdumplo;
return (0);
-}
+}
u_long bootdev = 0; /* not a dev_t - encoding is different */
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index 4e6a42c7d543..8ce7365a7ac9 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_disasm.c,v 1.7 1994/10/08 22:19:47 phk Exp $
+ * $Id: db_disasm.c,v 1.8 1995/01/29 02:38:15 bde Exp $
*/
/*
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 29007d20be2e..8daa0a27aa32 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_interface.c,v 1.12 1995/03/16 18:11:25 bde Exp $
+ * $Id: db_interface.c,v 1.13 1995/04/08 21:31:53 joerg Exp $
*/
/*
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 28c152f22b3e..dcbf19410f94 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_trace.c,v 1.9 1995/03/01 21:37:44 davidg Exp $
+ * $Id: db_trace.c,v 1.10 1995/03/16 18:11:26 bde Exp $
*/
#include <sys/param.h>
@@ -127,13 +127,13 @@ db_numargs(fp)
return (args);
}
-/*
- * Figure out the next frame up in the call stack.
- * For trap(), we print the address of the faulting instruction and
+/*
+ * Figure out the next frame up in the call stack.
+ * For trap(), we print the address of the faulting instruction and
* proceed with the calling frame. We return the ip that faulted.
* If the trap was caused by jumping through a bogus pointer, then
- * the next line in the backtrace will list some random function as
- * being called. It should get the argument list correct, though.
+ * the next line in the backtrace will list some random function as
+ * being called. It should get the argument list correct, though.
* It might be possible to dig out from the next frame up the name
* of the function that faulted, but that could get hairy.
*/
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index aacff0dd0b19..0a5327941724 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.21 1995/03/05 04:06:44 wpaul Exp $
+ * $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
*/
#include "npx.h"
@@ -280,7 +280,7 @@ npxprobe1(dvp)
/*
* Good, now check for a proper control word.
*/
- control = 0x5a5a;
+ control = 0x5a5a;
fnstcw(&control);
if ((control & 0x1f3f) == 0x033f) {
hw_float = npx_exists = 1;
@@ -344,7 +344,7 @@ npxattach(dvp)
printf("npx%d: INT 16 interface\n", dvp->id_unit);
else if (npx_irq13)
; /* higher level has printed "irq 13" */
-#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
+#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
else if (npx_exists) {
printf("npx%d: error reporting broken; using 387 emulator\n",
dvp->id_unit);
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index dbfb2a063350..a5261849d80e 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
- * $Id: genassym.c,v 1.25 1995/02/14 18:01:24 phk Exp $
+ * $Id: genassym.c,v 1.26 1995/05/25 07:41:18 davidg Exp $
*/
#include <stdio.h>
@@ -43,10 +43,10 @@
#include <sys/proc.h>
/* XXX This is just real ugly to have to do, but it is what you have to do! */
#ifndef NFS
-#define NFS
+#define NFS
#include <sys/mount.h>
#undef NFS
-#else
+#else
#include <sys/mount.h>
#endif
#include <sys/mbuf.h>
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 2f299b19c9d2..4a2d41d73d76 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.126 1995/05/12 19:17:14 wollman Exp $
+ * $Id: machdep.c,v 1.127 1995/05/25 07:41:20 davidg Exp $
*/
#include "npx.h"
@@ -389,7 +389,7 @@ again:
printf(" %x:%08x", i, j);
printf(" %d cyl, %d heads, %d sects\n",
j >> 16, (j >> 8) & 0xff, j & 0xff);
-
+
}
printf(" %d accounted for\n", bootinfo.bi_n_bios_used);
}
@@ -421,7 +421,7 @@ static void
identifycpu()
{
printf("CPU: ");
- if (cpu >= 0
+ if (cpu >= 0
&& cpu < (sizeof i386_cpus/sizeof(struct cpu_nameclass))) {
cpu_class = i386_cpus[cpu].cpu_class;
strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);
@@ -442,8 +442,8 @@ identifycpu()
cpu_model[0] = '\0';
switch (cpu_id & 0x3000) {
- case 0x1000:
- strcpy(cpu_model, "Overdrive ");
+ case 0x1000:
+ strcpy(cpu_model, "Overdrive ");
break;
case 0x2000:
strcpy(cpu_model, "Dual ");
@@ -478,7 +478,7 @@ identifycpu()
case 0x480:
strcat(cpu_model, "DX4"); break;
#if defined(I586_CPU)
- case 0x510:
+ case 0x510:
if (pentium_mhz == 60) {
strcat(cpu_model, "510\\60");
} else if (pentium_mhz == 66) {
@@ -630,7 +630,7 @@ sendsig(catcher, sig, mask, code)
return;
}
- /*
+ /*
* Build the argument list for the signal handler.
*/
if (p->p_sysent->sv_sigtbl) {
@@ -868,7 +868,7 @@ boot(arghowto)
if (howto & RB_DUMP) {
savectx(&dumppcb, 0);
dumppcb.pcb_ptd = rcr3();
- dumpsys();
+ dumpsys();
if (PANIC_REBOOT_WAIT_TIME != 0) {
if (PANIC_REBOOT_WAIT_TIME != -1) {
@@ -1321,7 +1321,7 @@ init386(first)
#ifdef COMPAT_LINUX
setidt(0x80, &IDTVEC(linux_syscall), SDT_SYS386TGT, SEL_UPL);
#endif
-
+
#include "isa.h"
#if NISA >0
isa_defaultirq();
@@ -1507,7 +1507,7 @@ init386(first)
proc0.p_addr->u_pcb.pcb_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL) ;
gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
- ((struct i386tss *)gdt_segs[GPROC0_SEL].ssd_base)->tss_ioopt =
+ ((struct i386tss *)gdt_segs[GPROC0_SEL].ssd_base)->tss_ioopt =
(sizeof(tss))<<16;
ltr(gsel_tss);
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index bb4858f1276d..99716033654a 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.56 1995/04/09 05:40:38 davidg Exp $
+ * $Id: pmap.c,v 1.57 1995/05/11 19:26:11 rgrimes Exp $
*/
/*
@@ -167,7 +167,7 @@ struct msgbuf *msgbufp;
#endif
-void
+void
init_pv_entries(int);
/*
@@ -178,7 +178,7 @@ init_pv_entries(int);
* [ what about induced faults -wfj]
*/
-inline pt_entry_t * const
+inline pt_entry_t * const
pmap_pte(pmap, va)
register pmap_t pmap;
vm_offset_t va;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 7e33003f8ded..3c4f1cc264c3 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.7 1995/03/04 02:25:36 davidg Exp $
+ * $Id: sys_machdep.c,v 1.8 1995/03/10 08:13:07 davidg Exp $
*
*/
@@ -64,11 +64,11 @@ sysarch(p, uap, retval)
switch(uap->op) {
#ifdef USER_LDT
- case I386_GET_LDT:
+ case I386_GET_LDT:
error = i386_get_ldt(p, uap->parms, retval);
break;
- case I386_SET_LDT:
+ case I386_SET_LDT:
error = i386_set_ldt(p, uap->parms, retval);
break;
#endif
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 6ca87c2c6044..5e1489aaadce 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.50 1995/03/21 07:02:51 davidg Exp $
+ * $Id: trap.c,v 1.51 1995/03/21 07:16:12 davidg Exp $
*/
/*
@@ -174,7 +174,7 @@ trap(frame)
type = frame.tf_trapno;
code = frame.tf_err;
-
+
if (ISPL(frame.tf_cs) == SEL_UPL) {
/* user trap */
@@ -262,7 +262,7 @@ trap(frame)
return;
#endif /* NNPX > 0 */
-#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
+#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
i = math_emulate(&frame);
if (i == 0) {
if (!(frame.tf_eflags & PSL_T))
@@ -352,7 +352,7 @@ trap(frame)
frame.tf_eflags &= ~PSL_T;
return;
#endif
-
+
#if NISA > 0
case T_NMI:
#ifdef DDB
@@ -376,7 +376,7 @@ trap(frame)
#ifdef DEBUG
eva = rcr2();
if (type <= MAX_TRAP_MSG) {
- uprintf("fatal process exception: %s",
+ uprintf("fatal process exception: %s",
trap_msg[type]);
if ((type == T_PAGEFLT) || (type == T_PROTFLT))
uprintf(", fault VA = 0x%x", eva);
@@ -464,7 +464,7 @@ trap_pfault(frame, usermode)
v = (vm_offset_t) vtopte(va);
/* Fault the pte only if needed: */
- *(volatile char *)v += 0;
+ *(volatile char *)v += 0;
pmap_use_pt( vm_map_pmap(map), va);
@@ -580,7 +580,7 @@ trap_pfault(frame, usermode)
*/
/* Fault the pte only if needed: */
- *(volatile char *)v += 0;
+ *(volatile char *)v += 0;
pmap_use_pt( vm_map_pmap(map), va);
@@ -804,7 +804,7 @@ syscall(frame)
if (p->p_sysent->sv_mask)
code = code & p->p_sysent->sv_mask;
-
+
if (code >= p->p_sysent->sv_size)
callp = &p->p_sysent->sv_table[0];
else
@@ -852,7 +852,7 @@ syscall(frame)
if (p->p_sysent->sv_errsize)
if (error >= p->p_sysent->sv_errsize)
error = -1; /* XXX */
- else
+ else
error = p->p_sysent->sv_errtbl[error];
frame.tf_eax = error;
frame.tf_eflags |= PSL_C; /* carry bit */
@@ -966,7 +966,7 @@ linux_syscall(frame)
if (p->p_sysent->sv_errsize)
if (error >= p->p_sysent->sv_errsize)
error = -1; /* XXX */
- else
+ else
error = p->p_sysent->sv_errtbl[error];
frame.tf_eax = -error;
frame.tf_eflags |= PSL_C; /* carry bit */
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 196d34ce75ca..e1bc372f176f 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.32 1995/03/16 18:11:58 bde Exp $
+ * $Id: clock.c,v 1.33 1995/05/11 07:44:40 bde Exp $
*/
/*
@@ -193,7 +193,7 @@ int
acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
{
if (timer0_state || TIMER_DIV(rate) < TIMER0_MIN_MAX_COUNT ||
- !function)
+ !function)
return -1;
new_function = function;
new_rate = rate;
@@ -204,7 +204,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
int
acquire_timer2(int mode)
{
- if (timer2_state)
+ if (timer2_state)
return -1;
timer2_state = 1;
outb(TIMER_MODE, TIMER_SEL2 | (mode &0x3f));
@@ -265,7 +265,7 @@ printrtc(void)
#endif
static int
-getit()
+getit()
{
int high, low;
@@ -307,7 +307,7 @@ calibrate_cyclecounter(void)
/*
* Wait "n" microseconds.
- * Relies on timer 1 counting down from (TIMER_FREQ / hz)
+ * Relies on timer 1 counting down from (TIMER_FREQ / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@@ -339,7 +339,7 @@ DELAY(int n)
prev_tick = getit(0, 0);
n -= 20;
/*
- * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
+ * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
* and without any avoidable overflows.
*/
sec = n / 1000000;
@@ -375,11 +375,11 @@ sysbeepstop(void *chan)
beeping = 0;
}
-int
+int
sysbeep(int pitch, int period)
{
- if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
+ if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
return -1;
disable_intr();
outb(TIMER_CNTR2, pitch);
@@ -426,7 +426,7 @@ readrtc(int port)
* XXX initialization of other timers is unintentionally left blank.
*/
void
-startrtclock()
+startrtclock()
{
timer0_max_count = hardclock_max_count = TIMER_DIV(hz);
timer0_overflow_threshold = timer0_max_count - TIMER0_LATCH_COUNT;
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index f012a6a30c8a..2ff3602015b3 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $Id: vm_machdep.c,v 1.37 1995/05/01 23:32:30 dyson Exp $
+ * $Id: vm_machdep.c,v 1.38 1995/05/18 09:17:07 davidg Exp $
*/
#include "npx.h"
@@ -232,7 +232,7 @@ more:
* same as vm_bounce_kva -- but really allocate (but takes pages as arg)
*/
vm_offset_t
-vm_bounce_kva_alloc(count)
+vm_bounce_kva_alloc(count)
int count;
{
int i;
@@ -308,7 +308,7 @@ vm_bounce_alloc(bp)
* printf("size: %d, count: %d\n", bp->b_bufsize, bp->b_bcount);
* }
*/
-
+
vastart = (vm_offset_t) bp->b_data;
vaend = (vm_offset_t) bp->b_data + bp->b_bufsize;
@@ -332,7 +332,7 @@ vm_bounce_alloc(bp)
if (dobounceflag == 0)
return;
- if (bouncepages < dobounceflag)
+ if (bouncepages < dobounceflag)
panic("Not enough bounce buffers!!!");
/*
@@ -445,7 +445,7 @@ vm_bounce_free(bp)
/*
* free the bounce allocation
*/
-
+
/*
printf("(kva: %x, pa: %x)", bouncekva, mybouncepa);
*/
@@ -463,7 +463,7 @@ vm_bounce_free(bp)
/*
* add the old kva into the "to free" list
*/
-
+
bouncekva= i386_trunc_page((vm_offset_t) bp->b_data);
bouncekvaend= i386_round_page((vm_offset_t)bp->b_data + bp->b_bufsize);
@@ -491,7 +491,7 @@ vm_bounce_init()
if (bouncepages == 0)
return;
-
+
bounceallocarraysize = (bouncepages + BITS_IN_UNSIGNED - 1) / BITS_IN_UNSIGNED;
bounceallocarray = malloc(bounceallocarraysize * sizeof(unsigned), M_TEMP, M_NOWAIT);
@@ -552,7 +552,7 @@ cpu_fork(p1, p2)
int offset;
/*
- * Copy pcb and stack from proc p1 to p2.
+ * Copy pcb and stack from proc p1 to p2.
* We do this as cheaply as possible, copying only the active
* part of the stack. The stack and pcb need to agree;
* this is tricky, as the final pcb is constructed by savectx,
@@ -571,7 +571,7 @@ cpu_fork(p1, p2)
pmap_activate(&p2->p_vmspace->vm_pmap, &up->u_pcb);
/*
- *
+ *
* Arrange for a non-local goto when the new process
* is started, to resume here, returning nonzero from setjmp.
*/
@@ -588,7 +588,7 @@ void
cpu_exit(p)
register struct proc *p;
{
-
+
#if NNPX > 0
npxexit(p);
#endif /* NNPX */
@@ -765,7 +765,7 @@ vunmapbuf(bp)
addr < bp->b_data + bp->b_bufsize;
addr += NBPG)
pmap_kremove((vm_offset_t) addr);
-
+
bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = NULL;
@@ -806,7 +806,7 @@ cpu_reset() {
bzero((caddr_t) PTD, NBPG);
/* "good night, sweet prince .... <THUNK!>" */
- pmap_update();
+ pmap_update();
/* NOTREACHED */
while(1);
}
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index a57dc9d40caf..576ba23e26c8 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cpufunc.h,v 1.35 1995/05/11 07:24:35 bde Exp $
+ * $Id: cpufunc.h,v 1.36 1995/05/14 22:25:11 davidg Exp $
*/
/*
@@ -279,7 +279,7 @@ read_eflags(void)
{
u_long ef;
- __asm __volatile("pushfl; popl %0" : "=r" (ef));
+ __asm __volatile("pushfl; popl %0" : "=r" (ef));
return (ef);
}
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index a59b632d8267..cae2a45e191b 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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.
*
- * $Id: db_machdep.h,v 1.6 1994/10/19 21:13:51 bde Exp $
+ * $Id: db_machdep.h,v 1.7 1995/01/14 10:34:52 bde Exp $
*/
#ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 6bc580809d11..34854b05c1b2 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: md_var.h,v 1.1 1995/03/16 18:11:43 bde Exp $
+ * $Id: md_var.h,v 1.2 1995/03/28 07:55:08 bde Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -41,7 +41,7 @@ extern u_long cpu_feature;
extern u_long cpu_high;
extern u_long cpu_id;
extern char cpu_vendor[];
-extern char etext[];
+extern char etext[];
extern vm_offset_t isaphysmem;
extern char kstack[];
extern void (*netisrs[32]) __P((void));
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 3ebe003981b0..6a35c0536f6a 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (c) 1991 Regents of the University of California.
* All rights reserved.
*
@@ -42,7 +42,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $Id: pmap.h,v 1.24 1995/03/16 18:11:44 bde Exp $
+ * $Id: pmap.h,v 1.25 1995/03/26 23:42:55 davidg Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -108,12 +108,12 @@ extern int IdlePTD; /* physical address of "Idle" state directory */
*/
#define vtopte(va) (PTmap + i386_btop(va))
#define kvtopte(va) vtopte(va)
-#define ptetov(pt) (i386_ptob(pt - PTmap))
+#define ptetov(pt) (i386_ptob(pt - PTmap))
#define vtophys(va) (((int) (*vtopte(va))&PG_FRAME) | ((int)(va) & PGOFSET))
#define ispt(va) ((va) >= UPT_MIN_ADDRESS && (va) <= KPT_MAX_ADDRESS)
#define avtopte(va) (APTmap + i386_btop(va))
-#define ptetoav(pt) (i386_ptob(pt - APTmap))
+#define ptetoav(pt) (i386_ptob(pt - APTmap))
#define avtophys(va) (((int) (*avtopte(va))&PG_FRAME) | ((int)(va) & PGOFSET))
#ifdef KERNEL
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 0c236f5f3b72..dcac309481a7 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)segments.h 7.1 (Berkeley) 5/9/91
- * $Id: segments.h,v 1.7 1994/11/15 14:12:40 bde Exp $
+ * $Id: segments.h,v 1.8 1995/02/14 19:21:15 sos Exp $
*/
#ifndef _MACHINE_SEGMENTS_H_
@@ -51,10 +51,10 @@
*/
#define ISPL(s) ((s)&3) /* what is the priority level of a selector */
-#define SEL_KPL 0 /* kernel priority level */
-#define SEL_UPL 3 /* user priority level */
+#define SEL_KPL 0 /* kernel priority level */
+#define SEL_UPL 3 /* user priority level */
#define ISLDT(s) ((s)&SEL_LDT) /* is it local or global */
-#define SEL_LDT 4 /* local descriptor table */
+#define SEL_LDT 4 /* local descriptor table */
#define IDXSEL(s) (((s)>>3) & 0x1fff) /* index of selector */
#define LSEL(s,r) (((s)<<3) | SEL_LDT | r) /* a local selector */
#define GSEL(s,r) (((s)<<3) | r) /* a global selector */
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index aa87bec9c1aa..75cc79dae89b 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $Id: specialreg.h,v 1.5 1994/09/04 23:10:27 davidg Exp $
+ * $Id: specialreg.h,v 1.6 1995/01/14 10:44:55 bde Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -84,7 +84,7 @@
* NCRx+0: A31-A24 of starting address
* NCRx+1: A23-A16 of starting address
* NCRx+2: A15-A12 of starting address | NCR_SIZE_xx.
- *
+ *
* The non-cacheable region's starting address must be aligned to the
* size indicated by the NCR_SIZE_xx field.
*/
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 1fada6e7145b..fd07e357ffd8 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)tss.h 5.4 (Berkeley) 1/18/91
- * $Id: tss.h,v 1.3 1993/11/07 17:43:16 wollman Exp $
+ * $Id: tss.h,v 1.4 1993/11/17 23:25:04 wollman Exp $
*/
#ifndef _MACHINE_TSS_H_
@@ -59,16 +59,16 @@ struct i386tss {
#define tss_pc tss_eip
int tss_eflags; /* program status longword */
#define tss_psl tss_eflags
- int tss_eax;
- int tss_ecx;
- int tss_edx;
- int tss_ebx;
+ int tss_eax;
+ int tss_ecx;
+ int tss_edx;
+ int tss_ebx;
int tss_esp; /* user stack pointer */
#define tss_usp tss_esp
int tss_ebp; /* user frame pointer */
#define tss_fp tss_ebp
- int tss_esi;
- int tss_edi;
+ int tss_esi;
+ int tss_edi;
int tss_es; /* actually 16 bits: top 16 bits must be zero */
int tss_cs; /* actually 16 bits: top 16 bits must be zero */
int tss_ss; /* actually 16 bits: top 16 bits must be zero */
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 196d34ce75ca..e1bc372f176f 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.32 1995/03/16 18:11:58 bde Exp $
+ * $Id: clock.c,v 1.33 1995/05/11 07:44:40 bde Exp $
*/
/*
@@ -193,7 +193,7 @@ int
acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
{
if (timer0_state || TIMER_DIV(rate) < TIMER0_MIN_MAX_COUNT ||
- !function)
+ !function)
return -1;
new_function = function;
new_rate = rate;
@@ -204,7 +204,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
int
acquire_timer2(int mode)
{
- if (timer2_state)
+ if (timer2_state)
return -1;
timer2_state = 1;
outb(TIMER_MODE, TIMER_SEL2 | (mode &0x3f));
@@ -265,7 +265,7 @@ printrtc(void)
#endif
static int
-getit()
+getit()
{
int high, low;
@@ -307,7 +307,7 @@ calibrate_cyclecounter(void)
/*
* Wait "n" microseconds.
- * Relies on timer 1 counting down from (TIMER_FREQ / hz)
+ * Relies on timer 1 counting down from (TIMER_FREQ / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@@ -339,7 +339,7 @@ DELAY(int n)
prev_tick = getit(0, 0);
n -= 20;
/*
- * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
+ * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
* and without any avoidable overflows.
*/
sec = n / 1000000;
@@ -375,11 +375,11 @@ sysbeepstop(void *chan)
beeping = 0;
}
-int
+int
sysbeep(int pitch, int period)
{
- if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
+ if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
return -1;
disable_intr();
outb(TIMER_CNTR2, pitch);
@@ -426,7 +426,7 @@ readrtc(int port)
* XXX initialization of other timers is unintentionally left blank.
*/
void
-startrtclock()
+startrtclock()
{
timer0_max_count = hardclock_max_count = TIMER_DIV(hz);
timer0_overflow_threshold = timer0_max_count - TIMER0_LATCH_COUNT;
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index c4a2455b8d6e..1dd0fb99557a 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $
+ * $Id: isa.c,v 1.49 1995/05/13 00:09:38 jkh Exp $
*/
/*
@@ -334,7 +334,7 @@ isa_configure() {
* SLIPDISC. No need to block out ALL ttys during a splimp when only one
* of them is running slip.
*
- * XXX actually, blocking all ttys during a splimp doesn't matter so much
+ * XXX actually, blocking all ttys during a splimp doesn't matter so much
* with sio because the serial interrupt layer doesn't use tty_imask. Only
* non-serial ttys suffer. It's more stupid that ALL 'net's are blocked
* during spltty.
@@ -372,8 +372,8 @@ isa_configure() {
/*
* Configure an ISA device.
*/
-
-
+
+
static void
config_isadev(isdp, mp)
struct isa_device *isdp;
@@ -381,7 +381,7 @@ config_isadev(isdp, mp)
{
config_isadev_c(isdp, mp, 0);
}
-
+
void
reconfig_isadev(isdp, mp)
struct isa_device *isdp;
@@ -400,7 +400,7 @@ config_isadev_c(isdp, mp, reconfig)
int id_alive;
int last_alive;
struct isa_driver *dp = isdp->id_driver;
-
+
checkbits = 0;
checkbits |= CC_DRQ;
checkbits |= CC_IOADDR;
@@ -464,11 +464,11 @@ config_isadev_c(isdp, mp, reconfig)
}
printf("\n");
/*
- * Check for conflicts again. The driver may have
- * changed *dvp. We should weaken the early check
- * since the driver may have been able to change
- * *dvp to avoid conflicts if given a chance. We
- * already skip the early check for IRQs and force
+ * Check for conflicts again. The driver may have
+ * changed *dvp. We should weaken the early check
+ * since the driver may have been able to change
+ * *dvp to avoid conflicts if given a chance. We
+ * already skip the early check for IRQs and force
* a check for IRQs in the next group of checks.
*/
checkbits |= CC_IRQ;
@@ -497,12 +497,12 @@ config_isadev_c(isdp, mp, reconfig)
}
printf("\n");
}
- }
+ }
else {
/* This code has not been tested.... */
if (isdp->id_irq) {
INTRDIS(isdp->id_irq);
- unregister_intr(ffs(isdp->id_irq) - 1,
+ unregister_intr(ffs(isdp->id_irq) - 1,
isdp->id_intr);
if (mp)
INTRUNMASK(*mp, isdp->id_irq);
@@ -593,7 +593,7 @@ eisa_generic_externalize(struct proc *p, struct kern_devconf *kdc,
* during configuration of kernel, setup interrupt control unit
*/
void
-isa_defaultirq()
+isa_defaultirq()
{
int i;
@@ -643,7 +643,7 @@ static short dmapageport[8] =
void isa_dmacascade(unsigned chan)
{
if (chan > 7)
- panic("isa_dmacascade: impossible request");
+ panic("isa_dmacascade: impossible request");
/* set dma channel mode, and set dma channel mode */
if ((chan & 4) == 0) {
@@ -670,7 +670,7 @@ void isa_dmastart(int flags, caddr_t addr, unsigned nbytes, unsigned chan)
if ( chan > 7
|| (chan < 4 && nbytes > (1<<16))
|| (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
- panic("isa_dmastart: impossible request");
+ panic("isa_dmastart: impossible request");
if (isa_dmarangecheck(addr, nbytes, chan)) {
if (dma_bounce[chan] == 0)
@@ -818,7 +818,7 @@ static void (*isaphysmemunblock)(); /* needs to be a list */
*/
caddr_t
isa_allocphysmem(caddr_t va, unsigned length, void (*func)()) {
-
+
isaphysmemunblock = func;
while (isaphysmemflag & B_BUSY) {
isaphysmemflag |= B_WANTED;
@@ -844,7 +844,7 @@ isa_freephysmem(caddr_t va, unsigned length) {
(*isaphysmemunblock)();
}
}
-
+
#define NMI_PARITY (1 << 7)
#define NMI_IOCHAN (1 << 6)
#define ENMI_WATCHDOG (1 << 7)
@@ -856,7 +856,7 @@ isa_freephysmem(caddr_t va, unsigned length) {
* return true to panic system, false to ignore.
*/
int
-isa_nmi(cd)
+isa_nmi(cd)
int cd;
{
int isa_port = inb(0x61);
@@ -930,7 +930,7 @@ struct isa_device *find_isadev(table, driverp, unit)
while ((table->id_driver != driverp) || (table->id_unit != unit)) {
if (table->id_driver == 0)
return NULL;
-
+
table++;
}
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index aacff0dd0b19..0a5327941724 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.21 1995/03/05 04:06:44 wpaul Exp $
+ * $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
*/
#include "npx.h"
@@ -280,7 +280,7 @@ npxprobe1(dvp)
/*
* Good, now check for a proper control word.
*/
- control = 0x5a5a;
+ control = 0x5a5a;
fnstcw(&control);
if ((control & 0x1f3f) == 0x033f) {
hw_float = npx_exists = 1;
@@ -344,7 +344,7 @@ npxattach(dvp)
printf("npx%d: INT 16 interface\n", dvp->id_unit);
else if (npx_irq13)
; /* higher level has printed "irq 13" */
-#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
+#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
else if (npx_exists) {
printf("npx%d: error reporting broken; using 387 emulator\n",
dvp->id_unit);
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index e81caf3e36e2..aef575547678 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
+# $Id: Makefile.i386,v 1.63 1995/05/11 19:48:45 wollman Exp $
#
# Makefile for FreeBSD
#
@@ -14,7 +14,7 @@
# /sys/i386/conf/Makefile.i386
# after which config should be rerun for all machines.
#
-CC?= cc
+CC?= cc
CPP?= cpp
LD?= /usr/bin/ld
@@ -61,7 +61,7 @@ SFILES= ${I386}/i386/exception.s ${I386}/i386/microtime.s \
${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
SYSTEM_CFILES= ioconf.c param.c vnode_if.c
SYSTEM_SFILES= ${I386}/i386/locore.s
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
@@ -145,7 +145,7 @@ trap.o cons.o: Makefile
assym.s: genassym
./genassym >assym.s
-# Some of the defines that genassym outputs may well depend on the
+# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index e81caf3e36e2..aef575547678 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
+# $Id: Makefile.i386,v 1.63 1995/05/11 19:48:45 wollman Exp $
#
# Makefile for FreeBSD
#
@@ -14,7 +14,7 @@
# /sys/i386/conf/Makefile.i386
# after which config should be rerun for all machines.
#
-CC?= cc
+CC?= cc
CPP?= cpp
LD?= /usr/bin/ld
@@ -61,7 +61,7 @@ SFILES= ${I386}/i386/exception.s ${I386}/i386/microtime.s \
${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
SYSTEM_CFILES= ioconf.c param.c vnode_if.c
SYSTEM_SFILES= ${I386}/i386/locore.s
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
@@ -145,7 +145,7 @@ trap.o cons.o: Makefile
assym.s: genassym
./genassym >assym.s
-# Some of the defines that genassym outputs may well depend on the
+# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 7178bbe1c96c..fb53d27f5f12 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_access.c,v 1.5 1994/08/13 03:49:13 wollman Exp $
+ * $Id: db_access.c,v 1.6 1994/08/18 22:34:18 wollman Exp $
*/
/*
@@ -68,7 +68,7 @@ db_get_value(addr, size, is_signed)
{
value = (value << 8) + (data[i] & 0xFF);
}
-
+
if (size < 4) {
if (is_signed && (value & db_extend[size]) != 0)
value |= db_extend[size];
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index a62edbacc6ad..dbf3d2112115 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_access.h,v 1.2 1993/10/16 16:47:05 rgrimes Exp $
+ * $Id: db_access.h,v 1.3 1993/11/07 17:39:20 wollman Exp $
*/
#ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 91c67ce7c401..62cbba94b653 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_aout.c,v 1.9 1994/09/27 03:34:52 phk Exp $
+ * $Id: db_aout.c,v 1.10 1995/01/25 21:37:04 bde Exp $
*/
/*
@@ -243,7 +243,7 @@ X_db_line_at_pc(symtab, cursym, filename, linenum, off)
if (sp->n_value <= off && (off - sp->n_value) <= sodiff &&
NEWSRC(sp->n_un.n_name)) {
#endif
- if ((sp->n_type & N_TYPE) == N_FN || NEWSRC(sp->n_un.n_name)) {
+ if ((sp->n_type & N_TYPE) == N_FN || NEWSRC(sp->n_un.n_name)) {
sodiff = lndiff = -1UL;
ln = 0;
fname = NULL;
@@ -392,7 +392,7 @@ read_symtab_from_file(fp, symtab_name)
X_db_sym_init((int *)symtab,
(char *)(symtab + table_size),
symtab_name);
-
+
}
#endif
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index cb9c55e0a1b7..05a4cc16a93c 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_break.c,v 1.4 1994/08/13 03:49:15 wollman Exp $
+ * $Id: db_break.c,v 1.5 1994/08/18 22:34:19 wollman Exp $
*/
/*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index dc66dcab75d4..efe62c717e29 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id$
+ * $Id: db_break.h,v 1.2 1993/10/16 16:47:09 rgrimes Exp $
*/
/*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 1613ab950bf8..c52238ad6116 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_command.c,v 1.11 1995/03/16 18:10:59 bde Exp $
+ * $Id: db_command.c,v 1.12 1995/03/19 14:28:28 davidg Exp $
*/
/*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 9000cd049649..3b6d77ae7102 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_command.h,v 1.4 1994/08/13 03:49:16 wollman Exp $
+ * $Id: db_command.h,v 1.5 1994/08/18 22:34:21 wollman Exp $
*/
#ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 48334bafd07e..8f321b936c85 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_examine.c,v 1.6 1994/08/18 22:34:22 wollman Exp $
+ * $Id: db_examine.c,v 1.7 1995/05/22 13:07:11 davidg Exp $
*/
/*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 1c7eea1fb840..8f4b78f99def 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_expr.c,v 1.3 1993/11/25 01:30:06 wollman Exp $
+ * $Id: db_expr.c,v 1.4 1994/08/13 03:49:18 wollman Exp $
*/
/*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index 4697a8c8f3fc..c3097742eb9f 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_input.c,v 1.5 1994/08/13 03:49:19 wollman Exp $
+ * $Id: db_input.c,v 1.6 1994/08/18 22:34:23 wollman Exp $
*/
/*
@@ -253,4 +253,4 @@ void
cnpollc (flag)
int flag;
{
-}
+}
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 8f5f4b0b4813..3985c4f67e34 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_lex.c,v 1.4 1994/08/13 03:49:20 wollman Exp $
+ * $Id: db_lex.c,v 1.5 1994/08/18 22:34:23 wollman Exp $
*/
/*
@@ -76,7 +76,7 @@ db_read_char()
}
else if (db_lp >= db_endlp)
c = -1;
- else
+ else
c = *db_lp++;
return (c);
}
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index db1d2b9f20ce..0be7d4ac4a18 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_lex.h,v 1.3 1993/11/07 17:39:23 wollman Exp $
+ * $Id: db_lex.h,v 1.4 1994/08/18 22:34:24 wollman Exp $
*/
#ifndef _DDB_DB_LEX_H_
@@ -45,7 +45,7 @@ extern void db_unread_token(/* int t */);
extern void db_flush_lex();
extern int db_tok_number;
-#define TOK_STRING_SIZE 120
+#define TOK_STRING_SIZE 120
extern char db_tok_string[TOK_STRING_SIZE];
#define tEOF (-1)
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index cc70b6342822..ca92bfc912de 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_output.c,v 1.9 1994/09/27 03:34:54 phk Exp $
+ * $Id: db_output.c,v 1.10 1994/10/30 20:55:44 bde Exp $
*/
/*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 3bfd7108c50a..3a2f5fd321a9 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_output.h,v 1.5 1994/09/27 03:34:55 phk Exp $
+ * $Id: db_output.h,v 1.6 1994/09/27 12:15:53 davidg Exp $
*/
#ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index e9a9fd3e0181..7f0557b5c771 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_print.c,v 1.5 1994/08/18 22:34:25 wollman Exp $
+ * $Id: db_print.c,v 1.6 1994/09/27 03:34:56 phk Exp $
*/
/*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 18435277f7d3..09af7f0787ac 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: db_ps.c,v 1.4 1995/03/28 23:29:52 davidg Exp $
+ * $Id: db_ps.c,v 1.5 1995/04/04 01:35:33 davidg Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ db_ps() {
pp = p;
if (p->p_stat) {
db_printf("%5d %06x %06x %4d %5d %5d %06x %d",
- p->p_pid, ap, p->p_addr, p->p_cred->p_ruid, pp->p_pid,
+ p->p_pid, ap, p->p_addr, p->p_cred->p_ruid, pp->p_pid,
p->p_pgrp->pg_id, p->p_flag, p->p_stat);
if (p->p_wchan) {
db_printf(" %6s %08x %s\n", p->p_wmesg, p->p_wchan, p->p_comm);
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 4b1bd15c7440..e161a73228ce 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_run.c,v 1.3 1993/11/25 01:30:10 wollman Exp $
+ * $Id: db_run.c,v 1.4 1994/08/13 03:49:22 wollman Exp $
*/
/*
@@ -103,7 +103,7 @@ db_stop_at_pc(is_breakpoint)
} else if (*is_breakpoint) {
ddb_regs.tf_eip += 1;
}
-
+
*is_breakpoint = FALSE;
if (db_run_mode == STEP_INVISIBLE) {
@@ -236,7 +236,7 @@ db_single_step(regs)
* 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) returns the address of the first
* instruction following the one at "pc",
* which is either in the taken path of
@@ -248,7 +248,7 @@ db_single_step(regs)
* 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;
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 57329d6deb40..81c7b4d94a80 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_sym.c,v 1.7 1994/09/27 03:34:57 phk Exp $
+ * $Id: db_sym.c,v 1.8 1995/05/22 13:07:12 davidg Exp $
*/
/*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 88cd689dbeeb..319279dab56b 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_sym.h,v 1.6 1994/09/27 03:34:57 phk Exp $
+ * $Id: db_sym.h,v 1.7 1995/03/16 18:11:00 bde Exp $
*/
#ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index bc65ed976242..83419b825537 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_trap.c,v 1.5 1994/08/18 22:34:27 wollman Exp $
+ * $Id: db_trap.c,v 1.6 1994/10/02 19:36:21 phk Exp $
*/
/*
@@ -65,7 +65,7 @@ db_trap(type, code)
db_printf("Watchpoint at\t");
else
db_printf("Stopped at\t");
-
+
db_print_loc_and_inst(db_dot);
}
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index b803e5b34628..25485f5256c2 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_variables.c,v 1.5 1994/08/18 22:34:27 wollman Exp $
+ * $Id: db_variables.c,v 1.6 1994/09/27 03:34:58 phk Exp $
*/
/*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 35e5a0001817..76aeedecaf62 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_variables.h,v 1.2 1993/10/16 16:47:31 rgrimes Exp $
+ * $Id: db_variables.h,v 1.3 1993/11/25 01:30:14 wollman Exp $
*/
/*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index fb6680fd47a4..b74fab9e9fa6 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_watch.c,v 1.4 1994/08/13 03:49:25 wollman Exp $
+ * $Id: db_watch.c,v 1.5 1994/08/18 22:34:28 wollman Exp $
*/
/*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index d564ad24afbf..61cb7c1806bb 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_watch.h,v 1.2 1993/10/16 16:47:33 rgrimes Exp $
+ * $Id: db_watch.h,v 1.3 1994/08/18 22:34:29 wollman Exp $
*/
/*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index e2625ca0df5f..1b2a99e42c1f 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_write_cmd.c,v 1.3 1993/11/25 01:30:16 wollman Exp $
+ * $Id: db_write_cmd.c,v 1.4 1994/08/13 03:49:26 wollman Exp $
*/
/*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 23cfc60dcc88..23702b28cb7f 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ddb.h,v 1.4 1994/09/27 12:15:56 davidg Exp $
+ * $Id: ddb.h,v 1.5 1995/03/16 18:11:01 bde Exp $
*/
/*
@@ -55,8 +55,8 @@ extern int db_tab_stop_width;
/*
* Functions...
*/
-extern void
-db_read_bytes(vm_offset_t addr, register int size, register char *data);
+extern void
+db_read_bytes(vm_offset_t addr, register int size, register char *data);
/* machine-dependent */
extern void
diff --git a/sys/dev/aic7xxx/aic7xxx_asm.c b/sys/dev/aic7xxx/aic7xxx_asm.c
index 5f910d45bb28..e2745f094023 100644
--- a/sys/dev/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/aic7xxx/aic7xxx_asm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$Id$";
+static char id[] = "$Id: aic7xxx_asm.c,v 1.8 1995/04/15 21:45:56 gibbs Exp $";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
@@ -70,7 +70,7 @@ char *filename;
FILE *ifp, *ofp;
unsigned char M[MEMORY][4];
-void
+void
error(char *s)
{
fprintf(stderr, "%s: %s at line %d\n", filename, s, lineno);
@@ -107,7 +107,7 @@ typedef struct sym_t {
struct sym_t *next; /* MUST BE FIRST */
char *name;
int value;
- int npatch;
+ int npatch;
int *patch;
} sym_t;
@@ -151,7 +151,7 @@ lookup(char *name)
return(NULL);
}
-void
+void
patch(sym_t *p, int location)
{
p->npatch += 1;
@@ -244,7 +244,7 @@ rescan:
else
error("too many tokens");
if (quote) {
- quote++;
+ quote++;
p = strchr(quote, '\"');
if (!p)
error("unterminated string constant");
@@ -256,7 +256,7 @@ rescan:
else
error("too many tokens");
goto rescan;
- }
+ }
if (i) {
*n = i;
return(a);
@@ -336,7 +336,7 @@ struct {
{ 0, 0, 0, 0, 0, 0, 0, 0 }
};
-int
+int
eval_operand(char **a, int spec)
{
int i;
@@ -604,7 +604,7 @@ main(int argc, char **argv)
}
break;
case 'h':
- printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
+ printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
*argv);
exit(EXIT_SUCCESS);
break;
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index 5f910d45bb28..e2745f094023 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$Id$";
+static char id[] = "$Id: aic7xxx_asm.c,v 1.8 1995/04/15 21:45:56 gibbs Exp $";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
@@ -70,7 +70,7 @@ char *filename;
FILE *ifp, *ofp;
unsigned char M[MEMORY][4];
-void
+void
error(char *s)
{
fprintf(stderr, "%s: %s at line %d\n", filename, s, lineno);
@@ -107,7 +107,7 @@ typedef struct sym_t {
struct sym_t *next; /* MUST BE FIRST */
char *name;
int value;
- int npatch;
+ int npatch;
int *patch;
} sym_t;
@@ -151,7 +151,7 @@ lookup(char *name)
return(NULL);
}
-void
+void
patch(sym_t *p, int location)
{
p->npatch += 1;
@@ -244,7 +244,7 @@ rescan:
else
error("too many tokens");
if (quote) {
- quote++;
+ quote++;
p = strchr(quote, '\"');
if (!p)
error("unterminated string constant");
@@ -256,7 +256,7 @@ rescan:
else
error("too many tokens");
goto rescan;
- }
+ }
if (i) {
*n = i;
return(a);
@@ -336,7 +336,7 @@ struct {
{ 0, 0, 0, 0, 0, 0, 0, 0 }
};
-int
+int
eval_operand(char **a, int spec)
{
int i;
@@ -604,7 +604,7 @@ main(int argc, char **argv)
}
break;
case 'h':
- printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
+ printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
*argv);
exit(EXIT_SUCCESS);
break;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index 5f910d45bb28..e2745f094023 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -43,7 +43,7 @@
* are token separators.
*
*-M*************************************************************************/
-static char id[] = "$Id$";
+static char id[] = "$Id: aic7xxx_asm.c,v 1.8 1995/04/15 21:45:56 gibbs Exp $";
#include <ctype.h>
#include <stdio.h>
#include <string.h>
@@ -70,7 +70,7 @@ char *filename;
FILE *ifp, *ofp;
unsigned char M[MEMORY][4];
-void
+void
error(char *s)
{
fprintf(stderr, "%s: %s at line %d\n", filename, s, lineno);
@@ -107,7 +107,7 @@ typedef struct sym_t {
struct sym_t *next; /* MUST BE FIRST */
char *name;
int value;
- int npatch;
+ int npatch;
int *patch;
} sym_t;
@@ -151,7 +151,7 @@ lookup(char *name)
return(NULL);
}
-void
+void
patch(sym_t *p, int location)
{
p->npatch += 1;
@@ -244,7 +244,7 @@ rescan:
else
error("too many tokens");
if (quote) {
- quote++;
+ quote++;
p = strchr(quote, '\"');
if (!p)
error("unterminated string constant");
@@ -256,7 +256,7 @@ rescan:
else
error("too many tokens");
goto rescan;
- }
+ }
if (i) {
*n = i;
return(a);
@@ -336,7 +336,7 @@ struct {
{ 0, 0, 0, 0, 0, 0, 0, 0 }
};
-int
+int
eval_operand(char **a, int spec)
{
int i;
@@ -604,7 +604,7 @@ main(int argc, char **argv)
}
break;
case 'h':
- printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
+ printf("usage: %s [-d] [-Dname] [-ooutput] input\n",
*argv);
exit(EXIT_SUCCESS);
break;
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index a37292e6d460..fd898f24e23e 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.5 1995/03/28 07:55:25 bde Exp $
+ * $Id: cy.c,v 1.6 1995/03/28 12:29:11 bde Exp $
*/
/*
@@ -99,7 +99,7 @@
#define PollMode /* use polling-based irq service routine, not the
* hardware svcack lines. Must be defined for
* cyclom-16y boards.
- *
+ *
* XXX cyclom-8y doesn't work without this defined
* either (!)
*/
@@ -172,7 +172,7 @@ void delay(int delay);
/* Better get rid of this until the core people agree on kernel interfaces.
At least it will then compile on both WhichBSDs.
- */
+ */
#if 0
extern unsigned int delaycount; /* calibrated 1 ms cpu-spin delay */
#endif
@@ -546,7 +546,7 @@ service_upper_rx(int unit)
#ifdef FastRawInput
/* try to avoid calling the line discipline stuff if we can */
if ((tp->t_line == 0) &&
- !(tp->t_iflag & (ICRNL | IMAXBEL | INLCR)) &&
+ !(tp->t_iflag & (ICRNL | IMAXBEL | INLCR)) &&
!(tp->t_lflag & (ECHO | ECHONL | ICANON | IEXTEN |
ISIG | PENDIN)) &&
!(tp->t_state & (TS_CNTTB | TS_LNCH))) {
@@ -1321,11 +1321,11 @@ cyparam(struct tty *tp, struct termios *t)
if (iflag & IXOFF)
opt |= 1 << 6; /* auto XOFF output flow-control */
#endif
-#ifndef ALWAYS_RTS_CTS
+#ifndef ALWAYS_RTS_CTS
if (cflag & CCTS_OFLOW)
#endif
opt |= 1 << 1; /* auto CTS flow-control */
-
+
if (opt != infop->cor[1]) {
cor_change |= 1 << 2;
*(base + CD1400_COR2) = opt;
@@ -1560,7 +1560,7 @@ cyspeed(int speed, int *prescaler_io)
static void
cd1400_channel_cmd(cy_addr base, u_char cmd)
{
- /* XXX hsu@clinet.fi: This is always more dependent on ISA bus speed,
+ /* XXX hsu@clinet.fi: This is always more dependent on ISA bus speed,
as the card is probed every round? Replaced delaycount with 8k.
Either delaycount has to be implemented in FreeBSD or more sensible
way of doing these should be implemented. DELAY isn't enough here.
@@ -1570,7 +1570,7 @@ cd1400_channel_cmd(cy_addr base, u_char cmd)
/* wait for processing of previous command to complete */
while (*(base + CD1400_CCR) && maxwait--)
;
-
+
if (!maxwait)
log(LOG_ERR, "cy: channel command timeout (%d loops) - arrgh\n",
5 * 8 * 1024);
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index a37292e6d460..fd898f24e23e 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.5 1995/03/28 07:55:25 bde Exp $
+ * $Id: cy.c,v 1.6 1995/03/28 12:29:11 bde Exp $
*/
/*
@@ -99,7 +99,7 @@
#define PollMode /* use polling-based irq service routine, not the
* hardware svcack lines. Must be defined for
* cyclom-16y boards.
- *
+ *
* XXX cyclom-8y doesn't work without this defined
* either (!)
*/
@@ -172,7 +172,7 @@ void delay(int delay);
/* Better get rid of this until the core people agree on kernel interfaces.
At least it will then compile on both WhichBSDs.
- */
+ */
#if 0
extern unsigned int delaycount; /* calibrated 1 ms cpu-spin delay */
#endif
@@ -546,7 +546,7 @@ service_upper_rx(int unit)
#ifdef FastRawInput
/* try to avoid calling the line discipline stuff if we can */
if ((tp->t_line == 0) &&
- !(tp->t_iflag & (ICRNL | IMAXBEL | INLCR)) &&
+ !(tp->t_iflag & (ICRNL | IMAXBEL | INLCR)) &&
!(tp->t_lflag & (ECHO | ECHONL | ICANON | IEXTEN |
ISIG | PENDIN)) &&
!(tp->t_state & (TS_CNTTB | TS_LNCH))) {
@@ -1321,11 +1321,11 @@ cyparam(struct tty *tp, struct termios *t)
if (iflag & IXOFF)
opt |= 1 << 6; /* auto XOFF output flow-control */
#endif
-#ifndef ALWAYS_RTS_CTS
+#ifndef ALWAYS_RTS_CTS
if (cflag & CCTS_OFLOW)
#endif
opt |= 1 << 1; /* auto CTS flow-control */
-
+
if (opt != infop->cor[1]) {
cor_change |= 1 << 2;
*(base + CD1400_COR2) = opt;
@@ -1560,7 +1560,7 @@ cyspeed(int speed, int *prescaler_io)
static void
cd1400_channel_cmd(cy_addr base, u_char cmd)
{
- /* XXX hsu@clinet.fi: This is always more dependent on ISA bus speed,
+ /* XXX hsu@clinet.fi: This is always more dependent on ISA bus speed,
as the card is probed every round? Replaced delaycount with 8k.
Either delaycount has to be implemented in FreeBSD or more sensible
way of doing these should be implemented. DELAY isn't enough here.
@@ -1570,7 +1570,7 @@ cd1400_channel_cmd(cy_addr base, u_char cmd)
/* wait for processing of previous command to complete */
while (*(base + CD1400_CCR) && maxwait--)
;
-
+
if (!maxwait)
log(LOG_ERR, "cy: channel command timeout (%d loops) - arrgh\n",
5 * 8 * 1024);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 2767cceb9f9a..7a0eee7ca165 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_de.c,v 1.26 1995/05/22 13:32:24 davidg Exp $
+ * $Id: if_de.c,v 1.27 1995/05/26 02:02:44 davidg Exp $
*
*/
@@ -187,7 +187,7 @@ typedef struct {
* And the number of receive descriptors multiplied by the size
* of the receive buffers must equal the recevive space. This
* is so that we can manipulate the page tables so that even if a
- * packet wraps around the end of the receive space, we can
+ * packet wraps around the end of the receive space, we can
* treat it as virtually contiguous.
*
* The above used to be true (the stupid restriction is still true)
@@ -257,7 +257,7 @@ struct _tulip_softc_t {
#ifndef IFF_ALTPHYS
#define IFF_ALTPHYS IFF_LINK0 /* In case it isn't defined */
#endif
-static const char *tulip_chipdescs[] = {
+static const char *tulip_chipdescs[] = {
"DC21040 [10Mb/s]",
"DC21140 [10-100Mb/s]",
"DC21041 [10Mb/s]"
@@ -500,7 +500,7 @@ tulip_reset(
tulip_desc_t *di;
TULIP_WRITE_CSR(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
- DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
+ DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a
bit longer anyways) */
@@ -532,7 +532,7 @@ tulip_reset(
di->d_status = 0;
/*
- * We need to collect all the mbufs were on the
+ * We need to collect all the mbufs were on the
* receive ring before we reinit it either to put
* them back on or to know if we have to allocate
* more.
@@ -648,7 +648,7 @@ tulip_rx_intr(
if (((volatile tulip_desc_t *) eop)->d_status & TULIP_DSTS_OWNER)
break;
-
+
total_len = ((eop->d_status >> 16) & 0x7FF) - 4;
IF_DEQUEUE(&sc->tulip_rxq, m);
if ((eop->d_status & TULIP_DSTS_ERRSUM) == 0) {
@@ -1056,8 +1056,8 @@ tulip_idle_srom(
tulip_softc_t * const sc)
{
unsigned bit, csr;
-
- csr = SROMSEL | SROMRD; EMIT;
+
+ csr = SROMSEL | SROMRD; EMIT;
csr ^= SROMCS; EMIT;
csr ^= SROMCLKON; EMIT;
@@ -1073,12 +1073,12 @@ tulip_idle_srom(
csr = 0; EMIT;
}
-
+
static void
tulip_read_srom(
tulip_softc_t * const sc)
-{
- int idx;
+{
+ int idx;
const unsigned bitwidth = SROM_BITWIDTH;
const unsigned cmdmask = (SROMCMD_RD << bitwidth);
const unsigned msb = 1 << (bitwidth + 3 - 1);
@@ -1091,7 +1091,7 @@ tulip_read_srom(
csr = SROMSEL | SROMRD; EMIT;
csr ^= SROMCSON; EMIT;
csr ^= SROMCLKON; EMIT;
-
+
lastbit = 0;
for (bits = idx|cmdmask, bit = bitwidth + 3; bit > 0; bit--, bits <<= 1) {
const unsigned thisbit = bits & msb;
@@ -1106,7 +1106,7 @@ tulip_read_srom(
for (data = 0, bits = 0; bits < 16; bits++) {
data <<= 1;
- csr ^= SROMCLKON; EMIT; /* clock high; data valid */
+ csr ^= SROMCLKON; EMIT; /* clock high; data valid */
data |= TULIP_READ_CSR(sc, csr_srom_mii) & SROMDIN ? 1 : 0;
csr ^= SROMCLKOFF; EMIT; /* clock low; data not valid */
}
@@ -1227,7 +1227,7 @@ tulip_read_macaddr(
if (cksum >= 65535) cksum -= 65535;
rom_cksum = *(u_short *) &sc->tulip_rombuf[6];
-
+
if (cksum != rom_cksum)
return -1;
@@ -1274,8 +1274,8 @@ tulip_addr_filter(
ETHER_NEXT_MULTI(step, enm);
}
sc->tulip_flags |= TULIP_WANTHASH;
- sp[39] = ((u_short *) sc->tulip_ac.ac_enaddr)[0];
- sp[40] = ((u_short *) sc->tulip_ac.ac_enaddr)[1];
+ sp[39] = ((u_short *) sc->tulip_ac.ac_enaddr)[0];
+ sp[40] = ((u_short *) sc->tulip_ac.ac_enaddr)[1];
sp[41] = ((u_short *) sc->tulip_ac.ac_enaddr)[2];
} else {
/*
@@ -1284,8 +1284,8 @@ tulip_addr_filter(
i = 0;
ETHER_FIRST_MULTI(step, &sc->tulip_ac, enm);
for (; enm != NULL; i++) {
- *sp++ = ((u_short *) enm->enm_addrlo)[0];
- *sp++ = ((u_short *) enm->enm_addrlo)[1];
+ *sp++ = ((u_short *) enm->enm_addrlo)[0];
+ *sp++ = ((u_short *) enm->enm_addrlo)[1];
*sp++ = ((u_short *) enm->enm_addrlo)[2];
ETHER_NEXT_MULTI(step, enm);
}
@@ -1302,8 +1302,8 @@ tulip_addr_filter(
* Pad the rest with our hardware address
*/
for (; i < 16; i++) {
- *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[0];
- *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[1];
+ *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[0];
+ *sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[1];
*sp++ = ((u_short *) sc->tulip_ac.ac_enaddr)[2];
}
}
@@ -1441,11 +1441,11 @@ tulip_attach(
ifp->if_ioctl = tulip_ioctl;
ifp->if_output = ether_output;
ifp->if_start = tulip_start;
-
+
#ifdef __FreeBSD__
printf("%s%d", sc->tulip_name, sc->tulip_unit);
#endif
- printf(": %s%s pass %d.%d Ethernet address %s\n",
+ printf(": %s%s pass %d.%d Ethernet address %s\n",
sc->tulip_boardsw->bd_description,
tulip_chipdescs[sc->tulip_chipid],
(sc->tulip_revinfo & 0xF0) >> 4,
@@ -1550,7 +1550,7 @@ tulip_pci_shutdown(
if (kdc->kdc_unit < NDE) {
tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(kdc->kdc_unit);
TULIP_WRITE_CSR(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
- DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
+ DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a
bit longer anyways) */
}
@@ -1595,7 +1595,7 @@ tulip_pci_shutdown(
{
tulip_softc_t * const sc = (tulip_softc_t *) arg;
TULIP_WRITE_CSR(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
- DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
+ DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a
bit longer anyways) */
}
@@ -1684,7 +1684,7 @@ tulip_pci_shutdown(
{
tulip_softc_t * const sc = (tulip_softc_t *) arg;
TULIP_WRITE_CSR(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
- DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
+ DELAY(10); /* Wait 10 microsends (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a
bit longer anyways) */
}
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d4d29f87e363..100d8f737582 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
- * $Id: if_ed.c,v 1.71 1995/05/12 22:39:40 davidg Exp $
+ * $Id: if_ed.c,v 1.72 1995/05/14 11:01:20 davidg Exp $
*/
#include "ed.h"
@@ -363,11 +363,11 @@ ed_probe_WD80x3(isa_dev)
isa16bit = 1;
memsize = 16384;
sc->type_str = "WD8013EP";
- sc->kdc.kdc_description =
+ sc->kdc.kdc_description =
"Ethernet adapter: WD 8013EP";
} else {
sc->type_str = "WD8003EP";
- sc->kdc.kdc_description =
+ sc->kdc.kdc_description =
"Ethernet adapter: WD 8003EP";
}
break;
@@ -407,7 +407,7 @@ ed_probe_WD80x3(isa_dev)
break;
case ED_TYPE_SMC8216T:
sc->type_str = "SMC8216T";
- sc->kdc.kdc_description =
+ sc->kdc.kdc_description =
"Ethernet adapter: SMC 8216T";
outb(sc->asic_addr + ED_WD790_HWR,
@@ -1376,7 +1376,7 @@ ed_init(unit)
/*
* Enable the following interrupts: receive/transmit complete,
* receive/transmit error, and Receiver OverWrite.
- *
+ *
* Counter overflow and Remote DMA complete are *not* enabled.
*/
outb(sc->nic_addr + ED_P0_IMR,
@@ -2060,8 +2060,8 @@ ed_ioctl(ifp, command, data)
ed_init(ifp->if_unit);
}
/* UP controls BUSY/IDLE */
- sc->kdc.kdc_state = ((ifp->if_flags & IFF_UP)
- ? DC_BUSY
+ sc->kdc.kdc_state = ((ifp->if_flags & IFF_UP)
+ ? DC_BUSY
: DC_IDLE);
#if NBPFILTER > 0
@@ -2327,7 +2327,7 @@ ed_pio_write_mbufs(sc, m, dst)
outb(sc->nic_addr + ED_P0_CR, ED_CR_RD1 | ED_CR_STA);
/*
- * Transfer the mbuf chain to the NIC memory.
+ * Transfer the mbuf chain to the NIC memory.
* 16-bit cards require that data be transferred as words, and only words.
* So that case requires some extra code to patch over odd-length mbufs.
*/
@@ -2336,7 +2336,7 @@ ed_pio_write_mbufs(sc, m, dst)
/* NE1000s are easy */
while (m) {
if (m->m_len) {
- outsb(sc->asic_addr + ED_NOVELL_DATA,
+ outsb(sc->asic_addr + ED_NOVELL_DATA,
m->m_data, m->m_len);
}
m = m->m_next;
@@ -2346,7 +2346,7 @@ ed_pio_write_mbufs(sc, m, dst)
unsigned char *data;
int len, wantbyte;
unsigned char savebyte[2];
-
+
wantbyte = 0;
while (m) {
@@ -2363,7 +2363,7 @@ ed_pio_write_mbufs(sc, m, dst)
}
/* output contiguous words */
if (len > 1) {
- outsw(sc->asic_addr + ED_NOVELL_DATA,
+ outsw(sc->asic_addr + ED_NOVELL_DATA,
data, len >> 1);
data += len & ~1;
len &= 1;
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 31f78795a9bf..430fa9393602 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,10 +6,10 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $Id: if_edreg.h,v 1.16 1994/08/04 17:42:35 davidg Exp $
+ * $Id: if_edreg.h,v 1.17 1995/01/23 19:06:08 davidg Exp $
*/
/*
- * National Semiconductor DS8390 NIC register definitions
+ * National Semiconductor DS8390 NIC register definitions
*
*
* Modification history
@@ -26,10 +26,10 @@
* changed double buffering flag to multi buffering
* made changes/additions for 3c503 multi-buffering
* ...companion to Rev. 2.0 of 'ed' driver.
- *
+ *
* Revision 1.1 93/06/23 03:01:07 davidg
* Initial revision
- *
+ *
*/
/*
@@ -378,7 +378,7 @@
* algorithm to allow prioritization of nodes.
*/
#define ED_TCR_OFST 0x10
-
+
/*
* bits 5, 6, and 7 are unused/reserved
*/
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 2aad5d2c6fc0..ca6baf3f0cd8 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: eisaconf.c,v 1.1 1995/03/13 09:10:17 root Exp root $
+ * $Id: eisaconf.c,v 1.1 1995/04/23 08:55:41 julian Exp $
*/
/*
@@ -61,7 +61,7 @@ eisa_configure()
if (productID & 0x80) {
printf("Warning: running EISA kernel on non-EISA system board\n");
return;
- }
+ }
printf("Probing for devices on EISA bus\n");
productID = (productID<<8) | inb(eisaBase+1);
productRevision = inb(eisaBase+2);
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index b0a0cbb27779..9b16c23543fa 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -13,14 +13,14 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: eisaconf.h,v 1.1 1995/03/13 09:10:17 root Exp root $
+ * $Id: eisaconf.h,v 1.1 1995/04/23 08:55:42 julian Exp $
*/
/*
* Ported to run under FreeBSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
-#define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */
+#define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */
struct eisa_dev {
char productID[4];
unsigned short productType;
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index de75d41e72c6..3b677d6a9994 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -32,13 +32,13 @@
/*
* Modified from the FreeBSD 1.1.5.1 version by:
- * Andres Vega Garcia
+ * Andres Vega Garcia
* INRIA - Sophia Antipolis, France
* avega@sophia.inria.fr
*/
/*
- * $Id: if_ep.c,v 1.26 1995/04/12 20:47:49 wollman Exp $
+ * $Id: if_ep.c,v 1.27 1995/05/27 04:40:57 davidg Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -183,7 +183,7 @@ ep_look_for_board_at(is)
if (ep_current_tag == (EP_LAST_TAG + 1)) {
/* Come here just one time */
-
+
/* Look for the EISA boards, leave them activated */
for(j = 1; j < 16; j++) {
io_base = (j * EP_EISA_START) | EP_EISA_W0;
@@ -191,7 +191,7 @@ ep_look_for_board_at(is)
continue;
/* we must found 0x1f if the board is EISA configurated */
- if ((inw(io_base + EP_W0_ADDRESS_CFG) & 0x1f) != 0x1f)
+ if ((inw(io_base + EP_W0_ADDRESS_CFG) & 0x1f) != 0x1f)
continue;
/* Reset and Enable the card */
@@ -270,7 +270,7 @@ ep_look_for_board_at(is)
} else {
for (i=0; ep_board[i].epb_addr && ep_board[i].epb_addr != IS_BASE; i++);
- if( ep_board[i].epb_used || ep_board[i].epb_addr != IS_BASE)
+ if( ep_board[i].epb_used || ep_board[i].epb_addr != IS_BASE)
return 0;
if (inw(IS_BASE + EP_W0_EEPROM_COMMAND) & EEPROM_TST_MODE)
@@ -455,10 +455,10 @@ epattach(is)
sc->rx_avg_pkt = 128;
/*
- * NOTE: In all this I multiply everything by 64.
- * W_s = the speed the CPU is able to write to the TX FIFO.
+ * NOTE: In all this I multiply everything by 64.
+ * W_s = the speed the CPU is able to write to the TX FIFO.
* T_s = the speed the board sends the info to the Ether.
- * W_s/T_s = 16 (represents 16/64) => W_s = 25 % of T_s.
+ * W_s/T_s = 16 (represents 16/64) => W_s = 25 % of T_s.
* This will give us for a packet of 1500 bytes
* tx_start_thresh=1125 and for a pkt of 64 bytes tx_start_threshold=48.
* We prefer to start thinking the CPU is much slower than the Ethernet
@@ -814,7 +814,7 @@ rescan:
sc->rx_no_first, sc->rx_no_mbuf, sc->rx_bpf_disc, sc->rx_overrunf,
sc->rx_overrunl, sc->tx_underrun);
#else
- printf("ep%d: Status: %x\n", unit, status);
+ printf("ep%d: Status: %x\n", unit, status);
#endif
epinit(unit);
splx(x);
@@ -865,7 +865,7 @@ rescan:
outw(BASE + EP_COMMAND, C_INTR_LATCH); /* ACK int Latch */
- if ((status = inw(BASE + EP_STATUS)) & S_5_INTS)
+ if ((status = inw(BASE + EP_STATUS)) & S_5_INTS)
goto rescan;
/* re-enable Ints */
@@ -1195,17 +1195,17 @@ epioctl(ifp, cmd, data)
sizeof(sc->sc_addr));
break;
#endif
- case SIOCSIFMTU:
+ case SIOCSIFMTU:
/*
* Set the interface MTU.
*/
- if (ifr->ifr_mtu > ETHERMTU) {
- error = EINVAL;
+ if (ifr->ifr_mtu > ETHERMTU) {
+ error = EINVAL;
} else {
- ifp->if_mtu = ifr->ifr_mtu;
+ ifp->if_mtu = ifr->ifr_mtu;
}
- break;
+ break;
default:
error = EINVAL;
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index a905caaaa349..e0b7d09834c6 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -1,13 +1,13 @@
/*
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. 2. The name
* of the author may not be used to endorse or promote products derived from
* this software withough specific prior written permission
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -18,20 +18,20 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by:
- *
+ *
October 2, 1994
-
- Modified by: Andres Vega Garcia
- INRIA - Sophia Antipolis, France
- e-mail: avega@sophia.inria.fr
+ Modified by: Andres Vega Garcia
+
+ INRIA - Sophia Antipolis, France
+ e-mail: avega@sophia.inria.fr
finger: avega@pax.inria.fr
*/
/*
- * $Id: if_epreg.h,v 1.8 1995/04/10 07:48:03 root Exp root $
+ * $Id: if_epreg.h,v 1.7 1995/04/10 21:25:06 jkh Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -349,7 +349,7 @@ struct ep_softc {
#define SET_IRQ(i) (((i)<<12) | 0xF00) /* set IRQ i */
/*
- * FIFO Registers.
+ * FIFO Registers.
* RX Status. Window 1/Port 08
*
* 15: Incomplete or FIFO empty.
@@ -375,7 +375,7 @@ struct ep_softc {
#define ERR_RX_DRIBBLE (u_short) (0x2<<11)
/*
- * FIFO Registers.
+ * FIFO Registers.
* TX Status. Window 1/Port 0B
*
* Reports the transmit status of a completed transmission. Writing this
@@ -400,7 +400,7 @@ struct ep_softc {
#define TXS_STATUS_OVERFLOW 0x4
/*
- * Configuration control register.
+ * Configuration control register.
* Window 0/Port 04
*/
/* Read */
@@ -411,7 +411,7 @@ struct ep_softc {
#define ENABLE_DRQ_IRQ 0x0001
#define W0_P4_CMD_RESET_ADAPTER 0x4
#define W0_P4_CMD_ENABLE_ADAPTER 0x1
-/*
+/*
* Media type and status.
* Window 4/Port 0A
*/
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 49d7fdcf9c33..be36035d3d42 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.59 1995/05/06 19:34:25 joerg Exp $
+ * $Id: fd.c,v 1.60 1995/05/09 12:25:52 rgrimes Exp $
*
*/
@@ -370,7 +370,7 @@ fdc_err(fdcu_t fdcu, const char *s)
else if(fdc_data[fdcu].fdc_errs == FDC_ERRMAX)
printf("fdc%d: too many errors, not logging any more\n",
fdcu);
-
+
return FD_FAILED;
}
@@ -378,7 +378,7 @@ fdc_err(fdcu_t fdcu, const char *s)
* fd_cmd: Send a command to the chip. Takes a varargs with this structure:
* Unit number,
* # of output bytes, output bytes as ints ...,
- * # of input bytes, input bytes as ints ...
+ * # of input bytes, input bytes as ints ...
*/
int
@@ -604,7 +604,7 @@ fdattach(struct isa_device *dev)
unithasfd = 1;
if (ftattach(dev, fdup, unithasfd))
continue;
- if (fdsu < DRVS_PER_CTLR)
+ if (fdsu < DRVS_PER_CTLR)
fd->type = NO_TYPE;
#endif
continue;
@@ -683,9 +683,9 @@ fdattach(struct isa_device *dev)
break; /* already probed succesfully */
}
}
-
+
set_motor(fdcu, fdsu, TURNOFF);
-
+
if (st0 & NE7_ST0_EC) /* no track 0 -> no drive present */
continue;
@@ -694,13 +694,13 @@ fdattach(struct isa_device *dev)
fd->fdsu = fdsu;
fd->options = 0;
printf("fd%d: ", fdu);
-
+
fd_registerdev(fdcu, fdu);
switch (fdt) {
case RTCFDT_12M:
printf("1.2MB 5.25in\n");
fd->type = FD_1200;
- kdc_fd[fdu].kdc_description =
+ kdc_fd[fdu].kdc_description =
"1.2MB (1200K) 5.25in floppy disk drive";
#ifdef DEVFS
sprintf(name,"fd%d.1200",fdu);
@@ -787,9 +787,9 @@ set_motor(fdcu_t fdcu, int fdsu, int turnon)
{
int fdout = fdc_data[fdcu].fdout;
int needspecify = 0;
-
+
if(turnon) {
- fdout &= ~FDO_FDSEL;
+ fdout &= ~FDO_FDSEL;
fdout |= (FDO_MOEN0 << fdsu) + fdsu;
} else
fdout &= ~(FDO_MOEN0 << fdsu);
@@ -856,7 +856,7 @@ fd_motor_on(void *arg1)
}
static void
-fd_turnon(fdu_t fdu)
+fd_turnon(fdu_t fdu)
{
fd_p fd = fd_data + fdu;
if(!(fd->flags & FD_MOTOR))
@@ -871,7 +871,7 @@ static void
fdc_reset(fdc_p fdc)
{
fdcu_t fdcu = fdc->fdcu;
-
+
/* Try a reset, keep motor on */
outb(fdc->baseport + FDOUT, fdc->fdout & ~(FDO_FRST|FDO_FDMAEN));
TRACE1("[0x%x->FDOUT]", fdc->fdout & ~(FDO_FRST|FDO_FDMAEN));
@@ -978,7 +978,7 @@ Fdopen(dev_t dev, int flags, int mode, struct proc *p)
return(ftopen(dev, flags));
#endif
/* check bounds */
- if (fdu >= NFD)
+ if (fdu >= NFD)
return(ENXIO);
fdc = fd_data[fdu].fdc;
if ((fdc == NULL) || (fd_data[fdu].type == NO_TYPE))
@@ -1093,7 +1093,7 @@ fdstrategy(struct buf *bp)
if (fdc->flags & FDC_TAPE_BUSY) {
bp->b_error = EBUSY;
bp->b_flags |= B_ERROR;
- goto bad;
+ goto bad;
}
#endif
if (!(bp->b_flags & B_FORMAT)) {
@@ -1111,7 +1111,7 @@ fdstrategy(struct buf *bp)
goto bad;
}
}
-
+
/*
* Set up block calculations.
*/
@@ -1262,7 +1262,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
dp = &(fdc->head);
bp = dp->b_actf;
- if(!bp)
+ if(!bp)
{
/***********************************************\
* nothing left for this controller to do *
@@ -1469,7 +1469,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
if(format)
{
/* formatting */
- if(fd_cmd(fdcu, 6,
+ if(fd_cmd(fdcu, 6,
NE7CMD_FORMAT,
head << 2 | fdu,
finfo->fd_formb_secshift,
@@ -1482,7 +1482,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
fdc->retry = 6;
return(retrier(fdcu));
}
- }
+ }
else
{
if (fd_cmd(fdcu, 9,
@@ -1761,7 +1761,7 @@ fdformat(dev, finfo, p)
bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs;
bp->b_un.b_addr = (caddr_t)finfo;
-
+
/* now do the format */
fdstrategy(bp);
@@ -1774,7 +1774,7 @@ fdformat(dev, finfo, p)
break;
}
splx(s);
-
+
if(rv == EWOULDBLOCK) {
/* timed out */
rv = EIO;
@@ -1890,7 +1890,7 @@ fdioctl(dev, cmd, addr, flag, p)
case FD_GOPTS: /* get drive options */
*(int *)addr = fd_data[FDUNIT(minor(dev))].options;
break;
-
+
case FD_SOPTS: /* set drive options */
fd_data[FDUNIT(minor(dev))].options = *(int *)addr;
break;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index ab09ce57d286..80aba8286292 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -806,7 +806,7 @@ fe_probe_ati ( struct isa_device * isa_dev, struct fe_softc * sc )
/*
* Determine the card type.
- * There may be a way to identify various models. FIXME.
+ * There may be a way to identify various models. FIXME.
*/
sc->type = FE_TYPE_AT1700;
sc->typestr = "AT1700/RE2000";
@@ -1552,7 +1552,7 @@ fe_start ( struct ifnet *ifp )
* We *could* do better job by peeking the send queue to
* know the length of the next packet. Current version just
* tests against the worst case (i.e., longest packet). FIXME.
- *
+ *
* When adding the packet-peek feature, don't forget adding a
* test on txb_count against QUEUEING_MAX.
* There is a little chance the packet count exceeds
@@ -1755,7 +1755,7 @@ fe_tint ( struct fe_softc * sc, u_char tstat )
/*
* The transmitter is no more active.
- * Reset output active flag and watchdog timer.
+ * Reset output active flag and watchdog timer.
*/
sc->sc_if.if_flags &= ~IFF_OACTIVE;
sc->sc_if.if_timer = 0;
@@ -1879,7 +1879,7 @@ fe_rint ( struct fe_softc * sc, u_char rstat )
"fe%d: received a short packet? (%u bytes)\n",
sc->sc_unit, len );
}
-#endif
+#endif
/*
* Go get a packet.
@@ -1920,7 +1920,7 @@ feintr ( int unit )
* Loop until there are no more new interrupt conditions.
*/
for (;;) {
-
+
#if FE_DEBUG >= 4
fe_dump( LOG_INFO, sc, "intr()" );
#endif
@@ -2312,7 +2312,7 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
*
* If an mbuf chain is too long for an Ethernet frame, it is not sent.
* Packets shorter than Ethernet minimum are legal, and we pad them
- * before sending out. An exception is "partial" packets which are
+ * before sending out. An exception is "partial" packets which are
* shorter than mandatory Ethernet header.
*
* I wrote a code for an experimental "delayed padding" technique.
@@ -2403,7 +2403,7 @@ fe_write_mbufs ( struct fe_softc *sc, struct mbuf *m )
#endif
/*
- * Transfer the data from mbuf chain to the transmission buffer.
+ * Transfer the data from mbuf chain to the transmission buffer.
* MB86960 seems to require that data be transferred as words, and
* only words. So that we require some extra code to patch
* over odd-length mbufs.
@@ -2503,7 +2503,7 @@ fe_mcaf ( struct fe_softc *sc )
log( LOG_INFO, "fe%d: hash(%s) == %d\n",
sc->sc_unit, ether_sprintf( enm->enm_addrlo ), index );
#endif
-
+
filter.data[index >> 3] |= 1 << (index & 7);
ETHER_NEXT_MULTI(step, enm);
}
@@ -2669,7 +2669,7 @@ fe_setlinkaddr ( struct fe_softc * sc )
{
struct ifaddr *ifa;
struct sockaddr_dl * sdl;
-
+
/*
* Search down the ifa address list looking for the AF_LINK type entry.
*/
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index 722194c5a65d..5493ca8eb44e 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
/*
* Intel 8237 DMA Controller
*
- * $Id: i8237.h,v 1.2 1993/10/16 13:48:48 rgrimes Exp $
+ * $Id: i8237.h,v 1.3 1994/11/01 17:26:47 ache Exp $
*/
#define DMA37MD_SINGLE 0x40 /* single pass mode */
@@ -9,4 +9,4 @@
#define DMA37MD_AUTO 0x50 /* autoinitialise single pass mode */
#define DMA37MD_WRITE 0x04 /* read the device, write memory operation */
#define DMA37MD_READ 0x08 /* write the device, read memory operation */
-
+
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 5e85521f251b..8f4b47a71e39 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.22 1995/03/28 07:55:31 bde Exp $
+ * $Id: if_ie.c,v 1.23 1995/04/12 20:47:50 wollman Exp $
*/
/*
@@ -60,7 +60,7 @@
/*
* The i82586 is a very versatile chip, found in many implementations.
* Programming this chip is mostly the same, but certain details differ
- * from card to card. This driver is written so that different cards
+ * from card to card. This driver is written so that different cards
* can be automatically detected at run-time. Currently, only the
* AT&T EN100/StarLAN 10 series are supported.
*/
@@ -231,7 +231,7 @@ const char *ie_hardware_names[] = {
"Unknown"
};
-/*
+/*
sizeof(iscp) == 1+1+2+4 == 8
sizeof(scb) == 2+2+2+2+2+2+2+2 == 16
NFRAMES * sizeof(rfd) == NFRAMES*(2+2+2+2+6+6+2+2) == NFRAMES*24 == 384
@@ -274,7 +274,7 @@ struct ie_softc {
caddr_t iomembot;
unsigned iosize;
int bus_use; /* 0 means 16bit, 1 means 8 bit adapter */
-
+
int want_mcsetup;
int promisc;
volatile struct ie_int_sys_conf_ptr *iscp;
@@ -400,7 +400,7 @@ static int sl_probe(dvp)
break;
default:
- printf("ie%d: unknown AT&T board type code %d\n", unit,
+ printf("ie%d: unknown AT&T board type code %d\n", unit,
ie_softc[unit].hard_type);
return 0;
}
@@ -417,22 +417,22 @@ static int el_probe(dvp)
int i;
u_char signature[] = "*3COM*";
int unit = dvp->id_unit;
-
+
sc->port = dvp->id_iobase;
sc->iomembot = dvp->id_maddr;
sc->bus_use = 0;
-
+
/* Need this for part of the probe. */
sc->ie_reset_586 = el_reset_586;
sc->ie_chan_attn = el_chan_attn;
-
+
/* Reset and put card in CONFIG state without changing address. */
elink_reset();
outb(ELINK_ID_PORT, 0x00);
elink_idseq(ELINK_507_POLY);
elink_idseq(ELINK_507_POLY);
outb(ELINK_ID_PORT, 0xff);
-
+
c = inb(PORT + IE507_MADDR);
if(c & 0x20) {
#ifdef DEBUG
@@ -440,50 +440,50 @@ static int el_probe(dvp)
#endif
return 0;
}
-
+
/* go to RUN state */
outb(ELINK_ID_PORT, 0x00);
elink_idseq(ELINK_507_POLY);
outb(ELINK_ID_PORT, 0x00);
-
+
outb(PORT + IE507_CTRL, EL_CTRL_NRST);
-
+
for (i = 0; i < 6; i++)
if (inb(PORT + i) != signature[i])
return 0;
-
+
c = inb(PORT + IE507_IRQ) & 0x0f;
-
+
if (dvp->id_irq != (1 << c)) {
printf("ie%d: kernel configured irq %d doesn't match board configured irq %d\n",
unit, ffs(dvp->id_irq) - 1, c);
return 0;
}
-
+
c = (inb(PORT + IE507_MADDR) & 0x1c) + 0xc0;
-
+
if (kvtop(dvp->id_maddr) != ((int)c << 12)) {
printf("ie%d: kernel configured maddr %lx doesn't match board configured maddr %x\n",
unit, kvtop(dvp->id_maddr),(int)c << 12);
return 0;
}
-
+
outb(PORT + IE507_CTRL, EL_CTRL_NORMAL);
-
+
sc->hard_type = IE_3C507;
sc->hard_vers = 0; /* 3C507 has no version number. */
-
+
/*
* Divine memory size on-board the card.
*/
find_ie_mem_size(unit);
-
+
if (!sc->iosize) {
printf("ie%d: can't find shared memory\n", unit);
outb(PORT + IE507_CTRL, EL_CTRL_NRST);
return 0;
}
-
+
if(!dvp->id_msize)
dvp->id_msize = sc->iosize;
else if (dvp->id_msize != sc->iosize) {
@@ -492,12 +492,12 @@ static int el_probe(dvp)
outb(PORT + IE507_CTRL, EL_CTRL_NRST);
return 0;
}
-
+
sl_read_ether(unit, ie_softc[unit].arpcom.ac_enaddr);
-
+
/* Clear the interrupt latch just in case. */
outb(PORT + IE507_ICTRL, 1);
-
+
return 16;
}
@@ -538,7 +538,7 @@ static int ni_probe(dvp)
find_ie_mem_size(unit);
if(!ie_softc[unit].iosize) {
- return 0;
+ return 0;
}
if(!dvp->id_msize)
@@ -570,7 +570,7 @@ ieattach(dvp)
ifp->if_unit = unit;
ifp->if_name = iedriver.name;
ifp->if_mtu = ETHERMTU;
- printf(" <%s R%d> ethernet address %s\n",
+ printf(" <%s R%d> ethernet address %s\n",
ie_hardware_names[ie_softc[unit].hard_type],
ie_softc[unit].hard_vers + 1,
ether_sprintf(ie->arpcom.ac_enaddr));
@@ -586,7 +586,7 @@ ieattach(dvp)
ifp->if_type = IFT_ETHER;
ifp->if_addrlen = 6;
ifp->if_hdrlen = 14;
-
+
#if NBPFILTER > 0
bpfattach(&ie_softc[unit].ie_bpf, ifp, DLT_EN10MB,
sizeof(struct ether_header));
@@ -840,7 +840,7 @@ static inline int ether_equal(u_char *one, u_char *two) {
* only client which will fiddle with IFF_PROMISC is BPF. This is
* probably a good assumption, but we do not make it here. (Yet.)
*/
-static inline int check_eh(struct ie_softc *ie,
+static inline int check_eh(struct ie_softc *ie,
struct ether_header *eh,
int *to_bpf) {
int i;
@@ -902,7 +902,7 @@ static inline int check_eh(struct ie_softc *ie,
#endif
/* We want to see multicasts. */
if(eh->ether_dhost[0] & 1) return 1;
-
+
/* We want to see our own packets */
if(ether_equal(eh->ether_dhost, ie->arpcom.ac_enaddr)) return 1;
@@ -1032,7 +1032,7 @@ static inline int ieget(unit, ie, mp, ehp, to_bpf)
*/
do { /* while(resid > 0) */
/*
- * Try to allocate an mbuf to hold the data that we have. If we
+ * Try to allocate an mbuf to hold the data that we have. If we
* already allocated one, just get another one and stick it on the
* end (eventually). If we don't already have one, try to allocate
* an mbuf cluster big enough to hold the whole packet, if we think it's
@@ -1317,12 +1317,12 @@ iestart(ifp)
ie->xmit_buffs[ie->xmit_count]->ie_xmit_flags = IE_XMIT_LAST | len;
ie->xmit_buffs[ie->xmit_count]->ie_xmit_next = 0xffff;
- ie->xmit_buffs[ie->xmit_count]->ie_xmit_buf =
+ ie->xmit_buffs[ie->xmit_count]->ie_xmit_buf =
MK_24(ie->iomem, ie->xmit_cbuffs[ie->xmit_count]);
ie->xmit_cmds[ie->xmit_count]->com.ie_cmd_cmd = IE_CMD_XMIT;
ie->xmit_cmds[ie->xmit_count]->ie_xmit_status = 0;
- ie->xmit_cmds[ie->xmit_count]->ie_xmit_desc =
+ ie->xmit_cmds[ie->xmit_count]->ie_xmit_desc =
MK_16(ie->iomem, ie->xmit_buffs[ie->xmit_count]);
*bptr = MK_16(ie->iomem, ie->xmit_cmds[ie->xmit_count]);
@@ -1334,7 +1334,7 @@ iestart(ifp)
* If we queued up anything for transmission, send it.
*/
if(ie->xmit_count) {
- ie->xmit_cmds[ie->xmit_count - 1]->com.ie_cmd_cmd |=
+ ie->xmit_cmds[ie->xmit_count - 1]->com.ie_cmd_cmd |=
IE_CMD_LAST | IE_CMD_INTR;
/*
@@ -1369,7 +1369,7 @@ int check_ie_present(unit, where, size)
scp = (volatile struct ie_sys_conf_ptr *)(realbase + IE_SCP_ADDR);
bzero((char *)scp, sizeof *scp); /* ignore cast-qual */
-
+
/*
* First we put the ISCP at the bottom of memory; this tests to make
* sure that our idea of the size of memory is the same as the controller's.
@@ -1402,7 +1402,7 @@ int check_ie_present(unit, where, size)
* Now relocate the ISCP to its real home, and reset the controller
* again.
*/
- iscp = (void *)Align((caddr_t)(realbase + IE_SCP_ADDR -
+ iscp = (void *)Align((caddr_t)(realbase + IE_SCP_ADDR -
sizeof(struct ie_int_sys_conf_ptr)));
bzero((char *)iscp, sizeof *iscp); /* ignore cast-qual */
@@ -1526,7 +1526,7 @@ iereset(unit)
ie_softc[unit].arpcom.ac_if.if_flags |= IFF_UP;
ieioctl(&ie_softc[unit].arpcom.ac_if, SIOCSIFFLAGS, 0);
-
+
splx(s);
return;
}
@@ -1561,7 +1561,7 @@ static int command_and_wait(unit, cmd, pcmd, mask)
extern int hz;
ie_softc[unit].scb->ie_command = (u_short)cmd;
-
+
if(IE_ACTION_COMMAND(cmd) && pcmd) {
(*ie_softc[unit].ie_chan_attn)(unit);
@@ -1589,7 +1589,7 @@ static int command_and_wait(unit, cmd, pcmd, mask)
return timedout;
} else {
-
+
/*
* Otherwise, just wait for the command to be accepted.
*/
@@ -1624,7 +1624,7 @@ static void run_tdr(unit, cmd)
else
result = cmd->ie_tdr_time;
- ie_ack(ie_softc[unit].scb, IE_ST_WHENCE, unit,
+ ie_ack(ie_softc[unit].scb, IE_ST_WHENCE, unit,
ie_softc[unit].ie_chan_attn);
if(result & IE_TDR_SUCCESS)
@@ -1633,7 +1633,7 @@ static void run_tdr(unit, cmd)
if(result & IE_TDR_XCVR) {
printf("ie%d: transceiver problem\n", unit);
} else if(result & IE_TDR_OPEN) {
- printf("ie%d: TDR detected an open %d clocks away\n", unit,
+ printf("ie%d: TDR detected an open %d clocks away\n", unit,
result & IE_TDR_TIME);
} else if(result & IE_TDR_SHORT) {
printf("ie%d: TDR detected a short %d clocks away\n", unit,
@@ -1674,13 +1674,13 @@ static caddr_t setup_rfa(caddr_t ptr, struct ie_softc *ie) {
}
ptr = (caddr_t)Align((caddr_t)rfd); /* ignore cast-qual */
-
+
/* Now link them together */
for(i = 0; i < NFRAMES; i++) {
ie->rframes[i]->ie_fd_next =
MK_16(MEM, ie->rframes[(i + 1) % NFRAMES]);
}
-
+
/* Finally, set the EOL bit on the last one. */
ie->rframes[NFRAMES - 1]->ie_fd_last |= IE_FD_LAST;
@@ -1701,12 +1701,12 @@ static caddr_t setup_rfa(caddr_t ptr, struct ie_softc *ie) {
ptr += IE_RBUF_SIZE;
rbd = (void *)ptr;
}
-
+
/* Now link them together */
for(i = 0; i < NBUFFS; i++) {
ie->rbuffs[i]->ie_rbd_next = MK_16(MEM, ie->rbuffs[(i + 1) % NBUFFS]);
}
-
+
/* Tag EOF on the last one */
ie->rbuffs[NBUFFS - 1]->ie_rbd_length |= IE_RBD_LAST;
@@ -1728,21 +1728,21 @@ static caddr_t setup_rfa(caddr_t ptr, struct ie_softc *ie) {
* Run the multicast setup command.
* Call at splimp().
*/
-static int mc_setup(int unit, caddr_t ptr,
+static int mc_setup(int unit, caddr_t ptr,
volatile struct ie_sys_ctl_block *scb) {
struct ie_softc *ie = &ie_softc[unit];
volatile struct ie_mcast_cmd *cmd = (void *)ptr;
-
+
cmd->com.ie_cmd_status = 0;
cmd->com.ie_cmd_cmd = IE_CMD_MCAST | IE_CMD_LAST;
cmd->com.ie_cmd_link = 0xffff;
-
+
/* ignore cast-qual */
bcopy((caddr_t)ie->mcast_addrs, (caddr_t)cmd->ie_mcast_addrs,
ie->mcast_count * sizeof *ie->mcast_addrs);
cmd->ie_mcast_bytes = ie->mcast_count * 6; /* grrr... */
-
+
scb->ie_command_list = MK_16(MEM, cmd);
if(command_and_wait(unit, IE_CU_START, cmd, IE_STAT_COMPL)
|| !(cmd->com.ie_cmd_status & IE_STAT_OK)) {
@@ -1934,7 +1934,7 @@ ieioctl(ifp, command, data)
ie_stop(ifp->if_unit);
} else if((ifp->if_flags & IFF_UP) &&
(ifp->if_flags & IFF_RUNNING) == 0) {
- ie_softc[ifp->if_unit].promisc =
+ ie_softc[ifp->if_unit].promisc =
ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI);
ieinit(ifp->if_unit);
} else if(ie_softc[ifp->if_unit].promisc ^
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 942b45a03315..97225a88db93 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -41,7 +41,7 @@
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>
-/* The game port can manage 4 buttons and 4 variable resistors (usually 2
+/* The game port can manage 4 buttons and 4 variable resistors (usually 2
* joysticks, each with 2 buttons and 2 pots.) via the port at address 0x201.
* Getting the state of the buttons is done by reading the game port:
* buttons 1-4 correspond to bits 4-7 and resistors 1-4 (X1, Y1, X2, Y2)
@@ -52,7 +52,7 @@
*/
-/* the formulae below only work if u is ``not too large''. See also
+/* the formulae below only work if u is ``not too large''. See also
* the discussion in microtime.s */
#define usec2ticks(u) (((u) * 19549)>>14)
#define ticks2usec(u) (((u) * 3433)>>12)
@@ -114,7 +114,7 @@ joyopen (dev_t dev, int flag)
joy[unit].timeout[i] = JOY_TIMEOUT;
return 0;
}
-int
+int
joyclose (dev_t dev, int flag)
{
int unit = UNIT (dev);
@@ -132,7 +132,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
int i, t0, t1;
int state = 0, x = 0, y = 0;
struct joystick c;
-
+
disable_intr ();
outb (port, 0xff);
t0 = get_tick ();
@@ -140,7 +140,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
i = usec2ticks(joy[unit].timeout[joypart(dev)]);
while (t0-t1 < i) {
state = inb (port);
- if (joypart(dev) == 1)
+ if (joypart(dev) == 1)
state >>= 2;
t1 = get_tick ();
if (t1 > t0)
@@ -149,7 +149,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
x = t1;
if (!y && !(state & 0x02))
y = t1;
- if (x && y)
+ if (x && y)
break;
}
enable_intr ();
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 8477f5878603..1366236cbf8a 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -6,8 +6,8 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer,
- * verbatim and that no modifications are made prior to this
+ * notice, this list of conditions and the following disclaimer,
+ * verbatim and that no modifications are made prior to this
* point in the file.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -35,28 +35,28 @@
/*
#define DIAGNOSTIC
#define DEBUG
- *
+ *
* TODO ----
*
* This driver will need bounce buffer support when dma'ing to mbufs above the
* 16Mb mark.
- *
+ *
* Check all the XXX comments -- some of them are just things I've left
* unfinished rather than "difficult" problems that were hacked around.
- *
+ *
* Check log settings.
- *
+ *
* Check how all the arpcom flags get set and used.
- *
+ *
* Re-inline and re-static all routines after debugging.
- *
+ *
* Remember to assign iobase in SHMEM probe routines.
- *
+ *
* Replace all occurences of LANCE-controller-card etc in prints by the name
* strings of the appropriate type -- nifty window dressing
- *
- * Add DEPCA support -- mostly done.
- *
+ *
+ * Add DEPCA support -- mostly done.
+ *
*/
#include "lnc.h"
@@ -175,7 +175,7 @@ lnc_registerdev(struct isa_device *isa_dev)
struct kern_devconf *kdc = &sc->kdc;
*kdc = kdc_lnc;
kdc->kdc_unit = isa_dev->id_unit;
- kdc->kdc_parentdata = isa_dev;
+ kdc->kdc_parentdata = isa_dev;
switch(sc->nic.ic) {
case LANCE:
@@ -209,7 +209,7 @@ lnc_registerdev(struct isa_device *isa_dev)
default:
break;
}
-
+
dev_attach(kdc);
}
@@ -270,7 +270,7 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc)
/* XXX m->m_data = m->m_ext.ext_buf;*/
} else {
MGET(m, M_DONTWAIT, MT_DATA);
- if (!m)
+ if (!m)
return(1);
MCLGET(m, M_DONTWAIT);
if (!m->m_ext.ext_buf) {
@@ -320,7 +320,7 @@ chain_mbufs(struct lnc_softc *sc, int start_of_packet, int pkt_len)
m->m_next = 0;
return(head);
-}
+}
inline struct mbuf *
mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len)
@@ -415,7 +415,7 @@ lnc_rint(int unit)
* Therefore, it can be assumed that a complete packet can be found
* before hitting buffers that are still owned by the LANCE, if not
* then there is a bug in the driver that is causing the descriptors
- * to get out of sync.
+ * to get out of sync.
*/
#ifdef DIAGNOSTIC
@@ -443,8 +443,8 @@ lnc_rint(int unit)
* jabber packets can overrun into a second descriptor.
* If there is no error, then the ENP flag is set in the last
* descriptor of the packet. If there is an error then the ERR
- * flag will be set in the descriptor where the error occured.
- * Therefore, to find the last buffer of a packet we search for
+ * flag will be set in the descriptor where the error occured.
+ * Therefore, to find the last buffer of a packet we search for
* either ERR or ENP.
*/
@@ -533,7 +533,7 @@ lnc_rint(int unit)
if (head) {
/*
- * First mbuf in packet holds the
+ * First mbuf in packet holds the
* ethernet and packet headers
*/
head->m_pkthdr.rcvif = &sc->arpcom.ac_if;
@@ -627,7 +627,7 @@ lnc_tint(int unit)
* status will be written into the descriptor that was being accessed
* when the error occured and all subsequent descriptors in that
* packet will have been relinquished by the LANCE.
- *
+ *
* At this point we know that sc->trans_next points to the start
* of a packet that the LANCE has just finished trying to transmit.
* We now search for a buffer with either ENP or ERR set.
@@ -648,7 +648,7 @@ lnc_tint(int unit)
#endif
/*
- * Find end of packet.
+ * Find end of packet.
*/
if (!(next->md->md1 & (ENP | MDERR))) {
@@ -717,7 +717,7 @@ lnc_tint(int unit)
* set then TBUFF will have been cleared above. A
* UFLO error will turn off the transmitter so we
* have to reset.
- *
+ *
*/
if (next->md->md3 & UFLO) {
@@ -759,7 +759,7 @@ lnc_tint(int unit)
* ERR would have also been set and we would have
* returned from lnc_tint above. Therefore we can
* assume if we arrive here that ONE is valid.
- *
+ *
*/
if (next->md->md1 & ONE) {
@@ -810,7 +810,7 @@ lnc_tint(int unit)
} while (sc->pending_transmits && !(next->md->md1 & OWN));
/*
- * Clear TINT since we've dealt with all
+ * Clear TINT since we've dealt with all
* the completed transmissions.
*/
@@ -887,7 +887,7 @@ int i;
* There isn't any way to determine if a NIC is a BICC. Basically, if
* the lance probe succeeds using the i/o addresses of the BICC then
* we assume it's a BICC.
- *
+ *
*/
sc->rap = isa_dev->id_iobase + BICC_RAP;
@@ -1035,14 +1035,14 @@ lnc_attach(struct isa_device * isa_dev)
/*
* Allocate memory for use by the controller.
- *
+ *
* XXX -- the Am7990 and Am79C960 only have 24 address lines and so can
* only access the lower 16Mb of physical memory. For the moment we
* assume that malloc will allocate memory within the lower 16Mb
* range. This is not a very valid assumption but there's nothing
* that can be done about it yet. For shared memory NICs this isn't
* relevant.
- *
+ *
*/
lnc_mem_size = ((NDESC(sc->nrdre) + NDESC(sc->ntdre)) *
@@ -1139,7 +1139,7 @@ lnc_init(int unit)
* on a word boundary),the transmit and receive ring structures (each
* entry is 4 words long and must start on a quadword boundary) and
* the data buffers.
- *
+ *
* The alignment tests are particularly paranoid.
*/
@@ -1248,7 +1248,7 @@ lnc_init(int unit)
* For the Am7990 it controls DMA operations, for the Am79C960 it
* controls interrupt masks and transmitter algorithms. In either
* case, none of the flags are set.
- *
+ *
*/
write_csr(unit, CSR3, 0);
@@ -1286,13 +1286,13 @@ lnc_init(int unit)
* The interrupt flag (INTR) will be set and provided that the interrupt enable
* flag (INEA) is also set, the interrupt pin will be driven low when any of
* the following occur:
- *
+ *
* 1) Completion of the initialisation routine (IDON). 2) The reception of a
* packet (RINT). 3) The transmission of a packet (TINT). 4) A transmitter
* timeout error (BABL). 5) A missed packet (MISS). 6) A memory error (MERR).
- *
+ *
* The interrupt flag is cleared when all of the above conditions are cleared.
- *
+ *
* If the driver is reset from this routine then it first checks to see if any
* interrupts have ocurred since the reset and handles them before returning.
* This is because the NIC may signify a pending interrupt in CSR0 using the
@@ -1300,7 +1300,7 @@ lnc_init(int unit)
* think it does from reading the data sheets). We may as well deal with
* these pending interrupts now rather than get the overhead of another
* hardware interrupt immediately upon returning from the interrupt handler.
- *
+ *
*/
void
@@ -1440,7 +1440,7 @@ lnc_start(struct ifnet *ifp)
no_entries_needed++;
/*
- * We try and avoid bcopy as much as possible
+ * We try and avoid bcopy as much as possible
* but there are two cases when we use it.
*
* 1) If there are not enough free entries in the ring
@@ -1452,7 +1452,7 @@ lnc_start(struct ifnet *ifp)
* packet so it's necessary to shuffle the mbuf
* contents to ensure this.
*/
-
+
if (no_entries_needed > (NDESC(sc->ntdre) - sc->pending_transmits))
if (!(head = chain_to_cluster(head))) {
@@ -1465,9 +1465,9 @@ lnc_start(struct ifnet *ifp)
len = 100 - head->m_len;
if (M_TRAILINGSPACE(head) < len) {
/*
- * Move data to start of data
- * area. We assume the first
- * mbuf has a packet header
+ * Move data to start of data
+ * area. We assume the first
+ * mbuf has a packet header
* and is not a cluster.
*/
bcopy((caddr_t)head->m_data, (caddr_t)head->m_pktdat, head->m_len);
@@ -1564,7 +1564,7 @@ lnc_start(struct ifnet *ifp)
} while (sc->pending_transmits < NDESC(sc->ntdre));
/*
- * Transmit ring is full so set IFF_OACTIVE
+ * Transmit ring is full so set IFF_OACTIVE
* since we can't buffer any more packets.
*/
@@ -1633,7 +1633,7 @@ lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
*/
lnc_init(ifp->if_unit);
}
- sc->kdc.kdc_state =
+ sc->kdc.kdc_state =
((ifp->if_flags & IFF_UP) ? DC_BUSY : DC_IDLE);
break;
#ifdef notyet
diff --git a/sys/dev/lnc/if_lncreg.h b/sys/dev/lnc/if_lncreg.h
index bbc6c63d4b42..fe146ee8931c 100644
--- a/sys/dev/lnc/if_lncreg.h
+++ b/sys/dev/lnc/if_lncreg.h
@@ -1,6 +1,6 @@
/*
* Am7990, Local Area Network Controller for Ethernet (LANCE)
- *
+ *
* Copyright (c) 1994, Paul Richards. This software may be used,
* modified, copied, distributed, and sold, in both source and binary
* form provided that the above copyright and these terms are retained.
@@ -35,18 +35,18 @@
#define MISS 0x1000
#define MERR 0x0800
#define RINT 0x0400
-#define TINT 0x0200
-#define IDON 0x0100
+#define TINT 0x0200
+#define IDON 0x0100
#define INTR 0x0080
#define INEA 0x0040
#define RXON 0x0020
#define TXON 0x0010
#define TDMD 0x0008
-#define STOP 0x0004
+#define STOP 0x0004
#define STRT 0x0002
-#define INIT 0x0001
+#define INIT 0x0001
-/*
+/*
* CSR3
*
* Bits 3-15 are reserved.
@@ -54,12 +54,12 @@
*/
#define BSWP 0x0004
-#define ACON 0x0002
+#define ACON 0x0002
#define BCON 0x0001
/* Initialisation block */
-struct init_block {
+struct init_block {
u_short mode; /* Mode register */
u_char padr[6]; /* Ethernet address */
u_char ladrf[8]; /* Logical address filter (multicast) */
@@ -88,7 +88,7 @@ struct init_block {
#define DTX 0x0002 /* Disable the transmitter */
#define DRX 0x0001 /* Disable the receiver */
-/*
+/*
* Message Descriptor Structure
*
* Each transmit or receive descriptor ring entry (RDRE's and TDRE's)
@@ -100,14 +100,14 @@ struct init_block {
* 3. The status information for that particular buffer. The eight most
* significant bits of md1 are collectively termed the STATUS of the
* descriptor.
- *
+ *
* Descriptor md0 contains LADR 0-15, the low order 16 bits of the 24-bit
- * address of the actual data buffer. Bits 0-7 of descriptor md1 contain
+ * address of the actual data buffer. Bits 0-7 of descriptor md1 contain
* HADR, the high order 8-bits of the 24-bit data buffer address. Bits 8-15
* of md1 contain the status flags of the buffer. Descriptor md2 contains the
- * buffer byte count in bits 0-11 as a two's complement number and must have
+ * buffer byte count in bits 0-11 as a two's complement number and must have
* 1's written to bits 12-15. For the receive entry md3 has the Message Byte
- * Count in bits 0-11, this is the length of the received message and is valid
+ * Count in bits 0-11, this is the length of the received message and is valid
* only when ERR is cleared and ENP is set. For the transmit entry it contains
* more status information.
*
@@ -116,8 +116,8 @@ struct init_block {
struct mds {
u_short md0;
u_short md1;
- short md2;
- u_short md3;
+ short md2;
+ u_short md3;
};
/* Receive STATUS flags for md1 */
@@ -147,8 +147,8 @@ struct mds {
#define ONE 0x0800 /* Exactly one retry was needed */
#define DEF 0x0400 /* Packet transmit deferred -- channel busy */
-/*
- * Transmit status flags for md2
+/*
+ * Transmit status flags for md2
*
* Same as for receive descriptor.
*
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index fbe6b13dcfa2..d976194877fb 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: mcd.c,v 1.42 1995/05/09 11:39:40 rgrimes Exp $
+ * $Id: mcd.c,v 1.43 1995/05/11 19:26:18 rgrimes Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@@ -249,7 +249,7 @@ int mcd_attach(struct isa_device *dev)
{
struct mcd_data *cd = mcd_data + dev->id_unit;
int i;
-
+
cd->iobase = dev->id_iobase;
cd->flags |= MCDINIT;
mcd_soft_reset(dev->id_unit);
@@ -269,7 +269,7 @@ int mcdopen(dev_t dev)
{
int unit,part,phys,r,retry;
struct mcd_data *cd;
-
+
unit = mcd_unit(dev);
if (unit >= NMCD)
return ENXIO;
@@ -277,7 +277,7 @@ int mcdopen(dev_t dev)
cd = mcd_data + unit;
part = mcd_part(dev);
phys = mcd_phys(dev);
-
+
/* not initialized*/
if (!(cd->flags & MCDINIT))
return ENXIO;
@@ -337,7 +337,7 @@ MCD_TRACE("open: partition=%d, disksize = %ld, blksize=%d\n",
return ENXIO;
return 0;
}
-
+
return ENXIO;
}
@@ -345,7 +345,7 @@ int mcdclose(dev_t dev)
{
int unit,part,phys;
struct mcd_data *cd;
-
+
unit = mcd_unit(dev);
if (unit >= NMCD)
return ENXIO;
@@ -353,7 +353,7 @@ int mcdclose(dev_t dev)
cd = mcd_data + unit;
part = mcd_part(dev);
phys = mcd_phys(dev);
-
+
if (!(cd->flags & MCDINIT))
return ENXIO;
@@ -377,7 +377,7 @@ mcdstrategy(struct buf *bp)
struct mcd_data *cd;
struct buf *qp;
int s;
-
+
int unit = mcd_unit(bp->b_dev);
cd = mcd_data + unit;
@@ -406,11 +406,11 @@ MCD_TRACE("strategy: drive not valid\n");
bp->b_error = EROFS;
goto bad;
}
-
+
/* no data to read */
if (bp->b_bcount == 0)
goto done;
-
+
/* for non raw access, check partition limits */
if (mcd_part(bp->b_dev) != RAW_PART) {
if (!(cd->flags & MCDLABEL)) {
@@ -425,13 +425,13 @@ MCD_TRACE("strategy: drive not valid\n");
bp->b_pblkno = bp->b_blkno;
bp->b_resid = 0;
}
-
+
/* queue it */
qp = &cd->head;
s = splbio();
disksort(qp,bp);
splx(s);
-
+
/* now check whether we can perform processing */
mcd_start(unit);
return;
@@ -451,7 +451,7 @@ static void mcd_start(int unit)
struct partition *p;
int part;
register s = splbio();
-
+
if (cd->flags & MCDMBXBSY) {
splx(s);
return;
@@ -495,7 +495,7 @@ int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
{
struct mcd_data *cd;
int unit,part;
-
+
unit = mcd_unit(dev);
part = mcd_part(dev);
cd = mcd_data + unit;
@@ -523,7 +523,7 @@ MCD_TRACE("ioctl called 0x%x\n", cmd);
return 0;
/*
- * a bit silly, but someone might want to test something on a
+ * a bit silly, but someone might want to test something on a
* section of cdrom.
*/
case DIOCWDINFO:
@@ -614,10 +614,10 @@ MCD_TRACE("ioctl called 0x%x\n", cmd);
static int mcd_getdisklabel(int unit)
{
struct mcd_data *cd = mcd_data + unit;
-
+
if (cd->flags & MCDLABEL)
return -1;
-
+
bzero(&cd->dlabel,sizeof(struct disklabel));
/* filled with spaces first */
strncpy(cd->dlabel.d_typename," ",
@@ -642,7 +642,7 @@ static int mcd_getdisklabel(int unit)
cd->dlabel.d_magic = DISKMAGIC;
cd->dlabel.d_magic2 = DISKMAGIC;
cd->dlabel.d_checksum = dkcksum(&cd->dlabel);
-
+
cd->flags |= MCDLABEL;
return 0;
}
@@ -704,7 +704,7 @@ twiddle_thumbs(int port, int unit, int count, char *whine)
int
mcd_probe(struct isa_device *dev)
{
- int port = dev->id_iobase;
+ int port = dev->id_iobase;
int unit = dev->id_unit;
int i, j;
int status;
@@ -856,7 +856,7 @@ mcd_get(int unit, char *buf, int nmax)
{
int port = mcd_data[unit].iobase;
int i,k;
-
+
for (i=0; i<nmax; i++) {
/* wait for data */
if ((k = mcd_getreply(unit,DELAY_GETREPLY)) < 0) {
@@ -873,7 +873,7 @@ mcd_send(int unit, int cmd,int nretrys)
{
int i,k=0;
int port = mcd_data[unit].iobase;
-
+
/*MCD_TRACE("mcd_send: command = 0x%02x\n",cmd,0,0,0);*/
for (i=0; i<nretrys; i++) {
outb(port+mcd_command, cmd);
@@ -1406,7 +1406,7 @@ mcd_toc_entrys(int unit, struct ioc_read_toc_entry *te)
i = te->starting_track;
if (i == MCD_LASTPLUS1)
i = bcd2bin(cd->volinfo.trk_high) + 1;
-
+
/* verify starting track */
if (i < bcd2bin(cd->volinfo.trk_low) ||
i > bcd2bin(cd->volinfo.trk_high)+1) {
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index f8d8598f2bab..d5ece62169e7 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -1,7 +1,7 @@
/*
* Copyright 1993 by Holger Veit (data part)
* Copyright 1993 by Brian Moore (audio part)
- * Changes Copyright 1993 by Gary Clark II
+ * Changes Copyright 1993 by Gary Clark II
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
* the manufacturer or anyone else might provide better documentation,
* so this file (and the driver) will then have a better quality.
*
- * $Id: mcdreg.h,v 1.6 1994/12/24 13:24:02 ache Exp $
+ * $Id: mcdreg.h,v 1.7 1995/01/30 06:44:40 ache Exp $
*/
#ifndef MCD_H
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index a2c5ef3fd3b2..4dedadd5f4e9 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
- * $Id: mse.c,v 1.10 1995/03/28 07:55:44 bde Exp $
+ * $Id: mse.c,v 1.11 1995/04/12 20:47:59 wollman Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -114,9 +114,9 @@ struct mse_softc {
#define MSE_SETUP 0x91 /* What does this mean? */
/* The definition for the control port */
/* is as follows: */
-
+
/* D7 = Mode set flag (1 = active) */
- /* D6,D5 = Mode selection (port A) */
+ /* D6,D5 = Mode selection (port A) */
/* 00 = Mode 0 = Basic I/O */
/* 01 = Mode 1 = Strobed I/O */
/* 10 = Mode 2 = Bi-dir bus */
@@ -129,7 +129,7 @@ struct mse_softc {
/* D1 = Port B direction (1 = input)*/
/* D0 = Port C (lower 4 bits) */
/* direction. (1 = input) */
-
+
/* So 91 means Basic I/O on all 3 ports,*/
/* Port A is an input port, B is an */
/* output port, C is split with upper */
@@ -288,7 +288,7 @@ mseclose(dev, flag)
return(0);
}
-/*
+/*
* mseread: return mouse info using the MSC serial protocol, but without
* using bytes 4 and 5.
* (Yes this is cheesy, but it makes the X386 server happy, so...)
@@ -404,10 +404,10 @@ mseintr(unit)
*/
if (sc->sc_deltax != 0 || sc->sc_deltay != 0 ||
(sc->sc_obuttons ^ sc->sc_buttons) != 0) {
- if (sc->sc_flags & MSESC_WANT) {
- sc->sc_flags &= ~MSESC_WANT;
- wakeup((caddr_t)sc);
- }
+ if (sc->sc_flags & MSESC_WANT) {
+ sc->sc_flags &= ~MSESC_WANT;
+ wakeup((caddr_t)sc);
+ }
selwakeup(&sc->sc_selp);
}
}
@@ -437,7 +437,7 @@ mse_probelogi(idp)
outb(idp->id_iobase + MSE_PORTC, MSE_DISINTR);
return(1);
} else {
- printf("mse%d: wrong signature %x\n",idp->id_unit,sig);
+ printf("mse%d: wrong signature %x\n",idp->id_unit,sig);
return(0);
}
}
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index e12474009fd6..0d0c2f82d0fc 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pci.c,v 1.21 1995/03/23 06:14:44 davidg Exp $
+** $Id: pci.c,v 1.22 1995/05/04 06:57:11 davidg Exp $
**
** General subroutines for the PCI bus.
** pci_configure ()
@@ -113,7 +113,7 @@ struct pcicb {
static int
pci_externalize (struct proc *, struct kern_devconf *, void *, size_t);
-
+
static int
pci_internalize (struct proc *, struct kern_devconf *, void *, size_t);
@@ -234,7 +234,7 @@ pci_register_io (struct pcicb * cb, u_int base, u_int limit)
cb->pcicb_pupto = limit;
/*
- ** XXX should set bridge io mapping here
+ ** XXX should set bridge io mapping here
** but it can be mapped in 4k blocks only,
** leading to conflicts with isa/eisa ..
*/
@@ -1097,8 +1097,8 @@ pci_externalize (struct proc *p, struct kern_devconf *kdcp, void *u, size_t l)
return copyout(&buffer, u, sizeof buffer);
}
-
-
+
+
static int
pci_internalize (struct proc *p, struct kern_devconf *kdcp, void *u, size_t s)
{
@@ -1476,7 +1476,7 @@ static struct vt VendorTable[] = {
static const char *const majclasses[] = {
"old", "storage", "network", "display",
- "multimedia", "memory", "bridge"
+ "multimedia", "memory", "bridge"
};
void not_supported (pcici_t tag, u_long type)
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 712c6705f3ac..207a7437d46f 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcivar.h,v 1.4 1995/03/21 23:01:06 se Exp $
+** $Id: pcivar.h,v 1.5 1995/03/25 21:10:38 bde Exp $
**
** Declarations for pci device drivers.
**
@@ -159,8 +159,8 @@ extern unsigned pci_maxdevice;
struct pci_info {
u_short pi_bus;
u_short pi_device;
-};
-
+};
+
#define PCI_EXT_CONF_LEN (16)
#define PCI_EXTERNAL_LEN (sizeof(struct pci_externalize_buffer))
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 7e3df4224182..a203c7d69d54 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -1,17 +1,17 @@
/*
* Copyright (C) 1994 Geoffrey M. Rehmet
*
- * This program is free software; you may redistribute it and/or
- * modify it, provided that it retain the above copyright notice
+ * This program is free software; you may redistribute it and/or
+ * modify it, provided that it retain the above copyright notice
* and the following disclaimer.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
*
- * $Id$
+ * $Id: lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp $
*/
#ifndef _LPT_PRINTER_H_
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 8b68956edd45..9f50105f57f6 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
*/
-/* $Id: scd.c,v 1.3 1995/04/12 20:48:02 wollman Exp $ */
+/* $Id: scd.c,v 1.4 1995/05/09 12:25:58 rgrimes Exp $ */
/* Please send any comments to micke@dynas.se */
@@ -135,7 +135,7 @@ struct scd_data {
short first_track;
short last_track;
struct ioc_play_msf last_play;
-
+
short audio_status;
struct buf head; /* head of buf queue */
struct scd_mbx mbx;
@@ -213,7 +213,7 @@ int scd_attach(struct isa_device *dev)
{
struct scd_data *cd = scd_data + dev->id_unit;
int i;
-
+
cd->iobase = dev->id_iobase; /* Already set by probe, but ... */
kdc_scd[dev->id_unit].kdc_state = DC_IDLE;
@@ -235,7 +235,7 @@ scdopen(dev_t dev)
int unit,part,phys;
int rc;
struct scd_data *cd;
-
+
unit = scd_unit(dev);
if (unit >= NSCD)
return ENXIO;
@@ -243,7 +243,7 @@ scdopen(dev_t dev)
cd = scd_data + unit;
part = scd_part(dev);
phys = scd_phys(dev);
-
+
/* not initialized*/
if (!(cd->flags & SCDINIT))
return ENXIO;
@@ -289,7 +289,7 @@ scdclose(dev_t dev)
struct scd_data *cd;
int rlen;
char rdata[10];
-
+
unit = scd_unit(dev);
if (unit >= NSCD)
return ENXIO;
@@ -297,8 +297,8 @@ scdclose(dev_t dev)
cd = scd_data + unit;
part = scd_part(dev);
phys = scd_phys(dev);
-
- if (!(cd->flags & SCDINIT) || !cd->openflag)
+
+ if (!(cd->flags & SCDINIT) || !cd->openflag)
return ENXIO;
if (cd->audio_status != CD_AS_PLAY_IN_PROGRESS) {
@@ -346,11 +346,11 @@ scdstrategy(struct buf *bp)
bp->b_error = EROFS;
goto bad;
}
-
+
/* no data to read */
if (bp->b_bcount == 0)
goto done;
-
+
if (!(cd->flags & SCDTOC)) {
bp->b_error = EIO;
goto bad;
@@ -361,13 +361,13 @@ scdstrategy(struct buf *bp)
bp->b_pblkno = bp->b_blkno;
bp->b_resid = 0;
-
+
/* queue it */
qp = &cd->head;
s = splbio();
disksort(qp,bp);
splx(s);
-
+
/* now check whether we can perform processing */
scd_start(unit);
return;
@@ -388,7 +388,7 @@ scd_start(int unit)
struct partition *p;
int part;
register s = splbio();
-
+
if (cd->flags & SCDMBXBSY) {
splx(s);
return;
@@ -423,7 +423,7 @@ scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
{
struct scd_data *cd;
int unit,part;
-
+
unit = scd_unit(dev);
part = scd_part(dev);
cd = scd_data + unit;
@@ -618,7 +618,7 @@ scd_pause(int unit)
if (send_cmd(unit, CMD_STOP_AUDIO, 0) != 0)
return EIO;
-
+
cd->last_play.start_m = subpos.abs_msf[0];
cd->last_play.start_s = subpos.abs_msf[1];
cd->last_play.start_f = subpos.abs_msf[2];
@@ -831,7 +831,7 @@ trystat:
(caddr_t)SCD_S_WAITSTAT,hz/100); /* XXX */
return;
}
-
+
process_attention(unit);
/* reject, if audio active */
@@ -1184,19 +1184,19 @@ get_tl(struct sony_toc *toc, int size)
if (tl->track != 0xb0)
return tl;
(char *)tl += 9;
- if (tl->track != 0xb1)
+ if (tl->track != 0xb1)
return tl;
(char *)tl += 9;
- if (tl->track != 0xb2)
+ if (tl->track != 0xb2)
return tl;
(char *)tl += 9;
- if (tl->track != 0xb3)
+ if (tl->track != 0xb3)
return tl;
(char *)tl += 9;
- if (tl->track != 0xb4)
+ if (tl->track != 0xb4)
return tl;
(char *)tl += 9;
- if (tl->track != 0xc0)
+ if (tl->track != 0xc0)
return tl;
(char *)tl += 9;
return tl;
@@ -1368,7 +1368,7 @@ send_cmd(u_int unit, u_char cmd, u_int nargs, ...)
XDEBUG(1, ("\nscd%d: wparam timeout\n", unit));
return -EIO;
}
-
+
va_start(ap, nargs);
reg = port + OREG_WPARAMS;
for (i = 0; i < nargs; i++) {
@@ -1512,7 +1512,7 @@ scd_toc_entrys (int unit, struct ioc_read_toc_entry *te)
i = te->starting_track;
if (i == SCD_LASTPLUS1)
i = cd->last_track + 1;
-
+
/* verify starting track */
if (i < cd->first_track || i > cd->last_track+1)
return EINVAL;
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 9764ef65112e..4ae58cddc9ef 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.97 1995/05/07 23:00:02 ache Exp $
+ * $Id: sio.c,v 1.98 1995/05/11 19:26:19 rgrimes Exp $
*/
#include "sio.h"
@@ -630,7 +630,7 @@ sioattach(isdp)
#ifdef DSI_SOFT_MODEM
if((inb(iobase+7) ^ inb(iobase+7)) & 0x80) {
printf(" Digicom Systems, Inc. SoftModem");
- kdc_sio[unit].kdc_description =
+ kdc_sio[unit].kdc_description =
"Serial port: Digicom Systems SoftModem";
goto determined_type;
}
@@ -1326,15 +1326,15 @@ sioioctl(dev, cmd, data, flag, p)
pi = (u_char*)(*(caddr_t*)data);
error = copyin(pi,&l,sizeof l);
- if(error)
+ if(error)
{return error;};
pi += sizeof l;
p = malloc(l,M_TEMP,M_NOWAIT);
- if(!p)
+ if(!p)
{return ENOBUFS;}
error = copyin(pi,p,l);
- if(error)
+ if(error)
{free(p,M_TEMP); return error;};
if(error = LoadSoftModem(
MINOR_TO_UNIT(mynor),iobase,l,p))
@@ -2229,7 +2229,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
int int_c,int_k;
int data_0188, data_0187;
- /*
+ /*
* First see if it is a DSI SoftModem
*/
if(!((inb(base_io+7) ^ inb(base_io+7) & 0x80)))
@@ -2248,8 +2248,8 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
DSI_ERROR("dsp bus not granted");
if(0x01 != (inb(base_io+7) & 0x01)) {
- outb(base_io+7,0x18);
- outb(base_io+7,0x19);
+ outb(base_io+7,0x18);
+ outb(base_io+7,0x19);
if(0x01 != (inb(base_io+7) & 0x01))
DSI_ERROR("program mem not granted");
}
@@ -2275,14 +2275,14 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
outb(base_io+7,0x19);
if(0x00 != (inb(base_io+7) & 0x01))
DSI_ERROR("program data not granted");
-
+
for(int_k = 0 ; int_k < 0x800; int_k++) {
outb(base_io+1,*ptr++);
outb(base_io+2,0);
outb(base_io+1,*ptr++);
outb(base_io+2,*ptr++);
}
-
+
size -= 0x1800;
while(size > 0x1800) {
@@ -2299,7 +2299,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
outb(base_io+2,*ptr++);
}
}
-
+
} else if (size > 0) {
if(int_c == 7) {
outb(base_io+7,0x18);
@@ -2319,7 +2319,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
outb(base_io+2,*ptr++);
}
}
- }
+ }
outb(base_io+7,0x11);
outb(base_io+7,3);
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index e36af000a998..503836b79a65 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -63,7 +63,7 @@ snpwrite(dev, uio, flag)
int unit = minor(dev), len, i, error;
struct snoop *snp = &snoopsw[unit];
struct tty *tp;
- char c[SNP_INPUT_BUF];
+ char c[SNP_INPUT_BUF];
if (snp->snp_tty == NULL)
return (EIO);
@@ -71,16 +71,16 @@ snpwrite(dev, uio, flag)
tp = snp->snp_tty;
if ((tp->t_sc == snp) && (tp->t_state & TS_SNOOP) &&
- (tp->t_line == OTTYDISC || tp->t_line == NTTYDISC))
+ (tp->t_line == OTTYDISC || tp->t_line == NTTYDISC))
goto tty_input;
printf("Snoop: attempt to write to bad tty.\n");
return (EIO);
tty_input:
- if (!(tp->t_state & TS_ISOPEN))
+ if (!(tp->t_state & TS_ISOPEN))
return (EIO);
-
+
while (uio->uio_resid > 0) {
len = MIN(uio->uio_resid,SNP_INPUT_BUF);
if ((error = uiomove(c, len, uio)) != 0)
@@ -91,7 +91,7 @@ tty_input:
}
}
return 0;
-
+
}
@@ -443,7 +443,7 @@ snpioctl(dev, cmd, data, flag)
s = spltty();
if (snp->snp_tty != NULL)
*(int *) data = snp->snp_len;
- else
+ else
if (snp->snp_flags & SNOOP_DOWN) {
if (snp->snp_flags & SNOOP_OFLOW)
*(int *) data = SNP_OFLOW;
@@ -473,7 +473,7 @@ snpselect(dev, rw, p)
if (rw != FREAD)
return 1;
-
+
if (snp->snp_len > 0)
return 1;
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 170abb8c0020..4c1f12890640 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
- * $Id: spkr.c,v 1.12 1995/03/16 18:12:05 bde Exp $
+ * $Id: spkr.c,v 1.13 1995/05/05 06:15:11 davidg Exp $
*/
#include "speaker.h"
@@ -48,14 +48,14 @@
* | SC1 SC0 | RW1 RW0 | M2 M1 M0 | BCD |
* +----------+----------+---------------+-----+
* Counter Write Mode 3 Binary
- * Channel 2 LSB first, (Square Wave) Encoding
+ * Channel 2 LSB first, (Square Wave) Encoding
* MSB second
*/
#define PPI_SPKR 0x03 /* turn these PPI bits on to pass sound */
#define PIT_MODE 0xB6 /* set timer mode for sound generation */
/*
- * Magic numbers for timer control.
+ * Magic numbers for timer control.
*/
#define TIMER_CLK 1193180L /* corresponds to 18.2 MHz tick rate */
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 123e2a9cc0d8..19c572a5c039 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -6,7 +6,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer
+ * notice, this list of conditions and the following disclaimer
* in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.115 1995/04/28 09:10:56 sos Exp $
+ * $Id: syscons.c,v 1.116 1995/05/21 18:30:05 sos Exp $
*/
#include "sc.h"
@@ -65,7 +65,7 @@
#endif
/* this may break on older VGA's but is usefull on real 32 bit systems */
-#define bcopyw bcopy
+#define bcopyw bcopy
static default_attr user_default = {
(FG_LIGHTGREY | BG_BLACK) << 8,
@@ -81,7 +81,7 @@ static scr_stat main_console;
static scr_stat *console[MAXCONS];
scr_stat *cur_console;
static scr_stat *new_scp, *old_scp;
-static term_stat kernel_console;
+static term_stat kernel_console;
static default_attr *current_default;
static char init_done = FALSE;
static int configuration = 0;
@@ -107,7 +107,7 @@ static char *video_mode_ptr = NULL;
static u_char kbd_reply = 0;
#endif
-static u_short mouse_and_mask[16] = {
+static u_short mouse_and_mask[16] = {
0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80,
0xfe00, 0x1e00, 0x1f00, 0x0f00, 0x0f00, 0x0000, 0x0000, 0x0000
};
@@ -168,7 +168,7 @@ scprobe(struct isa_device *dev)
DELAY(10);
val = inb(KB_DATA);
if (val == KB_ACK || val == KB_ECHO)
- goto gotres;
+ goto gotres;
if (val == KB_RESEND)
break;
}
@@ -184,7 +184,7 @@ gotack:
val = inb(KB_DATA);
if (val == KB_ACK)
goto gotack;
- if (val != KB_RESET_DONE)
+ if (val != KB_RESET_DONE)
printf("scprobe: keyboard RESET failed %02x\n", val);
}
#ifdef XT_KEYBOARD
@@ -218,8 +218,8 @@ sc_registerdev(struct isa_device *id)
dev_attach(&kdc_sc[id->id_unit]);
}
-#if NAPM > 0
-static int
+#if NAPM > 0
+static int
scresume(void *dummy)
{
shfts = 0;
@@ -265,7 +265,7 @@ scattach(struct isa_device *dev)
bzero(scp->history_head, scp->history_size*sizeof(u_short));
/* initialize cursor stuff */
- draw_cursor(scp, TRUE);
+ draw_cursor(scp, TRUE);
if (crtc_vga && (configuration & CHAR_CURSOR))
set_destructive_cursor(scp, TRUE);
@@ -279,12 +279,12 @@ scattach(struct isa_device *dev)
if (crtc_vga)
if (crtc_addr == MONO_BASE)
printf("VGA mono");
- else
+ else
printf("VGA color");
else
if (crtc_addr == MONO_BASE)
printf("MDA/hercules");
- else
+ else
printf("CGA/EGA");
printf(" <%d virtual consoles, flags=0x%x>\n", MAXCONS, configuration);
@@ -298,7 +298,7 @@ scattach(struct isa_device *dev)
return 0;
}
-struct tty
+struct tty
*scdevtotty(dev_t dev)
{
int unit = minor(dev);
@@ -310,7 +310,7 @@ struct tty
return VIRTUAL_TTY(unit);
}
-static scr_stat
+static scr_stat
*get_scr_stat(dev_t dev)
{
int unit = minor(dev);
@@ -332,7 +332,7 @@ get_scr_num()
return i < MAXCONS ? i : 0;
}
-int
+int
scopen(dev_t dev, int flag, int mode, struct proc *p)
{
struct tty *tp = scdevtotty(dev);
@@ -352,8 +352,8 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
scparam(tp, &tp->t_termios);
ttsetwater(tp);
- }
- else
+ }
+ else
if (tp->t_state & TS_XCLUDE && p->p_ucred->cr_uid != 0)
return(EBUSY);
tp->t_state |= TS_CARR_ON;
@@ -363,7 +363,7 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
return((*linesw[tp->t_line].l_open)(dev, tp));
}
-int
+int
scclose(dev_t dev, int flag, int mode, struct proc *p)
{
struct tty *tp = scdevtotty(dev);
@@ -382,8 +382,8 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
scp->smode.mode = VT_AUTO;
}
else {
- free(scp->scr_buf, M_DEVBUF);
- free(scp->history, M_DEVBUF);
+ free(scp->scr_buf, M_DEVBUF);
+ free(scp->history, M_DEVBUF);
free(scp, M_DEVBUF);
console[minor(dev)] = NULL;
}
@@ -394,11 +394,11 @@ scclose(dev_t dev, int flag, int mode, struct proc *p)
#endif
}
(*linesw[tp->t_line].l_close)(tp, flag);
- ttyclose(tp);
+ ttyclose(tp);
return(0);
}
-int
+int
scread(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp = scdevtotty(dev);
@@ -408,7 +408,7 @@ scread(dev_t dev, struct uio *uio, int flag)
return((*linesw[tp->t_line].l_read)(tp, uio, flag));
}
-int
+int
scwrite(dev_t dev, struct uio *uio, int flag)
{
struct tty *tp = scdevtotty(dev);
@@ -418,7 +418,7 @@ scwrite(dev_t dev, struct uio *uio, int flag)
return((*linesw[tp->t_line].l_write)(tp, uio, flag));
}
-void
+void
scintr(int unit)
{
static struct tty *cur_tty;
@@ -461,10 +461,10 @@ scintr(int unit)
(*linesw[cur_tty->t_line].l_rint)('[', cur_tty);
(*linesw[cur_tty->t_line].l_rint)('Z', cur_tty);
break;
- }
+ }
}
-int
+int
scparam(struct tty *tp, struct termios *t)
{
tp->t_ispeed = t->c_ispeed;
@@ -473,13 +473,13 @@ scparam(struct tty *tp, struct termios *t)
return 0;
}
-int
+int
scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
{
int i, error;
struct tty *tp;
struct trapframe *fp;
- scr_stat *scp;
+ scr_stat *scp;
tp = scdevtotty(dev);
if (!tp)
@@ -498,14 +498,14 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
else
*(int*)data = 0;
return 0;
-
+
case CONS_CURRENT: /* get current adapter type */
if (crtc_vga)
*(int*)data = KD_VGA;
else
if (crtc_addr == MONO_BASE)
*(int*)data = KD_MONO;
- else
+ else
*(int*)data = KD_CGA;
return 0;
@@ -538,7 +538,7 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
case CONS_HISTORY: /* set history size */
if (*data) {
- free(scp->history, M_DEVBUF);
+ free(scp->history, M_DEVBUF);
scp->history_size = *(int*)data;
if (scp->history_size < scp->ysize)
scp->history = NULL;
@@ -604,7 +604,7 @@ set_mouse_pos:
scp->mouse_xpos = (scp->xsize*8)-1;
if (scp->mouse_ypos >= scp->ysize*fontsize)
scp->mouse_ypos = (scp->ysize*fontsize)-1;
- scp->mouse_pos = scp->scr_buf +
+ scp->mouse_pos = scp->scr_buf +
(scp->mouse_ypos/fontsize)*scp->xsize + scp->mouse_xpos/8;
if (scp->status & MOUSE_ENABLED)
scp->status |= UPDATE_MOUSE;
@@ -664,7 +664,7 @@ set_mouse_pos:
case SW_VGA_C80x60: case SW_VGA_M80x60:
case SW_B40x25: case SW_C40x25:
case SW_B80x25: case SW_C80x25:
- case SW_ENH_B40x25: case SW_ENH_C40x25:
+ case SW_ENH_B40x25: case SW_ENH_C40x25:
case SW_ENH_B80x25: case SW_ENH_C80x25:
case SW_ENH_B80x43: case SW_ENH_C80x43:
@@ -696,26 +696,26 @@ set_mouse_pos:
default:
if ((cmd & 0xff) > M_VGA_CG320)
return EINVAL;
- else
+ else
scp->xsize = *(video_mode_ptr+((cmd&0xff)*64));
scp->ysize = *(video_mode_ptr+((cmd&0xff)*64)+1)+1;
break;
}
scp->mode = cmd & 0xff;
scp->status &= ~UNKNOWN_MODE; /* text mode */
- free(scp->scr_buf, M_DEVBUF);
+ free(scp->scr_buf, M_DEVBUF);
scp->scr_buf = (u_short *)malloc(scp->xsize*scp->ysize*sizeof(u_short),
M_DEVBUF, M_NOWAIT);
if (scp == cur_console)
set_mode(scp);
clear_screen(scp);
- if (tp->t_winsize.ws_col != scp->xsize
+ if (tp->t_winsize.ws_col != scp->xsize
|| tp->t_winsize.ws_row != scp->ysize) {
tp->t_winsize.ws_col = scp->xsize;
tp->t_winsize.ws_row = scp->ysize;
pgsignal(tp->t_pgrp, SIGWINCH, 1);
}
- return 0;
+ return 0;
/* GRAPHICS MODES */
case SW_BG320: case SW_BG640:
@@ -733,7 +733,7 @@ set_mouse_pos:
set_mode(scp);
/* clear_graphics();*/
- if (tp->t_winsize.ws_xpixel != scp->xsize
+ if (tp->t_winsize.ws_xpixel != scp->xsize
|| tp->t_winsize.ws_ypixel != scp->ysize) {
tp->t_winsize.ws_xpixel = scp->xsize;
tp->t_winsize.ws_ypixel = scp->ysize;
@@ -748,11 +748,11 @@ set_mouse_pos:
scp->pid = scp->proc->p_pid;
}
return 0;
-
+
case VT_GETMODE: /* get screen switcher mode */
bcopy(&scp->smode, data, sizeof(struct vt_mode));
return 0;
-
+
case VT_RELDISP: /* screen switcher ioctl */
switch(*data) {
case VT_FALSE: /* user refuses to release screen, abort */
@@ -771,7 +771,7 @@ set_mouse_pos:
new_scp->status |= SWITCH_WAIT_ACQ;
psignal(new_scp->proc, new_scp->smode.acqsig);
}
- else
+ else
switch_in_progress = FALSE;
return 0;
}
@@ -797,24 +797,24 @@ set_mouse_pos:
*data = i + 1;
return 0;
}
- }
+ }
return EINVAL;
case VT_ACTIVATE: /* switch to screen *data */
return switch_scr(scp, (*data) - 1);
case VT_WAITACTIVE: /* wait for switch to occur */
- if (*data > MAXCONS || *data < 0)
+ if (*data > MAXCONS || *data < 0)
return EINVAL;
- if (minor(dev) == (*data) - 1)
+ if (minor(dev) == (*data) - 1)
return 0;
if (*data == 0) {
if (scp == cur_console)
return 0;
}
- else
+ else
scp = console[(*data) - 1];
- while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
+ while ((error=tsleep((caddr_t)&scp->smode, PZERO|PCATCH,
"waitvt", 0)) == ERESTART) ;
return error;
@@ -825,7 +825,7 @@ set_mouse_pos:
case KDENABIO: /* allow io operations */
fp = (struct trapframe *)p->p_md.md_regs;
fp->tf_eflags |= PSL_IOPL;
- return 0;
+ return 0;
case KDDISABIO: /* disallow io operations (default) */
fp = (struct trapframe *)p->p_md.md_regs;
@@ -873,7 +873,7 @@ set_mouse_pos:
if (!crtc_vga)
return ENXIO;
scp->border = *data;
- if (scp == cur_console)
+ if (scp == cur_console)
set_border(scp->border);
return 0;
@@ -881,7 +881,7 @@ set_mouse_pos:
if (*data >= 0 && *data <= LOCK_KEY_MASK) {
scp->status &= ~LOCK_KEY_MASK;
scp->status |= *data;
- if (scp == cur_console)
+ if (scp == cur_console)
update_leds(scp->status);
return 0;
}
@@ -984,7 +984,7 @@ set_mouse_pos:
case SETFKEY: /* set functionkey string */
if (*(u_short*)data < n_fkey_tab) {
fkeyarg_t *ptr = (fkeyarg_t*)data;
- bcopy(ptr->keydef, &fkey_tab[ptr->keynum].str,
+ bcopy(ptr->keydef, &fkey_tab[ptr->keynum].str,
min(ptr->flen, MAXFK));
fkey_tab[ptr->keynum].len = min(ptr->flen, MAXFK);
return 0;
@@ -1069,8 +1069,8 @@ set_mouse_pos:
return ENXIO;
default:
break;
- }
-
+ }
+
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
if (error >= 0)
return(error);
@@ -1080,7 +1080,7 @@ set_mouse_pos:
return(ENOTTY);
}
-void
+void
scxint(dev_t dev)
{
struct tty *tp = scdevtotty(dev);
@@ -1094,7 +1094,7 @@ scxint(dev_t dev)
scstart(tp);
}
-void
+void
scstart(struct tty *tp)
{
struct clist *rbp;
@@ -1126,7 +1126,7 @@ scstart(struct tty *tp)
splx(s);
}
-void
+void
pccnprobe(struct consdev *cp)
{
int maj;
@@ -1141,13 +1141,13 @@ pccnprobe(struct consdev *cp)
cp->cn_pri = CN_INTERNAL;
}
-void
+void
pccninit(struct consdev *cp)
{
scinit();
}
-void
+void
pccnputc(dev_t dev, int c)
{
u_char buf[1];
@@ -1169,7 +1169,7 @@ pccnputc(dev_t dev, int c)
scp->term = save;
if (scp == cur_console /* && scrn_timer not running */) {
if (scp->scr_buf != Crtat && (scp->start <= scp->end)) {
- bcopyw(scp->scr_buf + scp->start, Crtat + scp->start,
+ bcopyw(scp->scr_buf + scp->start, Crtat + scp->start,
(1 + scp->end - scp->start) * sizeof(u_short));
scp->start = scp->xsize * scp->ysize;
scp->end = 0;
@@ -1179,7 +1179,7 @@ pccnputc(dev_t dev, int c)
}
}
-int
+int
pccngetc(dev_t dev)
{
int s = spltty(); /* block scintr while we poll */
@@ -1188,13 +1188,13 @@ pccngetc(dev_t dev)
return(c);
}
-int
+int
pccncheckc(dev_t dev)
{
return (scgetc(1) & 0xff);
}
-static void
+static void
scrn_timer()
{
static int cursor_blinkrate;
@@ -1205,11 +1205,11 @@ scrn_timer()
timeout((timeout_func_t)scrn_timer, 0, hz/10);
return;
}
-
+
if (!scrn_blanked) {
/* update screen image */
if (scp->start <= scp->end) {
- bcopyw(scp->scr_buf + scp->start, Crtat + scp->start,
+ bcopyw(scp->scr_buf + scp->start, Crtat + scp->start,
(1 + scp->end - scp->start) * sizeof(u_short));
scp->status &= ~CURSOR_SHOWN;
scp->start = scp->xsize * scp->ysize;
@@ -1229,7 +1229,7 @@ scrn_timer()
timeout((timeout_func_t)scrn_timer, 0, hz/25);
}
-static void
+static void
clear_screen(scr_stat *scp)
{
move_crsr(scp, 0, 0);
@@ -1238,14 +1238,14 @@ clear_screen(scr_stat *scp)
mark_all(scp);
}
-static int
+static int
switch_scr(scr_stat *scp, u_int next_scr)
{
if (switch_in_progress && (cur_console->proc != pfind(cur_console->pid)))
switch_in_progress = FALSE;
- if (next_scr >= MAXCONS || switch_in_progress ||
- (cur_console->smode.mode == VT_AUTO
+ if (next_scr >= MAXCONS || switch_in_progress ||
+ (cur_console->smode.mode == VT_AUTO
&& cur_console->status & UNKNOWN_MODE)) {
do_bell(scp, BELL_PITCH, BELL_DURATION);
return EINVAL;
@@ -1273,7 +1273,7 @@ switch_scr(scr_stat *scp, u_int next_scr)
delayed_next_scr = FALSE;
return 0;
}
-
+
/* has controlling process died? */
if (old_scp->proc && (old_scp->proc != pfind(old_scp->pid)))
old_scp->smode.mode = VT_AUTO;
@@ -1297,8 +1297,8 @@ switch_scr(scr_stat *scp, u_int next_scr)
return 0;
}
-static void
-exchange_scr(void)
+static void
+exchange_scr(void)
{
move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
cur_console = new_scp;
@@ -1327,7 +1327,7 @@ exchange_scr(void)
new_scp->status &= ~CURSOR_SHOWN;
}
-static inline void
+static inline void
move_crsr(scr_stat *scp, int x, int y)
{
if (x < 0 || y < 0 || x >= scp->xsize || y >= scp->ysize)
@@ -1339,10 +1339,10 @@ move_crsr(scr_stat *scp, int x, int y)
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
}
-static void
+static void
scan_esc(scr_stat *scp, u_char c)
{
- static u_char ansi_col[16] =
+ static u_char ansi_col[16] =
{0, 4, 2, 6, 1, 5, 3, 7, 8, 12, 10, 14, 9, 13, 11, 15};
int i, n;
u_short *src, *dst, count;
@@ -1364,7 +1364,7 @@ scan_esc(scr_stat *scp, u_char c)
else {
bcopyw(scp->scr_buf, scp->scr_buf + scp->xsize,
(scp->ysize - 1) * scp->xsize * sizeof(u_short));
- fillw(scp->term.cur_attr | scr_map[0x20],
+ fillw(scp->term.cur_attr | scr_map[0x20],
scp->scr_buf, scp->xsize);
mark_all(scp);
}
@@ -1440,7 +1440,7 @@ scan_esc(scr_stat *scp, u_char c)
case 'f': /* Cursor move */
case 'H':
- if (scp->term.num_param == 0)
+ if (scp->term.num_param == 0)
move_crsr(scp, 0, 0);
else if (scp->term.num_param == 2)
move_crsr(scp, scp->term.param[1] - 1, scp->term.param[0] - 1);
@@ -1454,14 +1454,14 @@ scan_esc(scr_stat *scp, u_char c)
switch (n) {
case 0: /* clear form cursor to end of display */
fillw(scp->term.cur_attr | scr_map[0x20],
- scp->cursor_pos,
+ scp->cursor_pos,
scp->scr_buf + scp->xsize * scp->ysize - scp->cursor_pos);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
mark_for_update(scp, scp->xsize * scp->ysize);
break;
case 1: /* clear from beginning of display to cursor */
fillw(scp->term.cur_attr | scr_map[0x20],
- scp->scr_buf,
+ scp->scr_buf,
scp->cursor_pos - scp->scr_buf);
mark_for_update(scp, 0);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
@@ -1480,21 +1480,21 @@ scan_esc(scr_stat *scp, u_char c)
switch (n) {
case 0: /* clear form cursor to end of line */
fillw(scp->term.cur_attr | scr_map[0x20],
- scp->cursor_pos,
+ scp->cursor_pos,
scp->xsize - scp->xpos);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf +
scp->xsize - scp->xpos);
break;
case 1: /* clear from beginning of line to cursor */
- fillw(scp->term.cur_attr|scr_map[0x20],
+ fillw(scp->term.cur_attr|scr_map[0x20],
scp->cursor_pos - (scp->xsize - scp->xpos),
(scp->xsize - scp->xpos) + 1);
mark_for_update(scp, scp->ypos * scp->xsize);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
break;
case 2: /* clear entire line */
- fillw(scp->term.cur_attr|scr_map[0x20],
+ fillw(scp->term.cur_attr|scr_map[0x20],
scp->cursor_pos - (scp->xsize - scp->xpos),
scp->xsize);
mark_for_update(scp, scp->ypos * scp->xsize);
@@ -1563,11 +1563,11 @@ scan_esc(scr_stat *scp, u_char c)
n = scp->term.param[0]; if (n < 1) n = 1;
if (n > scp->ysize)
n = scp->ysize;
- bcopyw(scp->scr_buf + (scp->xsize * n),
- scp->scr_buf,
+ bcopyw(scp->scr_buf + (scp->xsize * n),
+ scp->scr_buf,
scp->xsize * (scp->ysize - n) * sizeof(u_short));
fillw(scp->term.cur_attr | scr_map[0x20],
- scp->scr_buf + scp->xsize * (scp->ysize - n),
+ scp->scr_buf + scp->xsize * (scp->ysize - n),
scp->xsize * n);
mark_all(scp);
break;
@@ -1576,11 +1576,11 @@ scan_esc(scr_stat *scp, u_char c)
n = scp->term.param[0]; if (n < 1) n = 1;
if (n > scp->ysize)
n = scp->ysize;
- bcopyw(scp->scr_buf,
+ bcopyw(scp->scr_buf,
scp->scr_buf + (scp->xsize * n),
- scp->xsize * (scp->ysize - n) *
+ scp->xsize * (scp->ysize - n) *
sizeof(u_short));
- fillw(scp->term.cur_attr | scr_map[0x20],
+ fillw(scp->term.cur_attr | scr_map[0x20],
scp->scr_buf, scp->xsize * n);
mark_all(scp);
break;
@@ -1589,8 +1589,8 @@ scan_esc(scr_stat *scp, u_char c)
n = scp->term.param[0]; if (n < 1) n = 1;
if (n > scp->xsize - scp->xpos)
n = scp->xsize - scp->xpos;
- fillw(scp->term.cur_attr | scr_map[0x20],
- scp->scr_buf + scp->xpos +
+ fillw(scp->term.cur_attr | scr_map[0x20],
+ scp->scr_buf + scp->xpos +
((scp->xsize*scp->ypos) * sizeof(u_short)), n);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf);
mark_for_update(scp, scp->cursor_pos - scp->scr_buf + n);
@@ -1600,9 +1600,9 @@ scan_esc(scr_stat *scp, u_char c)
n = scp->term.param[0]; if (n < 1) n = 1;
if ((i = scp->xpos & 0xf8) == scp->xpos)
i -= 8*n;
- else
- i -= 8*(n-1);
- if (i < 0)
+ else
+ i -= 8*(n-1);
+ if (i < 0)
i = 0;
move_crsr(scp, i, scp->ypos);
break;
@@ -1653,15 +1653,15 @@ scan_esc(scr_stat *scp, u_char c)
scp->term.cur_attr = scp->term.rev_attr;
break;
case 30: case 31: /* set fg color */
- case 32: case 33: case 34:
+ case 32: case 33: case 34:
case 35: case 36: case 37:
- scp->term.cur_attr =
+ scp->term.cur_attr =
(scp->term.cur_attr&0xF8FF) | (ansi_col[(n-30)&7]<<8);
break;
case 40: case 41: /* set bg color */
- case 42: case 43: case 44:
+ case 42: case 43: case 44:
case 45: case 46: case 47:
- scp->term.cur_attr =
+ scp->term.cur_attr =
(scp->term.cur_attr&0x8FFF) | (ansi_col[(n-40)&7]<<12);
break;
}
@@ -1680,12 +1680,12 @@ scan_esc(scr_stat *scp, u_char c)
scp->term.rev_attr = current_default->rev_attr;
break;
case 1: /* set ansi background */
- scp->term.cur_attr = scp->term.std_attr =
+ scp->term.cur_attr = scp->term.std_attr =
(scp->term.std_attr & 0x0F00) |
(ansi_col[(scp->term.param[1])&0x0F]<<12);
break;
case 2: /* set ansi foreground */
- scp->term.cur_attr = scp->term.std_attr =
+ scp->term.cur_attr = scp->term.std_attr =
(scp->term.std_attr & 0xF000) |
(ansi_col[(scp->term.param[1])&0x0F]<<8);
break;
@@ -1694,12 +1694,12 @@ scan_esc(scr_stat *scp, u_char c)
(scp->term.param[1]&0xFF)<<8;
break;
case 5: /* set ansi reverse video background */
- scp->term.rev_attr =
+ scp->term.rev_attr =
(scp->term.rev_attr & 0x0F00) |
(ansi_col[(scp->term.param[1])&0x0F]<<12);
break;
case 6: /* set ansi reverse video foreground */
- scp->term.rev_attr =
+ scp->term.rev_attr =
(scp->term.rev_attr & 0xF000) |
(ansi_col[(scp->term.param[1])&0x0F]<<8);
break;
@@ -1764,38 +1764,38 @@ scan_esc(scr_stat *scp, u_char c)
configuration &= ~CHAR_CURSOR;
}
else if (scp->term.num_param == 2) {
- scp->cursor_start = scp->term.param[0] & 0x1F;
- scp->cursor_end = scp->term.param[1] & 0x1F;
+ scp->cursor_start = scp->term.param[0] & 0x1F;
+ scp->cursor_end = scp->term.param[1] & 0x1F;
if (configuration & CHAR_CURSOR)
set_destructive_cursor(scp, TRUE);
}
break;
case 'F': /* set ansi foreground */
- if (scp->term.num_param == 1)
- scp->term.cur_attr = scp->term.std_attr =
- (scp->term.std_attr & 0xF000)
+ if (scp->term.num_param == 1)
+ scp->term.cur_attr = scp->term.std_attr =
+ (scp->term.std_attr & 0xF000)
| ((scp->term.param[0] & 0x0F) << 8);
break;
case 'G': /* set ansi background */
- if (scp->term.num_param == 1)
- scp->term.cur_attr = scp->term.std_attr =
- (scp->term.std_attr & 0x0F00)
+ if (scp->term.num_param == 1)
+ scp->term.cur_attr = scp->term.std_attr =
+ (scp->term.std_attr & 0x0F00)
| ((scp->term.param[0] & 0x0F) << 12);
break;
case 'H': /* set ansi reverse video foreground */
- if (scp->term.num_param == 1)
- scp->term.rev_attr =
- (scp->term.rev_attr & 0xF000)
+ if (scp->term.num_param == 1)
+ scp->term.rev_attr =
+ (scp->term.rev_attr & 0xF000)
| ((scp->term.param[0] & 0x0F) << 8);
break;
case 'I': /* set ansi reverse video background */
- if (scp->term.num_param == 1)
- scp->term.rev_attr =
- (scp->term.rev_attr & 0x0F00)
+ if (scp->term.num_param == 1)
+ scp->term.rev_attr =
+ (scp->term.rev_attr & 0x0F00)
| ((scp->term.param[0] & 0x0F) << 12);
break;
}
@@ -1803,7 +1803,7 @@ scan_esc(scr_stat *scp, u_char c)
scp->term.esc = 0;
}
-static inline void
+static inline void
draw_cursor(scr_stat *scp, int show)
{
if (show && !(scp->status & CURSOR_SHOWN)) {
@@ -1836,12 +1836,12 @@ draw_cursor(scr_stat *scp, int show)
}
}
-static void
+static void
ansi_put(scr_stat *scp, u_char *buf, int len)
{
u_char *ptr = buf;
- if (scp->status & UNKNOWN_MODE)
+ if (scp->status & UNKNOWN_MODE)
return;
/* make screensaver happy */
@@ -1945,7 +1945,7 @@ outloop:
bcopyw(scp->scr_buf + scp->xsize, scp->scr_buf,
scp->xsize * (scp->ysize - 1) * sizeof(u_short));
fillw(scp->term.cur_attr | scr_map[0x20],
- scp->scr_buf + scp->xsize * (scp->ysize - 1),
+ scp->scr_buf + scp->xsize * (scp->ysize - 1),
scp->xsize);
scp->cursor_pos -= scp->xsize;
scp->ypos--;
@@ -1958,14 +1958,14 @@ outloop:
switch_scr(scp, delayed_next_scr - 1);
}
-static void
+static void
scinit(void)
{
u_short volatile *cp = Crtat + (CGA_BUF-MONO_BUF)/sizeof(u_short), was;
unsigned hw_cursor;
int i;
- if (init_done)
+ if (init_done)
return;
init_done = TRUE;
/*
@@ -2033,7 +2033,7 @@ scinit(void)
scr_map[i] = i;
}
-static scr_stat
+static scr_stat
*alloc_scp()
{
scr_stat *scp;
@@ -2081,7 +2081,7 @@ init_scp(scr_stat *scp)
scp->history_size = HISTORY_SIZE;
}
-static u_char
+static u_char
*get_fstr(u_int c, u_int *len)
{
u_int i;
@@ -2095,7 +2095,7 @@ static u_char
return(fkey_tab[i].str);
}
-static void
+static void
update_leds(int which)
{
int s;
@@ -2113,14 +2113,14 @@ update_leds(int which)
kbd_cmd(xlate_leds[which & LED_MASK]);
splx(s);
}
-
+
static void
history_to_screen(scr_stat *scp)
{
int i;
for (i=0; i<scp->ysize; i++)
- bcopyw(scp->history + (((scp->history_pos - scp->history) +
+ bcopyw(scp->history + (((scp->history_pos - scp->history) +
scp->history_size-((i+1)*scp->xsize))%scp->history_size),
scp->scr_buf + (scp->xsize * (scp->ysize-1 - i)),
scp->xsize * sizeof(u_short));
@@ -2153,11 +2153,11 @@ history_down_line(scr_stat *scp)
}
/*
- * scgetc(noblock) - get character from keyboard.
+ * scgetc(noblock) - get character from keyboard.
* If noblock = 0 wait until a key is pressed.
* Else return NOKEY.
*/
-u_int
+u_int
scgetc(int noblock)
{
u_char scancode, keycode;
@@ -2192,9 +2192,9 @@ next_code:
switch(scancode) {
case 0xB8: /* left alt (compose key) */
if (compose) {
- compose = 0;
+ compose = 0;
if (chr > 255) {
- do_bell(cur_console,
+ do_bell(cur_console,
BELL_PITCH, BELL_DURATION);
chr = 0;
}
@@ -2209,7 +2209,7 @@ next_code:
case 0xE0:
case 0xE1:
esc_flag = scancode;
- goto next_code;
+ goto next_code;
}
break;
case 0xE0: /* 0xE0 prefix */
@@ -2276,13 +2276,13 @@ next_code:
}
break;
case 0xE1: /* 0xE1 prefix */
- esc_flag = 0;
+ esc_flag = 0;
if (keycode == 0x1D)
esc_flag = 0x1D;
goto next_code;
/* NOT REACHED */
case 0x1D: /* pause / break */
- esc_flag = 0;
+ esc_flag = 0;
if (keycode != 0x45)
goto next_code;
keycode = 0x68;
@@ -2300,7 +2300,7 @@ next_code:
/* copy screen into top of history buffer */
for (i=0; i<cur_console->ysize; i++) {
- bcopyw(cur_console->scr_buf + (cur_console->xsize * i),
+ bcopyw(cur_console->scr_buf + (cur_console->xsize * i),
cur_console->history_head,
cur_console->xsize * sizeof(u_short));
cur_console->history_head += cur_console->xsize;
@@ -2319,7 +2319,7 @@ next_code:
case 0x4F: /* end key */
cur_console->history_pos =
- WRAPHIST(cur_console, cur_console->history_head,
+ WRAPHIST(cur_console, cur_console->history_head,
cur_console->xsize*cur_console->ysize);
history_to_screen(cur_console);
goto next_code;
@@ -2358,10 +2358,10 @@ next_code:
case 0x47: case 0x48: case 0x49: /* keypad 7,8,9 */
chr = (scancode - 0x40) + chr*10;
goto next_code;
- case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */
+ case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */
chr = (scancode - 0x47) + chr*10;
goto next_code;
- case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */
+ case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */
chr = (scancode - 0x4E) + chr*10;
goto next_code;
case 0x52: /* keypad 0 */
@@ -2370,8 +2370,8 @@ next_code:
/* key release, no interest here */
case 0xC7: case 0xC8: case 0xC9: /* keypad 7,8,9 */
- case 0xCB: case 0xCC: case 0xCD: /* keypad 4,5,6 */
- case 0xCF: case 0xD0: case 0xD1: /* keypad 1,2,3 */
+ case 0xCB: case 0xCC: case 0xCD: /* keypad 4,5,6 */
+ case 0xCF: case 0xD0: case 0xD1: /* keypad 1,2,3 */
case 0xD2: /* keypad 0 */
goto next_code;
@@ -2381,12 +2381,12 @@ next_code:
if (chr) {
compose = chr = 0;
do_bell(cur_console, BELL_PITCH, BELL_DURATION);
- goto next_code;
+ goto next_code;
}
break;
}
}
-
+
state = (shfts ? 1 : 0 ) | (2 * (ctls ? 1 : 0)) | (4 * (alts ? 1 : 0));
if ((!agrs && (cur_console->status & ALKED))
|| (agrs && !(cur_console->status & ALKED)))
@@ -2420,7 +2420,7 @@ next_code:
alts &= ~2;
break;
case NLK:
- nlkcnt = 0;
+ nlkcnt = 0;
break;
case CLK:
clkcnt = 0;
@@ -2452,7 +2452,7 @@ next_code:
case NLK:
if (!nlkcnt) {
nlkcnt++;
- if (cur_console->status & NLKED)
+ if (cur_console->status & NLKED)
cur_console->status &= ~NLKED;
else
cur_console->status |= NLKED;
@@ -2479,7 +2479,7 @@ next_code:
u_short *ptr = cur_console->history_save;
for (i=0; i<cur_console->ysize; i++) {
- bcopyw(ptr,
+ bcopyw(ptr,
cur_console->scr_buf +
(cur_console->xsize*i),
cur_console->xsize * sizeof(u_short));
@@ -2495,8 +2495,8 @@ next_code:
mark_all(cur_console);
}
scstart(VIRTUAL_TTY(get_scr_num()));
- }
- else
+ }
+ else
cur_console->status |= SLKED;
update_leds(cur_console->status);
}
@@ -2517,9 +2517,9 @@ next_code:
break;
case RBT:
shutdown_nice();
- break;
+ break;
case SUSP:
-#if NAPM > 0
+#if NAPM > 0
apm_suspend();
#endif
break;
@@ -2528,7 +2528,7 @@ next_code:
#ifdef DDB /* try to switch to console 0 */
if (cur_console->smode.mode == VT_AUTO &&
console[0]->smode.mode == VT_AUTO)
- switch_scr(cur_console, 0);
+ switch_scr(cur_console, 0);
Debugger("manual escape to debugger");
return(NOKEY);
#else
@@ -2569,7 +2569,7 @@ next_code:
switch_scr(cur_console, action - F_SCR);
break;
}
- if (action >= F_FN && action <= L_FN)
+ if (action >= F_FN && action <= L_FN)
action |= FKEY;
return(action);
}
@@ -2583,7 +2583,7 @@ next_code:
goto next_code;
}
-int
+int
scmmap(dev_t dev, int offset, int nprot)
{
if (offset > 0x20000 - PAGE_SIZE)
@@ -2591,19 +2591,19 @@ scmmap(dev_t dev, int offset, int nprot)
return i386_btop((VIDEOMEM + offset));
}
-static void
+static void
kbd_wait(void)
{
int i = 1000;
while (i--) {
- if ((inb(KB_STAT) & KB_READY) == 0)
+ if ((inb(KB_STAT) & KB_READY) == 0)
break;
DELAY (10);
}
}
-static void
+static void
kbd_cmd(u_char command)
{
int retry = 5;
@@ -2637,7 +2637,7 @@ kbd_cmd(u_char command)
} while (retry--);
}
-static void
+static void
set_mode(scr_stat *scp)
{
char *modetable;
@@ -2649,11 +2649,11 @@ set_mode(scr_stat *scp)
/* setup video hardware for the given mode */
switch (scp->mode) {
- case M_VGA_M80x60:
+ case M_VGA_M80x60:
bcopyw(video_mode_ptr+(64*M_VGA_M80x25),&special_modetable, 64);
goto special_80x60;
- case M_VGA_C80x60:
+ case M_VGA_C80x60:
bcopyw(video_mode_ptr+(64*M_VGA_C80x25),&special_modetable, 64);
special_80x60:
special_modetable[2] = 0x08;
@@ -2673,7 +2673,7 @@ special_480l:
special_modetable[16] = 0x08;
special_modetable[17] = 0x3e;
special_modetable[26] = 0xea;
- special_modetable[28] = 0xdf;
+ special_modetable[28] = 0xdf;
special_modetable[31] = 0xe7;
special_modetable[32] = 0x04;
modetable = special_modetable;
@@ -2685,17 +2685,17 @@ special_480l:
case M_ENH_C80x43:
bcopyw(video_mode_ptr+(64*M_ENH_C80x25),&special_modetable, 64);
-special_80x43:
+special_80x43:
special_modetable[28] = 87;
goto special_80x50;
- case M_VGA_M80x50:
+ case M_VGA_M80x50:
bcopyw(video_mode_ptr+(64*M_VGA_M80x25),&special_modetable, 64);
goto special_80x50;
case M_VGA_C80x50:
bcopyw(video_mode_ptr+(64*M_VGA_C80x25),&special_modetable, 64);
-special_80x50:
+special_80x50:
special_modetable[2] = 8;
special_modetable[19] = 7;
modetable = special_modetable;
@@ -2737,7 +2737,7 @@ setup_mode:
case M_CG320_D: case M_CG640_E:
case M_CG640x350: case M_ENH_CG640:
case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
-
+
set_vgaregs(video_mode_ptr + (scp->mode * 64));
break;
@@ -2751,11 +2751,11 @@ setup_mode:
return;
}
-void
+void
set_border(int color)
{
inb(crtc_addr+6); /* reset flip-flop */
- outb(ATC, 0x11); outb(ATC, color);
+ outb(ATC, 0x11); outb(ATC, color);
inb(crtc_addr+6); /* reset flip-flop */
outb(ATC, 0x20); /* enable Palette */
}
@@ -2768,7 +2768,7 @@ set_vgaregs(char *modetable)
outb(TSIDX, 0x00); outb(TSREG, 0x01); /* stop sequencer */
outb(TSIDX, 0x07); outb(TSREG, 0x00); /* unlock registers */
for (i=0; i<4; i++) { /* program sequencer */
- outb(TSIDX, i+1);
+ outb(TSIDX, i+1);
outb(TSREG, modetable[i+5]);
}
outb(MISC, modetable[9]); /* set dot-clock */
@@ -2776,7 +2776,7 @@ set_vgaregs(char *modetable)
outb(crtc_addr, 0x11);
outb(crtc_addr+1, inb(crtc_addr+1) & 0x7F);
for (i=0; i<25; i++) { /* program crtc */
- outb(crtc_addr, i);
+ outb(crtc_addr, i);
if (i == 14 || i == 15) /* no hardware cursor */
outb(crtc_addr+1, 0xff);
else
@@ -2784,11 +2784,11 @@ set_vgaregs(char *modetable)
}
inb(crtc_addr+6); /* reset flip-flop */
for (i=0; i<20; i++) { /* program attribute ctrl */
- outb(ATC, i);
+ outb(ATC, i);
outb(ATC, modetable[i+35]);
}
for (i=0; i<9; i++) { /* program graph data ctrl */
- outb(GDCIDX, i);
+ outb(GDCIDX, i);
outb(GDCREG, modetable[i+55]);
}
inb(crtc_addr+6); /* reset flip-flop */
@@ -2807,7 +2807,7 @@ set_font_mode()
outb(TSIDX, 0x04); outb(TSREG, 0x06);
outb(GDCIDX, 0x04); outb(GDCREG, 0x02);
outb(GDCIDX, 0x05); outb(GDCREG, 0x00);
- outb(GDCIDX, 0x06); outb(GDCREG, 0x05);
+ outb(GDCIDX, 0x06); outb(GDCREG, 0x05);
#else
outw(TSIDX, 0x0402);
outw(TSIDX, 0x0604);
@@ -2849,7 +2849,7 @@ set_normal_mode()
splx(s);
}
-static void
+static void
copy_font(int operation, int font_type, char* font_image)
{
int ch, line, segment, fontsize;
@@ -2873,11 +2873,11 @@ copy_font(int operation, int font_type, char* font_image)
outb(TSIDX, 0x01); val = inb(TSREG); /* disable screen */
outb(TSIDX, 0x01); outb(TSREG, val | 0x20);
set_font_mode();
- for (ch=0; ch < 256; ch++)
- for (line=0; line < fontsize; line++)
+ for (ch=0; ch < 256; ch++)
+ for (line=0; line < fontsize; line++)
if (operation)
*(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line) =
- font_image[(ch*fontsize)+line];
+ font_image[(ch*fontsize)+line];
else
font_image[(ch*fontsize)+line] =
*(char *)pa_to_va(VIDEOMEM+(segment)+(ch*32)+line);
@@ -2885,7 +2885,7 @@ copy_font(int operation, int font_type, char* font_image)
outb(TSIDX, 0x01); outb(TSREG, val & 0xDF); /* enable screen */
}
-static void
+static void
set_destructive_cursor(scr_stat *scp, int force)
{
u_char cursor[32];
@@ -2918,7 +2918,7 @@ set_destructive_cursor(scr_stat *scp, int force)
bcopyw(font_buffer + ((scp->cursor_saveunder & 0xff) * font_size),
cursor, font_size);
for (i=0; i<32; i++)
- if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
+ if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
(scp->cursor_start >= font_size && i == font_size - 1))
cursor[i] |= 0xff;
while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
@@ -3018,25 +3018,25 @@ draw_mouse_image(scr_stat *scp)
set_normal_mode();
}
-static void
+static void
save_palette(void)
{
int i;
- outb(PALRADR, 0x00);
- for (i=0x00; i<0x300; i++)
+ outb(PALRADR, 0x00);
+ for (i=0x00; i<0x300; i++)
palette[i] = inb(PALDATA);
inb(crtc_addr+6); /* reset flip/flop */
}
-void
+void
load_palette(void)
{
int i;
outb(PIXMASK, 0xFF); /* no pixelmask */
- outb(PALWADR, 0x00);
- for (i=0x00; i<0x300; i++)
+ outb(PALWADR, 0x00);
+ for (i=0x00; i<0x300; i++)
outb(PALDATA, palette[i]);
inb(crtc_addr+6); /* reset flip/flop */
outb(ATC, 0x20); /* enable palette */
@@ -3052,7 +3052,7 @@ do_bell(scr_stat *scp, int pitch, int duration)
blink_in_progress = 4;
blink_screen(scp);
timeout((timeout_func_t)blink_screen, scp, hz/10);
- }
+ }
else
sysbeep(pitch, duration);
}
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 649b6535be52..4b22de6e83b9 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -6,7 +6,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer
+ * notice, this list of conditions and the following disclaimer
* in this position and unchanged.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.h,v 1.7 1995/04/04 20:04:17 sos Exp $
+ * $Id: syscons.h,v 1.8 1995/04/23 10:15:38 bde Exp $
*/
#ifndef SYSCONS_H
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 310b8e54eb26..d5d268717e16 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -156,7 +156,7 @@ vnopen(dev_t dev, int flags, int mode, struct proc *p)
if (unit >= NVN) {
if (vn_options & VN_FOLLOW)
- printf("vnopen(0x%lx, 0x%x, 0x%x, %p)\n",
+ printf("vnopen(0x%lx, 0x%x, 0x%x, %p)\n",
dev, flags, mode, p);
return(ENOENT);
}
@@ -184,14 +184,14 @@ vnopen(dev_t dev, int flags, int mode, struct proc *p)
label.d_ntracks = 64;
label.d_ncylinders = vn->sc_size / (32 * 64);
label.d_secpercyl = 32 * 64;
- label.d_secperunit =
+ label.d_secperunit =
label.d_partitions[RAW_PART].p_size =
vn->sc_size;
return (dsopen("vn", dev, mode, &vn->sc_slices, &label,
vnstrategy, (ds_setgeom_t *)NULL));
}
- if (dkslice(dev) != WHOLE_DISK_SLICE ||
+ if (dkslice(dev) != WHOLE_DISK_SLICE ||
dkpart(dev) != RAW_PART ||
mode != S_IFCHR)
return (ENXIO);
@@ -277,9 +277,9 @@ vnstrategy(struct buf *bp)
daddr_t bsize;
int flags, resid;
caddr_t addr;
-
+
struct buf *nbp;
-
+
nbp = getvnbuf();
bn = dbtob(bn);
@@ -359,7 +359,7 @@ vnstrategy(struct buf *bp)
putvnbuf(nbp);
return;
}
-
+
bn += sz;
addr += sz;
resid -= sz;
@@ -409,7 +409,7 @@ vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (error != -1)
return (error);
}
- if (dkslice(dev) != WHOLE_DISK_SLICE ||
+ if (dkslice(dev) != WHOLE_DISK_SLICE ||
dkpart(dev) != RAW_PART)
return (ENOTTY);
}
@@ -456,8 +456,8 @@ vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
IFOPT(vn, VN_LABELS) {
/*
* Reopen so that `ds' knows which devices are open.
- * If this is the first VNIOCSET, then we've
- * guaranteed that the device is the cdev and that
+ * If this is the first VNIOCSET, then we've
+ * guaranteed that the device is the cdev and that
* no other slices or labels are open. Otherwise,
* we rely on VNIOCCLR not being abused.
*/
@@ -485,7 +485,7 @@ vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
IFOPT(vn, VN_FOLLOW)
printf("vnioctl: CLRed\n");
break;
-
+
case VNIOCGSET:
vn_options |= *f;
*f = vn_options;
@@ -518,7 +518,7 @@ vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
* to this "disk" is essentially as root. Note that credentials may change
* if some other uid can write directly to the mapped file (NFS).
*/
-int
+int
vnsetcred(struct vn_softc *vn, struct ucred *cred)
{
struct uio auio;
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 9ae15f60e472..e035ce03a23b 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
* from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91
*
* @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.5 1994/09/26 00:32:54 gpalmer Exp $
+ * $Id: cd9660_lookup.c,v 1.6 1995/01/16 17:03:23 joerg Exp $
*/
#include <sys/param.h>
@@ -126,7 +126,7 @@ cd9660_lookup(ap)
struct ucred *cred = cnp->cn_cred;
int flags = cnp->cn_flags;
int nameiop = cnp->cn_nameiop;
-
+
bp = NULL;
*vpp = NULL;
vdp = ap->a_dvp;
@@ -134,7 +134,7 @@ cd9660_lookup(ap)
imp = dp->i_mnt;
lockparent = flags & LOCKPARENT;
wantparent = flags & (LOCKPARENT|WANTPARENT);
-
+
/*
* Check accessiblity of directory.
*/
@@ -142,7 +142,7 @@ cd9660_lookup(ap)
return (ENOTDIR);
if ((error = VOP_ACCESS(vdp, VEXEC, cred, cnp->cn_proc)))
return (error);
-
+
/*
* We now have a segment name to search for, and a directory to search.
*
@@ -197,7 +197,7 @@ cd9660_lookup(ap)
vdp = ITOV(dp);
*vpp = NULL;
}
-
+
len = cnp->cn_namelen;
name = cnp->cn_nameptr;
/*
@@ -208,7 +208,7 @@ cd9660_lookup(ap)
len--;
name++;
}
-
+
/*
* If there is cached information on a previous search of
* this directory, pick up where we last left off.
@@ -236,7 +236,7 @@ cd9660_lookup(ap)
iso_nchstats.ncs_2passes++;
}
endsearch = roundup(dp->i_size, imp->logical_block_size);
-
+
searchloop:
while (dp->i_offset < endsearch) {
/*
@@ -256,7 +256,7 @@ searchloop:
*/
ep = (struct iso_directory_record *)
(bp->b_un.b_addr + entryoffsetinblock);
-
+
reclen = isonum_711 (ep->length);
if (reclen == 0) {
/* skip to next block, if any */
@@ -264,26 +264,26 @@ searchloop:
roundup(dp->i_offset, imp->logical_block_size);
continue;
}
-
+
if (reclen < ISO_DIRECTORY_RECORD_SIZE)
/* illegal entry, stop */
break;
-
+
if (entryoffsetinblock + reclen > imp->logical_block_size)
/* entries are not allowed to cross boundaries */
break;
-
+
/*
* Check for a name match.
*/
namelen = isonum_711(ep->name_len);
isoflags = isonum_711(imp->iso_ftype == ISO_FTYPE_HIGH_SIERRA?
&ep->date[6]: ep->flags);
-
+
if (reclen < ISO_DIRECTORY_RECORD_SIZE + namelen)
/* illegal entry, stop */
break;
-
+
switch (imp->iso_ftype) {
default:
if (!(isoflags & 4) == !assoc) {
@@ -375,13 +375,13 @@ notfound:
if (nameiop == CREATE || nameiop == RENAME)
return (EJUSTRETURN);
return (ENOENT);
-
+
found:
if (numdirpasses == 2)
iso_nchstats.ncs_pass2++;
if (bp != NULL)
brelse(bp);
-
+
/*
* Found component in pathname.
* If the final component of path name, save information
@@ -389,7 +389,7 @@ found:
*/
if ((flags & ISLASTCN) && nameiop == LOOKUP)
dp->i_diroff = dp->i_offset;
-
+
/*
* Step through the translation in the name. We do not `iput' the
* directory because we may need it again if a symbolic link
@@ -435,7 +435,7 @@ found:
ISO_IUNLOCK(pdp);
*vpp = ITOV(tdp);
}
-
+
/*
* Insert name into cache if appropriate.
*/
@@ -461,13 +461,13 @@ iso_blkatoff(ip, offset, bpp)
int bsize = iso_blksize(imp,ip,lbn);
struct buf *bp;
int error;
-
+
if ((error = bread(ITOV(ip),lbn,bsize,NOCRED,&bp))) {
brelse(bp);
*bpp = 0;
return (error);
}
*bpp = bp;
-
+
return (0);
}
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index a6292f3073c2..7b321a788274 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.9 1995/02/21 18:41:30 bde Exp $
+ * $Id: cd9660_node.c,v 1.10 1995/03/16 18:12:15 bde Exp $
*/
#include <sys/param.h>
@@ -117,7 +117,7 @@ iso_dmap(dev,ino,create)
{
struct iso_dnode *dp;
union iso_dhead *dh;
-
+
dh = &iso_dhead[DNOHASH(dev, ino)];
for (dp = dh->dh_chain[0];
dp != (struct iso_dnode *)dh;
@@ -132,7 +132,7 @@ iso_dmap(dev,ino,create)
dp->i_dev = dev;
dp->i_number = ino;
insque(dp,dh);
-
+
return dp;
}
@@ -142,7 +142,7 @@ iso_dunmap(dev)
{
struct iso_dnode *dp, *dq;
union iso_dhead *dh;
-
+
for (dh = iso_dhead; dh < iso_dhead + DNOHSZ; dh++) {
for (dp = dh->dh_chain[0];
dp != (struct iso_dnode *)dh;
@@ -184,7 +184,7 @@ iso_iget(xp, ino, relocated, ipp, isodir)
union iso_ihead *ih;
int error, result;
struct iso_mnt *imp;
-
+
ih = &iso_ihead[INOHASH(dev, ino)];
loop:
for (ip = ih->ih_chain[0];
@@ -218,7 +218,7 @@ loop:
ip->i_devvp = 0;
ip->i_diroff = 0;
ip->i_lockf = 0;
-
+
/*
* Put it onto its hash chain and lock it so that other requests for
* this inode will block if they arrive while we are sleeping waiting
@@ -234,7 +234,7 @@ loop:
ip->i_mnt = imp;
ip->i_devvp = imp->im_devvp;
VREF(ip->i_devvp);
-
+
if (relocated) {
/*
* On relocated directories we must
@@ -252,13 +252,13 @@ loop:
}
isodir = (struct iso_directory_record *)bp->b_un.b_addr;
}
-
+
ip->iso_extent = isonum_733(isodir->extent);
ip->i_size = isonum_733(isodir->size);
ip->iso_start = isonum_711(isodir->ext_attr_length) + ip->iso_extent;
-
+
vp = ITOV(ip);
-
+
/*
* Setup time stamp, attribute
*/
@@ -280,12 +280,12 @@ loop:
brelse(bp2);
if (bp)
brelse(bp);
-
+
/*
* Initialize the associated vnode
*/
vp->v_type = IFTOVT(ip->inode.iso_mode);
-
+
if ( vp->v_type == VFIFO ) {
vp->v_op = cd9660_fifoop_p;
} else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
@@ -321,10 +321,10 @@ loop:
ip = iq;
}
}
-
+
if (ip->iso_extent == imp->root_extent)
vp->v_flag |= VROOT;
-
+
*ipp = ip;
return 0;
}
@@ -336,7 +336,7 @@ int
iso_iput(ip)
register struct iso_node *ip;
{
-
+
if ((ip->i_flag & ILOCKED) == 0)
panic("iso_iput");
ISO_IUNLOCK(ip);
@@ -357,10 +357,10 @@ cd9660_inactive(ap)
struct vnode *vp = ap->a_vp;
register struct iso_node *ip = VTOI(vp);
int error = 0;
-
+
if (prtactive && vp->v_usecount != 0)
vprint("cd9660_inactive: pushing active", vp);
-
+
ip->i_flag = 0;
/*
* If we are done with the inode, reclaim it
@@ -382,7 +382,7 @@ cd9660_reclaim(ap)
{
register struct vnode *vp = ap->a_vp;
register struct iso_node *ip = VTOI(vp);
-
+
if (prtactive && vp->v_usecount != 0)
vprint("cd9660_reclaim: pushing active", vp);
/*
@@ -411,7 +411,7 @@ int
iso_ilock(ip)
register struct iso_node *ip;
{
-
+
while (ip->i_flag & ILOCKED) {
ip->i_flag |= IWANT;
if (ip->i_spare0 == curproc->p_pid)
@@ -458,7 +458,7 @@ cd9660_defattr(isodir,inop,bp,ftype)
struct iso_mnt *imp;
struct iso_extended_attributes *ap = NULL;
int off;
-
+
/* high sierra does not have timezone data, flag is one byte ahead */
if (isonum_711(ftype == ISO_FTYPE_HIGH_SIERRA?
&isodir->date[6]: isodir->flags)&2) {
@@ -480,7 +480,7 @@ cd9660_defattr(isodir,inop,bp,ftype)
}
if (bp) {
ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
-
+
if (isonum_711(ap->version) == 1) {
if (!(ap->perm[0]&0x40))
inop->inode.iso_mode |= VEXEC >> 6;
@@ -522,7 +522,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype)
struct iso_mnt *imp;
struct iso_extended_attributes *ap = NULL;
int off;
-
+
if (!bp
&& ((imp = inop->i_mnt)->im_flags&ISOFSMNT_EXTATT)
&& (off = isonum_711(isodir->ext_attr_length))) {
@@ -531,7 +531,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype)
}
if (bp) {
ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
-
+
if (ftype != ISO_FTYPE_HIGH_SIERRA
&& isonum_711(ap->version) == 1) {
if (!cd9660_tstamp_conv17(ap->ftime,&inop->inode.iso_atime))
@@ -560,7 +560,7 @@ enum ISO_FTYPE ftype;
{
int crtime, days;
int y, m, d, hour, minute, second, tz;
-
+
y = pi[0] + 1900;
m = pi[1];
d = pi[2];
@@ -572,7 +572,7 @@ enum ISO_FTYPE ftype;
else
/* original high sierra misses timezone data */
tz = 0;
-
+
if (y < 1970) {
pu->ts_sec = 0;
pu->ts_nsec = 0;
@@ -590,7 +590,7 @@ enum ISO_FTYPE ftype;
days = 367*(y-1960)-7*(y+(m+9)/12)/4-3*((y+(m+9)/12-1)/100+1)/4+275*m/9+d-239;
#endif
crtime = ((((days * 24) + hour) * 60 + minute) * 60) + second;
-
+
/* timezone offset is unreliable on some disks */
if (-48 <= tz && tz <= 52)
crtime -= tz * 15 * 60;
@@ -606,7 +606,7 @@ cd9660_chars2ui(begin,len)
int len;
{
unsigned rc;
-
+
for (rc = 0; --len >= 0;) {
rc *= 10;
rc += *begin++ - '0';
@@ -620,28 +620,28 @@ cd9660_tstamp_conv17(pi,pu)
struct timespec *pu;
{
unsigned char buf[7];
-
+
/* year:"0001"-"9999" -> -1900 */
buf[0] = cd9660_chars2ui(pi,4) - 1900;
-
+
/* month: " 1"-"12" -> 1 - 12 */
buf[1] = cd9660_chars2ui(pi + 4,2);
-
+
/* day: " 1"-"31" -> 1 - 31 */
buf[2] = cd9660_chars2ui(pi + 6,2);
-
+
/* hour: " 0"-"23" -> 0 - 23 */
buf[3] = cd9660_chars2ui(pi + 8,2);
-
+
/* minute:" 0"-"59" -> 0 - 59 */
buf[4] = cd9660_chars2ui(pi + 10,2);
-
+
/* second:" 0"-"59" -> 0 - 59 */
buf[5] = cd9660_chars2ui(pi + 12,2);
-
+
/* difference of GMT */
buf[6] = pi[16];
-
+
return cd9660_tstamp_conv7(buf, pu, ISO_FTYPE_DEFAULT);
}
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 87767ea2d1c2..dca898301697 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_rrip.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_rrip.c,v 1.5 1994/09/26 00:32:57 gpalmer Exp $
+ * $Id: cd9660_rrip.c,v 1.6 1995/01/16 17:03:26 joerg Exp $
*/
#include <sys/param.h>
@@ -95,13 +95,13 @@ cd9660_rrip_slink(p,ana)
register ISO_RRIP_SLINK_COMPONENT *pcompe;
int len, wlen, cont;
char *outbuf, *inbuf;
-
+
pcomp = (ISO_RRIP_SLINK_COMPONENT *)p->component;
pcompe = (ISO_RRIP_SLINK_COMPONENT *)((char *)p + isonum_711(p->h.length));
len = *ana->outlen;
outbuf = ana->outbuf;
cont = ana->cont;
-
+
/*
* Gathering a Symbolic name from each component with path
*/
@@ -109,7 +109,7 @@ cd9660_rrip_slink(p,ana)
pcomp < pcompe;
pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ
+ isonum_711(pcomp->clen))) {
-
+
if (!cont) {
if (len < ana->maxlen) {
len++;
@@ -117,29 +117,29 @@ cd9660_rrip_slink(p,ana)
}
}
cont = 0;
-
+
inbuf = "..";
wlen = 0;
-
+
switch (*pcomp->cflag) {
-
+
case ISO_SUSP_CFLAG_CURRENT:
/* Inserting Current */
wlen = 1;
break;
-
+
case ISO_SUSP_CFLAG_PARENT:
/* Inserting Parent */
wlen = 2;
break;
-
+
case ISO_SUSP_CFLAG_ROOT:
/* Inserting slash for ROOT */
/* start over from beginning(?) */
outbuf -= len;
len = 0;
break;
-
+
case ISO_SUSP_CFLAG_VOLROOT:
/* Inserting a mount point i.e. "/cdrom" */
/* same as above */
@@ -148,13 +148,13 @@ cd9660_rrip_slink(p,ana)
inbuf = ana->imp->im_mountp->mnt_stat.f_mntonname;
wlen = strlen(inbuf);
break;
-
+
case ISO_SUSP_CFLAG_HOST:
/* Inserting hostname i.e. "kurt.tools.de" */
inbuf = hostname;
wlen = hostnamelen;
break;
-
+
case ISO_SUSP_CFLAG_CONTINUE:
cont = 1;
/* fall thru */
@@ -168,7 +168,7 @@ cd9660_rrip_slink(p,ana)
wlen = ana->maxlen + 1;
break;
}
-
+
if (len + wlen > ana->maxlen) {
/* indicate error to caller */
ana->cont = 1;
@@ -177,16 +177,16 @@ cd9660_rrip_slink(p,ana)
*ana->outlen = 0;
return 0;
}
-
+
bcopy(inbuf,outbuf,wlen);
outbuf += wlen;
len += wlen;
-
+
}
ana->outbuf = outbuf;
*ana->outlen = len;
ana->cont = cont;
-
+
if (!isonum_711(p->flags)) {
ana->fields &= ~ISO_SUSP_SLINK;
return ISO_SUSP_SLINK;
@@ -205,28 +205,28 @@ cd9660_rrip_altname(p,ana)
char *inbuf;
int wlen;
int cont;
-
+
inbuf = "..";
wlen = 0;
cont = 0;
-
+
switch (*p->flags) {
case ISO_SUSP_CFLAG_CURRENT:
/* Inserting Current */
wlen = 1;
break;
-
+
case ISO_SUSP_CFLAG_PARENT:
/* Inserting Parent */
wlen = 2;
break;
-
+
case ISO_SUSP_CFLAG_HOST:
/* Inserting hostname i.e. "kurt.tools.de" */
inbuf = hostname;
wlen = hostnamelen;
break;
-
+
case ISO_SUSP_CFLAG_CONTINUE:
cont = 1;
/* fall thru */
@@ -235,13 +235,13 @@ cd9660_rrip_altname(p,ana)
wlen = isonum_711(p->h.length) - 5;
inbuf = (char *)p + 5;
break;
-
+
default:
printf("RRIP with incorrect NM flags?\n");
wlen = ana->maxlen + 1;
break;
}
-
+
if ((*ana->outlen += wlen) > ana->maxlen) {
/* treat as no name field */
ana->fields &= ~ISO_SUSP_ALTNAME;
@@ -249,10 +249,10 @@ cd9660_rrip_altname(p,ana)
*ana->outlen = 0;
return 0;
}
-
+
bcopy(inbuf,ana->outbuf,wlen);
ana->outbuf += wlen;
-
+
if (!cont) {
ana->fields &= ~ISO_SUSP_ALTNAME;
return ISO_SUSP_ALTNAME;
@@ -314,55 +314,55 @@ cd9660_rrip_tstamp(p,ana)
ISO_RRIP_ANALYZE *ana;
{
unsigned char *ptime;
-
+
ptime = p->time;
-
+
/* Check a format of time stamp (7bytes/17bytes) */
if (!(*p->flags&ISO_SUSP_TSTAMP_FORM17)) {
if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
ptime += 7;
-
+
if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime,
ISO_FTYPE_RRIP);
ptime += 7;
} else
bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
-
+
if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime,
ISO_FTYPE_RRIP);
ptime += 7;
} else
ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-
+
if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime,
ISO_FTYPE_RRIP);
else
ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-
+
} else {
if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
ptime += 17;
-
+
if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
ptime += 17;
} else
bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
-
+
if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
ptime += 17;
} else
ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-
+
if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);
else
ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-
+
}
ana->fields &= ~ISO_SUSP_TSTAMP;
return ISO_SUSP_TSTAMP;
@@ -385,10 +385,10 @@ cd9660_rrip_device(p,ana)
ISO_RRIP_ANALYZE *ana;
{
unsigned high, low;
-
+
high = isonum_733(p->dev_t_high_l);
low = isonum_733(p->dev_t_low_l);
-
+
if ( high == 0 ) {
ana->inop->inode.iso_rdev = makedev( major(low), minor(low) );
} else {
@@ -410,7 +410,7 @@ cd9660_rrip_idflag(p,ana)
/* special handling of RE field */
if (ana->fields&ISO_SUSP_RELDIR)
return cd9660_rrip_reldir(p,ana);
-
+
return ISO_SUSP_IDFLAG;
}
@@ -476,7 +476,7 @@ cd9660_rrip_loop(isodir,ana,table)
struct buf *bp = NULL;
char *pwhead;
int result;
-
+
/*
* Note: If name length is odd,
* it will be padding 1 byte after the name
@@ -484,23 +484,23 @@ cd9660_rrip_loop(isodir,ana,table)
pwhead = isodir->name + isonum_711(isodir->name_len);
if (!(isonum_711(isodir->name_len)&1))
pwhead++;
-
+
/* If it's not the '.' entry of the root dir obey SP field */
if (*isodir->name != 0
|| isonum_733(isodir->extent) != ana->imp->root_extent)
pwhead += ana->imp->rr_skip;
else
pwhead += ana->imp->rr_skip0;
-
+
phead = (ISO_SUSP_HEADER *)pwhead;
pend = (ISO_SUSP_HEADER *)((char *)isodir + isonum_711(isodir->length));
-
+
result = 0;
while (1) {
ana->iso_ce_len = 0;
/*
* Note: "pend" should be more than one SUSP header
- */
+ */
while (pend >= phead + 1) {
if (isonum_711(phead->version) == 1) {
for (ptable = table; ptable->func; ptable++) {
@@ -519,7 +519,7 @@ cd9660_rrip_loop(isodir,ana,table)
*/
phead = (ISO_SUSP_HEADER *)((char *)phead + isonum_711(phead->length));
}
-
+
if ( ana->fields && ana->iso_ce_len ) {
if (ana->iso_ce_blk >= ana->imp->volume_space_size
|| ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size
@@ -542,7 +542,7 @@ cd9660_rrip_loop(isodir,ana,table)
for (ptable = table; ptable->func2; ptable++)
if (!(ptable->result&result))
ptable->func2(isodir,ana);
-
+
return result;
}
@@ -563,17 +563,17 @@ cd9660_rrip_analyze(isodir,inop,imp)
struct iso_mnt *imp;
{
ISO_RRIP_ANALYZE analyze;
-
+
analyze.inop = inop;
analyze.imp = imp;
analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE;
-
+
return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze);
}
-/*
- * Get Alternate Name from 'AL' record
- * If either no AL record or 0 length,
+/*
+ * Get Alternate Name from 'AL' record
+ * If either no AL record or 0 length,
* it will be return the translated ISO9660 name,
*/
static RRIP_TABLE rrip_table_getname[] = {
@@ -597,7 +597,7 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp)
{
ISO_RRIP_ANALYZE analyze;
RRIP_TABLE *tab;
-
+
analyze.outbuf = outbuf;
analyze.outlen = outlen;
analyze.maxlen = NAME_MAX;
@@ -605,21 +605,21 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp)
analyze.imp = imp;
analyze.fields = ISO_SUSP_ALTNAME|ISO_SUSP_RELDIR|ISO_SUSP_CLINK|ISO_SUSP_PLINK;
*outlen = 0;
-
+
tab = rrip_table_getname;
if (*isodir->name == 0
|| *isodir->name == 1) {
cd9660_rrip_defname(isodir,&analyze);
-
+
analyze.fields &= ~ISO_SUSP_ALTNAME;
tab++;
}
-
+
return cd9660_rrip_loop(isodir,&analyze,tab);
}
-/*
- * Get Symbolic Name from 'SL' record
+/*
+ * Get Symbolic Name from 'SL' record
*
* Note: isodir should contains SL record!
*/
@@ -639,7 +639,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp)
struct iso_mnt *imp;
{
ISO_RRIP_ANALYZE analyze;
-
+
analyze.outbuf = outbuf;
analyze.outlen = outlen;
*outlen = 0;
@@ -647,7 +647,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp)
analyze.cont = 1; /* don't start with a slash */
analyze.imp = imp;
analyze.fields = ISO_SUSP_SLINK;
-
+
return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK);
}
@@ -669,7 +669,7 @@ cd9660_rrip_offset(isodir,imp)
{
ISO_RRIP_OFFSET *p;
ISO_RRIP_ANALYZE analyze;
-
+
imp->rr_skip0 = 0;
p = (ISO_RRIP_OFFSET *)(isodir->name + 1);
if (bcmp(p,"SP\7\1\276\357",6)) {
@@ -679,11 +679,11 @@ cd9660_rrip_offset(isodir,imp)
if (bcmp(p,"SP\7\1\276\357",6))
return -1;
}
-
+
analyze.imp = imp;
analyze.fields = ISO_SUSP_EXTREF;
if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF))
return -1;
-
+
return isonum_711(p->skip);
}
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 52a80d75ce42..3d58e4e16d57 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_util.c 8.1 (Berkeley) 1/21/94
- * $Id$
+ * $Id: cd9660_util.c,v 1.3 1994/08/02 07:41:31 davidg Exp $
*/
#include <sys/param.h>
@@ -159,7 +159,7 @@ isofncmp(unsigned char *fn,int fnlen,unsigned char *isofn,int isolen)
{
int i, j;
unsigned char c;
-
+
while (--fnlen >= 0) {
if (--isolen < 0)
return *fn;
@@ -216,14 +216,14 @@ isofntrans(unsigned char *infn,int infnlen,
int original,int assoc)
{
int fnidx = 0;
-
+
if (assoc) {
*outfn++ = ASSOCCHAR;
fnidx++;
}
for (; fnidx < infnlen; fnidx++) {
char c = *infn++;
-
+
if (!original && c >= 'A' && c <= 'Z')
*outfn++ = c + ('a' - 'A');
else if (!original && c == '.' && *infn == ';')
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 8fc30a85e385..afa08f473811 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.11 1995/03/16 20:23:24 wollman Exp $
+ * $Id: cd9660_vfsops.c,v 1.12 1995/05/19 03:25:35 davidg Exp $
*/
#include <sys/param.h>
@@ -92,7 +92,7 @@ cd9660_mountroot()
u_int size;
int error;
struct iso_args args;
-
+
/*
* Get vnode for rootdev.
*/
@@ -152,13 +152,13 @@ cd9660_mount(mp, path, data, ndp, p)
u_int size;
int error;
struct iso_mnt *imp = 0;
-
+
if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args))))
return (error);
-
+
if ((mp->mnt_flag & MNT_RDONLY) == 0)
return (EROFS);
-
+
/*
* If updating, check whether changing from read-only to
* read/write; if there is no device name, that's all we do.
@@ -233,10 +233,10 @@ iso_mountfs(devvp, mp, p, argp)
struct iso_sierra_primary_descriptor *pri_sierra;
struct iso_directory_record *rootp;
int logical_block_size;
-
+
if (!ronly)
return EROFS;
-
+
/*
* Disallow multiple mounts of the same device.
* Disallow mounting of a device that is currently in use
@@ -253,18 +253,18 @@ iso_mountfs(devvp, mp, p, argp)
if ((error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p)))
return error;
needclose = 1;
-
+
/* This is the "logical sector size". The standard says this
* should be 2048 or the physical sector size on the device,
* whichever is greater. For now, we'll just use a constant.
*/
iso_bsize = ISO_DEFAULT_BLOCK_SIZE;
-
+
for (iso_blknum = 16; iso_blknum < 100; iso_blknum++) {
if ((error = bread (devvp, btodb(iso_blknum * iso_bsize),
iso_bsize, NOCRED, &bp)))
goto out;
-
+
vdp = (struct iso_volume_descriptor *)bp->b_un.b_addr;
if (bcmp (vdp->id, ISO_STANDARD_ID, sizeof vdp->id) != 0) {
if (bcmp (vdp->id_sierra, ISO_SIERRA_ID,
@@ -274,41 +274,41 @@ iso_mountfs(devvp, mp, p, argp)
} else
high_sierra = 1;
}
-
+
if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) == ISO_VD_END) {
error = EINVAL;
goto out;
}
-
+
if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) == ISO_VD_PRIMARY)
break;
brelse(bp);
}
-
+
if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) != ISO_VD_PRIMARY) {
error = EINVAL;
goto out;
}
-
+
pri = (struct iso_primary_descriptor *)vdp;
pri_sierra = (struct iso_sierra_primary_descriptor *)vdp;
-
+
logical_block_size =
isonum_723 (high_sierra?
pri_sierra->logical_block_size:
pri->logical_block_size);
-
+
if (logical_block_size < DEV_BSIZE || logical_block_size > MAXBSIZE
|| (logical_block_size & (logical_block_size - 1)) != 0) {
error = EINVAL;
goto out;
}
-
+
rootp = (struct iso_directory_record *)
(high_sierra?
pri_sierra->root_directory_record:
pri->root_directory_record);
-
+
isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK);
bzero((caddr_t)isomp, sizeof *isomp);
isomp->logical_block_size = logical_block_size;
@@ -319,16 +319,16 @@ iso_mountfs(devvp, mp, p, argp)
bcopy (rootp, isomp->root, sizeof isomp->root);
isomp->root_extent = isonum_733 (rootp->extent);
isomp->root_size = isonum_733 (rootp->size);
-
+
isomp->im_bmask = logical_block_size - 1;
isomp->im_bshift = 0;
while ((1 << isomp->im_bshift) < isomp->logical_block_size)
isomp->im_bshift++;
-
+
bp->b_flags |= B_AGE;
brelse(bp);
bp = NULL;
-
+
mp->mnt_data = (qaddr_t)isomp;
mp->mnt_stat.f_fsid.val[0] = (long)dev;
mp->mnt_stat.f_fsid.val[1] = MOUNT_CD9660;
@@ -337,9 +337,9 @@ iso_mountfs(devvp, mp, p, argp)
isomp->im_mountp = mp;
isomp->im_dev = dev;
isomp->im_devvp = devvp;
-
+
devvp->v_specflags |= SI_MOUNTEDON;
-
+
/* Check the Rock Ridge Extention support */
if (!(argp->flags & ISOFSMNT_NORRIP)) {
if ((error = bread (isomp->im_devvp,
@@ -347,15 +347,15 @@ iso_mountfs(devvp, mp, p, argp)
* isomp->logical_block_size / DEV_BSIZE,
isomp->logical_block_size,NOCRED,&bp)))
goto out;
-
+
rootp = (struct iso_directory_record *)bp->b_un.b_addr;
-
+
if ((isomp->rr_skip = cd9660_rrip_offset(rootp,isomp)) < 0) {
argp->flags |= ISOFSMNT_NORRIP;
} else {
argp->flags &= ~ISOFSMNT_GENS;
}
-
+
/*
* The contents are valid,
* but they will get reread as part of another vnode, so...
@@ -381,7 +381,7 @@ iso_mountfs(devvp, mp, p, argp)
isomp->iso_ftype = ISO_FTYPE_RRIP;
break;
}
-
+
return 0;
out:
if (bp)
@@ -420,7 +420,7 @@ cd9660_unmount(mp, mntflags, p)
{
register struct iso_mnt *isomp;
int error, flags = 0;
-
+
if (mntflags & MNT_FORCE) {
if (!iso_doforce)
return (EINVAL);
@@ -440,7 +440,7 @@ cd9660_unmount(mp, mntflags, p)
if (isomp->iso_ftype == ISO_FTYPE_RRIP)
iso_dunmap(isomp->im_dev);
#endif
-
+
isomp->im_devvp->v_specflags &= ~SI_MOUNTEDON;
error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p);
vrele(isomp->im_devvp);
@@ -464,7 +464,7 @@ cd9660_root(mp, vpp)
int error;
struct iso_mnt *imp = VFSTOISOFS (mp);
struct iso_directory_record *dp;
-
+
tvp.v_mount = mp;
tvp.v_data = &tip;
ip = VTOI(&tvp);
@@ -473,7 +473,7 @@ cd9660_root(mp, vpp)
ip->i_diroff = 0;
dp = (struct iso_directory_record *)imp->root;
isodirino(&ip->i_number,dp,imp);
-
+
/*
* With RRIP we must use the `.' entry of the root directory.
* Simply tell iget, that it's a relocated directory.
@@ -513,9 +513,9 @@ cd9660_statfs(mp, sbp, p)
struct proc *p;
{
register struct iso_mnt *isomp;
-
+
isomp = VFSTOISOFS(mp);
-
+
sbp->f_type = MOUNT_CD9660;
sbp->f_bsize = isomp->logical_block_size;
sbp->f_iosize = sbp->f_bsize; /* XXX */
@@ -597,15 +597,15 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
struct iso_directory_record *dirp;
struct iso_node tip, *ip, *nip;
struct netcred *np;
-
+
imp = VFSTOISOFS (mp);
ifhp = (struct ifid *)fhp;
-
+
#ifdef ISOFS_DBG
printf("fhtovp: ino %d, start %ld\n",
ifhp->ifid_ino, ifhp->ifid_start);
#endif
-
+
np = vfs_export_lookup(mp, &imp->im_export, nam);
if (np == NULL)
return (EACCES);
@@ -615,14 +615,14 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
printf("fhtovp: lbn exceed volume space %d\n", lbn);
return (ESTALE);
}
-
+
off = iso_blkoff(imp, ifhp->ifid_ino);
if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size) {
printf("fhtovp: crosses block boundary %d\n",
off + ISO_DIRECTORY_RECORD_SIZE);
return (ESTALE);
}
-
+
error = bread(imp->im_devvp, btodb(lbn * imp->logical_block_size),
imp->logical_block_size, NOCRED, &bp);
if (error) {
@@ -630,7 +630,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
brelse(bp);
return (error);
}
-
+
dirp = (struct iso_directory_record *)(bp->b_un.b_addr + off);
if (off + isonum_711(dirp->length) > imp->logical_block_size) {
brelse(bp);
@@ -639,7 +639,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
isonum_711(dirp->length));
return (ESTALE);
}
-
+
if (isonum_733(dirp->extent) + isonum_711(dirp->ext_attr_length) !=
ifhp->ifid_start) {
brelse(bp);
@@ -649,7 +649,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
return (ESTALE);
}
brelse(bp);
-
+
ip = &tip;
tvp.v_mount = mp;
tvp.v_data = ip;
@@ -687,13 +687,13 @@ cd9660_vptofh(vp, fhp)
{
register struct iso_node *ip = VTOI(vp);
register struct ifid *ifhp;
-
+
ifhp = (struct ifid *)fhp;
ifhp->ifid_len = sizeof(struct ifid);
-
+
ifhp->ifid_ino = ip->i_number;
ifhp->ifid_start = ip->iso_start;
-
+
#ifdef ISOFS_DBG
printf("vptofh: ino %d, start %ld\n",
ifhp->ifid_ino,ifhp->ifid_start);
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 5e403e3fc962..3b538a8d0cb5 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vnops.c 8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.12 1995/02/13 06:12:32 phk Exp $
+ * $Id: cd9660_vnops.c,v 1.13 1995/03/28 07:46:38 phk Exp $
*/
#include <sys/param.h>
@@ -81,10 +81,10 @@ cd9660_mknod(ndp, vap, cred, p)
struct iso_node *ip;
struct iso_dnode *dp;
int error;
-
+
vp = ndp->ni_vp;
ip = VTOI(vp);
-
+
if (ip->i_mnt->iso_ftype != ISO_FTYPE_RRIP
|| vap->va_type != vp->v_type
|| (vap->va_type != VCHR && vap->va_type != VBLK)) {
@@ -93,7 +93,7 @@ cd9660_mknod(ndp, vap, cred, p)
vput(ndp->ni_vp);
return EINVAL;
}
-
+
dp = iso_dmap(ip->i_dev,ip->i_number,1);
if (ip->inode.iso_rdev == vap->va_rdev || vap->va_rdev == VNOVAL) {
/* same as the unmapped one, delete the mapping */
@@ -102,7 +102,7 @@ cd9660_mknod(ndp, vap, cred, p)
} else
/* enter new mapping */
dp->d_dev = vap->va_rdev;
-
+
/*
* Remove inode so that it will be reloaded by iget and
* checked to see if it is an alias of an existing entry
@@ -237,7 +237,7 @@ cd9660_read(ap)
off_t diff;
int rasize, error = 0;
long size, n, on;
-
+
if (uio->uio_resid == 0)
return (0);
if (uio->uio_offset < 0)
@@ -260,7 +260,7 @@ cd9660_read(ap)
if (iso_lblktosize(imp, rablock) <= ip->i_size)
error = cluster_read(vp, (off_t)ip->i_size,
lbn, size, NOCRED, &bp);
- else
+ else
error = bread(vp, lbn, size, NOCRED, &bp);
} else {
if (vp->v_lastr + 1 == lbn &&
@@ -380,25 +380,25 @@ iso_uiodir(idp,dp,off)
off_t off;
{
int error;
-
+
dp->d_name[dp->d_namlen] = 0;
dp->d_reclen = DIRSIZ(dp);
-
+
if (idp->uio->uio_resid < dp->d_reclen) {
idp->eof = 0;
return -1;
}
-
+
if (idp->cookiep) {
if (idp->ncookies <= 0) {
idp->eof = 0;
return -1;
}
-
+
*idp->cookiep++ = off;
--idp->ncookies;
}
-
+
if ((error = uiomove((caddr_t)dp,dp->d_reclen,idp->uio)))
return error;
idp->uio_off = off;
@@ -413,7 +413,7 @@ iso_shipdir(idp)
int cl, sl, assoc;
int error;
char *cname, *sname;
-
+
cl = idp->current.d_namlen;
cname = idp->current.d_name;
assoc = (cl > 1) && (*cname == ASSOCCHAR);
@@ -421,7 +421,7 @@ assoc = (cl > 1) && (*cname == ASSOCCHAR);
cl--;
cname++;
}
-
+
dp = &idp->saveent;
sname = dp->d_name;
if (!(sl = dp->d_namlen)) {
@@ -483,10 +483,10 @@ cd9660_readdir(ap)
u_short tmplen;
int ncookies = 0;
u_int *cookies = NULL;
-
+
ip = VTOI(ap->a_vp);
imp = ip->i_mnt;
-
+
MALLOC(idp,struct isoreaddir *,sizeof(*idp),M_TEMP,M_WAITOK);
idp->saveent.d_namlen = 0;
idp->assocent.d_namlen = 0;
@@ -503,7 +503,7 @@ cd9660_readdir(ap)
idp->cookiep = 0;
idp->eof = 0;
idp->curroff = uio->uio_offset;
-
+
entryoffsetinblock = iso_blkoff(imp, idp->curroff);
if (entryoffsetinblock != 0) {
if ((error = iso_blkatoff(ip, idp->curroff, &bp))) {
@@ -511,16 +511,16 @@ cd9660_readdir(ap)
return (error);
}
}
-
+
endsearch = ip->i_size;
-
+
while (idp->curroff < endsearch) {
/*
* If offset is on a block boundary,
* read the next directory block.
* Release previous if it exists.
*/
-
+
if (iso_blkoff(imp, idp->curroff) == 0) {
if (bp != NULL)
brelse(bp);
@@ -531,10 +531,10 @@ cd9660_readdir(ap)
/*
* Get pointer to next entry.
*/
-
+
ep = (struct iso_directory_record *)
(bp->b_un.b_addr + entryoffsetinblock);
-
+
reclen = isonum_711 (ep->length);
isoflags = isonum_711(imp->iso_ftype == ISO_FTYPE_HIGH_SIERRA?
&ep->date[6]: ep->flags);
@@ -544,19 +544,19 @@ cd9660_readdir(ap)
imp->logical_block_size);
continue;
}
-
+
if (reclen < ISO_DIRECTORY_RECORD_SIZE) {
error = EINVAL;
/* illegal entry, stop */
break;
}
-
+
if (entryoffsetinblock + reclen > imp->logical_block_size) {
error = EINVAL;
/* illegal directory, so stop looking */
break;
}
-
+
/* XXX: be more intelligent if we can */
idp->current.d_type = DT_UNKNOWN;
@@ -566,13 +566,13 @@ cd9660_readdir(ap)
else
idp->current.d_fileno = dbtob(bp->b_blkno) +
idp->curroff;
-
+
if (reclen < ISO_DIRECTORY_RECORD_SIZE + idp->current.d_namlen) {
error = EINVAL;
/* illegal entry, stop */
break;
}
-
+
idp->curroff += reclen;
/*
*
@@ -612,10 +612,10 @@ cd9660_readdir(ap)
}
if (error)
break;
-
+
entryoffsetinblock += reclen;
}
-
+
if (!error && imp->iso_ftype == ISO_FTYPE_DEFAULT) {
idp->current.d_namlen = 0;
error = iso_shipdir(idp);
@@ -634,16 +634,16 @@ cd9660_readdir(ap)
*ap->a_cookies = cookies;
}
}
-
+
if (bp)
brelse (bp);
uio->uio_offset = idp->uio_off;
if (ap->a_eofflag)
*ap->a_eofflag = idp->eof;
-
+
FREE(idp,M_TEMP);
-
+
return (error);
}
@@ -665,19 +665,19 @@ cd9660_readlink(ap)
} */ *ap;
{
ISONODE *ip;
- ISODIR *dirp;
+ ISODIR *dirp;
ISOMNT *imp;
struct buf *bp;
u_short symlen;
int error;
char *symname;
-
+
ip = VTOI(ap->a_vp);
imp = ip->i_mnt;
-
+
if (imp->iso_ftype != ISO_FTYPE_RRIP)
return EINVAL;
-
+
/*
* Get parents directory record block that this inode included.
*/
@@ -706,7 +706,7 @@ cd9660_readlink(ap)
ip->i_number,
ip->i_number & imp->im_bmask );
#endif
-
+
/*
* Just make sure, we have a right one....
* 1: Check not cross boundary on block
@@ -716,13 +716,13 @@ cd9660_readlink(ap)
brelse(bp);
return EINVAL;
}
-
+
/*
* Now get a buffer
* Abuse a namei buffer for now.
*/
MALLOC(symname,char *,MAXPATHLEN,M_NAMEI,M_WAITOK);
-
+
/*
* Ok, we just gathering a symbolic name in SL record.
*/
@@ -735,14 +735,14 @@ cd9660_readlink(ap)
* Don't forget before you leave from home ;-)
*/
brelse(bp);
-
+
/*
* return with the symbolic name to caller's.
*/
error = uiomove(symname,symlen,ap->a_uio);
-
+
FREE(symname,M_NAMEI);
-
+
return error;
}
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 858dbb3b7578..406572e42e0c 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)iso.h 8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.3 1994/09/09 11:11:01 dfr Exp $
+ * $Id: iso.h,v 1.4 1995/01/16 17:03:29 joerg Exp $
*/
#define ISODCL(from, to) (to - from + 1)
@@ -189,16 +189,16 @@ struct iso_mnt {
int logical_block_size;
int im_bshift;
int im_bmask;
-
+
int volume_space_size;
char im_fsmnt[50];
struct netexport im_export;
-
+
char root[ISODCL (157, 190)];
int root_extent;
int root_size;
enum ISO_FTYPE iso_ftype;
-
+
int rr_skip;
int rr_skip0;
};
@@ -228,13 +228,13 @@ int cd9660_vptofh __P((struct vnode *, struct fid *));
int cd9660_init __P(());
struct iso_node;
-int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
+int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
struct iso_node **ipp, struct iso_directory_record *isodir));
-int iso_iput __P((struct iso_node *ip));
-int iso_ilock __P((struct iso_node *ip));
-int iso_iunlock __P((struct iso_node *ip));
-int cd9660_mountroot __P((void));
+int iso_iput __P((struct iso_node *ip));
+int iso_ilock __P((struct iso_node *ip));
+int iso_iunlock __P((struct iso_node *ip));
+int cd9660_mountroot __P((void));
extern int (**cd9660_vnodeop_p)();
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 6c20b26bc527..420320acab7e 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id: fdesc_vnops.c,v 1.7 1994/10/06 21:06:42 davidg Exp $
+ * $Id: fdesc_vnops.c,v 1.8 1995/03/28 07:56:44 bde Exp $
*/
/*
@@ -138,7 +138,7 @@ loop:
/*
* otherwise lock the array while we call getnewvnode
* since that can block.
- */
+ */
if (fdcache_lock & FDL_LOCKED) {
fdcache_lock |= FDL_WANT;
(void) tsleep((caddr_t) &fdcache_lock, PINOD, "fdalvp", 0);
@@ -195,7 +195,7 @@ fdesc_lookup(ap)
pname = ap->a_cnp->cn_nameptr;
if (ap->a_cnp->cn_namelen == 1 && *pname == '.') {
*vpp = dvp;
- VREF(dvp);
+ VREF(dvp);
VOP_LOCK(dvp);
return (0);
}
@@ -325,7 +325,7 @@ fdesc_open(ap)
case Fdesc:
/*
* XXX Kludge: set p->p_dupfd to contain the value of the
- * the file descriptor being sought for duplication. The error
+ * the file descriptor being sought for duplication. The error
* return ensures that the vnode for this device will be
* released by vn_open. Open will detect this special error and
* take the actions in dupfdopen. Other callers of vn_open or
@@ -467,7 +467,7 @@ fdesc_getattr(ap)
default:
panic("fdesc_getattr");
- break;
+ break;
}
if (error == 0)
@@ -586,7 +586,7 @@ fdesc_readdir(ap)
break;
}
i++;
-
+
switch (dt->d_fileno) {
case FD_CTTY:
if (cttyvp(uio->uio_procp) == NULL)
@@ -690,7 +690,7 @@ fdesc_read(ap)
error = EOPNOTSUPP;
break;
}
-
+
return (error);
}
@@ -714,7 +714,7 @@ fdesc_write(ap)
error = EOPNOTSUPP;
break;
}
-
+
return (error);
}
@@ -741,7 +741,7 @@ fdesc_ioctl(ap)
error = EOPNOTSUPP;
break;
}
-
+
return (error);
}
@@ -766,7 +766,7 @@ fdesc_select(ap)
error = EOPNOTSUPP;
break;
}
-
+
return (error);
}
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index bf1ec828c434..106ac89661ca 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.7 1995/02/03 06:46:13 davidg Exp $
+ * $Id: fifo_vnops.c,v 1.8 1995/03/16 18:13:13 bde Exp $
*/
#include <sys/param.h>
@@ -124,7 +124,7 @@ fifo_lookup(ap)
struct componentname * a_cnp;
} */ *ap;
{
-
+
*ap->a_vpp = NULL;
return (ENOTDIR);
}
@@ -169,7 +169,7 @@ fifo_open(ap)
return (error);
}
fip->fi_writesock = wso;
- error = unp_connect2(wso, rso);
+ error = unp_connect2(wso, rso);
if (error) {
(void)soclose(wso);
(void)soclose(rso);
@@ -251,7 +251,7 @@ fifo_read(ap)
rso->so_state |= SS_NBIO;
startresid = uio->uio_resid;
VOP_UNLOCK(ap->a_vp);
- error = soreceive(rso, (struct mbuf **)0, uio,
+ error = soreceive(rso, (struct mbuf **)0, uio,
(struct mbuf **)0, (struct mbuf **)0, (int*)0);
VOP_LOCK(ap->a_vp);
/*
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 099b15f661f9..f83b9ec0b1a1 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,19 +1,19 @@
-/* $Id$ */
+/* $Id: bootsect.h,v 1.1 1994/09/19 15:41:36 dfr Exp $ */
/* $NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $ */
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 70e4de201a0f..7618126c3101 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,19 +1,19 @@
-/* $Id$ */
+/* $Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */
/* $NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $ */
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index b47196adbd7f..a7f2928ec8c5 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $Id: denode.h,v 1.3 1994/12/27 12:37:33 bde Exp $ */
+/* $Id: denode.h,v 1.4 1995/03/16 18:14:17 bde Exp $ */
/* $NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index d2ec0190e44b..f4eecac02d97 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: direntry.h,v 1.1 1994/09/19 15:41:39 dfr Exp $ */
/* $NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index b5f223f46db3..3b043c14d230 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/* $Id: fat.h,v 1.1 1994/09/19 15:41:40 dfr Exp $ */
+/* $Id: fat.h,v 1.2 1994/09/27 20:42:41 phk Exp $ */
/* $NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index d351a4809f90..88999827db52 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,19 +1,19 @@
-/* $Id: msdosfs_conv.c,v 1.3 1994/12/12 12:35:42 bde Exp $ */
+/* $Id: msdosfs_conv.c,v 1.4 1995/03/29 18:48:06 ache Exp $ */
/* $NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $ */
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index c0e882394538..60a68111833d 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.10 1995/03/19 12:11:13 davidg Exp $ */
+/* $Id: msdosfs_denode.c,v 1.11 1995/04/11 17:13:17 bde Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
@@ -83,7 +83,7 @@ msdosfs_hashget(dev, dirclust, diroff)
u_long diroff;
{
struct denode *dep;
-
+
for (;;)
for (dep = dehashtbl[DEHASH(dev, dirclust + diroff)];;
dep = dep->de_next) {
@@ -111,7 +111,7 @@ msdosfs_hashins(dep)
struct denode *dep;
{
struct denode **depp, *deq;
-
+
depp = &dehashtbl[DEHASH(dep->de_dev, dep->de_dirclust + dep->de_diroffset)];
deq = *depp;
if (deq)
@@ -137,17 +137,17 @@ msdosfs_hashrem(dep)
}
/*
- * If deget() succeeds it returns with the gotten denode locked().
+ * If deget() succeeds it returns with the gotten denode locked().
*
* pmp - address of msdosfsmount structure of the filesystem containing
* the denode of interest. The pm_dev field and the address of
- * the msdosfsmount structure are used.
+ * the msdosfsmount structure are used.
* dirclust - which cluster bp contains, if dirclust is 0 (root directory)
* diroffset is relative to the beginning of the root directory,
- * otherwise it is cluster relative.
- * diroffset - offset past begin of cluster of denode we want
+ * otherwise it is cluster relative.
+ * diroffset - offset past begin of cluster of denode we want
* direntptr - address of the direntry structure of interest. If direntptr is
- * NULL, the block is read if necessary.
+ * NULL, the block is read if necessary.
* depp - returns the address of the gotten denode.
*/
int
@@ -187,7 +187,7 @@ deget(pmp, dirclust, diroffset, direntptr, depp)
* the directory entry to compute the hash value. For subdir use
* address of "." entry. for root dir use cluster MSDOSFSROOT,
* offset MSDOSFSROOT_OFS
- *
+ *
* NOTE: The check for de_refcnt > 0 below insures the denode being
* examined does not represent an unlinked but still open file.
* These files are not to be accessible even when the directory
@@ -337,7 +337,7 @@ deupdat(dep, tp, waitfor)
* update.
*/
error = readde(dep, &bp, &dirp);
- if (error)
+ if (error)
return error;
/*
@@ -535,7 +535,7 @@ deextend(dep, length, cred)
u_long count;
int error;
struct timespec ts;
-
+
/*
* The root of a DOS filesystem cannot be extended.
*/
@@ -554,7 +554,7 @@ deextend(dep, length, cred)
if (length <= dep->de_FileSize)
panic("deextend: file too large");
-
+
/*
* Compute the number of clusters to allocate.
*/
@@ -569,7 +569,7 @@ deextend(dep, length, cred)
return error;
}
}
-
+
dep->de_flag |= DE_UPDATE;
dep->de_FileSize = length;
TIMEVAL_TO_TIMESPEC(&time, &ts);
@@ -606,7 +606,7 @@ msdosfs_reclaim(ap)
{
struct vnode *vp = ap->a_vp;
struct denode *dep = VTODE(vp);
-
+
#ifdef MSDOSFS_DEBUG
printf("msdosfs_reclaim(): dep %p, file %s, refcnt %ld\n",
dep, dep->de_Name, dep->de_refcnt);
@@ -630,10 +630,10 @@ msdosfs_reclaim(ap)
}
dep->de_flag = 0;
-
+
FREE(dep, M_MSDOSFSNODE);
vp->v_data = NULL;
-
+
return 0;
}
@@ -647,7 +647,7 @@ msdosfs_inactive(ap)
struct denode *dep = VTODE(vp);
int error = 0;
struct timespec ts;
-
+
#ifdef MSDOSFS_DEBUG
printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
#endif
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 06b30e460c4b..b43f9595b6b5 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_fat.c,v 1.5 1995/02/10 18:39:45 bde Exp $ */
+/* $Id: msdosfs_fat.c,v 1.6 1995/04/11 16:43:20 bde Exp $ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
@@ -251,7 +251,7 @@ hiteof:;
* Find the closest entry in the fat cache to the cluster we are looking
* for.
*/
-void
+void
fc_lookup(dep, findcn, frcnp, fsrcnp)
struct denode *dep;
u_long findcn;
@@ -344,22 +344,22 @@ updatefats(pmp, bp, fatbn)
/*
* Updating entries in 12 bit fats is a pain in the butt.
- *
+ *
* The following picture shows where nibbles go when moving from a 12 bit
* cluster number into the appropriate bytes in the FAT.
- *
+ *
* byte m byte m+1 byte m+2
* +----+----+ +----+----+ +----+----+
* | 0 1 | | 2 3 | | 4 5 | FAT bytes
* +----+----+ +----+----+ +----+----+
- *
+ *
* +----+----+----+ +----+----+----+
* | 3 0 1 | | 4 5 2 |
* +----+----+----+ +----+----+----+
* cluster n cluster n+1
- *
+ *
* Where n is even. m = n + (n >> 2)
- *
+ *
*/
static inline void
usemap_alloc(pmp, cn)
@@ -414,10 +414,10 @@ clusterfree(pmp, cluster, oldcnp)
* cluster'th entry if this is a get function
* newcontents - the new value to be written into the cluster'th element of
* the fat if this is a set function.
- *
+ *
* This function can also be used to free a cluster by setting the fat entry
* for a cluster to 0.
- *
+ *
* All copies of the fat are updated if this is a set function. NOTE: If
* fatentry() marks a cluster as free it does not update the inusemap in
* the msdosfsmount structure. This is left to the caller.
@@ -470,7 +470,7 @@ fatentry(function, pmp, cn, oldcontents, newcontents)
error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
if (error)
return error;
-
+
if (function & FAT_GET) {
readcn = getushort(&bp->b_data[bo]);
if (FAT12(pmp)) {
@@ -523,7 +523,7 @@ fatchain(pmp, start, count, fillwith)
int error;
u_long bn, bo, bsize, byteoffset, readcn, newc;
struct buf *bp;
-
+
#ifdef MSDOSFS_DEBUG
printf("fatchain(pmp %p, start %ld, count %ld, fillwith %ld)\n",
pmp, start, count, fillwith);
@@ -533,7 +533,7 @@ fatchain(pmp, start, count, fillwith)
*/
if (start < CLUST_FIRST || start + count - 1 > pmp->pm_maxcluster)
return EINVAL;
-
+
while (count > 0) {
byteoffset = FATOFS(pmp, start);
fatblock(pmp, byteoffset, &bn, &bsize, &bo);
@@ -585,7 +585,7 @@ chainlength(pmp, start, count)
u_long idx, max_idx;
u_int map;
u_long len;
-
+
max_idx = pmp->pm_maxcluster / N_INUSEBITS;
idx = start / N_INUSEBITS;
start %= N_INUSEBITS;
@@ -632,7 +632,7 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
u_long *got;
{
int error;
-
+
error = fatchain(pmp, start, count, fillwith);
if (error == 0) {
#ifdef MSDOSFS_DEBUG
@@ -672,7 +672,7 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
u_long idx;
u_long len, newst, foundcn, foundl, cn, l;
u_int map;
-
+
#ifdef MSDOSFS_DEBUG
printf("clusteralloc(): find %d clusters\n",count);
#endif
@@ -684,19 +684,19 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
* This is a new file, initialize start
*/
struct timeval tv;
-
+
microtime(&tv);
start = (tv.tv_usec >> 10)|tv.tv_usec;
len = 0;
}
-
+
/*
* Start at a (pseudo) random place to maximize cluster runs
* under multiple writers.
*/
foundcn = newst = (start * 1103515245 + 12345) % (pmp->pm_maxcluster + 1);
foundl = 0;
-
+
for (cn = newst; cn <= pmp->pm_maxcluster;) {
idx = cn / N_INUSEBITS;
map = pmp->pm_inusemap[idx];
@@ -759,7 +759,7 @@ freeclusterchain(pmp, cluster)
struct buf *bp = NULL;
u_long bn, bo, bsize, byteoffset;
u_long readcn, lbn = -1;
-
+
while (cluster >= CLUST_FIRST && cluster <= pmp->pm_maxcluster) {
byteoffset = FATOFS(pmp, cluster);
fatblock(pmp, byteoffset, &bn, &bsize, &bo);
@@ -878,7 +878,7 @@ extendfile(dep, count, bpp, ncp, flags)
u_long cn, got;
struct msdosfsmount *pmp = dep->de_pmp;
struct buf *bp;
-
+
/*
* Don't try to extend the root directory
*/
@@ -901,7 +901,7 @@ extendfile(dep, count, bpp, ncp, flags)
return error;
error = 0;
}
-
+
while (count > 0) {
/*
* Allocate a new cluster chain and cat onto the end of the file.
@@ -918,9 +918,9 @@ extendfile(dep, count, bpp, ncp, flags)
error = clusteralloc(pmp, cn, count, CLUST_EOFE, &cn, &got);
if (error)
return error;
-
+
count -= got;
-
+
/*
* Give them the filesystem relative cluster number if they want
* it.
@@ -929,7 +929,7 @@ extendfile(dep, count, bpp, ncp, flags)
*ncp = cn;
ncp = NULL;
}
-
+
if (dep->de_StartCluster == 0) {
dep->de_StartCluster = cn;
frcn = 0;
@@ -940,16 +940,16 @@ extendfile(dep, count, bpp, ncp, flags)
clusterfree(pmp, cn, NULL);
return error;
}
-
+
frcn = dep->de_fc[FC_LASTFC].fc_frcn + 1;
}
-
+
/*
* Update the "last cluster of the file" entry in the denode's fat
* cache.
*/
fc_setcache(dep, FC_LASTFC, frcn + got - 1, cn + got - 1);
-
+
if (flags & DE_CLEAR) {
while (got-- > 0) {
/*
@@ -979,6 +979,6 @@ extendfile(dep, count, bpp, ncp, flags)
}
}
}
-
+
return 0;
}
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 5e9cbca13422..a80e5ae7bac3 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_lookup.c,v 1.2 1994/09/27 20:42:51 phk Exp $ */
+/* $Id: msdosfs_lookup.c,v 1.3 1995/05/09 16:30:44 bde Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 4a765b98359b..bbb4fc6d2769 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.5 1994/10/02 17:48:21 phk Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.6 1994/12/12 12:35:47 bde Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
@@ -70,9 +70,9 @@
int msdosfsdoforce = 1; /* 1 = force unmount */
/*
- * mp - path - addr in user space of mount point (ie /usr or whatever)
+ * mp - path - addr in user space of mount point (ie /usr or whatever)
* data - addr in user space of mount params including the name of the block
- * special file to treat as a filesystem.
+ * special file to treat as a filesystem.
*/
int
msdosfs_mount(mp, path, data, ndp, p)
@@ -169,7 +169,7 @@ msdosfs_mount(mp, path, data, ndp, p)
crfree(cred); /* XXX */
if (error != 0)
return error;
-
+
/*
* Be sure they've given us a block device to treat as a
* filesystem. And, that its major number is within the bdevsw
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 0993c9d6379c..047eea0bcb0f 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.14 1995/04/11 18:32:17 ache Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.15 1995/05/09 16:30:45 bde Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
@@ -73,7 +73,7 @@
#include <msdosfs/fat.h>
/*
* Some general notes:
- *
+ *
* In the ufs filesystem the inodes, superblocks, and indirect blocks are
* read/written using the vnode for the filesystem. Blocks that represent
* the contents of a file are read/written using the vnode for the file
@@ -156,7 +156,7 @@ msdosfs_mknod(ap)
} */ *ap;
{
int error;
-
+
switch (ap->a_vap->va_type) {
case VDIR:
error = msdosfs_mkdir((struct vop_mkdir_args *)ap);
@@ -222,13 +222,13 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
mode_t mask;
int i;
register gid_t *gp;
-
+
/* User id 0 always gets access. */
if (cred->cr_uid == 0)
return 0;
-
+
mask = 0;
-
+
/* Otherwise, check the owner. */
if (cred->cr_uid == uid) {
if (acc_mode & VEXEC)
@@ -239,7 +239,7 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
mask |= S_IWUSR;
return (file_mode & mask) == mask ? 0 : EACCES;
}
-
+
/* Otherwise, check the groups. */
for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
if (gid == *gp) {
@@ -251,7 +251,7 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
mask |= S_IWGRP;
return (file_mode & mask) == mask ? 0 : EACCES;
}
-
+
/* Otherwise, check everyone else. */
if (acc_mode & VEXEC)
mask |= S_IXOTH;
@@ -274,11 +274,11 @@ msdosfs_access(ap)
mode_t dosmode;
struct denode *dep = VTODE(ap->a_vp);
struct msdosfsmount *pmp = dep->de_pmp;
-
+
dosmode = (S_IXUSR|S_IXGRP|S_IXOTH) | (S_IRUSR|S_IRGRP|S_IROTH) |
((dep->de_Attributes & ATTR_READONLY) ? 0 : (S_IWUSR|S_IWGRP|S_IWOTH));
dosmode &= pmp->pm_mask;
-
+
return vaccess(dosmode, pmp->pm_uid, pmp->pm_gid, ap->a_mode, ap->a_cred);
}
@@ -352,7 +352,7 @@ msdosfs_setattr(ap)
struct denode *dep = VTODE(ap->a_vp);
struct vattr *vap = ap->a_vap;
struct ucred *cred = ap->a_cred;
-
+
#ifdef MSDOSFS_DEBUG
printf("msdosfs_setattr(): vp %08x, vap %08x, cred %08x, p %08x\n",
ap->a_vp, vap, cred, ap->a_p);
@@ -396,7 +396,7 @@ msdosfs_setattr(ap)
if (vap->va_mtime.ts_sec != VNOVAL) {
if (cred->cr_uid != dep->de_pmp->pm_uid &&
(error = suser(cred, &ap->a_p->p_acflag)) &&
- ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
+ ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
(error = VOP_ACCESS(ap->a_vp, VWRITE, cred, &ap->a_p))))
return error;
dep->de_flag |= DE_UPDATE;
@@ -574,7 +574,7 @@ msdosfs_write(ap)
struct msdosfsmount *pmp = dep->de_pmp;
struct ucred *cred = ap->a_cred;
struct timespec ts;
-
+
#ifdef MSDOSFS_DEBUG
printf("msdosfs_write(vp %08x, uio %08x, ioflag %08x, cred %08x\n",
vp, uio, ioflag, cred);
@@ -658,7 +658,7 @@ msdosfs_write(ap)
lastcn = dep->de_fc[FC_LASTFC].fc_frcn;
} else
lastcn = de_clcount(pmp, osize) - 1;
-
+
do {
bn = de_blk(pmp, uio->uio_offset);
if (isadir) {
@@ -669,7 +669,7 @@ msdosfs_write(ap)
error = ENOSPC;
break;
}
-
+
if ((uio->uio_offset & pmp->pm_crbomask) == 0
&& (de_blk(pmp, uio->uio_offset + uio->uio_resid) > de_blk(pmp, uio->uio_offset)
|| uio->uio_offset + uio->uio_resid >= dep->de_FileSize)) {
@@ -687,7 +687,7 @@ msdosfs_write(ap)
if (!isadir) {
if (bp->b_blkno == bp->b_lblkno) {
error = pcbmap(dep, bp->b_lblkno,
- &bp->b_blkno, 0);
+ &bp->b_blkno, 0);
if (error)
bp->b_blkno = -1;
}
@@ -802,7 +802,7 @@ msdosfs_mmap(ap)
/*
* Flush the blocks of a file to disk.
- *
+ *
* This function is worthless for vnodes that represent directories. Maybe we
* could just do a sync if they try an fsync on a directory file.
*/
@@ -917,9 +917,9 @@ msdosfs_link(ap)
* Renames on files require moving the denode to a new hash queue since the
* denode's location is used to compute which hash queue to put the file
* in. Unless it is a rename in place. For example "mv a b".
- *
+ *
* What follows is the basic algorithm:
- *
+ *
* if (file move) {
* if (dest file exists) {
* remove dest file
@@ -951,13 +951,13 @@ msdosfs_link(ap)
* clear old directory entry for moved directory
* }
* }
- *
+ *
* On entry:
* source's parent directory is unlocked
* source file or directory is unlocked
* destination's parent directory is locked
* destination file or directory is locked if it exists
- *
+ *
* On exit:
* all denodes should be released
*
@@ -1646,7 +1646,7 @@ msdosfs_readdir(ap)
ncookies++;
}
dentp++;
-
+
crnt = (struct dirent *) ((char *) crnt + sizeof(struct direntry));
pushout = 1;
@@ -1722,7 +1722,7 @@ out: ;
*ap->a_eofflag = 1;
else
*ap->a_eofflag = 0;
-
+
return error;
}
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 270b5b4b4d5b..5309acbd0851 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/* $Id: msdosfsmount.h,v 1.1 1994/09/19 15:41:48 dfr Exp $ */
+/* $Id: msdosfsmount.h,v 1.2 1994/09/27 20:42:59 phk Exp $ */
/* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */
/*-
@@ -34,17 +34,17 @@
*/
/*
* Written by Paul Popelka (paulp@uts.amdahl.com)
- *
+ *
* You can do anything you want with this software, just don't say you wrote
* it, and don't remove this notice.
- *
+ *
* This software is provided "as is".
- *
+ *
* The author supplies this software to be publicly redistributed on the
* understanding that the author is not responsible for the correct
* functioning of this software in any circumstances and is not liable for
* any damages caused by this software.
- *
+ *
* October 1992
*/
@@ -88,19 +88,19 @@ struct msdosfsmount {
/*
* How to compute pm_cnshift and pm_crbomask.
- *
- * pm_crbomask = (pm_SectPerClust * pm_BytesPerSect) - 1
- * if (bytesperclust == * 0)
- * return EBADBLKSZ;
- * bit = 1;
- * for (i = 0; i < 32; i++) {
- * if (bit & bytesperclust) {
- * if (bit ^ bytesperclust)
- * return EBADBLKSZ;
- * pm_cnshift = * i;
- * break;
- * }
- * bit <<= 1;
+ *
+ * pm_crbomask = (pm_SectPerClust * pm_BytesPerSect) - 1
+ * if (bytesperclust == * 0)
+ * return EBADBLKSZ;
+ * bit = 1;
+ * for (i = 0; i < 32; i++) {
+ * if (bit & bytesperclust) {
+ * if (bit ^ bytesperclust)
+ * return EBADBLKSZ;
+ * pm_cnshift = * i;
+ * break;
+ * }
+ * bit <<= 1;
* }
*/
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 9b7e9da46118..eb1a19231c7d 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.5 1995/03/16 18:13:31 bde Exp $
+ * $Id: null_vfsops.c,v 1.6 1995/03/16 20:23:39 wollman Exp $
*/
/*
@@ -149,7 +149,7 @@ nullfs_mount(mp, path, data, ndp, p)
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
- (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
+ (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
&size);
bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
#ifdef NULLFS_DIAGNOSTIC
@@ -204,7 +204,7 @@ nullfs_unmount(mp, mntflags, p)
* moment, but who knows...
*/
#if 0
- mntflushbuf(mp, 0);
+ mntflushbuf(mp, 0);
if (mntinvalbuf(mp, 1))
return (EBUSY);
#endif
@@ -216,7 +216,7 @@ nullfs_unmount(mp, mntflags, p)
#ifdef NULLFS_DIAGNOSTIC
vprint("alias root of lower", nullm_rootvp);
-#endif
+#endif
/*
* Release reference on underlying root vnode
*/
@@ -327,7 +327,7 @@ nullfs_vget(mp, ino, vpp)
ino_t ino;
struct vnode **vpp;
{
-
+
return VFS_VGET(MOUNTTONULLMOUNT(mp)->nullm_vfs, ino, vpp);
}
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 9136baf78da5..464d15aa6246 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)null_vnops.c 8.1 (Berkeley) 6/10/93
*
- * $Id: null_vnops.c,v 1.6 1994/10/10 07:55:29 phk Exp $
+ * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $
*/
/*
@@ -88,7 +88,7 @@
* in the arguments and, if a vnode is return by the operation,
* stacks a null-node on top of the returned vnode.
*
- * Although bypass handles most operations,
+ * Although bypass handles most operations,
* vop_getattr, _inactive, _reclaim, and _print are not bypassed.
* Vop_getattr must change the fsid being returned.
* Vop_inactive and vop_reclaim are not bypassed so that
@@ -109,7 +109,7 @@
* this or other null vnode stacks.
*
* New vnode stacks come into existance as a result of
- * an operation which returns a vnode.
+ * an operation which returns a vnode.
* The bypass routine stacks a null-node above the new
* vnode before returning it to the caller.
*
@@ -119,7 +119,7 @@
* the root null-node (which was created when the null layer was mounted).
* Now consider opening "sys". A vop_lookup would be
* done on the root null-node. This operation would bypass through
- * to the lower layer which would return a vnode representing
+ * to the lower layer which would return a vnode representing
* the UFS "sys". Null_bypass then builds a null-node
* aliasing the UFS "sys" and returns this to the caller.
* Later operations on the null-node "sys" will repeat this
@@ -133,13 +133,13 @@
* then begin modifing the copy. Sed can be used to easily rename
* all variables.
*
- * The umap layer is an example of a layer descended from the
+ * The umap layer is an example of a layer descended from the
* null layer.
*
*
* INVOKING OPERATIONS ON LOWER LAYERS
*
- * There are two techniques to invoke operations on a lower layer
+ * There are two techniques to invoke operations on a lower layer
* when the operation cannot be completely bypassed. Each method
* is appropriate in different situations. In both cases,
* it is the responsibility of the aliasing layer to make
@@ -200,7 +200,7 @@ int null_bug_bypass = 0; /* for debugging: enables bypass printf'ing */
* to determine what implementation of the op should be invoked
* - all mapped vnodes are of our vnode-type (NEEDSWORK:
* problems on rmdir'ing mount points and renaming?)
- */
+ */
int
null_bypass(ap)
struct vop_generic_args /* {
@@ -237,7 +237,7 @@ null_bypass(ap)
for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
break; /* bail out at end of list */
- vps_p[i] = this_vp_p =
+ vps_p[i] = this_vp_p =
VOPARG_OFFSETTO(struct vnode**,descp->vdesc_vp_offsets[i],ap);
/*
* We're not guaranteed that any but the first vnode
@@ -257,7 +257,7 @@ null_bypass(ap)
if (reles & 1)
VREF(*this_vp_p);
}
-
+
}
/*
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 130f99177174..52c7bcf6094e 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vfsops.c 8.6 (Berkeley) 1/21/94
*
- * $Id: portal_vfsops.c,v 1.6 1995/03/16 18:13:38 bde Exp $
+ * $Id: portal_vfsops.c,v 1.7 1995/03/16 20:23:41 wollman Exp $
*/
/*
@@ -172,7 +172,7 @@ portal_unmount(mp, mntflags, p)
* moment, but who knows...
*/
#ifdef notyet
- mntflushbuf(mp, 0);
+ mntflushbuf(mp, 0);
if (mntinvalbuf(mp, 1))
return (EBUSY);
#endif
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 56f52fb481bf..41fd2de3f416 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94
*
- * $Id: portal_vnops.c,v 1.4 1994/09/21 03:47:05 wollman Exp $
+ * $Id: portal_vnops.c,v 1.5 1995/03/28 07:57:02 bde Exp $
*/
/*
@@ -272,7 +272,7 @@ portal_open(ap)
error = so->so_error;
goto bad;
}
-
+
/*
* Set miscellaneous flags
*/
@@ -377,7 +377,7 @@ portal_open(ap)
}
/*
- * Check that the mode the file is being opened for is a subset
+ * Check that the mode the file is being opened for is a subset
* of the mode of the existing descriptor.
*/
fp = p->p_fd->fd_ofiles[fd];
@@ -399,7 +399,7 @@ bad:;
/*
* And discard the control message.
*/
- if (cm) {
+ if (cm) {
m_freem(cm);
}
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index f55e5e3109ef..0f1b3b02f96d 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
*
* @(#)procfs_mem.c 8.4 (Berkeley) 1/21/94
*
- * $Id: procfs_mem.c,v 1.5 1994/10/18 04:40:41 davidg Exp $
+ * $Id: procfs_mem.c,v 1.6 1995/01/05 03:59:38 davidg Exp $
*/
/*
@@ -108,7 +108,7 @@ procfs_rwmem(p, uio)
* The map we want...
*/
map = &p->p_vmspace->vm_map;
-
+
/*
* Check the permissions for the area we're interested
* in.
@@ -148,7 +148,7 @@ procfs_rwmem(p, uio)
*/
if (!error)
vm_map_lookup_done(tmap, out_entry);
-
+
/*
* Fault the page in...
*/
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index c74cde9c8f65..f1290222d06b 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $Id: procfs_status.c,v 1.2 1994/08/02 07:45:20 davidg Exp $
+ * $Id: procfs_status.c,v 1.3 1994/10/10 07:55:38 phk Exp $
*/
#include <sys/param.h>
@@ -109,7 +109,7 @@ procfs_dostatus(curp, p, pfs, uio)
p->p_stats->p_start.tv_usec);
else
ps += sprintf(ps, " -1,-1");
-
+
{
struct timeval ut, st;
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index e1cfdf3b7716..6c464c1bdb77 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_subr.c 8.4 (Berkeley) 1/27/94
*
- * $Id: procfs_subr.c,v 1.3 1994/10/06 21:06:44 davidg Exp $
+ * $Id: procfs_subr.c,v 1.4 1995/04/15 02:30:12 davidg Exp $
*/
#include <sys/param.h>
@@ -103,7 +103,7 @@ loop:
/*
* otherwise lock the vp list while we call getnewvnode
* since that can block.
- */
+ */
if (pfsvplock & PROCFS_LOCKED) {
pfsvplock |= PROCFS_WANT;
(void) tsleep((caddr_t) &pfsvplock, PINOD, "pfsavp", 0);
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 8decad4f8bed..738df27cadf9 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94
*
- * $Id: procfs_vnops.c,v 1.12 1995/05/11 19:26:33 rgrimes Exp $
+ * $Id: procfs_vnops.c,v 1.13 1995/05/25 01:35:24 davidg Exp $
*/
/*
@@ -666,7 +666,7 @@ procfs_readdir(ap)
break;
dt = &procent[i];
-
+
dp->d_reclen = UIO_MX;
dp->d_fileno = PROCFS_FILENO(pfs->pfs_pid, dt->d_pfstype);
dp->d_type = DT_REG;
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 5903d30e3fa1..5be2e5eed466 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
*
* @(#)umap.h 8.3 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $
*/
#define MAPFILEENTRIES 64
@@ -56,9 +56,9 @@ struct umap_mount {
struct vnode *umapm_rootvp; /* Reference to root umap_node */
int info_nentries; /* number of uid mappings */
int info_gnentries; /* number of gid mappings */
- u_long info_mapdata[MAPFILEENTRIES][2]; /* mapping data for
+ u_long info_mapdata[MAPFILEENTRIES][2]; /* mapping data for
user mapping in ficus */
- u_long info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for
+ u_long info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for
group mapping in ficus */
};
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 4b2aad4ba01a..792f4a87b05e 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
*
* @(#)umap_subr.c 8.6 (Berkeley) 1/26/94
*
- * $Id: umap_subr.c,v 1.2 1994/05/25 09:09:07 rgrimes Exp $
+ * $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $
*/
#include <sys/param.h>
@@ -387,7 +387,7 @@ umap_mapids(v_mount, credp)
credp->cr_gid = NULLGROUP;
#endif
- /* Now we must map each of the set of groups in the cr_groups
+ /* Now we must map each of the set of groups in the cr_groups
structure. */
i = 0;
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index a98ae18d6758..64f05bbd62d6 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)umap_vfsops.c 8.3 (Berkeley) 1/21/94
*
- * $Id: umap_vfsops.c,v 1.6 1995/03/16 18:13:55 bde Exp $
+ * $Id: umap_vfsops.c,v 1.7 1995/03/16 20:23:43 wollman Exp $
*/
/*
@@ -127,12 +127,12 @@ umapfs_mount(mp, path, data, ndp, p)
*/
amp->umapm_vfs = lowerrootvp->v_mount;
- /*
+ /*
* Now copy in the number of entries and maps for umap mapping.
*/
amp->info_nentries = args.nentries;
amp->info_gnentries = args.gnentries;
- error = copyin(args.mapdata, (caddr_t)amp->info_mapdata,
+ error = copyin(args.mapdata, (caddr_t)amp->info_mapdata,
2*sizeof(u_long)*args.nentries);
if (error)
return (error);
@@ -144,7 +144,7 @@ umapfs_mount(mp, path, data, ndp, p)
amp->info_mapdata[i][1]);
#endif
- error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata,
+ error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata,
2*sizeof(u_long)*args.nentries);
if (error)
return (error);
@@ -152,7 +152,7 @@ umapfs_mount(mp, path, data, ndp, p)
#ifdef UMAP_DIAGNOSTIC
printf("umap_mount:gnentries %d\n",args.gnentries);
for (i = 0; i < args.gnentries; i++)
- printf(" group %d maps to %d\n",
+ printf(" group %d maps to %d\n",
amp->info_gmapdata[i][0],
amp->info_gmapdata[i][1]);
#endif
@@ -190,7 +190,7 @@ umapfs_mount(mp, path, data, ndp, p)
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
- (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
+ (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
&size);
bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
#ifdef UMAPFS_DIAGNOSTIC
@@ -245,7 +245,7 @@ umapfs_unmount(mp, mntflags, p)
* moment, but who knows...
*/
#ifdef notyet
- mntflushbuf(mp, 0);
+ mntflushbuf(mp, 0);
if (mntinvalbuf(mp, 1))
return (EBUSY);
#endif
@@ -257,7 +257,7 @@ umapfs_unmount(mp, mntflags, p)
#ifdef UMAPFS_DIAGNOSTIC
vprint("alias root of lower", umapm_rootvp);
-#endif
+#endif
/*
* Release reference on underlying root vnode
*/
@@ -368,7 +368,7 @@ umapfs_vget(mp, ino, vpp)
ino_t ino;
struct vnode **vpp;
{
-
+
return (VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp));
}
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 14d3fcc48266..a82d1c6d327b 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.7 1994/10/10 07:55:44 phk Exp $
+ * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $
*/
/*
@@ -59,7 +59,7 @@ int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */
/*
* This is the 10-Apr-92 bypass routine.
* See null_vnops.c:null_bypass for more details.
- */
+ */
int
umap_bypass(ap)
struct vop_generic_args /* {
@@ -101,7 +101,7 @@ umap_bypass(ap)
for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
break; /* bail out at end of list */
- vps_p[i] = this_vp_p =
+ vps_p[i] = this_vp_p =
VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[i], ap);
if (i == 0) {
@@ -122,7 +122,7 @@ umap_bypass(ap)
if (reles & 1)
VREF(*this_vp_p);
}
-
+
}
/*
@@ -131,7 +131,7 @@ umap_bypass(ap)
if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) {
- credpp = VOPARG_OFFSETTO(struct ucred**,
+ credpp = VOPARG_OFFSETTO(struct ucred**,
descp->vdesc_cred_offset, ap);
/* Save old values */
@@ -141,7 +141,7 @@ umap_bypass(ap)
credp = *credpp;
if (umap_bug_bypass && credp->cr_uid != 0)
- printf("umap_bypass: user was %ld, group %ld\n",
+ printf("umap_bypass: user was %ld, group %ld\n",
credp->cr_uid, credp->cr_gid);
/* Map all ids in the credential structure. */
@@ -149,17 +149,17 @@ umap_bypass(ap)
umap_mapids(vp1->v_mount, credp);
if (umap_bug_bypass && credp->cr_uid != 0)
- printf("umap_bypass: user now %ld, group %ld\n",
+ printf("umap_bypass: user now %ld, group %ld\n",
credp->cr_uid, credp->cr_gid);
}
/* BSD often keeps a credential in the componentname structure
- * for speed. If there is one, it better get mapped, too.
+ * for speed. If there is one, it better get mapped, too.
*/
if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) {
- compnamepp = VOPARG_OFFSETTO(struct componentname**,
+ compnamepp = VOPARG_OFFSETTO(struct componentname**,
descp->vdesc_componentname_offset, ap);
compcredp = (*compnamepp)->cn_cred;
@@ -167,7 +167,7 @@ umap_bypass(ap)
compcredp = (*compnamepp)->cn_cred = crdup(savecompcredp);
if (umap_bug_bypass && compcredp->cr_uid != 0)
- printf("umap_bypass: component credit user was %ld, group %ld\n",
+ printf("umap_bypass: component credit user was %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
/* Map all ids in the credential structure. */
@@ -175,7 +175,7 @@ umap_bypass(ap)
umap_mapids(vp1->v_mount, compcredp);
if (umap_bug_bypass && compcredp->cr_uid != 0)
- printf("umap_bypass: component credit user now %ld, group %ld\n",
+ printf("umap_bypass: component credit user now %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
}
@@ -217,7 +217,7 @@ umap_bypass(ap)
};
out:
- /*
+ /*
* Free duplicate cred structure and restore old one.
*/
if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) {
@@ -228,19 +228,19 @@ umap_bypass(ap)
crfree(credp);
(*credpp) = savecredp;
if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
- printf("umap_bypass: returning-user now %ld\n\n",
+ printf("umap_bypass: returning-user now %ld\n\n",
(*credpp)->cr_uid);
}
if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) {
if (umap_bug_bypass && compcredp && compcredp->cr_uid != 0)
- printf("umap_bypass: returning-component-user was %ld\n",
+ printf("umap_bypass: returning-component-user was %ld\n",
compcredp->cr_uid);
crfree(compcredp);
(*compnamepp)->cn_cred = savecompcredp;
if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
- printf("umap_bypass: returning-component-user now %ld\n",
+ printf("umap_bypass: returning-component-user now %ld\n",
compcredp->cr_uid);
}
@@ -288,7 +288,7 @@ umap_getattr(ap)
uid = ap->a_vap->va_uid;
gid = ap->a_vap->va_gid;
if (umap_bug_bypass)
- printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid,
+ printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid,
gid);
vp1p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[0], ap);
@@ -307,7 +307,7 @@ umap_getattr(ap)
ap->a_vap->va_uid = (uid_t) tmpid;
if (umap_bug_bypass)
printf("umap_getattr: original uid = %d\n", uid);
- } else
+ } else
ap->a_vap->va_uid = (uid_t) NOBODY;
/* Reverse map the gid for the vnode. */
@@ -321,7 +321,7 @@ umap_getattr(ap)
printf("umap_getattr: original gid = %d\n", gid);
} else
ap->a_vap->va_gid = (gid_t) NULLGROUP;
-
+
return (0);
}
@@ -350,7 +350,7 @@ umap_reclaim(ap)
struct vnode *vp = ap->a_vp;
struct umap_node *xp = VTOUMAP(vp);
struct vnode *lowervp = xp->umap_lowervp;
-
+
/* After this assignment, this node will not be re-used. */
xp->umap_lowervp = NULL;
remque(xp);
@@ -442,7 +442,7 @@ umap_rename(ap)
compcredp = compnamep->cn_cred = crdup(savecompcredp);
if (umap_bug_bypass && compcredp->cr_uid != 0)
- printf("umap_rename: rename component credit user was %ld, group %ld\n",
+ printf("umap_rename: rename component credit user was %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
/* Map all ids in the credential structure. */
@@ -450,11 +450,11 @@ umap_rename(ap)
umap_mapids(vp->v_mount, compcredp);
if (umap_bug_bypass && compcredp->cr_uid != 0)
- printf("umap_rename: rename component credit user now %ld, group %ld\n",
+ printf("umap_rename: rename component credit user now %ld, group %ld\n",
compcredp->cr_uid, compcredp->cr_gid);
error = umap_bypass(ap);
-
+
/* Restore the additional mapped componentname cred structure. */
crfree(compcredp);
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 02f7a1068e9b..cbbd17111bbc 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.4 (Berkeley) 2/17/94
- * $Id: union_subr.c,v 1.4 1994/10/06 21:06:48 davidg Exp $
+ * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $
*/
#include <sys/param.h>
@@ -130,7 +130,7 @@ union_updatevp(un, uppervp, lowervp)
LIST_REMOVE(un, un_cache);
union_list_unlock(ohash);
- } else {
+ } else {
while (union_list_lock(nhash))
continue;
}
@@ -372,7 +372,7 @@ loop:
/*
* otherwise lock the vp list while we call getnewvnode
* since that can block.
- */
+ */
hash = UNION_HASH(uppervp, lowervp);
if (union_list_lock(hash))
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index c9e2c60874f4..670c7ce98d90 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.8 1995/03/16 18:14:02 bde Exp $
+ * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $
*/
/*
@@ -118,7 +118,7 @@ union_mount(mp, path, data, ndp, p)
error = VOP_GETATTR(mp->mnt_vnodecovered, &va, cred, p);
if (error)
goto bad;
- if ((va.va_uid != cred->cr_uid) &&
+ if ((va.va_uid != cred->cr_uid) &&
(cred->cr_uid != 0)) {
error = EACCES;
goto bad;
@@ -163,7 +163,7 @@ union_mount(mp, path, data, ndp, p)
error = EINVAL;
goto bad;
}
-
+
um = (struct union_mount *) malloc(sizeof(struct union_mount),
M_UFSMNT, M_WAITOK); /* XXX */
@@ -338,7 +338,7 @@ union_unmount(mp, mntflags, p)
#ifdef UNION_DIAGNOSTIC
vprint("alias root of lower", um_rootvp);
-#endif
+#endif
/*
* Discard references to upper and lower target vnodes.
*/
@@ -517,7 +517,7 @@ union_vget(mp, ino, vpp)
ino_t ino;
struct vnode **vpp;
{
-
+
return (EOPNOTSUPP);
}
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 1bc8455f62e5..900d2c24a709 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94
- * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $
+ * $Id: ufs_bmap.c,v 1.7 1995/03/28 07:58:16 bde Exp $
*/
#include <sys/param.h>
@@ -159,7 +159,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
devvp = VFSTOUFS(vp->v_mount)->um_devvp;
for (bp = NULL, ++xap; --num; ++xap) {
- /*
+ /*
* Exit the loop if there is no disk address assigned yet and
* the indirect block isn't in the cache, or if we were
* looking for an indirect block and we've found it.
@@ -242,7 +242,7 @@ ufs_getlbns(vp, bn, ap, nump)
if (bn < NDADDR)
return (0);
- /*
+ /*
* Determine the number of levels of indirection. After this loop
* is done, blockcnt indicates the number of data blocks possible
* at the given level of indirection, and NIADDR - i is the number
@@ -262,7 +262,7 @@ ufs_getlbns(vp, bn, ap, nump)
else
metalbn = -(-realbn - bn + NIADDR - i);
- /*
+ /*
* At each iteration, off is the offset into the bap array which is
* an array of disk addresses at the current level of indirection.
* The logical block number and the offset in that block are stored
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index f0c729769c8b..00105ea3635d 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)inode.h 8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.4 1994/12/27 13:59:14 bde Exp $
+ * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
*/
#ifndef _UFS_UFS_INODE_H_
@@ -57,7 +57,7 @@
* file in the UFS filesystem. It is composed of two types of
* information. The first part is the information that is needed
* only while the file is active (such as the identity of the file
- * and linkage to speed its lookup). The second part is the
+ * and linkage to speed its lookup). The second part is the
* permannent meta-data associated with the file which is read
* in from the permanent dinode from long term storage when the
* file becomes active, and is put back when the file is no longer
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 1bc8455f62e5..900d2c24a709 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94
- * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $
+ * $Id: ufs_bmap.c,v 1.7 1995/03/28 07:58:16 bde Exp $
*/
#include <sys/param.h>
@@ -159,7 +159,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
devvp = VFSTOUFS(vp->v_mount)->um_devvp;
for (bp = NULL, ++xap; --num; ++xap) {
- /*
+ /*
* Exit the loop if there is no disk address assigned yet and
* the indirect block isn't in the cache, or if we were
* looking for an indirect block and we've found it.
@@ -242,7 +242,7 @@ ufs_getlbns(vp, bn, ap, nump)
if (bn < NDADDR)
return (0);
- /*
+ /*
* Determine the number of levels of indirection. After this loop
* is done, blockcnt indicates the number of data blocks possible
* at the given level of indirection, and NIADDR - i is the number
@@ -262,7 +262,7 @@ ufs_getlbns(vp, bn, ap, nump)
else
metalbn = -(-realbn - bn + NIADDR - i);
- /*
+ /*
* At each iteration, off is the offset into the bap array which is
* an array of disk addresses at the current level of indirection.
* The logical block number and the offset in that block are stored
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index f0c729769c8b..00105ea3635d 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)inode.h 8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.4 1994/12/27 13:59:14 bde Exp $
+ * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
*/
#ifndef _UFS_UFS_INODE_H_
@@ -57,7 +57,7 @@
* file in the UFS filesystem. It is composed of two types of
* information. The first part is the information that is needed
* only while the file is active (such as the identity of the file
- * and linkage to speed its lookup). The second part is the
+ * and linkage to speed its lookup). The second part is the
* permannent meta-data associated with the file which is read
* in from the permanent dinode from long term storage when the
* file becomes active, and is put back when the file is no longer
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index d7ede076124f..0e799c568f03 100644
--- a/sys/gnu/i386/fpemul/control_w.h
+++ b/sys/gnu/i386/fpemul/control_w.h
@@ -54,7 +54,7 @@
* W. Metzenthen June 1994.
*
*
- * $Id: control_w.h,v 1.2 1994/04/29 21:02:30 gclarkii Exp $
+ * $Id: control_w.h,v 1.3 1994/06/10 07:44:07 rich Exp $
*
*/
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index a1da514d1fe3..5745e1b32d17 100644
--- a/sys/gnu/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/i386/fpemul/fpu_arith.c
@@ -56,8 +56,8 @@
* W. Metzenthen June 1994.
*
*
- * $Id: fpu_arith.c,v 1.2 1994/04/29 21:07:14 gclarkii Exp $
- *
+ * $Id: fpu_arith.c,v 1.3 1994/06/10 07:44:14 rich Exp $
+ *
*/
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 09e32c0721c5..edbe94d6aeea 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,8 +55,8 @@
*
* W. Metzenthen June 1994.
*
- * $Id: fpu_entry.c,v 1.4 1994/06/22 05:52:14 jkh Exp $
- *
+ * $Id: fpu_entry.c,v 1.5 1994/08/30 20:18:52 davidg Exp $
+ *
*/
/*---------------------------------------------------------------------------+
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index 8bcc14c0922b..bb9e5d04fdb4 100644
--- a/sys/gnu/i386/fpemul/fpu_system.h
+++ b/sys/gnu/i386/fpemul/fpu_system.h
@@ -54,8 +54,8 @@
* W. Metzenthen June 1994.
*
*
- * $Id: fpu_system.h,v 1.2 1994/04/29 21:16:24 gclarkii Exp $
- *
+ * $Id: fpu_system.h,v 1.3 1994/06/10 07:44:25 rich Exp $
+ *
*/
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index 7f703880a36a..6098c814b42f 100644
--- a/sys/gnu/i386/fpemul/poly_tan.c
+++ b/sys/gnu/i386/fpemul/poly_tan.c
@@ -56,8 +56,8 @@
* W. Metzenthen June 1994.
*
*
- * $Id: poly_tan.c,v 1.3 1994/04/29 21:23:31 gclarkii Exp $
- *
+ * $Id: poly_tan.c,v 1.4 1994/06/10 07:44:42 rich Exp $
+ *
*/
#include "exception.h"
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index b1c987a40cb8..52623f72711a 100644
--- a/sys/gnu/i386/fpemul/reg_compare.c
+++ b/sys/gnu/i386/fpemul/reg_compare.c
@@ -56,8 +56,8 @@
* W. Metzenthen June 1994.
*
*
- * $Id: reg_compare.c,v 1.3 1994/06/10 07:44:47 rich Exp $
- *
+ * $Id: reg_compare.c,v 1.4 1994/08/31 04:45:23 davidg Exp $
+ *
*/
/*---------------------------------------------------------------------------+
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index ce14be8853de..03f8b58dfaea 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.4 1995/03/28 07:54:31 bde Exp $";
+static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.5 1995/05/11 19:25:55 rgrimes Exp $";
/*******************************************************************************
- * II - Version 0.1 $Revision: 1.4 $ $State: Exp $
+ * II - Version 0.1 $Revision: 1.5 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,9 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.4 1995/03/28 07:54:31 bde E
*
*******************************************************************************
* $Log: nic3008.c,v $
+ * Revision 1.5 1995/05/11 19:25:55 rgrimes
+ * Fix -Wformat warnings from LINT kernel.
+ *
* Revision 1.4 1995/03/28 07:54:31 bde
* Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
* (except in netccitt, netiso and netns) that I didn't notice when I fixed
@@ -86,7 +89,7 @@ int nic_connect(), nic_listen(), nic_disconnect(), nic_accept();
int nic_output();
extern void isdn_start_out();
-static void s_intr(), reset_req(), reset_card();
+static void s_intr(), reset_req(), reset_card();
static int cstrcmp(), discon_req(), reset_plci(), sel_b2_prot_req();
static short bsintr;
diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c
index bdb3ebde9df7..280023d017a6 100644
--- a/sys/gnu/isdn/if_ii.c
+++ b/sys/gnu/isdn/if_ii.c
@@ -1,6 +1,6 @@
-static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/02/14 15:00:27 jkh Exp $";
+static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.2 1995/02/15 06:28:26 jkh Exp $";
/*******************************************************************************
- * II - Version 0.1 $Revision: 1.1 $ $State: Exp $
+ * II - Version 0.1 $Revision: 1.2 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,9 @@ static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/02/14 15:00:27 jkh Exp
*
*******************************************************************************
* $Log: if_ii.c,v $
+ * Revision 1.2 1995/02/15 06:28:26 jkh
+ * Fix up include paths, nuke some warnings.
+ *
* Revision 1.1 1995/02/14 15:00:27 jkh
* An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
* EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
@@ -25,9 +28,9 @@ static char _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/02/14 15:00:27 jkh Exp
/*
* Copyright (c) 1994 Dietmar Friede (dietmar@friede.de) All rights reserved.
* FSF/FSAG GNU Copyright applies
- *
+ *
* A high level ip isdn driver.
- *
+ *
* Uses loop driver as template. Small - and simple - is beautiful.
*/
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 035c4fb09f29..e1e4fd1ee302 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char _isdnid[] = "@(#)$Id: isdn.c,v 1.2 1995/02/15 06:28:29 jkh Exp $";
+static char _isdnid[] = "@(#)$Id: isdn.c,v 1.3 1995/03/28 07:54:44 bde Exp $";
/*******************************************************************************
- * II - Version 0.1 $Revision: 1.2 $ $State: Exp $
+ * II - Version 0.1 $Revision: 1.3 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@@ -10,6 +10,11 @@ static char _isdnid[] = "@(#)$Id: isdn.c,v 1.2 1995/02/15 06:28:29 jkh Exp $
*
*******************************************************************************
* $Log: isdn.c,v $
+ * Revision 1.3 1995/03/28 07:54:44 bde
+ * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
+ * (except in netccitt, netiso and netns) that I didn't notice when I fixed
+ * "all" such warnings before.
+ *
* Revision 1.2 1995/02/15 06:28:29 jkh
* Fix up include paths, nuke some warnings.
*
@@ -28,9 +33,9 @@ static char _isdnid[] = "@(#)$Id: isdn.c,v 1.2 1995/02/15 06:28:29 jkh Exp $
/*
* Copyright (c) 1994 Dietmar Friede (dietmar@friede.de) All rights reserved.
* FSF/FSAG GNU Copyright applies
- *
+ *
* An intermediate level for ISDN Drivers.
- *
+ *
*/
#include "isdn.h"
@@ -187,7 +192,7 @@ isdn_ctrl_attach(int n)
/*
* isdnopen() New open on device.
- *
+ *
* I forbid all but one open per application. The only programs opening the
* isdn device are the ISDN-daemon
*/
@@ -560,7 +565,7 @@ isdn_check()
timeout(isdn_check,0,hz/2);
}
}
-
+
void
isdn_conn_ind(int an, int cn, int dial)
{
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 38f5d8f00372..1ba1472c4148 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -6,14 +6,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.10 1994/12/16 07:31:47 phk Exp $
+ * $Id: apm.c,v 1.11 1995/02/17 02:22:21 phk Exp $
*/
#include "apm.h"
@@ -72,7 +72,7 @@ struct apm_softc {
int idle_cpu, disabled, disengaged;
struct apmhook sc_suspend;
struct apmhook sc_resume;
-};
+};
static struct apm_softc apm_softc[NAPM];
static struct apm_softc *master_softc = NULL; /* XXX */
@@ -102,8 +102,8 @@ static void apm_timeout(void *);
#endif /* MACH_KERNEL */
/* setup APM GDT discriptors */
-static void
-setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_limit, u_int data_limit)
+static void
+setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_limit, u_int data_limit)
{
#ifdef __FreeBSD__
/* setup 32bit code segment */
@@ -170,20 +170,20 @@ apm_int(u_long *eax, u_long *ebx, u_long *ecx)
lcall _apm_addr
jnc 1f
incl %3
- 1:
+ 1:
popl %%esi
popl %%edx
popl %%ebp"
: "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=D" (cf)
: "0" (*eax), "1" (*ebx), "2" (*ecx)
- );
+ );
apm_errno = ((*eax) >> 8) & 0xff;
return cf;
}
/* enable/disable power management */
-static int
+static int
apm_enable_disable_pm(struct apm_softc *sc, int enable)
{
u_long eax, ebx, ecx;
@@ -217,7 +217,7 @@ apm_driver_version(void)
eax = (APM_BIOS << 8) | APM_DRVVERSION;
ebx = 0x0;
ecx = 0x0101;
- if(!apm_int(&eax, &ebx, &ecx))
+ if(!apm_int(&eax, &ebx, &ecx))
apm_version = eax & 0xffff;
#ifdef APM_DEBUG
@@ -231,7 +231,7 @@ apm_driver_version(void)
}
/* engage/disengage power management (APM 1.1 or later) */
-static int
+static int
apm_engage_disengage_pm(struct apm_softc *sc, int engage)
{
u_long eax, ebx, ecx, i;
@@ -244,13 +244,13 @@ apm_engage_disengage_pm(struct apm_softc *sc, int engage)
}
/* get PM event */
-static u_int
+static u_int
apm_getevent(struct apm_softc *sc)
{
u_long eax, ebx, ecx;
eax = (APM_BIOS << 8) | APM_GETPMEVENT;
-
+
ebx = 0;
ecx = 0;
if (apm_int(&eax, &ebx, &ecx))
@@ -260,11 +260,11 @@ apm_getevent(struct apm_softc *sc)
}
/* suspend entire system */
-static int
+static int
apm_suspend_system(struct apm_softc *sc)
{
u_long eax, ebx, ecx;
-
+
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_SUSPEND;
@@ -272,7 +272,7 @@ apm_suspend_system(struct apm_softc *sc)
__asm("cli");
if (apm_int(&eax, &ebx, &ecx)) {
__asm("sti");
- printf("Entire system suspend failure: errcode = %ld\n",
+ printf("Entire system suspend failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
}
@@ -290,12 +290,12 @@ int
apm_display_off(void)
{
u_long eax, ebx, ecx;
-
+
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_2NDSTORAGE0;
ecx = PMST_STANDBY;
if (apm_int(&eax, &ebx, &ecx)) {
- printf("Display off failure: errcode = %ld\n",
+ printf("Display off failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
}
@@ -304,7 +304,7 @@ apm_display_off(void)
}
/* APM Battery low handler */
-static void
+static void
apm_battery_low(struct apm_softc *sc)
{
printf("\007\007 * * * BATTERY IS LOW * * * \007\007");
@@ -343,7 +343,7 @@ apm_add_hook(struct apmhook **list, struct apmhook *ah)
return ah;
}
-static void
+static void
apm_del_hook(struct apmhook **list, struct apmhook *ah)
{
int s;
@@ -370,7 +370,7 @@ nosuchnode:
/* APM driver calls some functions automatically */
-static void
+static void
apm_execute_hook(struct apmhook *list)
{
struct apmhook *p;
@@ -381,8 +381,8 @@ apm_execute_hook(struct apmhook *list)
#endif
if ((*(p->ah_fun))(p->ah_arg)) {
printf("Warning: APM hook \"%s\" failed", p->ah_name);
- }
- }
+ }
+ }
}
@@ -410,7 +410,7 @@ apm_hook_disestablish(int apmh, struct apmhook *ah)
static struct timeval suspend_time;
static struct timeval diff_time;
-static int
+static int
apm_default_resume(struct apm_softc *sc)
{
#ifdef __FreeBSD__
@@ -437,7 +437,7 @@ apm_default_resume(struct apm_softc *sc)
return 0;
}
-static int
+static int
apm_default_suspend(void)
{
#ifdef __FreeBSD__
@@ -465,7 +465,7 @@ static void apm_processevent(struct apm_softc *);
*
*/
-void
+void
apm_suspend(void)
{
struct apm_softc *sc;
@@ -519,7 +519,7 @@ apm_get_info(struct apm_softc *sc, apm_info_t aip)
/* inform APM BIOS that CPU is idle */
-void
+void
apm_cpu_idle(void)
{
struct apm_softc *sc = master_softc; /* XXX */
@@ -530,7 +530,7 @@ apm_cpu_idle(void)
}
}
/*
- * Some APM implementation halts CPU in BIOS, whenever
+ * Some APM implementation halts CPU in BIOS, whenever
* "CPU-idle" function are invoked, but swtch() of
* FreeBSD halts CPU, therefore, CPU is halted twice
* in the sched loop. It makes the interrupt latency
@@ -551,7 +551,7 @@ apm_cpu_idle(void)
}
/* inform APM BIOS that CPU is busy */
-void
+void
apm_cpu_busy(void)
{
struct apm_softc *sc = master_softc; /* XXX */
@@ -568,7 +568,7 @@ apm_cpu_busy(void)
* This routine is automatically called by timer once per second.
*/
-static void
+static void
apm_timeout(void *arg)
{
struct apm_softc *sc = arg;
@@ -578,7 +578,7 @@ apm_timeout(void *arg)
}
/* enable APM BIOS */
-static void
+static void
apm_event_enable(struct apm_softc *sc)
{
#ifdef APM_DEBUG
@@ -591,7 +591,7 @@ apm_event_enable(struct apm_softc *sc)
}
/* disable APM BIOS */
-static void
+static void
apm_event_disable(struct apm_softc *sc)
{
#ifdef APM_DEBUG
@@ -604,7 +604,7 @@ apm_event_disable(struct apm_softc *sc)
}
/* halt CPU in scheduling loop */
-static void
+static void
apm_halt_cpu(struct apm_softc *sc)
{
if (sc->initialized) {
@@ -616,7 +616,7 @@ apm_halt_cpu(struct apm_softc *sc)
}
/* don't halt CPU in scheduling loop */
-static void
+static void
apm_not_halt_cpu(struct apm_softc *sc)
{
if (sc->initialized) {
@@ -654,7 +654,7 @@ struct bus_driver apmdriver = {
* to use V86 mode in APM initialization.
*/
-int
+int
#ifdef __FreeBSD__
apmprobe(struct isa_device *dvp)
#endif /* __FreeBSD__ */
@@ -700,7 +700,7 @@ apm_processevent(struct apm_softc *sc)
#endif
while (1) {
apm_event = apm_getevent(sc);
- if (apm_event == PMEV_NOEVENT)
+ if (apm_event == PMEV_NOEVENT)
break;
switch (apm_event) {
OPMEV_DEBUGMESSAGE(PMEV_STANDBYREQ);
@@ -749,7 +749,7 @@ apm_processevent(struct apm_softc *sc)
* Initialize APM driver (APM BIOS itself has been initialized in locore.s)
*
* Now, unless I'm mad, (not quite ruled out yet), the APM-1.1 spec is bogus:
- *
+ *
* Appendix C says under the header "APM 1.0/APM 1.1 Modal BIOS Behavior"
* that "When an APM Driver connects with an APM 1.1 BIOS, the APM 1.1 BIOS
* will default to an APM 1.0 connection. After an APM Driver calls the APM
@@ -761,21 +761,21 @@ apm_processevent(struct apm_softc *sc)
* OK so I can establish a 1.0 connection, and then tell that I'm a 1.1
* and maybe then the BIOS will tell that it too is a 1.1.
* Fine.
- * Now how will I ever get the segment-limits for instance ? There is no
- * way I can see that I can get a 1.1 response back from an "APM Protected
+ * Now how will I ever get the segment-limits for instance ? There is no
+ * way I can see that I can get a 1.1 response back from an "APM Protected
* Mode 32-bit Interface Connect" function ???
- *
+ *
* Who made this, Intel and Microsoft ? -- How did you guess !
*
* /phk
*/
#ifdef __FreeBSD__
-int
+int
apmattach(struct isa_device *dvp)
#endif /* __FreeBSD__ */
#ifdef MACH_KERNEL
-void
+void
apmattach(struct bus_device *dvp)
#endif /* MACH_KERNEL */
{
@@ -811,7 +811,7 @@ apmattach(struct bus_device *dvp)
if (sc->idle_cpu) {
apm_slowstart = apm_slowstart_p = 1;
}
-#endif
+#endif
/* print bootstrap messages */
#ifdef APM_DEBUG
@@ -819,7 +819,7 @@ apmattach(struct bus_device *dvp)
printf("apm%d: Code32 0x%08x, Code16 0x%08x, Data 0x%08x\n",
unit, sc->cs32_base, sc->cs16_base, sc->ds_base);
printf("apm%d: Code entry 0x%08x, Idling CPU %s, Management %s\n",
- unit, sc->cs_entry, is_enabled(sc->idle_cpu),
+ unit, sc->cs_entry, is_enabled(sc->idle_cpu),
is_enabled(!sc->disabled));
printf("apm%d: CS_limit=%x, DS_limit=%x\n",
unit, sc->cs_limit, sc->ds_limit);
@@ -829,7 +829,7 @@ apmattach(struct bus_device *dvp)
sc->ds_limit = 0xffff;
/* setup GDT */
- setup_apm_gdt(sc->cs32_base, sc->cs16_base, sc->ds_base,
+ setup_apm_gdt(sc->cs32_base, sc->cs16_base, sc->ds_base,
sc->cs_limit, sc->ds_limit);
/* setup entry point 48bit pointer */
@@ -845,7 +845,7 @@ apmattach(struct bus_device *dvp)
apm_driver_version();
sc->minorversion = ((apm_version & 0x00f0) >> 4) * 10 +
((apm_version & 0x000f) >> 0);
- sc->majorversion = ((apm_version & 0xf000) >> 12) * 10 +
+ sc->majorversion = ((apm_version & 0xf000) >> 12) * 10 +
((apm_version & 0x0f00) >> 8);
sc->intversion = INTVERSION(sc->majorversion, sc->minorversion);
@@ -855,14 +855,14 @@ apmattach(struct bus_device *dvp)
unit, is_enabled(!sc->disengaged));
}
- printf(" found APM BIOS version %d.%d\n",
+ printf(" found APM BIOS version %d.%d\n",
sc->majorversion, sc->minorversion);
printf("apm%d: Idling CPU %s\n", unit, is_enabled(sc->idle_cpu));
/* enable power management */
if (sc->disabled) {
if (apm_enable_disable_pm(sc, 1)) {
- printf("Warning: APM enable function failed! [%x]\n",
+ printf("Warning: APM enable function failed! [%x]\n",
apm_errno);
}
}
@@ -870,7 +870,7 @@ apmattach(struct bus_device *dvp)
/* engage power managment (APM 1.1 or later) */
if (sc->intversion >= INTVERSION(1, 1) && sc->disengaged) {
if (apm_engage_disengage_pm(sc, 1)) {
- printf("Warning: APM engage function failed [%x]\n",
+ printf("Warning: APM engage function failed [%x]\n",
apm_errno);
}
}
@@ -900,8 +900,8 @@ apmattach(struct bus_device *dvp)
}
#ifdef __FreeBSD__
-int
-apmopen(dev_t dev, int flag, int fmt, struct proc *p)
+int
+apmopen(dev_t dev, int flag, int fmt, struct proc *p)
{
struct apm_softc *sc = &apm_softc[minor(dev)];
@@ -914,13 +914,13 @@ apmopen(dev_t dev, int flag, int fmt, struct proc *p)
return 0;
}
-int
+int
apmclose(dev_t dev, int flag, int fmt, struct proc *p)
{
return 0;
}
-int
+int
apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
{
struct apm_softc *sc = &apm_softc[minor(dev)];
diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile
index 1d9c5c3ff985..3cc1f9d5e00a 100644
--- a/sys/i386/apm/apm_init/Makefile
+++ b/sys/i386/apm/apm_init/Makefile
@@ -5,14 +5,14 @@
#
# This software may be used, modified, copied, and distributed, in
# both source and binary form provided that the above copyright and
-# these terms are retained. Under no circumstances is the author
-# responsible for the proper functioning of this software, nor does
-# the author assume any responsibility for damages incurred with its
+# these terms are retained. Under no circumstances is the author
+# responsible for the proper functioning of this software, nor does
+# the author assume any responsibility for damages incurred with its
# use.
#
# Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
#
-# $Id: Makefile,v 1.2 1994/10/01 05:12:29 davidg Exp $
+# $Id: Makefile,v 1.3 1995/02/17 02:22:30 phk Exp $
#
OBJS = apm_init.o real_prot.o table.o
@@ -47,6 +47,6 @@ bin2asm: bin2asm.c
allclean: clean
@rm -f apm_init.inc
clean:
- @rm -f *.o apm_init apm_init.sym bin2asm
+ @rm -f *.o apm_init apm_init.sym bin2asm
.include <bsd.prog.mk>
diff --git a/sys/i386/apm/apm_init/bin2asm.c b/sys/i386/apm/apm_init/bin2asm.c
index 791798ab0bf3..09c98f450ff1 100644
--- a/sys/i386/apm/apm_init/bin2asm.c
+++ b/sys/i386/apm/apm_init/bin2asm.c
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: bin2asm.c,v 1.2 1994/10/01 05:12:30 davidg Exp $
+ * $Id: bin2asm.c,v 1.3 1995/02/17 02:22:33 phk Exp $
*/
#include <stdio.h>
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Usage: %s infile outfile\n", argv[0]);
exit(1);
}
-
+
if ((infile = fopen(argv[1], "rb")) == NULL) {
fprintf(stderr, "Can't open %s.\n", argv[1]);
exit(1);
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
} while ((col++) % NCOLS < NCOLS - 2);
fprintf(outfile, "0x00\n");
}
-
+
fprintf(outfile, "\n/* Total size = 0x%04x */\n", col);
fclose(infile);
diff --git a/sys/i386/apm/apm_init/real_prot.h b/sys/i386/apm/apm_init/real_prot.h
index 692ebfe47066..93b3f28fd427 100644
--- a/sys/i386/apm/apm_init/real_prot.h
+++ b/sys/i386/apm/apm_init/real_prot.h
@@ -1,30 +1,30 @@
-/*
+/*
* 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.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $Id: real_prot.h,v 1.1 1994/10/01 02:55:52 davidg Exp $
+ * $Id: real_prot.h,v 1.2 1995/02/17 02:22:33 phk Exp $
*/
/*
@@ -34,9 +34,9 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
diff --git a/sys/i386/apm/apm_init/table.c b/sys/i386/apm/apm_init/table.c
index 607fcc6f6c3c..b50d60fe803a 100644
--- a/sys/i386/apm/apm_init/table.c
+++ b/sys/i386/apm/apm_init/table.c
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: table.c,v 1.2 1994/10/01 05:12:31 davidg Exp $
+ * $Id: table.c,v 1.3 1995/02/17 02:22:34 phk Exp $
*/
#include <apm_bios.h>
diff --git a/sys/i386/apm/apm_setup.h b/sys/i386/apm/apm_setup.h
index 55f126df9863..f5e67efec461 100644
--- a/sys/i386/apm/apm_setup.h
+++ b/sys/i386/apm/apm_setup.h
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, distributed, and sold,
* in both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm_setup.h,v 1.2 1994/10/01 05:12:23 davidg Exp $
+ * $Id: apm_setup.h,v 1.3 1995/02/17 02:22:22 phk Exp $
*/
extern u_long apm_version;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 38f5d8f00372..1ba1472c4148 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -6,14 +6,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.10 1994/12/16 07:31:47 phk Exp $
+ * $Id: apm.c,v 1.11 1995/02/17 02:22:21 phk Exp $
*/
#include "apm.h"
@@ -72,7 +72,7 @@ struct apm_softc {
int idle_cpu, disabled, disengaged;
struct apmhook sc_suspend;
struct apmhook sc_resume;
-};
+};
static struct apm_softc apm_softc[NAPM];
static struct apm_softc *master_softc = NULL; /* XXX */
@@ -102,8 +102,8 @@ static void apm_timeout(void *);
#endif /* MACH_KERNEL */
/* setup APM GDT discriptors */
-static void
-setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_limit, u_int data_limit)
+static void
+setup_apm_gdt(u_int code32_base, u_int code16_base, u_int data_base, u_int code_limit, u_int data_limit)
{
#ifdef __FreeBSD__
/* setup 32bit code segment */
@@ -170,20 +170,20 @@ apm_int(u_long *eax, u_long *ebx, u_long *ecx)
lcall _apm_addr
jnc 1f
incl %3
- 1:
+ 1:
popl %%esi
popl %%edx
popl %%ebp"
: "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=D" (cf)
: "0" (*eax), "1" (*ebx), "2" (*ecx)
- );
+ );
apm_errno = ((*eax) >> 8) & 0xff;
return cf;
}
/* enable/disable power management */
-static int
+static int
apm_enable_disable_pm(struct apm_softc *sc, int enable)
{
u_long eax, ebx, ecx;
@@ -217,7 +217,7 @@ apm_driver_version(void)
eax = (APM_BIOS << 8) | APM_DRVVERSION;
ebx = 0x0;
ecx = 0x0101;
- if(!apm_int(&eax, &ebx, &ecx))
+ if(!apm_int(&eax, &ebx, &ecx))
apm_version = eax & 0xffff;
#ifdef APM_DEBUG
@@ -231,7 +231,7 @@ apm_driver_version(void)
}
/* engage/disengage power management (APM 1.1 or later) */
-static int
+static int
apm_engage_disengage_pm(struct apm_softc *sc, int engage)
{
u_long eax, ebx, ecx, i;
@@ -244,13 +244,13 @@ apm_engage_disengage_pm(struct apm_softc *sc, int engage)
}
/* get PM event */
-static u_int
+static u_int
apm_getevent(struct apm_softc *sc)
{
u_long eax, ebx, ecx;
eax = (APM_BIOS << 8) | APM_GETPMEVENT;
-
+
ebx = 0;
ecx = 0;
if (apm_int(&eax, &ebx, &ecx))
@@ -260,11 +260,11 @@ apm_getevent(struct apm_softc *sc)
}
/* suspend entire system */
-static int
+static int
apm_suspend_system(struct apm_softc *sc)
{
u_long eax, ebx, ecx;
-
+
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_SUSPEND;
@@ -272,7 +272,7 @@ apm_suspend_system(struct apm_softc *sc)
__asm("cli");
if (apm_int(&eax, &ebx, &ecx)) {
__asm("sti");
- printf("Entire system suspend failure: errcode = %ld\n",
+ printf("Entire system suspend failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
}
@@ -290,12 +290,12 @@ int
apm_display_off(void)
{
u_long eax, ebx, ecx;
-
+
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_2NDSTORAGE0;
ecx = PMST_STANDBY;
if (apm_int(&eax, &ebx, &ecx)) {
- printf("Display off failure: errcode = %ld\n",
+ printf("Display off failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
}
@@ -304,7 +304,7 @@ apm_display_off(void)
}
/* APM Battery low handler */
-static void
+static void
apm_battery_low(struct apm_softc *sc)
{
printf("\007\007 * * * BATTERY IS LOW * * * \007\007");
@@ -343,7 +343,7 @@ apm_add_hook(struct apmhook **list, struct apmhook *ah)
return ah;
}
-static void
+static void
apm_del_hook(struct apmhook **list, struct apmhook *ah)
{
int s;
@@ -370,7 +370,7 @@ nosuchnode:
/* APM driver calls some functions automatically */
-static void
+static void
apm_execute_hook(struct apmhook *list)
{
struct apmhook *p;
@@ -381,8 +381,8 @@ apm_execute_hook(struct apmhook *list)
#endif
if ((*(p->ah_fun))(p->ah_arg)) {
printf("Warning: APM hook \"%s\" failed", p->ah_name);
- }
- }
+ }
+ }
}
@@ -410,7 +410,7 @@ apm_hook_disestablish(int apmh, struct apmhook *ah)
static struct timeval suspend_time;
static struct timeval diff_time;
-static int
+static int
apm_default_resume(struct apm_softc *sc)
{
#ifdef __FreeBSD__
@@ -437,7 +437,7 @@ apm_default_resume(struct apm_softc *sc)
return 0;
}
-static int
+static int
apm_default_suspend(void)
{
#ifdef __FreeBSD__
@@ -465,7 +465,7 @@ static void apm_processevent(struct apm_softc *);
*
*/
-void
+void
apm_suspend(void)
{
struct apm_softc *sc;
@@ -519,7 +519,7 @@ apm_get_info(struct apm_softc *sc, apm_info_t aip)
/* inform APM BIOS that CPU is idle */
-void
+void
apm_cpu_idle(void)
{
struct apm_softc *sc = master_softc; /* XXX */
@@ -530,7 +530,7 @@ apm_cpu_idle(void)
}
}
/*
- * Some APM implementation halts CPU in BIOS, whenever
+ * Some APM implementation halts CPU in BIOS, whenever
* "CPU-idle" function are invoked, but swtch() of
* FreeBSD halts CPU, therefore, CPU is halted twice
* in the sched loop. It makes the interrupt latency
@@ -551,7 +551,7 @@ apm_cpu_idle(void)
}
/* inform APM BIOS that CPU is busy */
-void
+void
apm_cpu_busy(void)
{
struct apm_softc *sc = master_softc; /* XXX */
@@ -568,7 +568,7 @@ apm_cpu_busy(void)
* This routine is automatically called by timer once per second.
*/
-static void
+static void
apm_timeout(void *arg)
{
struct apm_softc *sc = arg;
@@ -578,7 +578,7 @@ apm_timeout(void *arg)
}
/* enable APM BIOS */
-static void
+static void
apm_event_enable(struct apm_softc *sc)
{
#ifdef APM_DEBUG
@@ -591,7 +591,7 @@ apm_event_enable(struct apm_softc *sc)
}
/* disable APM BIOS */
-static void
+static void
apm_event_disable(struct apm_softc *sc)
{
#ifdef APM_DEBUG
@@ -604,7 +604,7 @@ apm_event_disable(struct apm_softc *sc)
}
/* halt CPU in scheduling loop */
-static void
+static void
apm_halt_cpu(struct apm_softc *sc)
{
if (sc->initialized) {
@@ -616,7 +616,7 @@ apm_halt_cpu(struct apm_softc *sc)
}
/* don't halt CPU in scheduling loop */
-static void
+static void
apm_not_halt_cpu(struct apm_softc *sc)
{
if (sc->initialized) {
@@ -654,7 +654,7 @@ struct bus_driver apmdriver = {
* to use V86 mode in APM initialization.
*/
-int
+int
#ifdef __FreeBSD__
apmprobe(struct isa_device *dvp)
#endif /* __FreeBSD__ */
@@ -700,7 +700,7 @@ apm_processevent(struct apm_softc *sc)
#endif
while (1) {
apm_event = apm_getevent(sc);
- if (apm_event == PMEV_NOEVENT)
+ if (apm_event == PMEV_NOEVENT)
break;
switch (apm_event) {
OPMEV_DEBUGMESSAGE(PMEV_STANDBYREQ);
@@ -749,7 +749,7 @@ apm_processevent(struct apm_softc *sc)
* Initialize APM driver (APM BIOS itself has been initialized in locore.s)
*
* Now, unless I'm mad, (not quite ruled out yet), the APM-1.1 spec is bogus:
- *
+ *
* Appendix C says under the header "APM 1.0/APM 1.1 Modal BIOS Behavior"
* that "When an APM Driver connects with an APM 1.1 BIOS, the APM 1.1 BIOS
* will default to an APM 1.0 connection. After an APM Driver calls the APM
@@ -761,21 +761,21 @@ apm_processevent(struct apm_softc *sc)
* OK so I can establish a 1.0 connection, and then tell that I'm a 1.1
* and maybe then the BIOS will tell that it too is a 1.1.
* Fine.
- * Now how will I ever get the segment-limits for instance ? There is no
- * way I can see that I can get a 1.1 response back from an "APM Protected
+ * Now how will I ever get the segment-limits for instance ? There is no
+ * way I can see that I can get a 1.1 response back from an "APM Protected
* Mode 32-bit Interface Connect" function ???
- *
+ *
* Who made this, Intel and Microsoft ? -- How did you guess !
*
* /phk
*/
#ifdef __FreeBSD__
-int
+int
apmattach(struct isa_device *dvp)
#endif /* __FreeBSD__ */
#ifdef MACH_KERNEL
-void
+void
apmattach(struct bus_device *dvp)
#endif /* MACH_KERNEL */
{
@@ -811,7 +811,7 @@ apmattach(struct bus_device *dvp)
if (sc->idle_cpu) {
apm_slowstart = apm_slowstart_p = 1;
}
-#endif
+#endif
/* print bootstrap messages */
#ifdef APM_DEBUG
@@ -819,7 +819,7 @@ apmattach(struct bus_device *dvp)
printf("apm%d: Code32 0x%08x, Code16 0x%08x, Data 0x%08x\n",
unit, sc->cs32_base, sc->cs16_base, sc->ds_base);
printf("apm%d: Code entry 0x%08x, Idling CPU %s, Management %s\n",
- unit, sc->cs_entry, is_enabled(sc->idle_cpu),
+ unit, sc->cs_entry, is_enabled(sc->idle_cpu),
is_enabled(!sc->disabled));
printf("apm%d: CS_limit=%x, DS_limit=%x\n",
unit, sc->cs_limit, sc->ds_limit);
@@ -829,7 +829,7 @@ apmattach(struct bus_device *dvp)
sc->ds_limit = 0xffff;
/* setup GDT */
- setup_apm_gdt(sc->cs32_base, sc->cs16_base, sc->ds_base,
+ setup_apm_gdt(sc->cs32_base, sc->cs16_base, sc->ds_base,
sc->cs_limit, sc->ds_limit);
/* setup entry point 48bit pointer */
@@ -845,7 +845,7 @@ apmattach(struct bus_device *dvp)
apm_driver_version();
sc->minorversion = ((apm_version & 0x00f0) >> 4) * 10 +
((apm_version & 0x000f) >> 0);
- sc->majorversion = ((apm_version & 0xf000) >> 12) * 10 +
+ sc->majorversion = ((apm_version & 0xf000) >> 12) * 10 +
((apm_version & 0x0f00) >> 8);
sc->intversion = INTVERSION(sc->majorversion, sc->minorversion);
@@ -855,14 +855,14 @@ apmattach(struct bus_device *dvp)
unit, is_enabled(!sc->disengaged));
}
- printf(" found APM BIOS version %d.%d\n",
+ printf(" found APM BIOS version %d.%d\n",
sc->majorversion, sc->minorversion);
printf("apm%d: Idling CPU %s\n", unit, is_enabled(sc->idle_cpu));
/* enable power management */
if (sc->disabled) {
if (apm_enable_disable_pm(sc, 1)) {
- printf("Warning: APM enable function failed! [%x]\n",
+ printf("Warning: APM enable function failed! [%x]\n",
apm_errno);
}
}
@@ -870,7 +870,7 @@ apmattach(struct bus_device *dvp)
/* engage power managment (APM 1.1 or later) */
if (sc->intversion >= INTVERSION(1, 1) && sc->disengaged) {
if (apm_engage_disengage_pm(sc, 1)) {
- printf("Warning: APM engage function failed [%x]\n",
+ printf("Warning: APM engage function failed [%x]\n",
apm_errno);
}
}
@@ -900,8 +900,8 @@ apmattach(struct bus_device *dvp)
}
#ifdef __FreeBSD__
-int
-apmopen(dev_t dev, int flag, int fmt, struct proc *p)
+int
+apmopen(dev_t dev, int flag, int fmt, struct proc *p)
{
struct apm_softc *sc = &apm_softc[minor(dev)];
@@ -914,13 +914,13 @@ apmopen(dev_t dev, int flag, int fmt, struct proc *p)
return 0;
}
-int
+int
apmclose(dev_t dev, int flag, int fmt, struct proc *p)
{
return 0;
}
-int
+int
apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
{
struct apm_softc *sc = &apm_softc[minor(dev)];
diff --git a/sys/i386/bios/apm_init/Makefile b/sys/i386/bios/apm_init/Makefile
index 1d9c5c3ff985..3cc1f9d5e00a 100644
--- a/sys/i386/bios/apm_init/Makefile
+++ b/sys/i386/bios/apm_init/Makefile
@@ -5,14 +5,14 @@
#
# This software may be used, modified, copied, and distributed, in
# both source and binary form provided that the above copyright and
-# these terms are retained. Under no circumstances is the author
-# responsible for the proper functioning of this software, nor does
-# the author assume any responsibility for damages incurred with its
+# these terms are retained. Under no circumstances is the author
+# responsible for the proper functioning of this software, nor does
+# the author assume any responsibility for damages incurred with its
# use.
#
# Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
#
-# $Id: Makefile,v 1.2 1994/10/01 05:12:29 davidg Exp $
+# $Id: Makefile,v 1.3 1995/02/17 02:22:30 phk Exp $
#
OBJS = apm_init.o real_prot.o table.o
@@ -47,6 +47,6 @@ bin2asm: bin2asm.c
allclean: clean
@rm -f apm_init.inc
clean:
- @rm -f *.o apm_init apm_init.sym bin2asm
+ @rm -f *.o apm_init apm_init.sym bin2asm
.include <bsd.prog.mk>
diff --git a/sys/i386/bios/apm_init/bin2asm.c b/sys/i386/bios/apm_init/bin2asm.c
index 791798ab0bf3..09c98f450ff1 100644
--- a/sys/i386/bios/apm_init/bin2asm.c
+++ b/sys/i386/bios/apm_init/bin2asm.c
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: bin2asm.c,v 1.2 1994/10/01 05:12:30 davidg Exp $
+ * $Id: bin2asm.c,v 1.3 1995/02/17 02:22:33 phk Exp $
*/
#include <stdio.h>
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Usage: %s infile outfile\n", argv[0]);
exit(1);
}
-
+
if ((infile = fopen(argv[1], "rb")) == NULL) {
fprintf(stderr, "Can't open %s.\n", argv[1]);
exit(1);
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
} while ((col++) % NCOLS < NCOLS - 2);
fprintf(outfile, "0x00\n");
}
-
+
fprintf(outfile, "\n/* Total size = 0x%04x */\n", col);
fclose(infile);
diff --git a/sys/i386/bios/apm_init/real_prot.h b/sys/i386/bios/apm_init/real_prot.h
index 692ebfe47066..93b3f28fd427 100644
--- a/sys/i386/bios/apm_init/real_prot.h
+++ b/sys/i386/bios/apm_init/real_prot.h
@@ -1,30 +1,30 @@
-/*
+/*
* 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.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $Id: real_prot.h,v 1.1 1994/10/01 02:55:52 davidg Exp $
+ * $Id: real_prot.h,v 1.2 1995/02/17 02:22:33 phk Exp $
*/
/*
@@ -34,9 +34,9 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
diff --git a/sys/i386/bios/apm_init/table.c b/sys/i386/bios/apm_init/table.c
index 607fcc6f6c3c..b50d60fe803a 100644
--- a/sys/i386/bios/apm_init/table.c
+++ b/sys/i386/bios/apm_init/table.c
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: table.c,v 1.2 1994/10/01 05:12:31 davidg Exp $
+ * $Id: table.c,v 1.3 1995/02/17 02:22:34 phk Exp $
*/
#include <apm_bios.h>
diff --git a/sys/i386/bios/apm_setup.h b/sys/i386/bios/apm_setup.h
index 55f126df9863..f5e67efec461 100644
--- a/sys/i386/bios/apm_setup.h
+++ b/sys/i386/bios/apm_setup.h
@@ -5,14 +5,14 @@
*
* This software may be used, modified, copied, distributed, and sold,
* in both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
+ * these terms are retained. Under no circumstances is the author
+ * responsible for the proper functioning of this software, nor does
+ * the author assume any responsibility for damages incurred with its
* use.
*
* Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm_setup.h,v 1.2 1994/10/01 05:12:23 davidg Exp $
+ * $Id: apm_setup.h,v 1.3 1995/02/17 02:22:22 phk Exp $
*/
extern u_long apm_version;
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index 43242bdec0fa..5d2c380b9fd3 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -1,30 +1,30 @@
-/*
+/*
* 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.
*
* from: Mach, Revision 2.7 92/02/29 15:33:41 rpd
- * $Id$
+ * $Id: asm.h,v 1.3 1993/10/16 19:11:29 rgrimes Exp $
*/
#define S_ARG0 4(%esp)
@@ -64,7 +64,7 @@
#define OUTL outl (%dx)
#else wheeze
-#define ALIGN
+#define ALIGN
#define LCL(x) x
#define LB(x,n) n
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index bb80505a6ed6..8ff7d8e34c51 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -2,34 +2,34 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, [92/04/03 16:51:14 rvb]
- * $Id: boot.c,v 1.41 1995/04/21 16:50:31 bde Exp $
+ * $Id: boot.c,v 1.42 1995/04/21 22:20:34 julian Exp $
*/
/*
- Copyright 1988, 1989, 1990, 1991, 1992
+ Copyright 1988, 1989, 1990, 1991, 1992
by Intel Corporation, Santa Clara, California.
All Rights Reserved
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 92334bf59507..11dd6d998999 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -2,29 +2,29 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, Revision 2.2 92/04/04 11:35:03 rpd
- * $Id: boot.h,v 1.8 1995/04/21 16:07:12 bde Exp $
+ * $Id: boot.h,v 1.9 1995/04/21 16:50:32 bde Exp $
*/
#include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 5e858e25006e..7a605f475752 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -2,29 +2,29 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, Revision 2.2 92/04/04 11:35:49 rpd
- * $Id: disk.c,v 1.11 1995/05/11 16:19:50 phk Exp $
+ * $Id: disk.c,v 1.12 1995/05/21 03:27:13 phk Exp $
*/
/*
@@ -87,7 +87,7 @@ devopen(void)
int dosdev = inode.i_dev;
int i, sector = 0, di;
u_long bend;
-
+
di = get_diskinfo(dosdev);
spc = (spt = SPT(di)) * HEADS(di);
if (dosdev == 2)
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index ff6de6038f2e..394c27111504 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -2,29 +2,29 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, Revision 2.2 92/04/04 11:35:57 rpd
- * $Id: io.c,v 1.12 1995/01/25 21:37:45 bde Exp $
+ * $Id: io.c,v 1.13 1995/04/14 21:26:51 joerg Exp $
*/
#include "boot.h"
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 49109f23bce0..c88fb3dc6a50 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -2,29 +2,29 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, Revision 2.2 92/04/04 11:36:34 rpd
- * $Id: sys.c,v 1.7 1994/12/30 07:48:07 bde Exp $
+ * $Id: sys.c,v 1.8 1995/04/14 21:26:53 joerg Exp $
*/
#include "boot.h"
@@ -40,7 +40,7 @@ char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
#define BUFSIZE 8192
#define MAPBUFSIZE BUFSIZE
-char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
+char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
char mapbuf[MAPBUFSIZE];
int mapblock;
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 5374c31c937c..e9774f49a8dd 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -2,33 +2,33 @@
* Mach Operating System
* Copyright (c) 1992, 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.
*
* from: Mach, Revision 2.2 92/04/04 11:36:43 rpd
- * $Id: table.c,v 1.5 1995/01/25 21:37:48 bde Exp $
+ * $Id: table.c,v 1.6 1995/04/14 21:26:53 joerg Exp $
*/
/*
- Copyright 1988, 1989, 1990, 1991, 1992
+ Copyright 1988, 1989, 1990, 1991, 1992
by Intel Corporation, Santa Clara, California.
All Rights Reserved
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index e97d03465888..4646bbb0c229 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.1 1995/03/28 19:22:43 phk Exp $
#
MPROG= fbsdboot.exe
@@ -8,7 +8,7 @@ BINMODE= 444
NOMAN=
STRIP=
-all: ${MPROG}
+all: ${MPROG}
install: ${MPROG}
${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sys/i386/boot/kzipboot/boot.c b/sys/i386/boot/kzipboot/boot.c
index 7a15e4e2067d..6dbd21975b80 100644
--- a/sys/i386/boot/kzipboot/boot.c
+++ b/sys/i386/boot/kzipboot/boot.c
@@ -1,4 +1,4 @@
-/*
+/*
* FreeBSD kernel unpacker.
* 1993 by Serge Vakulenko
* modified for FreeBSD 2.1 by Gary Jennejohn - 12FEB95
diff --git a/sys/i386/boot/kzipboot/malloc.c b/sys/i386/boot/kzipboot/malloc.c
index b540ec1bc54b..7890097c908d 100644
--- a/sys/i386/boot/kzipboot/malloc.c
+++ b/sys/i386/boot/kzipboot/malloc.c
@@ -54,5 +54,5 @@ void
free(cp, junk) /* junk not used */
void *cp;
int junk;
-{
+{
}
diff --git a/sys/i386/boot/kzipboot/misc.c b/sys/i386/boot/kzipboot/misc.c
index adf0e0d19ad3..a971aeec8b83 100644
--- a/sys/i386/boot/kzipboot/misc.c
+++ b/sys/i386/boot/kzipboot/misc.c
@@ -1,7 +1,7 @@
/*
* misc.c
- *
- * This is a collection of several routines from gzip-1.0.3
+ *
+ * This is a collection of several routines from gzip-1.0.3
* adapted for Linux.
*
* Ported to 386bsd by Serge Vakulenko
@@ -95,7 +95,7 @@ void flush_window()
}
/*
- * Code to compute the CRC-32 table. Borrowed from
+ * Code to compute the CRC-32 table. Borrowed from
* gzip-1.0.3/makecrc.c.
* Not copyrighted 1990 Mark Adler
*/
@@ -192,7 +192,7 @@ static void get_method()
error("Corrupted input");
}
-void
+void
decompress_kernel (void *dest)
{
output_data = dest;
diff --git a/sys/i386/boot/kzipboot/unzip.c b/sys/i386/boot/kzipboot/unzip.c
index 5883bc0b8a7d..93a2c8b84279 100644
--- a/sys/i386/boot/kzipboot/unzip.c
+++ b/sys/i386/boot/kzipboot/unzip.c
@@ -110,7 +110,7 @@ void unzip()
orig_len = LG(inbuf + LOCLEN);
}
- if (method != DEFLATED)
+ if (method != DEFLATED)
error("internal error, invalid method");
infl.gz_input = NextByte;
infl.gz_output = Flush;
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index b729a466f098..9ebfe5d3ae2c 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -8,7 +8,7 @@ Author: Martin Renters.
Andres Vega Garcia's if_ep.c driver.
Copyright (C) 1993-1994, David Greenman, Martin Renters.
- Copyright (C) 1993-1995, Andres Vega Garcia.
+ Copyright (C) 1993-1995, Andres Vega Garcia.
Copyright (C) 1995, Serge Babkin.
This software may be used, modified, copied, distributed, and sold, in
both source and binary form provided that the above copyright and these
@@ -18,7 +18,7 @@ Author: Martin Renters.
3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
-$Id: 3c509.c,v 1.1 1995/04/11 05:37:59 root Exp root $
+$Id: 3c509.c,v 1.1 1995/04/12 20:14:56 martin Exp $
***************************************************************************/
@@ -158,7 +158,7 @@ eth_probe()
eth_vendor=VENDOR_NONE;
goto no3c509;
}
-
+
break;
case 1:
if(i & IS_AUI)
@@ -168,7 +168,7 @@ eth_probe()
eth_vendor=VENDOR_NONE;
goto no3c509;
}
-
+
break;
case 3:
if(i & IS_BNC) {
@@ -180,7 +180,7 @@ eth_probe()
eth_vendor=VENDOR_NONE;
goto no3c509;
}
-
+
break;
default:
printf("unknown connector\r\n");
@@ -240,8 +240,8 @@ eth_reset()
outw(BASE + EP_COMMAND, SET_INTR_MASK);
outw(BASE + EP_COMMAND, SET_RX_FILTER);
- /*
- /* initialize card
+ /*
+ /* initialize card
*/
while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS);
diff --git a/sys/i386/boot/netboot/3c509.h b/sys/i386/boot/netboot/3c509.h
index 049f235bbc5b..8bfa36812d82 100644
--- a/sys/i386/boot/netboot/3c509.h
+++ b/sys/i386/boot/netboot/3c509.h
@@ -1,13 +1,13 @@
/*
* Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. 2. The name
* of the author may not be used to endorse or promote products derived from
* this software withough specific prior written permission
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -18,15 +18,15 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by:
- *
+ *
October 2, 1994
-
- Modified by: Andres Vega Garcia
- INRIA - Sophia Antipolis, France
- e-mail: avega@sophia.inria.fr
+ Modified by: Andres Vega Garcia
+
+ INRIA - Sophia Antipolis, France
+ e-mail: avega@sophia.inria.fr
finger: avega@pax.inria.fr
*/
@@ -284,7 +284,7 @@
#define S_COMMAND_IN_PROGRESS (u_short) (0x1000)
/*
- * FIFO Registers.
+ * FIFO Registers.
* RX Status. Window 1/Port 08
*
* 15: Incomplete or FIFO empty.
@@ -310,7 +310,7 @@
#define ERR_RX_DRIBBLE (u_short) (0x2<<11)
/*
- * FIFO Registers.
+ * FIFO Registers.
* TX Status. Window 1/Port 0B
*
* Reports the transmit status of a completed transmission. Writing this
@@ -335,7 +335,7 @@
#define TXS_STATUS_OVERFLOW 0x4
/*
- * Configuration control register.
+ * Configuration control register.
* Window 0/Port 04
*/
/* Read */
@@ -346,7 +346,7 @@
#define ENABLE_DRQ_IRQ 0x0001
#define W0_P4_CMD_RESET_ADAPTER 0x4
#define W0_P4_CMD_ENABLE_ADAPTER 0x1
-/*
+/*
* Media type and status.
* Window 4/Port 0A
*/
@@ -360,7 +360,7 @@
#define SET_IRQ(i) ( ((i)<<12) | 0xF00) /* set IRQ i */
/*
- * Receive status register
+ * Receive status register
*/
#define RX_BYTES_MASK (u_short) (0x07ff)
diff --git a/sys/i386/boot/netboot/bootmenu.c b/sys/i386/boot/netboot/bootmenu.c
index 32b266c83262..77a12ed5ff16 100644
--- a/sys/i386/boot/netboot/bootmenu.c
+++ b/sys/i386/boot/netboot/bootmenu.c
@@ -181,7 +181,7 @@ CMD_HOSTNAME - Set my hostname
cmd_hostname(p)
char *p;
{
- if (*p)
+ if (*p)
hostnamelen = ((sprintf(&nfsdiskless.my_hostnam,"%s",p) -
(char*)&nfsdiskless.my_hostnam) + 3) & ~3;
else printf("Hostname is: %s\r\n",nfsdiskless.my_hostnam);
diff --git a/sys/i386/boot/netboot/main.c b/sys/i386/boot/netboot/main.c
index 5cadf8f2e818..8ee6cf487b3c 100644
--- a/sys/i386/boot/netboot/main.c
+++ b/sys/i386/boot/netboot/main.c
@@ -197,7 +197,7 @@ load()
nfsdiskless.swap_saddr.sin_len = sizeof(struct sockaddr_in);
nfsdiskless.swap_saddr.sin_family = AF_INET;
nfsdiskless.swap_saddr.sin_port = htons(swap_nfs_port);
- nfsdiskless.swap_saddr.sin_addr.s_addr =
+ nfsdiskless.swap_saddr.sin_addr.s_addr =
htonl(arptable[ARP_SWAPSERVER].ipaddr);
nfsdiskless.swap_args.timeo = 10;
nfsdiskless.swap_args.retrans = 100;
@@ -219,7 +219,7 @@ load()
nfsdiskless.root_saddr.sin_len = sizeof(struct sockaddr_in);
nfsdiskless.root_saddr.sin_family = AF_INET;
nfsdiskless.root_saddr.sin_port = htons(root_nfs_port);
- nfsdiskless.root_saddr.sin_addr.s_addr =
+ nfsdiskless.root_saddr.sin_addr.s_addr =
htonl(arptable[ARP_ROOTSERVER].ipaddr);
nfsdiskless.root_args.timeo = 10;
nfsdiskless.root_args.retrans = 100;
@@ -356,7 +356,7 @@ udp_transmit(destip, srcsock, destsock, len, buf)
} else {
long h_netmask = ntohl(netmask);
/* Check to see if we need gateway */
- if (((destip & h_netmask) !=
+ if (((destip & h_netmask) !=
(arptable[ARP_CLIENT].ipaddr & h_netmask)) &&
arptable[ARP_GATEWAY].ipaddr)
destip = arptable[ARP_GATEWAY].ipaddr;
@@ -507,7 +507,7 @@ await_reply(type, ival, ptr)
if ((packetlen < protohdrlen) ||
(((packet[12] << 8) | packet[13]) != IP)) continue;
ip = (struct iphdr *)&packet[ETHER_HDR_SIZE];
- if ((ip->verhdrlen != 0x45) ||
+ if ((ip->verhdrlen != 0x45) ||
ipchksum(ip, sizeof(struct iphdr)) ||
(ip->protocol != IP_UDP)) continue;
udp = (struct udphdr *)&packet[ETHER_HDR_SIZE +
diff --git a/sys/i386/boot/netboot/ns8390.c b/sys/i386/boot/netboot/ns8390.c
index 10e88622b3e6..14cca176c825 100644
--- a/sys/i386/boot/netboot/ns8390.c
+++ b/sys/i386/boot/netboot/ns8390.c
@@ -134,7 +134,7 @@ eth_probe()
}
}
printf("\r\n");
-
+
}
#endif
#ifdef INCLUDE_3COM
@@ -244,7 +244,7 @@ eth_probe()
/*
* Clear memory and verify that it worked (we use only 8K)
*/
- bzero(eth_bmem, 0x2000);
+ bzero(eth_bmem, 0x2000);
for(i = 0; i < 0x2000; ++i)
if (*((eth_bmem)+i)) {
printf ("Failed to clear 3c503 shared mem.\r\n");
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index e81caf3e36e2..aef575547678 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
+# $Id: Makefile.i386,v 1.63 1995/05/11 19:48:45 wollman Exp $
#
# Makefile for FreeBSD
#
@@ -14,7 +14,7 @@
# /sys/i386/conf/Makefile.i386
# after which config should be rerun for all machines.
#
-CC?= cc
+CC?= cc
CPP?= cpp
LD?= /usr/bin/ld
@@ -61,7 +61,7 @@ SFILES= ${I386}/i386/exception.s ${I386}/i386/microtime.s \
${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
SYSTEM_CFILES= ioconf.c param.c vnode_if.c
SYSTEM_SFILES= ${I386}/i386/locore.s
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o
SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
@@ -145,7 +145,7 @@ trap.o cons.o: Makefile
assym.s: genassym
./genassym >assym.s
-# Some of the defines that genassym outputs may well depend on the
+# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${I386}/i386/genassym.c Makefile
${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c
index 0d31e01aea91..727b9a481fc2 100644
--- a/sys/i386/eisa/aha1742.c
+++ b/sys/i386/eisa/aha1742.c
@@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
- * $Id: aha1742.c,v 1.32 1995/05/09 12:25:50 rgrimes Exp $
+ * $Id: aha1742.c,v 1.33 1995/05/11 19:26:15 rgrimes Exp $
*/
#include <sys/types.h>
@@ -561,7 +561,7 @@ ahb_attach(dev)
* Return some information to the caller about
* the adapter and it's capabilities
*/
-u_int32
+u_int32
ahb_adapter_info(unit)
int unit;
{
@@ -590,7 +590,7 @@ ahbintr(unit)
while (inb(port + G2STAT) & G2STAT_INT_PEND) {
/*
- * First get all the information and then
+ * First get all the information and then
* acknowlege the interrupt
*/
ahbstat = inb(port + G2INTST);
@@ -712,7 +712,7 @@ ahb_done(unit, ecb, state)
printf("unexpected ha_status: %x\n",
stat->ha_status);
}
-#endif /*AHBDEBUG */
+#endif /*AHBDEBUG */
}
} else {
switch (stat->targ_status) {
@@ -741,7 +741,7 @@ done: xs->flags |= ITSDONE;
}
/*
- * A ecb (and hence a mbx-out is put onto the
+ * A ecb (and hence a mbx-out is put onto the
* free list.
*/
void
@@ -770,7 +770,7 @@ ahb_free_ecb(unit, ecb, flags)
}
/*
- * Get a free ecb
+ * Get a free ecb
* If there are none, see if we can allocate a
* new one. If so, put it in the hash table too
* otherwise either return an error or sleep
@@ -863,7 +863,7 @@ ahb_init(unit)
#define NO_NO 1
#ifdef NO_NO
/*
- * reset board, If it doesn't respond, assume
+ * reset board, If it doesn't respond, assume
* that it's not there.. good for the probe
*/
outb(port + EBCTRL, CDEN); /* enable full card */
@@ -944,7 +944,7 @@ ahb_init(unit)
#ifndef min
#define min(x,y) (x < y ? x : y)
-#endif /* min */
+#endif /* min */
void
ahbminphys(bp)
@@ -960,7 +960,7 @@ ahbminphys(bp)
* the data address. Also needs the unit, target
* and lu
*/
-int32
+int32
ahb_scsi_cmd(xs)
struct scsi_xfer *xs;
{
@@ -1001,7 +1001,7 @@ ahb_scsi_cmd(xs)
/*
* If it's a reset, we need to do an 'immediate'
* command, and store it's ecb for later
- * if there is already an immediate waiting,
+ * if there is already an immediate waiting,
* then WE must wait
*/
if (flags & SCSI_RESET) {
@@ -1091,8 +1091,8 @@ ahb_scsi_cmd(xs)
nextphys = thisphys;
while ((datalen) && (thisphys == nextphys)) {
/*
- * This page is contiguous (physically) with
- * the the last, just extend the length
+ * This page is contiguous (physically) with
+ * the the last, just extend the length
*/
/* how far to the end of the page */
nextphys = (thisphys & (~(PAGESIZ - 1)))
@@ -1111,7 +1111,7 @@ ahb_scsi_cmd(xs)
thisphys = KVTOPHYS(thiskv);
}
/*
- * next page isn't contiguous, finish the seg
+ * next page isn't contiguous, finish the seg
*/
SC_DEBUGN(xs->sc_link, SDEV_DB4,
("(0x%x)", bytes_this_seg));
@@ -1194,7 +1194,7 @@ ahb_timeout(void *arg1)
#endif /*AHBDEBUG */
/*
- * If it's immediate, don't try abort it
+ * If it's immediate, don't try abort it
*/
if (ecb->flags & ECB_IMMED) {
ecb->xs->retries = 0; /* I MEAN IT ! */
diff --git a/sys/i386/eisa/aic7770.c b/sys/i386/eisa/aic7770.c
index 2cfb90407d2e..ce4f94839292 100644
--- a/sys/i386/eisa/aic7770.c
+++ b/sys/i386/eisa/aic7770.c
@@ -19,7 +19,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: aic7770.c,v 1.12 1995/03/31 13:36:57 gibbs Exp $
+ * $Id: aic7770.c,v 1.13 1995/04/12 20:47:36 wollman Exp $
*/
#include <sys/param.h>
@@ -32,16 +32,16 @@
#include <machine/cpufunc.h>
#include <i386/scsi/aic7xxx.h>
-int aic7770probe __P((struct isa_device *dev));
+int aic7770probe __P((struct isa_device *dev));
int aic7770_attach __P((struct isa_device *dev));
-/*
+/*
* Standard EISA Host ID regs (Offset from slot base)
*/
#define HID0 0xC80 /* 0,1: msb of ID2, 2-7: ID1 */
-#define HID1 0xC81 /* 0-4: ID3, 5-7: LSB ID2 */
-#define HID2 0xC82 /* product */
+#define HID1 0xC81 /* 0-4: ID3, 5-7: LSB ID2 */
+#define HID2 0xC82 /* product */
#define HID3 0xC83 /* firmware revision */
#define CHAR1(B1,B2) (((B1>>2) & 0x1F) | '@')
@@ -78,11 +78,11 @@ aic7770_registerdev(struct isa_device *id)
kdc_aic7770[id->id_unit].kdc_unit = id->id_unit;
kdc_aic7770[id->id_unit].kdc_parentdata = id;
dev_attach(&kdc_aic7770[id->id_unit]);
-}
+}
int
aic7770probe(struct isa_device *dev)
-{
+{
u_long port;
int i;
u_char sig_id[4];
@@ -101,7 +101,7 @@ aic7770probe(struct isa_device *dev)
port = 0x1000 * ahc_slot;
for( i = 0; i < sizeof(sig_id); i++ )
{
- /*
+ /*
* An outb is required to prime these registers on
* VL cards
*/
@@ -124,13 +124,13 @@ aic7770probe(struct isa_device *dev)
#ifndef DEV_LKM
aic7770_registerdev(dev);
#endif /* DEV_LKM */
- if(ahcprobe(unit, port,
- valid_ids[i].type)){
+ if(ahcprobe(unit, port,
+ valid_ids[i].type)){
/*
- * If it's there, put in it's
+ * If it's there, put in it's
* interrupt vectors
*/
- dev->id_irq = (1 <<
+ dev->id_irq = (1 <<
ahcdata[unit]->vect);
dev->id_drq = -1; /* EISA dma */
ahc_unit++;
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index 2aad5d2c6fc0..ca6baf3f0cd8 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -13,7 +13,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: eisaconf.c,v 1.1 1995/03/13 09:10:17 root Exp root $
+ * $Id: eisaconf.c,v 1.1 1995/04/23 08:55:41 julian Exp $
*/
/*
@@ -61,7 +61,7 @@ eisa_configure()
if (productID & 0x80) {
printf("Warning: running EISA kernel on non-EISA system board\n");
return;
- }
+ }
printf("Probing for devices on EISA bus\n");
productID = (productID<<8) | inb(eisaBase+1);
productRevision = inb(eisaBase+2);
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index b0a0cbb27779..9b16c23543fa 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -13,14 +13,14 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: eisaconf.h,v 1.1 1995/03/13 09:10:17 root Exp root $
+ * $Id: eisaconf.h,v 1.1 1995/04/23 08:55:42 julian Exp $
*/
/*
* Ported to run under FreeBSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
-#define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */
+#define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */
struct eisa_dev {
char productID[4];
unsigned short productType;
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index e110eff3d464..f0648c9f4441 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,13 +34,13 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.31 1995/05/14 02:59:51 davidg Exp $
+ * $Id: autoconf.c,v 1.32 1995/05/29 04:08:13 davidg Exp $
*/
/*
* Setup the system to run on the current machine.
*
- * Configure() is called at boot time and initializes the vba
+ * Configure() is called at boot time and initializes the vba
* device tables and the memory controller monitoring. Available
* devices are determined (from possibilities mentioned in ioconf.c),
* and the drivers are initialized.
@@ -237,7 +237,7 @@ setdumpdev(dev)
dumpdev = dev;
dumplo = newdumplo;
return (0);
-}
+}
u_long bootdev = 0; /* not a dev_t - encoding is different */
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 60acb7dd9acf..1b00786a442e 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
* SUCH DAMAGE.
*
* from: @(#)conf.c 5.8 (Berkeley) 5/12/91
- * $Id: conf.c,v 1.83 1995/04/14 15:13:26 dufault Exp $
+ * $Id: conf.c,v 1.84 1995/04/28 00:51:30 dufault Exp $
*/
#include <sys/param.h>
@@ -522,15 +522,15 @@ d_select_t logselect;
d_open_t bquopen;
d_close_t bquclose;
d_rdwr_t bquread, bquwrite;
-d_select_t bquselect;
+d_select_t bquselect;
d_ioctl_t bquioctl;
-#else
-#define bquopen nxopen
+#else
+#define bquopen nxopen
#define bquclose nxclose
#define bquread nxread
#define bquwrite nxwrite
#define bquselect nxselect
-#define bquioctl nxioctl
+#define bquioctl nxioctl
#endif
#include "lpt.h"
@@ -805,8 +805,8 @@ d_ttycv_t cxdevtotty;
d_open_t gpopen;
d_close_t gpclose;
d_rdwr_t gpwrite;
-d_ioctl_t gpioctl;
-#else
+d_ioctl_t gpioctl;
+#else
#define gpopen nxopen
#define gpclose nxclose
#define gpwrite nxwrite
@@ -818,8 +818,8 @@ d_ioctl_t gpioctl;
d_open_t gscopen;
d_close_t gscclose;
d_rdwr_t gscread;
-d_ioctl_t gscioctl;
-#else
+d_ioctl_t gscioctl;
+#else
#define gscopen nxopen
#define gscclose nxclose
#define gscread nxread
@@ -855,8 +855,8 @@ d_select_t tunselect;
#define tunselect nxselect
#endif
-#include "spigot.h"
-#if NSPIGOT > 0
+#include "spigot.h"
+#if NSPIGOT > 0
d_open_t spigot_open;
d_close_t spigot_close;
d_ioctl_t spigot_ioctl;
@@ -864,12 +864,12 @@ d_rdwr_t spigot_read, spigot_write;
d_select_t spigot_select;
d_mmap_t spigot_mmap;
#else
-#define spigot_open nxopen
-#define spigot_close nxclose
-#define spigot_ioctl nxioctl
-#define spigot_read nxread
-#define spigot_write nxwrite
-#define spigot_select seltrue
+#define spigot_open nxopen
+#define spigot_close nxclose
+#define spigot_ioctl nxioctl
+#define spigot_read nxread
+#define spigot_write nxwrite
+#define spigot_select seltrue
#define spigot_mmap nommap
#endif
@@ -1162,7 +1162,7 @@ struct cdevsw cdevsw[] =
seltrue, nommap, vnstrategy },
{ gpopen, gpclose, noread, gpwrite, /*44*/
gpioctl, nostop, nullreset, nodevtotty,/* GPIB */
- seltrue, nommap, NULL },
+ seltrue, nommap, NULL },
{ scdopen, scdclose, rawread, nowrite, /*45*/
scdioctl, nostop, nullreset, nodevtotty,/* sony cd */
seltrue, nommap, scdstrategy },
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 3076fab1f29c..1500ff20382f 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)cons.c 7.2 (Berkeley) 5/9/91
- * $Id: cons.c,v 1.26 1995/04/23 12:55:54 bde Exp $
+ * $Id: cons.c,v 1.27 1995/04/24 16:42:59 bde Exp $
*/
#include <sys/param.h>
@@ -135,7 +135,7 @@ cnopen(dev, flag, mode, p)
}
return (retval);
}
-
+
int
cnclose(dev, flag, mode, p)
dev_t dev;
@@ -168,7 +168,7 @@ cnclose(dev, flag, mode, p)
}
return ((*cn_phys_close)(dev, flag, mode, p));
}
-
+
int
cnread(dev, uio, flag)
dev_t dev;
@@ -180,7 +180,7 @@ cnread(dev, uio, flag)
dev = cn_tab->cn_dev;
return ((*cdevsw[major(dev)].d_read)(dev, uio, flag));
}
-
+
int
cnwrite(dev, uio, flag)
dev_t dev;
@@ -195,7 +195,7 @@ cnwrite(dev, uio, flag)
dev = cn_tab->cn_dev;
return ((*cdevsw[major(dev)].d_write)(dev, uio, flag));
}
-
+
int
cnioctl(dev, cmd, data, flag, p)
dev_t dev;
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 4e6a42c7d543..8ce7365a7ac9 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_disasm.c,v 1.7 1994/10/08 22:19:47 phk Exp $
+ * $Id: db_disasm.c,v 1.8 1995/01/29 02:38:15 bde Exp $
*/
/*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 29007d20be2e..8daa0a27aa32 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_interface.c,v 1.12 1995/03/16 18:11:25 bde Exp $
+ * $Id: db_interface.c,v 1.13 1995/04/08 21:31:53 joerg Exp $
*/
/*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 28c152f22b3e..dcbf19410f94 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -1,29 +1,29 @@
-/*
+/*
* 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
+ *
+ * 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.
*
- * $Id: db_trace.c,v 1.9 1995/03/01 21:37:44 davidg Exp $
+ * $Id: db_trace.c,v 1.10 1995/03/16 18:11:26 bde Exp $
*/
#include <sys/param.h>
@@ -127,13 +127,13 @@ db_numargs(fp)
return (args);
}
-/*
- * Figure out the next frame up in the call stack.
- * For trap(), we print the address of the faulting instruction and
+/*
+ * Figure out the next frame up in the call stack.
+ * For trap(), we print the address of the faulting instruction and
* proceed with the calling frame. We return the ip that faulted.
* If the trap was caused by jumping through a bogus pointer, then
- * the next line in the backtrace will list some random function as
- * being called. It should get the argument list correct, though.
+ * the next line in the backtrace will list some random function as
+ * being called. It should get the argument list correct, though.
* It might be possible to dig out from the next frame up the name
* of the function that faulted, but that could get hairy.
*/
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index dbfb2a063350..a5261849d80e 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
- * $Id: genassym.c,v 1.25 1995/02/14 18:01:24 phk Exp $
+ * $Id: genassym.c,v 1.26 1995/05/25 07:41:18 davidg Exp $
*/
#include <stdio.h>
@@ -43,10 +43,10 @@
#include <sys/proc.h>
/* XXX This is just real ugly to have to do, but it is what you have to do! */
#ifndef NFS
-#define NFS
+#define NFS
#include <sys/mount.h>
#undef NFS
-#else
+#else
#include <sys/mount.h>
#endif
#include <sys/mbuf.h>
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 2d6d77a13a94..1764a58da93b 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,7 +32,7 @@
*
* from tahoe: in_cksum.c 1.2 86/01/05
* from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91
- * $Id: in_cksum.c,v 1.5 1994/03/07 11:47:30 davidg Exp $
+ * $Id: in_cksum.c,v 1.6 1994/08/13 03:49:39 wollman Exp $
*/
#include <sys/param.h>
@@ -44,7 +44,7 @@
*
* This routine is very heavily used in the network
* code and should be modified for each CPU to be as fast as possible.
- *
+ *
* This implementation is 386 version.
*/
@@ -83,7 +83,7 @@ in_cksum(m, len)
* last mbuf.
*/
- /* su.c[0] is already saved when scanning previous
+ /* su.c[0] is already saved when scanning previous
* mbuf. sum was REDUCEd when we found mlen == -1
*/
su.c[1] = *(u_char *)w;
@@ -149,7 +149,7 @@ in_cksum(m, len)
* memory takes to load the first word(s) addressed.
* These penalties are unavoidable. Subsequent
* accesses to a cache line being loaded (and to
- * other external memory?) are delayed until the
+ * other external memory?) are delayed until the
* whole load finishes. These penalties are mostly
* avoided by not accessing external memory for
* 8 cycles after the ADD(16) and 12 cycles after
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 2f299b19c9d2..4a2d41d73d76 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.126 1995/05/12 19:17:14 wollman Exp $
+ * $Id: machdep.c,v 1.127 1995/05/25 07:41:20 davidg Exp $
*/
#include "npx.h"
@@ -389,7 +389,7 @@ again:
printf(" %x:%08x", i, j);
printf(" %d cyl, %d heads, %d sects\n",
j >> 16, (j >> 8) & 0xff, j & 0xff);
-
+
}
printf(" %d accounted for\n", bootinfo.bi_n_bios_used);
}
@@ -421,7 +421,7 @@ static void
identifycpu()
{
printf("CPU: ");
- if (cpu >= 0
+ if (cpu >= 0
&& cpu < (sizeof i386_cpus/sizeof(struct cpu_nameclass))) {
cpu_class = i386_cpus[cpu].cpu_class;
strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);
@@ -442,8 +442,8 @@ identifycpu()
cpu_model[0] = '\0';
switch (cpu_id & 0x3000) {
- case 0x1000:
- strcpy(cpu_model, "Overdrive ");
+ case 0x1000:
+ strcpy(cpu_model, "Overdrive ");
break;
case 0x2000:
strcpy(cpu_model, "Dual ");
@@ -478,7 +478,7 @@ identifycpu()
case 0x480:
strcat(cpu_model, "DX4"); break;
#if defined(I586_CPU)
- case 0x510:
+ case 0x510:
if (pentium_mhz == 60) {
strcat(cpu_model, "510\\60");
} else if (pentium_mhz == 66) {
@@ -630,7 +630,7 @@ sendsig(catcher, sig, mask, code)
return;
}
- /*
+ /*
* Build the argument list for the signal handler.
*/
if (p->p_sysent->sv_sigtbl) {
@@ -868,7 +868,7 @@ boot(arghowto)
if (howto & RB_DUMP) {
savectx(&dumppcb, 0);
dumppcb.pcb_ptd = rcr3();
- dumpsys();
+ dumpsys();
if (PANIC_REBOOT_WAIT_TIME != 0) {
if (PANIC_REBOOT_WAIT_TIME != -1) {
@@ -1321,7 +1321,7 @@ init386(first)
#ifdef COMPAT_LINUX
setidt(0x80, &IDTVEC(linux_syscall), SDT_SYS386TGT, SEL_UPL);
#endif
-
+
#include "isa.h"
#if NISA >0
isa_defaultirq();
@@ -1507,7 +1507,7 @@ init386(first)
proc0.p_addr->u_pcb.pcb_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL) ;
gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
- ((struct i386tss *)gdt_segs[GPROC0_SEL].ssd_base)->tss_ioopt =
+ ((struct i386tss *)gdt_segs[GPROC0_SEL].ssd_base)->tss_ioopt =
(sizeof(tss))<<16;
ltr(gsel_tss);
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index 6c10020a78c7..d2ae7eb83ed5 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
* [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
*
* from: 386BSD 0.1
- * $Id: math_emulate.c,v 1.10 1994/09/15 10:58:35 davidg Exp $
+ * $Id: math_emulate.c,v 1.11 1995/05/11 19:26:09 rgrimes Exp $
*/
/*
@@ -270,7 +270,7 @@ for fcom , ??? ATS */
case 0x9b: /* same as above , ATS */
fcom(PST(code & 7),PST(0));
fpop();
- return(0);
+ return(0);
case 0x9c: /* fsubr */
ST(code & 7).exponent ^= 0x8000;
fadd(PST(0),PST(code & 7),&tmp);
@@ -1396,7 +1396,7 @@ void frndint(const temp_real * a, temp_real * b)
b->exponent = 0;
}
-void Fscale(const temp_real *a, const temp_real *b, temp_real *c)
+void Fscale(const temp_real *a, const temp_real *b, temp_real *c)
{
temp_int ti;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index bb4858f1276d..99716033654a 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.56 1995/04/09 05:40:38 davidg Exp $
+ * $Id: pmap.c,v 1.57 1995/05/11 19:26:11 rgrimes Exp $
*/
/*
@@ -167,7 +167,7 @@ struct msgbuf *msgbufp;
#endif
-void
+void
init_pv_entries(int);
/*
@@ -178,7 +178,7 @@ init_pv_entries(int);
* [ what about induced faults -wfj]
*/
-inline pt_entry_t * const
+inline pt_entry_t * const
pmap_pte(pmap, va)
register pmap_t pmap;
vm_offset_t va;
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 7e33003f8ded..3c4f1cc264c3 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91
- * $Id: sys_machdep.c,v 1.7 1995/03/04 02:25:36 davidg Exp $
+ * $Id: sys_machdep.c,v 1.8 1995/03/10 08:13:07 davidg Exp $
*
*/
@@ -64,11 +64,11 @@ sysarch(p, uap, retval)
switch(uap->op) {
#ifdef USER_LDT
- case I386_GET_LDT:
+ case I386_GET_LDT:
error = i386_get_ldt(p, uap->parms, retval);
break;
- case I386_SET_LDT:
+ case I386_SET_LDT:
error = i386_set_ldt(p, uap->parms, retval);
break;
#endif
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 6ca87c2c6044..5e1489aaadce 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.50 1995/03/21 07:02:51 davidg Exp $
+ * $Id: trap.c,v 1.51 1995/03/21 07:16:12 davidg Exp $
*/
/*
@@ -174,7 +174,7 @@ trap(frame)
type = frame.tf_trapno;
code = frame.tf_err;
-
+
if (ISPL(frame.tf_cs) == SEL_UPL) {
/* user trap */
@@ -262,7 +262,7 @@ trap(frame)
return;
#endif /* NNPX > 0 */
-#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
+#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
i = math_emulate(&frame);
if (i == 0) {
if (!(frame.tf_eflags & PSL_T))
@@ -352,7 +352,7 @@ trap(frame)
frame.tf_eflags &= ~PSL_T;
return;
#endif
-
+
#if NISA > 0
case T_NMI:
#ifdef DDB
@@ -376,7 +376,7 @@ trap(frame)
#ifdef DEBUG
eva = rcr2();
if (type <= MAX_TRAP_MSG) {
- uprintf("fatal process exception: %s",
+ uprintf("fatal process exception: %s",
trap_msg[type]);
if ((type == T_PAGEFLT) || (type == T_PROTFLT))
uprintf(", fault VA = 0x%x", eva);
@@ -464,7 +464,7 @@ trap_pfault(frame, usermode)
v = (vm_offset_t) vtopte(va);
/* Fault the pte only if needed: */
- *(volatile char *)v += 0;
+ *(volatile char *)v += 0;
pmap_use_pt( vm_map_pmap(map), va);
@@ -580,7 +580,7 @@ trap_pfault(frame, usermode)
*/
/* Fault the pte only if needed: */
- *(volatile char *)v += 0;
+ *(volatile char *)v += 0;
pmap_use_pt( vm_map_pmap(map), va);
@@ -804,7 +804,7 @@ syscall(frame)
if (p->p_sysent->sv_mask)
code = code & p->p_sysent->sv_mask;
-
+
if (code >= p->p_sysent->sv_size)
callp = &p->p_sysent->sv_table[0];
else
@@ -852,7 +852,7 @@ syscall(frame)
if (p->p_sysent->sv_errsize)
if (error >= p->p_sysent->sv_errsize)
error = -1; /* XXX */
- else
+ else
error = p->p_sysent->sv_errtbl[error];
frame.tf_eax = error;
frame.tf_eflags |= PSL_C; /* carry bit */
@@ -966,7 +966,7 @@ linux_syscall(frame)
if (p->p_sysent->sv_errsize)
if (error >= p->p_sysent->sv_errsize)
error = -1; /* XXX */
- else
+ else
error = p->p_sysent->sv_errtbl[error];
frame.tf_eax = -error;
frame.tf_eflags |= PSL_C; /* carry bit */
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 196d34ce75ca..e1bc372f176f 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.32 1995/03/16 18:11:58 bde Exp $
+ * $Id: clock.c,v 1.33 1995/05/11 07:44:40 bde Exp $
*/
/*
@@ -193,7 +193,7 @@ int
acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
{
if (timer0_state || TIMER_DIV(rate) < TIMER0_MIN_MAX_COUNT ||
- !function)
+ !function)
return -1;
new_function = function;
new_rate = rate;
@@ -204,7 +204,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame)))
int
acquire_timer2(int mode)
{
- if (timer2_state)
+ if (timer2_state)
return -1;
timer2_state = 1;
outb(TIMER_MODE, TIMER_SEL2 | (mode &0x3f));
@@ -265,7 +265,7 @@ printrtc(void)
#endif
static int
-getit()
+getit()
{
int high, low;
@@ -307,7 +307,7 @@ calibrate_cyclecounter(void)
/*
* Wait "n" microseconds.
- * Relies on timer 1 counting down from (TIMER_FREQ / hz)
+ * Relies on timer 1 counting down from (TIMER_FREQ / hz)
* Note: timer had better have been programmed before this is first used!
*/
void
@@ -339,7 +339,7 @@ DELAY(int n)
prev_tick = getit(0, 0);
n -= 20;
/*
- * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
+ * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point
* and without any avoidable overflows.
*/
sec = n / 1000000;
@@ -375,11 +375,11 @@ sysbeepstop(void *chan)
beeping = 0;
}
-int
+int
sysbeep(int pitch, int period)
{
- if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
+ if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
return -1;
disable_intr();
outb(TIMER_CNTR2, pitch);
@@ -426,7 +426,7 @@ readrtc(int port)
* XXX initialization of other timers is unintentionally left blank.
*/
void
-startrtclock()
+startrtclock()
{
timer0_max_count = hardclock_max_count = TIMER_DIV(hz);
timer0_overflow_threshold = timer0_max_count - TIMER0_LATCH_COUNT;
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 2f207bc5deea..0d1601675fb2 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -8,7 +8,7 @@
*
* Many additional changes by Bruce Evans
*
- * This code is derived from software contributed by the
+ * This code is derived from software contributed by the
* University of California Berkeley, Jordan K. Hubbard,
* David Greenman and Bruce Evans.
*
@@ -40,7 +40,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: userconfig.c,v 1.26 1995/05/07 19:45:49 jkh Exp $
+ * $Id: userconfig.c,v 1.27 1995/05/08 06:14:16 jkh Exp $
*/
#include <sys/param.h>
@@ -675,7 +675,7 @@ save_dev(idev)
struct isa_device *idev;
{
struct isa_device *id_p,*id_pn;
-
+
for (id_p=isa_devlist;
id_p;
id_p=id_p->id_next) {
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index f012a6a30c8a..2ff3602015b3 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $Id: vm_machdep.c,v 1.37 1995/05/01 23:32:30 dyson Exp $
+ * $Id: vm_machdep.c,v 1.38 1995/05/18 09:17:07 davidg Exp $
*/
#include "npx.h"
@@ -232,7 +232,7 @@ more:
* same as vm_bounce_kva -- but really allocate (but takes pages as arg)
*/
vm_offset_t
-vm_bounce_kva_alloc(count)
+vm_bounce_kva_alloc(count)
int count;
{
int i;
@@ -308,7 +308,7 @@ vm_bounce_alloc(bp)
* printf("size: %d, count: %d\n", bp->b_bufsize, bp->b_bcount);
* }
*/
-
+
vastart = (vm_offset_t) bp->b_data;
vaend = (vm_offset_t) bp->b_data + bp->b_bufsize;
@@ -332,7 +332,7 @@ vm_bounce_alloc(bp)
if (dobounceflag == 0)
return;
- if (bouncepages < dobounceflag)
+ if (bouncepages < dobounceflag)
panic("Not enough bounce buffers!!!");
/*
@@ -445,7 +445,7 @@ vm_bounce_free(bp)
/*
* free the bounce allocation
*/
-
+
/*
printf("(kva: %x, pa: %x)", bouncekva, mybouncepa);
*/
@@ -463,7 +463,7 @@ vm_bounce_free(bp)
/*
* add the old kva into the "to free" list
*/
-
+
bouncekva= i386_trunc_page((vm_offset_t) bp->b_data);
bouncekvaend= i386_round_page((vm_offset_t)bp->b_data + bp->b_bufsize);
@@ -491,7 +491,7 @@ vm_bounce_init()
if (bouncepages == 0)
return;
-
+
bounceallocarraysize = (bouncepages + BITS_IN_UNSIGNED - 1) / BITS_IN_UNSIGNED;
bounceallocarray = malloc(bounceallocarraysize * sizeof(unsigned), M_TEMP, M_NOWAIT);
@@ -552,7 +552,7 @@ cpu_fork(p1, p2)
int offset;
/*
- * Copy pcb and stack from proc p1 to p2.
+ * Copy pcb and stack from proc p1 to p2.
* We do this as cheaply as possible, copying only the active
* part of the stack. The stack and pcb need to agree;
* this is tricky, as the final pcb is constructed by savectx,
@@ -571,7 +571,7 @@ cpu_fork(p1, p2)
pmap_activate(&p2->p_vmspace->vm_pmap, &up->u_pcb);
/*
- *
+ *
* Arrange for a non-local goto when the new process
* is started, to resume here, returning nonzero from setjmp.
*/
@@ -588,7 +588,7 @@ void
cpu_exit(p)
register struct proc *p;
{
-
+
#if NNPX > 0
npxexit(p);
#endif /* NNPX */
@@ -765,7 +765,7 @@ vunmapbuf(bp)
addr < bp->b_data + bp->b_bufsize;
addr += NBPG)
pmap_kremove((vm_offset_t) addr);
-
+
bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = NULL;
@@ -806,7 +806,7 @@ cpu_reset() {
bzero((caddr_t) PTD, NBPG);
/* "good night, sweet prince .... <THUNK!>" */
- pmap_update();
+ pmap_update();
/* NOTREACHED */
while(1);
}
diff --git a/sys/i386/ibcs2/ibcs2.h b/sys/i386/ibcs2/ibcs2.h
index 6d6f3921aa90..8063c7be0b84 100644
--- a/sys/i386/ibcs2/ibcs2.h
+++ b/sys/i386/ibcs2/ibcs2.h
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2.h,v 1.2 1994/10/14 08:53:16 sos Exp $
+ * $Id: ibcs2.h,v 1.3 1994/10/17 22:13:06 sos Exp $
*/
/* trace all iBCS2 system calls */
@@ -153,7 +153,7 @@ typedef void (*ibcs2_sig_t) (int);
#define IBCS2_POLLHUP 0x0010
#define IBCS2_POLLNVAL 0x0020
#define IBCS2_POLLRDNORM 0x0040
-#define IBCS2_POLLWRNORM 0x0004
+#define IBCS2_POLLWRNORM 0x0004
#define IBCS2_POLLRDBAND 0x0080
#define IBCS2_POLLWRBAND 0x0100
#define IBCS2_READPOLL (IBCS2_POLLIN|IBCS2_POLLRDNORM|IBCS2_POLLRDBAND)
@@ -244,7 +244,7 @@ typedef void (*ibcs2_sig_t) (int);
#define IBCS2_VKILL 3
#define IBCS2_VEOF 4 /* ICANON */
#define IBCS2_VEOL 5 /* ICANON */
-#define IBCS2_VEOL2 6
+#define IBCS2_VEOL2 6
#define IBCS2_VSWTCH 7
#define IBCS2_VMIN 4 /* !ICANON */
#define IBCS2_VTIME 5 /* !ICANON */
diff --git a/sys/i386/ibcs2/ibcs2_dummy.c b/sys/i386/ibcs2/ibcs2_dummy.c
index f267e4c98aec..7a7c10275faf 100644
--- a/sys/i386/ibcs2/ibcs2_dummy.c
+++ b/sys/i386/ibcs2/ibcs2_dummy.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2_dummy.c,v 1.14 1994/10/13 23:10:58 sos Exp $
+ * $Id: ibcs2_dummy.c,v 1.1 1994/10/14 08:52:59 sos Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -124,7 +124,7 @@ ibcs2_putmsg(struct proc *p, void *args, int *retval)
/*
* The following are RFS system calls
- * We don't have RFS.
+ * We don't have RFS.
*/
int
ibcs2_rfdebug(struct proc *p, void *args, int *retval)
diff --git a/sys/i386/ibcs2/ibcs2_file.c b/sys/i386/ibcs2/ibcs2_file.c
index 0a0c41d68152..c6217582a179 100644
--- a/sys/i386/ibcs2/ibcs2_file.c
+++ b/sys/i386/ibcs2/ibcs2_file.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ibcs2_file.c,v 1.1 1994/10/14 08:53:01 sos Exp $
+ * $Id: ibcs2_file.c,v 1.2 1994/12/14 22:03:48 sos Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -61,7 +61,7 @@ struct ibcs2_close_args {
int
ibcs2_close(struct proc *p, struct ibcs2_close_args *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'close' fd=%d\n", args->fd);
return close(p, args, retval);
}
@@ -80,8 +80,8 @@ ibcs2_creat(struct proc *p, struct ibcs2_creat_args *args, int *retval)
int crtmode;
} bsd_open_args;
- if (ibcs2_trace & IBCS2_TRACE_FILE)
- printf("IBCS2: 'creat' name=%s, mode=%x\n",
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
+ printf("IBCS2: 'creat' name=%s, mode=%x\n",
args->fname, args->fmode);
bsd_open_args.fname = args->fname;
bsd_open_args.crtmode = args->fmode;
@@ -92,7 +92,7 @@ ibcs2_creat(struct proc *p, struct ibcs2_creat_args *args, int *retval)
int
ibcs2_dup(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'dup'\n");
return dup(p, args, retval);
}
@@ -161,11 +161,11 @@ ibcs2_fcntl(struct proc *p, struct ibcs2_fcntl_args *args, int *retval)
int fd;
int cmd;
int arg;
- } fcntl_args;
+ } fcntl_args;
struct ibcs2_flock ibcs2_flock;
struct flock *bsd_flock = (struct flock *)UA_ALLOC();
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'fcntl' fd=%d, cmd=%d arg=%d\n",
args->fd, args->cmd, args->arg);
@@ -203,10 +203,10 @@ ibcs2_fcntl(struct proc *p, struct ibcs2_fcntl_args *args, int *retval)
if (args->arg & IBCS2_SYNC) fcntl_args.arg |= O_FSYNC;
fcntl_args.cmd = F_SETFL;
return fcntl(p, &fcntl_args, retval);
-
+
case IBCS2_F_GETLK:
if ((error = copyin((caddr_t)args->arg, (caddr_t)&ibcs2_flock,
- sizeof(struct ibcs2_flock))))
+ sizeof(struct ibcs2_flock))))
return error;
ibcs2_to_bsd_flock(&ibcs2_flock, bsd_flock);
fcntl_args.cmd = F_GETLK;
@@ -219,7 +219,7 @@ ibcs2_fcntl(struct proc *p, struct ibcs2_fcntl_args *args, int *retval)
case IBCS2_F_SETLK:
if ((error = copyin((caddr_t)args->arg, (caddr_t)&ibcs2_flock,
- sizeof(struct ibcs2_flock))))
+ sizeof(struct ibcs2_flock))))
return error;
ibcs2_to_bsd_flock(&ibcs2_flock, bsd_flock);
fcntl_args.cmd = F_SETLK;
@@ -228,7 +228,7 @@ ibcs2_fcntl(struct proc *p, struct ibcs2_fcntl_args *args, int *retval)
case IBCS2_F_SETLKW:
if ((error = copyin((caddr_t)args->arg, (caddr_t)&ibcs2_flock,
- sizeof(struct ibcs2_flock))))
+ sizeof(struct ibcs2_flock))))
return error;
ibcs2_to_bsd_flock(&ibcs2_flock, bsd_flock);
fcntl_args.cmd = F_SETLKW;
@@ -317,7 +317,7 @@ again:
dir.d_ino = BSD_DIRENT(inp)->d_ino;
dir.d_off = (ibcs2_off_t)off;
dir.d_reclen = IBCS2_RECLEN(inp);
- bcopy(BSD_DIRENT(inp)->d_name, &dir.d_name,
+ bcopy(BSD_DIRENT(inp)->d_name, &dir.d_name,
BSD_DIRENT(inp)->d_namlen);
if (error = copyout(&dir, outp, dir.d_reclen))
goto out;
@@ -349,7 +349,7 @@ ibcs2_open(struct proc *p, struct ibcs2_open_args *args, int *retval)
int bsd_mode = 0;
int noctty = args->fmode & 0x8000;
int error;
-
+
if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'open' name=%s, flags=%x, mode=%x\n",
args->fname, args->fmode, args->crtmode);
@@ -399,7 +399,7 @@ ibcs2_read(struct proc *p, struct ibcs2_read_args *args, int *retval)
int buflen, error, eofflag;
int len, reclen, resid;
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'read' fd=%d, count=%d\n",
args->fd, args->count);
@@ -453,7 +453,7 @@ again:
outp++;
break;
}
- /*
+ /*
* TODO: break up name if > 14 chars
* put 14 chars in each dir entry wtih d_ino = 0xffff
* and set the last dir entry's d_ino = inode
@@ -498,7 +498,7 @@ ibcs2_seek(struct proc *p, struct ibcs2_seek_args *args, int *retval)
off_t tmp_retval;
int error;
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'seek' fd=%d, offset=%d, how=%d\n",
args->fdes, args->off, args->whence);
tmp_args.fdes = args->fdes;
@@ -518,7 +518,7 @@ struct ibcs2_write_args {
int
ibcs2_write(struct proc *p, struct ibcs2_write_args *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_FILE)
+ if (ibcs2_trace & IBCS2_TRACE_FILE)
printf("IBCS2: 'write' fd=%d, count=%d\n",
args->fd, args->count);
return write(p, args, retval);
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 4e3b991c0f92..2f2a6cb8a67c 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2_ioctl.c,v 1.2 1994/10/17 22:13:07 sos Exp $
+ * $Id: ibcs2_ioctl.c,v 1.3 1994/10/23 19:19:42 sos Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -71,7 +71,7 @@ static struct speedtab sptab[] = {
{ 134, 4 }, { 135, 4 }, { 150, 5 }, { 200, 6 },
{ 300, 7 }, { 600, 8 }, { 1200, 9 }, { 1800, 10 },
{ 2400, 11 }, { 4800, 12 }, { 9600, 13 },
- { 19200, 14 }, { 38400, 15 },
+ { 19200, 14 }, { 38400, 15 },
{ 57600, 15 }, { 115200, 15 }, {-1, -1 }
};
@@ -94,7 +94,7 @@ bsd_to_ibcs2_speed(int speed, struct speedtab *table)
}
static void
-bsd_termios_to_ibcs2_termio(struct termios *bsd_termios,
+bsd_termios_to_ibcs2_termio(struct termios *bsd_termios,
struct ibcs2_termio *ibcs2_termio)
{
int speed;
@@ -107,12 +107,12 @@ bsd_termios_to_ibcs2_termio(struct termios *bsd_termios,
bsd_termios->c_cflag, bsd_termios->c_lflag,
bsd_termios->c_ispeed, bsd_termios->c_ospeed);
printf("c_cc ");
- for (i=0; i<NCCS; i++)
+ for (i=0; i<NCCS; i++)
printf("%02x ", bsd_termios->c_cc[i]);
printf("\n");
}
- ibcs2_termio->c_iflag = bsd_termios->c_iflag &
+ ibcs2_termio->c_iflag = bsd_termios->c_iflag &
(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK
|ISTRIP|INLCR|IGNCR|ICRNL|IXANY);
if (bsd_termios->c_iflag & IXON)
@@ -219,7 +219,7 @@ ibcs2_termio_to_bsd_termios(struct ibcs2_termio *ibcs2_termio,
printf("\n");
}
- bsd_termios->c_iflag = ibcs2_termio->c_iflag &
+ bsd_termios->c_iflag = ibcs2_termio->c_iflag &
(IBCS2_IGNBRK|IBCS2_BRKINT|IBCS2_IGNPAR|IBCS2_PARMRK|IBCS2_INPCK
|IBCS2_ISTRIP|IBCS2_INLCR|IBCS2_IGNCR|IBCS2_ICRNL|IBCS2_IXANY);
if (ibcs2_termio->c_iflag & IBCS2_IXON)
@@ -303,7 +303,7 @@ ibcs2_termio_to_bsd_termios(struct ibcs2_termio *ibcs2_termio,
}
static void
-bsd_to_ibcs2_termios(struct termios *bsd_termios,
+bsd_to_ibcs2_termios(struct termios *bsd_termios,
struct ibcs2_termios *ibcs2_termios)
{
int speed;
@@ -321,7 +321,7 @@ bsd_to_ibcs2_termios(struct termios *bsd_termios,
printf("\n");
}
- ibcs2_termios->c_iflag = bsd_termios->c_iflag &
+ ibcs2_termios->c_iflag = bsd_termios->c_iflag &
(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK
|ISTRIP|INLCR|IGNCR|ICRNL|IXANY);
if (bsd_termios->c_iflag & IXON)
@@ -401,15 +401,15 @@ bsd_to_ibcs2_termios(struct termios *bsd_termios,
if (ibcs2_trace & IBCS2_TRACE_IOCTLCNV) {
int i;
printf("IBCS2: IBCS2 termios structure (output):\n");
- printf("i=%08x o=%08x c=%08x l=%08x ispeed=%d ospeed=%d "
+ printf("i=%08x o=%08x c=%08x l=%08x ispeed=%d ospeed=%d "
"line=%d\n",
ibcs2_termios->c_iflag, ibcs2_termios->c_oflag,
ibcs2_termios->c_cflag, ibcs2_termios->c_lflag,
- ibcs2_to_bsd_speed(ibcs2_termios->c_ispeed, sptab),
+ ibcs2_to_bsd_speed(ibcs2_termios->c_ispeed, sptab),
ibcs2_to_bsd_speed(ibcs2_termios->c_ospeed, sptab),
ibcs2_termios->c_line);
printf("c_cc ");
- for (i=0; i<IBCS2_NCCS; i++)
+ for (i=0; i<IBCS2_NCCS; i++)
printf("%02x ", ibcs2_termios->c_cc[i]);
printf("\n");
}
@@ -428,16 +428,16 @@ ibcs2_to_bsd_termios(struct ibcs2_termios *ibcs2_termios,
"line=%d\n",
ibcs2_termios->c_iflag, ibcs2_termios->c_oflag,
ibcs2_termios->c_cflag, ibcs2_termios->c_lflag,
- ibcs2_to_bsd_speed(ibcs2_termios->c_ispeed, sptab),
+ ibcs2_to_bsd_speed(ibcs2_termios->c_ispeed, sptab),
ibcs2_to_bsd_speed(ibcs2_termios->c_ospeed, sptab),
ibcs2_termios->c_line);
printf("c_cc ");
- for (i=0; i<IBCS2_NCCS; i++)
+ for (i=0; i<IBCS2_NCCS; i++)
printf("%02x ", ibcs2_termios->c_cc[i]);
printf("\n");
}
- bsd_termios->c_iflag = ibcs2_termios->c_iflag &
+ bsd_termios->c_iflag = ibcs2_termios->c_iflag &
(IBCS2_IGNBRK|IBCS2_BRKINT|IBCS2_IGNPAR|IBCS2_PARMRK|IBCS2_INPCK
|IBCS2_ISTRIP|IBCS2_INLCR|IBCS2_IGNCR|IBCS2_ICRNL|IBCS2_IXANY);
if (ibcs2_termios->c_iflag & IBCS2_IXON)
@@ -521,7 +521,7 @@ ibcs2_to_bsd_termios(struct ibcs2_termios *ibcs2_termios,
bsd_termios->c_cflag, bsd_termios->c_lflag,
bsd_termios->c_ispeed, bsd_termios->c_ospeed);
printf("c_cc ");
- for (i=0; i<NCCS; i++)
+ for (i=0; i<NCCS; i++)
printf("%02x ", bsd_termios->c_cc[i]);
printf("\n");
}
@@ -545,15 +545,15 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
struct filedesc *fdp = p->p_fd;
struct file *fp;
int (*func)();
- int type = (args->cmd&0xffff00)>>8;
+ int type = (args->cmd&0xffff00)>>8;
int num = args->cmd&0xff;
int error;
if (ibcs2_trace & IBCS2_TRACE_IOCTL)
- printf("IBCS2: 'ioctl' fd=%d, typ=%d(%c), num=%d\n",
+ printf("IBCS2: 'ioctl' fd=%d, typ=%d(%c), num=%d\n",
args->fd, type, type, num);
- if ((unsigned)args->fd >= fdp->fd_nfiles
+ if ((unsigned)args->fd >= fdp->fd_nfiles
|| (fp = fdp->fd_ofiles[args->fd]) == 0)
return EBADF;
@@ -572,7 +572,7 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
case 2:
args->cmd = FIONCLEX;
return ioctl(p, args, retval);
- case 3:
+ case 3:
args->cmd = FIONREAD;
return ioctl(p, args, retval);
}
@@ -585,11 +585,11 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
/* p->p_session->s_ttyp->t_winsize.ws_col; XXX */
ibcs2_winsize.bytey = 25;
/* p->p_session->s_ttyp->t_winsize.ws_row; XXX */
- ibcs2_winsize.bitx =
+ ibcs2_winsize.bitx =
p->p_session->s_ttyp->t_winsize.ws_xpixel;
ibcs2_winsize.bity =
p->p_session->s_ttyp->t_winsize.ws_ypixel;
- return copyout((caddr_t)&ibcs2_winsize,
+ return copyout((caddr_t)&ibcs2_winsize,
(caddr_t)args->arg,
sizeof(ibcs2_winsize));
}
@@ -635,11 +635,11 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
case 'T':
switch (num) {
case 1: /* TCGETA */
- if ((error = (*func)(fp, TIOCGETA,
+ if ((error = (*func)(fp, TIOCGETA,
(caddr_t)&bsd_termios, p)) != 0)
return error;
bsd_termios_to_ibcs2_termio(&bsd_termios,&ibcs2_termio);
- return copyout((caddr_t)&ibcs2_termio,
+ return copyout((caddr_t)&ibcs2_termio,
(caddr_t)args->arg,
sizeof(ibcs2_termio));
@@ -681,26 +681,26 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
return ioctl(p, args, retval);
case 103: /* TIOCSWINSZ */
- bsd_winsize.ws_row =
+ bsd_winsize.ws_row =
((struct ibcs2_winsize *)(args->arg))->bytex;
- bsd_winsize.ws_col =
+ bsd_winsize.ws_col =
((struct ibcs2_winsize *)(args->arg))->bytey;
- bsd_winsize.ws_xpixel =
+ bsd_winsize.ws_xpixel =
((struct ibcs2_winsize *)(args->arg))->bitx;
- bsd_winsize.ws_ypixel =
+ bsd_winsize.ws_ypixel =
((struct ibcs2_winsize *)(args->arg))->bity;
- return (*func)(fp, TIOCSWINSZ,
+ return (*func)(fp, TIOCSWINSZ,
(caddr_t)&bsd_winsize, p);
case 104: /* TIOCGWINSZ */
- if ((error = (*func)(fp, TIOCGWINSZ,
+ if ((error = (*func)(fp, TIOCGWINSZ,
(caddr_t)&bsd_winsize, p)) != 0)
return error;
ibcs2_winsize.bytex = bsd_winsize.ws_col;
ibcs2_winsize.bytey = bsd_winsize.ws_row;
ibcs2_winsize.bitx = bsd_winsize.ws_xpixel;
ibcs2_winsize.bity = bsd_winsize.ws_ypixel;
- return copyout((caddr_t)&ibcs2_winsize,
+ return copyout((caddr_t)&ibcs2_winsize,
(caddr_t)args->arg,
sizeof(ibcs2_winsize));
@@ -719,11 +719,11 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
case ('x'):
switch (num) {
case 1:
- if ((error = (*func)(fp, TIOCGETA,
+ if ((error = (*func)(fp, TIOCGETA,
(caddr_t)&bsd_termios, p)) != 0)
return error;
bsd_to_ibcs2_termios(&bsd_termios, &ibcs2_termios);
- return copyout((caddr_t)&ibcs2_termios,
+ return copyout((caddr_t)&ibcs2_termios,
(caddr_t)args->arg,
sizeof(ibcs2_termios));
case 2:
@@ -738,7 +738,7 @@ ibcs2_ioctl(struct proc *p, struct ibcs2_ioctl_args *args, int *retval)
ibcs2_to_bsd_termios((struct ibcs2_termios *)args->arg,
&bsd_termios);
return (*func)(fp, TIOCSETAF, (caddr_t)&bsd_termios, p);
-
+
}
break;
@@ -922,21 +922,21 @@ struct ioctl_args {
int
ibcs2_gtty(struct proc *p, struct ibcs2_sgtty_args *args, int *retval)
{
- struct ioctl_args ioctl_arg;
+ struct ioctl_args ioctl_arg;
if (ibcs2_trace & IBCS2_TRACE_IOCTL)
printf("IBCS2: 'gtty' fd=%d\n", args->fd);
ioctl_arg.fd = args->fd;
ioctl_arg.cmd = TIOCGETC;
ioctl_arg.arg = (caddr_t)args->buf;
-
+
return ioctl(p, &ioctl_arg, retval);
}
int
ibcs2_stty(struct proc *p, struct ibcs2_sgtty_args *args, int *retval)
{
- struct ioctl_args ioctl_arg;
+ struct ioctl_args ioctl_arg;
if (ibcs2_trace & IBCS2_TRACE_IOCTL)
printf("IBCS2: 'stty' fd=%d\n", args->fd);
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index f760e2ee7872..e2e5a5b81fcf 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2_ipc.c,v 1.3 1994/10/12 19:38:03 sos Exp $
+ * $Id: ibcs2_ipc.c,v 1.1 1994/10/14 08:53:04 sos Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -37,7 +37,7 @@
int
ibcs2_msgsys(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'msgsys'\n");
#ifdef SYSVMSG
return msgsys(p, args, retval);
@@ -50,7 +50,7 @@ ibcs2_msgsys(struct proc *p, void *args, int *retval)
int
ibcs2_semsys(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'semsys'\n");
#ifdef SYSVSEM
return semsys(p, args, retval);
@@ -63,7 +63,7 @@ ibcs2_semsys(struct proc *p, void *args, int *retval)
int
ibcs2_shmsys(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'shmsys'\n");
#ifdef SYSVSHM
return shmsys(p, args, retval);
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index 344fc9d22b0f..a6c9dbd09593 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2_isc.c,v 1.2 1995/02/03 21:31:32 bde Exp $
+ * $Id: ibcs2_isc.c,v 1.3 1995/04/30 11:30:12 ache Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -48,7 +48,7 @@ int
ibcs2_cisc(struct proc *p, void *args, int *retval)
{
struct trapframe *tf = (struct trapframe *)p->p_md.md_regs;
-
+
switch ((tf->tf_eax & 0xffffff00) >> 8) {
case 0x00:
@@ -87,8 +87,8 @@ ibcs2_cisc(struct proc *p, void *args, int *retval)
case 0x08: /* pathconf */
case 0x09: /* fpathconf */
- if (ibcs2_trace & IBCS2_TRACE_ISC)
- printf("IBCS2: 'cisc (f)pathconf'");
+ if (ibcs2_trace & IBCS2_TRACE_ISC)
+ printf("IBCS2: 'cisc (f)pathconf'");
return ibcs2_pathconf(p, args, retval);
case 0x10: { /* sysconf */
@@ -96,14 +96,14 @@ ibcs2_cisc(struct proc *p, void *args, int *retval)
int num;
} *sysconf_args = args;
- if (ibcs2_trace & IBCS2_TRACE_ISC)
- printf("IBCS2: 'cisc sysconf'");
+ if (ibcs2_trace & IBCS2_TRACE_ISC)
+ printf("IBCS2: 'cisc sysconf'");
switch (sysconf_args->num) {
case 0: /* _SC_ARG_MAX */
*retval = (ARG_MAX);
break;
case 1: /* _SC_CHILD_MAX */
- *retval = (CHILD_MAX);
+ *retval = (CHILD_MAX);
break;
case 2: /* _SC_CLK_TCK */
*retval = (_BSD_CLK_TCK_);
@@ -182,7 +182,7 @@ ibcs2_cisc(struct proc *p, void *args, int *retval)
printf("IBCS2: 'cisc getmajor'");
break;
default:
- printf("IBCS2: 'cisc' function %d(0x%x)",
+ printf("IBCS2: 'cisc' function %d(0x%x)",
tf->tf_eax>>8, tf->tf_eax>>8);
break;
}
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index a7d94f90a0bf..742f211fd056 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -35,7 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ibcs2_misc.c,v 1.3 1995/03/03 15:44:44 nate Exp $
+ * $Id: ibcs2_misc.c,v 1.4 1995/05/02 17:14:38 ache Exp $
*/
#include <i386/ibcs2/ibcs2.h>
@@ -74,7 +74,7 @@ ibcs2_traceemu(struct proc *p, struct ibcs2_traceemu_args *args, int *retval)
int
ibcs2_access(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'access'\n");
return access(p, args, retval);
}
@@ -90,7 +90,7 @@ ibcs2_alarm(struct proc *p, struct ibcs2_alarm_args *args, int *retval)
struct itimerval it, oit;
int s;
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'alarm' secs=%d\n", args->secs);
it.it_value.tv_sec = (long)args->secs;
it.it_value.tv_usec = 0;
@@ -132,7 +132,7 @@ ibcs2_break(struct proc *p, struct ibcs2_break_args *args, int *retval)
int rv, diff;
extern int swap_pager_full;
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'break' dsend=%x\n",
(unsigned int)args->dsend);
@@ -169,7 +169,7 @@ ibcs2_break(struct proc *p, struct ibcs2_break_args *args, int *retval)
int
ibcs2_chdir(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'chdir'\n");
return chdir(p, args, retval);
}
@@ -177,7 +177,7 @@ ibcs2_chdir(struct proc *p, void *args, int *retval)
int
ibcs2_chmod(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'chmod'\n");
return chmod(p, args, retval);
}
@@ -185,7 +185,7 @@ ibcs2_chmod(struct proc *p, void *args, int *retval)
int
ibcs2_chown(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'chown'\n");
return chown(p, args, retval);
}
@@ -193,7 +193,7 @@ ibcs2_chown(struct proc *p, void *args, int *retval)
int
ibcs2_chroot(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'chroot'\n");
return chroot(p, args, retval);
}
@@ -212,7 +212,7 @@ ibcs2_exec(struct proc *p, struct exec_args *args, int *retval)
char **envp;
} execve_args;
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'exec' name=%s\n", args->name);
execve_args.name = args->name;
execve_args.argv = args->argv;
@@ -229,7 +229,7 @@ struct ibcs2_exece_args {
int
ibcs2_exece(struct proc *p, struct ibcs2_exece_args *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'exece' name=%s\n", args->name);
return execve(p, args, retval);
}
@@ -237,7 +237,7 @@ ibcs2_exece(struct proc *p, struct ibcs2_exece_args *args, int *retval)
int
ibcs2_exit(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'exit'\n");
return exit(p, args, retval);
}
@@ -245,7 +245,7 @@ ibcs2_exit(struct proc *p, void *args, int *retval)
int
ibcs2_fork(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'fork'\n");
return fork(p, args, retval);
}
@@ -253,7 +253,7 @@ ibcs2_fork(struct proc *p, void *args, int *retval)
int
ibcs2_fsync(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'fsync'\n");
return fsync(p, args, retval);
}
@@ -261,7 +261,7 @@ ibcs2_fsync(struct proc *p, void *args, int *retval)
int
ibcs2_getgid(struct proc *p, void *args, int *retval)
{
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)
printf("IBCS2: 'getgid'\n");
return getgid(p, args, retval);
}
@@ -281,7 +281,7 @@ ibcs2_getgroups(struct proc *p, struct ibcs2_getgroups_args *args, int *retval)
ibcs2_gid_t *ibcs2_gidset;
int i, error;
- if (ibcs2_trace & IBCS2_TRACE_MISC)
+ if (ibcs2_trace & IBCS2_TRACE_MISC)