Module Name: src Committed By: christos Date: Fri Jan 2 19:42:07 UTC 2015
Modified Files: src/sys/arch/acorn32/mainbus: fd.c src/sys/arch/amiga/dev: fd.c src/sys/arch/arc/jazz: fd.c src/sys/arch/atari/dev: fd.c hdfd.c src/sys/arch/bebox/stand/boot: sd.c wd.c src/sys/arch/cobalt/stand/boot: wd.c src/sys/arch/dreamcast/dev/maple: mmemcard.c src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c src/sys/arch/evbarm/stand/boot2440: dev_sdmmc.c src/sys/arch/hp300/dev: rd.c src/sys/arch/luna68k/luna68k: disksubr.c src/sys/arch/luna68k/stand/boot: disklabel.c src/sys/arch/mac68k/obio: iwm_fd.c src/sys/arch/mmeye/stand/boot: wd.c src/sys/arch/next68k/next68k: disksubr.c src/sys/arch/prep/stand/boot: sd.c src/sys/arch/sparc/dev: fd.c src/sys/arch/sparc64/dev: fdc.c src/sys/arch/sun3/dev: fd.c src/sys/arch/vax/vsa: hdc9224.c src/sys/arch/x68k/dev: bmd.c fd.c src/sys/arch/xen/xen: xbd_xenbus.c src/sys/arch/zaurus/stand/zboot: diskprobe.c src/sys/dev: ccd.c cgd.c ld.c md.c vnd.c src/sys/dev/ata: ata_wdc.c wd.c src/sys/dev/gpib: rd.c src/sys/dev/ic: mvsata.c src/sys/dev/isa: fd.c src/sys/dev/mca: ed_mca.c src/sys/dev/mscp: mscp_disk.c src/sys/dev/qbus: rf.c rl.c src/sys/dev/raidframe: rf_netbsdkintf.c src/sys/dev/scsipi: cd.c sd.c src/sys/fs/adosfs: advfsops.c src/sys/rump/librump/rumpvfs: rumpblk.c src/sys/sys: disklabel.h Log Message: We have three sets of DTYPE_ constants in the kernel: altq Drop Type disklabel Disk Type file Descriptor Type (not to mention constants that contain the string DTYPE). Let's make them two, by changing the disklabel one to be DisK TYPE since the other disklabel constants seem to do that. Not many userland programs use these constants (and the ones that they do are mostly in ifdefs). They will be fixed shortly. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/acorn32/mainbus/fd.c cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amiga/dev/fd.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arc/jazz/fd.c cvs rdiff -u -r1.82 -r1.83 src/sys/arch/atari/dev/fd.c cvs rdiff -u -r1.79 -r1.80 src/sys/arch/atari/dev/hdfd.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/bebox/stand/boot/sd.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/bebox/stand/boot/wd.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/cobalt/stand/boot/wd.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/dreamcast/dev/maple/mmemcard.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/emips/ebus/ace_ebus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/emips/ebus/flash_ebus.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c cvs rdiff -u -r1.99 -r1.100 src/sys/arch/hp300/dev/rd.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/luna68k/disksubr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/disklabel.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mac68k/obio/iwm_fd.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mmeye/stand/boot/wd.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/next68k/disksubr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/prep/stand/boot/sd.c cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc/dev/fd.c cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sparc64/dev/fdc.c cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sun3/dev/fd.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vsa/hdc9224.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/dev/bmd.c cvs rdiff -u -r1.114 -r1.115 src/sys/arch/x68k/dev/fd.c cvs rdiff -u -r1.68 -r1.69 src/sys/arch/xen/xen/xbd_xenbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/zboot/diskprobe.c cvs rdiff -u -r1.161 -r1.162 src/sys/dev/ccd.c cvs rdiff -u -r1.95 -r1.96 src/sys/dev/cgd.c cvs rdiff -u -r1.80 -r1.81 src/sys/dev/ld.c cvs rdiff -u -r1.72 -r1.73 src/sys/dev/md.c cvs rdiff -u -r1.238 -r1.239 src/sys/dev/vnd.c cvs rdiff -u -r1.104 -r1.105 src/sys/dev/ata/ata_wdc.c cvs rdiff -u -r1.417 -r1.418 src/sys/dev/ata/wd.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/gpib/rd.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/mvsata.c cvs rdiff -u -r1.106 -r1.107 src/sys/dev/isa/fd.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mca/ed_mca.c cvs rdiff -u -r1.86 -r1.87 src/sys/dev/mscp/mscp_disk.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/qbus/rf.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/qbus/rl.c cvs rdiff -u -r1.320 -r1.321 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.327 -r1.328 src/sys/dev/scsipi/cd.c cvs rdiff -u -r1.313 -r1.314 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.71 -r1.72 src/sys/fs/adosfs/advfsops.c cvs rdiff -u -r1.58 -r1.59 src/sys/rump/librump/rumpvfs/rumpblk.c cvs rdiff -u -r1.117 -r1.118 src/sys/sys/disklabel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.