PERFORCE change 103695 for review
Warner Losh
imp at FreeBSD.org
Sat Aug 12 09:51:36 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103695
Change 103695 by imp at imp_paco-paco on 2006/08/12 09:51:02
IFC @103694
Affected files ...
.. //depot/projects/arm/src/ObsoleteFiles.inc#3 integrate
.. //depot/projects/arm/src/contrib/smbfs/smbutil/print.c#2 integrate
.. //depot/projects/arm/src/contrib/smbfs/smbutil/view.c#2 integrate
.. //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate
.. //depot/projects/arm/src/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#4 integrate
.. //depot/projects/arm/src/lib/libdisk/write_ia64_disk.c#2 integrate
.. //depot/projects/arm/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate
.. //depot/projects/arm/src/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#3 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#3 integrate
.. //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#2 integrate
.. //depot/projects/arm/src/share/man/man4/acpi.4#4 integrate
.. //depot/projects/arm/src/share/man/man4/ng_pppoe.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/vlan.4#2 integrate
.. //depot/projects/arm/src/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/arm/src/sys/Makefile#8 integrate
.. //depot/projects/arm/src/sys/amd64/acpica/madt.c#5 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/arm/src/sys/amd64/include/pmap.h#8 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_st.c#14 integrate
.. //depot/projects/arm/src/sys/boot/Makefile#5 integrate
.. //depot/projects/arm/src/sys/boot/arm/Makefile#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#19 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#17 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/arm_init.S#6 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#13 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#17 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200.h#5 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#7 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#7 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#25 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#9 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#16 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/p_string.c#7 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/xmodem.c#6 integrate
.. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdMemory.c#3 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_video.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#22 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#8 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#17 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#7 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#22 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#8 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#7 integrate
.. //depot/projects/arm/src/sys/dev/exca/excareg.h#2 integrate
.. //depot/projects/arm/src/sys/dev/hme/if_hme.c#6 integrate
.. //depot/projects/arm/src/sys/dev/mii/rgephy.c#6 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#14 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#8 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbbreg.h#5 integrate
.. //depot/projects/arm/src/sys/dev/sk/if_sk.c#7 integrate
.. //depot/projects/arm/src/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ti/if_ti.c#5 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.c#12 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.h#5 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli_ctl.c#5 integrate
.. //depot/projects/arm/src/sys/geom/geom_gpt.c#8 integrate
.. //depot/projects/arm/src/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/arm/src/sys/i386/acpica/madt.c#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/XBOX#7 integrate
.. //depot/projects/arm/src/sys/i386/i386/machdep.c#16 integrate
.. //depot/projects/arm/src/sys/i386/i386/pmap.c#20 integrate
.. //depot/projects/arm/src/sys/i386/include/pmap.h#5 integrate
.. //depot/projects/arm/src/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/arm/src/sys/ia64/include/pmap.h#4 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#20 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#23 integrate
.. //depot/projects/arm/src/sys/net/if_vlan.c#15 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#10 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#7 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#9 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#9 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timer.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/arm/src/sys/pc98/include/md_var.h#2 integrate
.. //depot/projects/arm/src/sys/pc98/pc98/pc98_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/pci/agp.c#5 integrate
.. //depot/projects/arm/src/sys/pci/if_xl.c#6 integrate
.. //depot/projects/arm/src/sys/vm/device_pager.c#3 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.c#16 integrate
.. //depot/projects/arm/src/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/arm/src/tools/tools/ath/athstats/athstats.c#3 integrate
.. //depot/projects/arm/src/tools/tools/ath/athstats/athstats.h#1 branch
.. //depot/projects/arm/src/tools/tools/ath/athstats/main.c#1 branch
.. //depot/projects/arm/src/tools/tools/ath/athstats/statfoo.c#1 branch
.. //depot/projects/arm/src/tools/tools/ath/athstats/statfoo.h#1 branch
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/Makefile#2 integrate
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/main.c#1 branch
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/statfoo.c#1 branch
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/statfoo.h#1 branch
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate
.. //depot/projects/arm/src/tools/tools/net80211/wlanstats/wlanstats.h#1 branch
.. //depot/projects/arm/src/usr.bin/hexdump/parse.c#2 integrate
.. //depot/projects/arm/src/usr.bin/split/split.1#3 integrate
.. //depot/projects/arm/src/usr.bin/split/split.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/pkg_install/lib/url.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/rpc.statd/procs.c#2 integrate
Differences ...
==== //depot/projects/arm/src/ObsoleteFiles.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.46 2006/08/11 22:02:16 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -745,6 +745,7 @@
OLD_FILES+=usr/bin/perlcc
OLD_FILES+=usr/bin/perldoc
OLD_FILES+=usr/bin/suidperl
+OLD_FILES+=usr/lib/pam_ftp.so
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm
OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm
@@ -2726,7 +2727,201 @@
OLD_FILES+=usr/games/worm
OLD_FILES+=usr/games/worms
OLD_FILES+=usr/games/wump
+OLD_FILES+=sbin/mount_reiserfs
+OLD_FILES+=usr/bin/hesinfo
+OLD_FILES+=usr/share/examples/etc/usbd.conf
+OLD_FILES+=usr/share/examples/meteor/README
+OLD_FILES+=usr/share/examples/meteor/rgb16.c
+OLD_FILES+=usr/share/examples/meteor/rgb24.c
+OLD_FILES+=usr/share/examples/meteor/test-n.c
+OLD_FILES+=usr/share/examples/meteor/yuvpk.c
+OLD_FILES+=usr/share/examples/meteor/yuvpl.c
+OLD_FILES+=usr/share/examples/worm/README
+OLD_FILES+=usr/share/examples/worm/makecdfs.sh
+OLD_FILES+=usr/share/groff_font/devlj4/Makefile
+OLD_FILES+=usr/share/groff_font/devlj4/text.map
+OLD_FILES+=usr/share/groff_font/devlj4/special.map
+OLD_FILES+=usr/share/misc/nslookup.help
+OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
+OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
+OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
+OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu
+OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires
+OLD_FILES+=usr/share/zoneinfo/America/Cordoba
+OLD_FILES+=usr/share/zoneinfo/America/Jujuy
+OLD_FILES+=usr/share/zoneinfo/America/Catamarca
+OLD_FILES+=usr/share/zoneinfo/America/Mendoza
+OLD_FILES+=usr/share/zoneinfo/America/Indianapolis
+OLD_FILES+=usr/share/zoneinfo/America/Louisville
+OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia
+OLD_FILES+=usr/share/zoneinfo/Europe/Belfast
+OLD_FILES+=usr/share/zoneinfo/Pacific/Yap
+OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
+OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
+OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
+OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
+OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
+OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
+OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
+OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
+OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
+OLD_FILES+=usr/share/doc/ntp/accopt.htm
+OLD_FILES+=usr/share/doc/ntp/assoc.htm
+OLD_FILES+=usr/share/doc/ntp/audio.htm
+OLD_FILES+=usr/share/doc/ntp/authopt.htm
+OLD_FILES+=usr/share/doc/ntp/biblio.htm
+OLD_FILES+=usr/share/doc/ntp/build.htm
+OLD_FILES+=usr/share/doc/ntp/clockopt.htm
+OLD_FILES+=usr/share/doc/ntp/config.htm
+OLD_FILES+=usr/share/doc/ntp/confopt.htm
+OLD_FILES+=usr/share/doc/ntp/copyright.htm
+OLD_FILES+=usr/share/doc/ntp/debug.htm
+OLD_FILES+=usr/share/doc/ntp/driver1.htm
+OLD_FILES+=usr/share/doc/ntp/driver10.htm
+OLD_FILES+=usr/share/doc/ntp/driver11.htm
+OLD_FILES+=usr/share/doc/ntp/driver12.htm
+OLD_FILES+=usr/share/doc/ntp/driver16.htm
+OLD_FILES+=usr/share/doc/ntp/driver18.htm
+OLD_FILES+=usr/share/doc/ntp/driver19.htm
+OLD_FILES+=usr/share/doc/ntp/driver2.htm
+OLD_FILES+=usr/share/doc/ntp/driver20.htm
+OLD_FILES+=usr/share/doc/ntp/driver22.htm
+OLD_FILES+=usr/share/doc/ntp/driver23.htm
+OLD_FILES+=usr/share/doc/ntp/driver24.htm
+OLD_FILES+=usr/share/doc/ntp/driver26.htm
+OLD_FILES+=usr/share/doc/ntp/driver27.htm
+OLD_FILES+=usr/share/doc/ntp/driver28.htm
+OLD_FILES+=usr/share/doc/ntp/driver29.htm
+OLD_FILES+=usr/share/doc/ntp/driver3.htm
+OLD_FILES+=usr/share/doc/ntp/driver30.htm
+OLD_FILES+=usr/share/doc/ntp/driver32.htm
+OLD_FILES+=usr/share/doc/ntp/driver33.htm
+OLD_FILES+=usr/share/doc/ntp/driver34.htm
+OLD_FILES+=usr/share/doc/ntp/driver35.htm
+OLD_FILES+=usr/share/doc/ntp/driver36.htm
+OLD_FILES+=usr/share/doc/ntp/driver37.htm
+OLD_FILES+=usr/share/doc/ntp/driver4.htm
+OLD_FILES+=usr/share/doc/ntp/driver5.htm
+OLD_FILES+=usr/share/doc/ntp/driver6.htm
+OLD_FILES+=usr/share/doc/ntp/driver7.htm
+OLD_FILES+=usr/share/doc/ntp/driver8.htm
+OLD_FILES+=usr/share/doc/ntp/driver9.htm
+OLD_FILES+=usr/share/doc/ntp/exec.htm
+OLD_FILES+=usr/share/doc/ntp/extern.htm
+OLD_FILES+=usr/share/doc/ntp/gadget.htm
+OLD_FILES+=usr/share/doc/ntp/hints.htm
+OLD_FILES+=usr/share/doc/ntp/howto.htm
+OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
+OLD_FILES+=usr/share/doc/ntp/index.htm
+OLD_FILES+=usr/share/doc/ntp/kern.htm
+OLD_FILES+=usr/share/doc/ntp/kernpps.htm
+OLD_FILES+=usr/share/doc/ntp/ldisc.htm
+OLD_FILES+=usr/share/doc/ntp/measure.htm
+OLD_FILES+=usr/share/doc/ntp/miscopt.htm
+OLD_FILES+=usr/share/doc/ntp/monopt.htm
+OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
+OLD_FILES+=usr/share/doc/ntp/notes.htm
+OLD_FILES+=usr/share/doc/ntp/ntpd.htm
+OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
+OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
+OLD_FILES+=usr/share/doc/ntp/ntpq.htm
+OLD_FILES+=usr/share/doc/ntp/ntptime.htm
+OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
+OLD_FILES+=usr/share/doc/ntp/parsedata.htm
+OLD_FILES+=usr/share/doc/ntp/parsenew.htm
+OLD_FILES+=usr/share/doc/ntp/patches.htm
+OLD_FILES+=usr/share/doc/ntp/porting.htm
+OLD_FILES+=usr/share/doc/ntp/pps.htm
+OLD_FILES+=usr/share/doc/ntp/prefer.htm
+OLD_FILES+=usr/share/doc/ntp/qth.htm
+OLD_FILES+=usr/share/doc/ntp/quick.htm
+OLD_FILES+=usr/share/doc/ntp/rdebug.htm
+OLD_FILES+=usr/share/doc/ntp/refclock.htm
+OLD_FILES+=usr/share/doc/ntp/release.htm
+OLD_FILES+=usr/share/doc/ntp/tickadj.htm
+OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
+OLD_FILES+=usr/share/doc/papers/px.ascii.gz
+OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/hesiod.3.gz
+OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
+OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
+OLD_FILES+=usr/share/man/man3/exp10f.3.gz
+OLD_FILES+=usr/share/man/man3/exp10.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbmb.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/hesiod.3.gz
+OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
+OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
+OLD_FILES+=usr/share/man/man3/exp10f.3.gz
+OLD_FILES+=usr/share/man/man3/exp10.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbmb.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
+OLD_FILES+=usr/share/man/man3/fputrune.3.gz
+OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
+OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
+OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
+.if ${TARGET_ARCH} != "i386"
+OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
+.endif
+OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
+OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
+OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
+OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
+OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
+OLD_FILES+=usr/share/info/annotate.info.gz
+OLD_FILES+=usr/share/info/tar.info.gz
+OLD_FILES+=usr/share/bsnmp/defs/tree.def
+OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
+OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
+OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
+OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
+OLD_FILES+=usr/libdata/msdosfs/iso22dos
+OLD_FILES+=usr/libdata/msdosfs/iso72dos
+OLD_FILES+=usr/libdata/msdosfs/koi2dos
+OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
+# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
+OLD_LIBS+=lib/libcrypto.so.4
+OLD_LIBS+=usr/lib/libssl.so.4
# 20060521: gethostbyaddr(3) ABI change
OLD_LIBS+=usr/lib/libroken.so.8
OLD_LIBS+=lib/libatm.so.3
@@ -2950,7 +3145,14 @@
# 199909XX
OLD_LIBS+=usr/lib/libc_r.so.3
# ???
+OLD_LIBS+=usr/lib/libarchive.so.2
+OLD_LIBS+=usr/lib/libbsnmp.so.1
+OLD_LIBS+=usr/lib/libc_r.so.6
+OLD_LIBS+=usr/lib/libcipher.so.2
OLD_LIBS+=usr/lib/libgssapi.so.6
+OLD_LIBS+=usr/lib/libkse.so.1
+OLD_LIBS+=usr/lib/liblwres.so.3
+OLD_LIBS+=usr/lib/pam_ftp.so.2
# 20040925: bind9 import
OLD_DIRS+=usr/share/doc/bind/html
==== //depot/projects/arm/src/contrib/smbfs/smbutil/print.c#2 (text+ko) ====
@@ -31,6 +31,10 @@
*
* $Id: print.c,v 1.4 2001/01/28 07:35:01 bp Exp $
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/print.c,v 1.2 2006/08/11 12:35:22 keramida Exp $");
+
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/stat.h>
@@ -145,7 +149,7 @@
print_usage(void)
{
printf(
- "usage: smbutil print [connection optinons] //user at server/share\n"
+ "usage: smbutil print [connection options] //user at server/share\n"
);
exit(1);
}
==== //depot/projects/arm/src/contrib/smbfs/smbutil/view.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/view.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/view.c,v 1.3 2006/08/11 12:35:22 keramida Exp $");
#include <sys/endian.h>
#include <sys/param.h>
@@ -133,7 +133,7 @@
view_usage(void)
{
printf(
- "usage: smbutil view [connection optinons] //[user@]server\n"
+ "usage: smbutil view [connection options] //[user@]server\n"
);
exit(1);
}
==== //depot/projects/arm/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.2 2006/07/22 14:55:55 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.arm,v 1.3 2006/08/10 16:39:55 obrien Exp $
.if defined(ARM_BIG_ENDIAN)
DEFAULT_VECTOR= bfd_elf32_bigarm_vec
==== //depot/projects/arm/src/lib/libc/gen/msgctl.3#2 (text+ko) ====
@@ -29,7 +29,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.
.\"
-.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.19 2003/09/08 19:57:14 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $
.\"/
.Dd November 24, 1997
.Dt MSGCTL 3
@@ -83,7 +83,7 @@
The
.Vt ipc_perm
structure used inside the
-.Vt shmid_ds
+.Vt msqid_ds
structure is defined in
.In sys/ipc.h
and looks like this:
==== //depot/projects/arm/src/lib/libc/stdlib/malloc.c#4 (text+ko) ====
@@ -185,7 +185,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.132 2006/07/27 19:09:32 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.133 2006/08/09 19:01:27 marcel Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -279,6 +279,7 @@
# define QUANTUM_2POW_MIN 4
# define SIZEOF_PTR 4
# define USE_BRK
+# define NO_TLS
#endif
/* sizeof(int) == (1 << SIZEOF_INT_2POW). */
==== //depot/projects/arm/src/lib/libdisk/write_ia64_disk.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.15 2004/01/30 20:52:54 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.16 2006/08/09 20:19:15 marcel Exp $");
#include <sys/types.h>
#include <sys/disklabel.h>
@@ -123,6 +123,8 @@
error = 0;
nsects = disk->media_size / disk->sector_size;
+ nsects--; /* The GPT starts at LBA 1 */
+
buffer = calloc(disk->sector_size, 1);
if (buffer == NULL)
return (ENOMEM);
==== //depot/projects/arm/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.20 2004/01/26 19:28:37 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.21 2006/08/11 17:03:33 des Exp $");
#define _BSD_SOURCE
@@ -87,12 +87,17 @@
PAM_LOG("Got user: %s", user);
pam_err = pam_get_item(pamh, PAM_RHOST, &rhost);
- if (pam_err != PAM_SUCCESS)
+ if (pam_err != PAM_SUCCESS) {
+ PAM_LOG("No PAM_RHOST");
goto err;
+ }
pam_err = pam_get_item(pamh, PAM_TTY, &tty);
- if (pam_err != PAM_SUCCESS)
+ if (pam_err != PAM_SUCCESS) {
+ PAM_LOG("No PAM_TTY");
goto err;
+ }
if (tty == NULL) {
+ PAM_LOG("No PAM_TTY");
pam_err = PAM_SERVICE_ERR;
goto err;
}
@@ -102,8 +107,10 @@
return (PAM_SERVICE_ERR);
fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0644);
- if (fd == -1)
+ if (fd == -1) {
+ PAM_LOG("Failed to open %s", _PATH_LASTLOG);
goto file_err;
+ }
/*
* Record session in lastlog(5).
==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.959 2006/07/31 16:49:25 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.960 2006/08/11 12:32:43 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -579,8 +579,9 @@
architectures such as sparc64. &merged;</para>
<para>The &man.em.4; driver has been updated to
- version 5.1.5 from Intel. Among other changes, it now supports
- 82571 and 82572 based adapters.</para>
+ version 6.1.4 from Intel. Among other changes, it now supports
+ 80003, 82571, 82571EB and 82572 based adapters, as well as
+ onboard-NICs on ICH8-based motherboards.</para>
<para>The &man.em.4; driver now includes
initial support for suspend and resume features.</para>
@@ -645,7 +646,7 @@
<para>The &man.stge.4; driver has been added. It supports the
Sundance/Tamarack TC9021 Gigabit Ethernet controller and was
- ported from NetBSD.</para>
+ ported from NetBSD. &merged;</para>
<para>The &man.ti.4; driver now supports big-endian
architectures such as sparc64.</para>
==== //depot/projects/arm/src/sbin/geom/class/eli/geli.8#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.13 2006/06/06 19:03:51 brueffer Exp $
+.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.17 2006/08/10 01:13:38 maxim Exp $
.\"
-.Dd June 5, 2006
+.Dd August 9, 2006
.Dt GELI 8
.Os
.Sh NAME
@@ -64,7 +64,7 @@
.Cm init
.Nm
.Cm attach
-.Op Fl dpv
+.Op Fl dprv
.Op Fl k Ar keyfile
.Ar prov
.Nm
@@ -163,7 +163,7 @@
passphrase before the root file system is mounted.
.It
The passphrase of the user is strengthened with:
-.Rs
+.Rs
.%A B. Kaliski
.%T "PKCS #5: Password-Based Cryptography Specification, Version 2.0."
.%R RFC
@@ -175,7 +175,7 @@
and
.Qq "company key" ) .
.It
-It is fast -
+It is fast -
.Nm
performs simple sector-to-sector encryption.
.It
@@ -288,6 +288,9 @@
option for the
.Cm detach
subcommand.
+.It Fl r
+Attach read-only provider.
+It will not be opened for writing.
.It Fl k Ar keyfile
Specifies a file which contains part of the key.
For more information see the description of the
==== //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2004 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+ * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.13 2006/08/07 20:09:09 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.14 2006/08/09 18:11:13 pjd Exp $");
#include <stdio.h>
#include <stdint.h>
@@ -78,7 +78,7 @@
*
* init [-bhPv] [-a aalgo] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov
* label - alias for 'init'
- * attach [-dpv] [-k keyfile] prov
+ * attach [-dprv] [-k keyfile] prov
* detach [-fl] prov ...
* stop - alias for 'detach'
* onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov ...
@@ -124,9 +124,10 @@
{ 'd', "detach", NULL, G_TYPE_NONE },
{ 'k', "keyfile", keyfile, G_TYPE_STRING },
{ 'p', "nopassphrase", NULL, G_TYPE_NONE },
+ { 'r', "readonly", NULL, G_TYPE_NONE },
G_OPT_SENTINEL
},
- "[-dpv] [-k keyfile] prov"
+ "[-dprv] [-k keyfile] prov"
},
{ "detach", 0, NULL,
{
==== //depot/projects/arm/src/sbin/ifconfig/ifieee80211.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.39 2006/07/26 03:08:45 sam Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.40 2006/08/10 06:06:13 sam Exp $
*/
/*-
@@ -974,19 +974,36 @@
list_scan(s);
}
+static enum ieee80211_opmode get80211opmode(int s);
+
static void
list_stations(int s)
{
- uint8_t buf[24*1024];
+ union {
+ struct ieee80211req_sta_req req;
+ uint8_t buf[24*1024];
+ } u;
+ enum ieee80211_opmode opmode = get80211opmode(s);
struct ieee80211req ireq;
uint8_t *cp;
int len;
(void) memset(&ireq, 0, sizeof(ireq));
(void) strncpy(ireq.i_name, name, sizeof(ireq.i_name));
+ /* broadcast address =>'s get all stations */
+ (void) memset(u.req.is_u.macaddr, 0xff, IEEE80211_ADDR_LEN);
+ if (opmode == IEEE80211_M_STA) {
+ /*
+ * Get information about the associated AP.
+ */
+ ireq.i_type = IEEE80211_IOC_BSSID;
+ ireq.i_data = u.req.is_u.macaddr;
+ ireq.i_len = IEEE80211_ADDR_LEN;
+ (void) ioctl(s, SIOCG80211, &ireq);
+ }
ireq.i_type = IEEE80211_IOC_STA_INFO;
- ireq.i_data = buf;
- ireq.i_len = sizeof(buf);
+ ireq.i_data = &u;
+ ireq.i_len = sizeof(u);
if (ioctl(s, SIOCG80211, &ireq) < 0)
errx(1, "unable to get station information");
len = ireq.i_len;
@@ -1005,12 +1022,14 @@
, "CAPS"
, "FLAG"
);
- cp = buf;
+ cp = (uint8_t *) u.req.info;
do {
struct ieee80211req_sta_info *si;
uint8_t *vp;
si = (struct ieee80211req_sta_info *) cp;
+ if (si->isi_len < sizeof(*si))
+ break;
vp = (u_int8_t *)(si+1);
printf("%s %4u %4d %3dM %4d %4d %6d %6d %-4.4s %-4.4s"
, ether_ntoa((const struct ether_addr*) si->isi_macaddr)
==== //depot/projects/arm/src/share/examples/drivers/make_pseudo_driver.sh#2 (text+ko) ====
@@ -1,42 +1,123 @@
#!/bin/sh
# This writes a skeleton driver and puts it into the kernel tree for you
-#arg1 is lowercase "foo"
+#
+# arg1 is lowercase "foo"
+# arg2 path to the kernel sources, "/sys" if omitted
#
# Trust me, RUN THIS SCRIPT :)
#
-# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.10 2005/03/09 12:29:07 stefanf Exp $
+# $FreeBSD: src/share/examples/drivers/make_pseudo_driver.sh,v 1.12 2006/08/09 21:23:42 rik Exp $
#
#-------cut here------------------
-cd /sys/i386/conf
if [ "${1}X" = "X" ]
then
echo "Hey , how about some help here.. give me a device name!"
exit 1
fi
+if [ "X${2}" = "X" ]; then
+ TOP=`cd /sys; pwd -P`
+ echo "Using ${TOP} as the path to the kernel sources!"
+else
+ TOP=${2}
+fi
+
+for i in "" "conf" "i386" "i386/conf" "dev" "sys" "modules"
+do
+ if [ -d ${TOP}/${i} ]
+ then
+ continue
+ fi
+ echo "${TOP}/${i}: no such directory."
+ echo "Please, correct the error and try again."
+ exit 1
+done
UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"`
-cat >files.${UPPER} <<DONE
-dev/${1}.c optional ${1} device-driver
+
+if [ -d ${TOP}/modules/${1} ]; then
+ echo "There appears to already be a module called ${1}"
+ echo -n "Should it be overwritten? [Y]"
+ read VAL
+ if [ "-z" "$VAL" ]; then
+ VAL=YES
+ fi
+ case ${VAL} in
+ [yY]*)
+ echo "Cleaning up from prior runs"
+ rm -rf ${TOP}/dev/${1}
+ rm -rf ${TOP}/modules/${1}
+ rm ${TOP}/conf/files.${UPPER}
+ rm ${TOP}/i386/conf/${UPPER}
+ rm ${TOP}/sys/${1}io.h
+ ;;
+ *)
+ exit 1
+ ;;
+ esac
+fi
+
+echo "The following files will be created:"
+echo ${TOP}/modules/${1}
+echo ${TOP}/conf/files.${UPPER}
+echo ${TOP}/i386/conf/${UPPER}
+echo ${TOP}/dev/${1}
+echo ${TOP}/dev/${1}/${1}.c
+echo ${TOP}/sys/${1}io.h
+echo ${TOP}/modules/${1}
+echo ${TOP}/modules/${1}/Makefile
+
+mkdir ${TOP}/modules/${1}
+
+cat >${TOP}/conf/files.${UPPER} <<DONE
+dev/${1}.c optional ${1}
DONE
-cat >${UPPER} <<DONE
+cat >${TOP}/i386/conf/${UPPER} <<DONE
# Configuration file for kernel type: ${UPPER}
-ident ${UPPER}
# \$FreeBSD\$
-DONE
+
+files "${TOP}/conf/files.${UPPER}"
+
+include GENERIC
-grep -v GENERIC < GENERIC >>${UPPER}
+ident ${UPPER}
-cat >>${UPPER} <<DONE
# trust me, you'll need this
-options DDB
-device ${1}
+options KDB
+options DDB
+device ${1}
DONE
-cat >../../dev/${1}.c <<DONE
+if [ ! -d ${TOP}/dev/${1} ]; then
+ mkdir -p ${TOP}/dev/${1}
+fi
+
+cat >${TOP}/dev/${1}/${1}.c <<DONE
/*
- * Copyright ME
+ * Copyright (c) [year] [your name]
+ * 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. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF 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.
*
* ${1} driver
*/
@@ -47,15 +128,19 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h> /* SYSINIT stuff */
+#include <sys/uio.h> /* SYSINIT stuff */
#include <sys/conf.h> /* cdevsw stuff */
-#include <sys/devfsext.h> /* DEVFS definitions */
#include <sys/malloc.h> /* malloc region definitions */
#include <sys/proc.h>
#include <sys/${1}io.h> /* ${1} IOCTL definitions */
#include <machine/clock.h> /* DELAY() */
-#include "${1}.h" /* generated file.. defines N${UPPER} */
+#define N${UPPER} 3 /* defines number of instances */
+
+/* XXX These should be defined in terms of bus-space ops. */
+#define ${UPPER}_INB(port) inb(port)
+#define ${UPPER}_OUTB(port, val) (port, (val))
/* Function prototypes (these should all be static) */
static d_open_t ${1}open;
@@ -68,20 +153,15 @@
#define CDEV_MAJOR 20
static struct cdevsw ${1}_cdevsw = {
- ${1}open,
- ${1}close,
- ${1}read,
- ${1}write,
- ${1}ioctl,
- nullstop,
- nullreset,
- nodevtotty,
- ${1}poll,
- ${1}mmap,
- NULL,
- "${1}",
- NULL,
- -1
+ .d_version = D_VERSION,
+ .d_open = ${1}open,
+ .d_close = ${1}close,
+ .d_read = ${1}read,
+ .d_write = ${1}write,
+ .d_ioctl = ${1}ioctl,
+ .d_poll = ${1}poll,
+ .d_mmap = ${1}mmap,
+ .d_name = "${1}",
};
/*
@@ -94,9 +174,9 @@
* One of these per allocated device
*/
struct ${1}_softc {
- struct isa_device *dev;
+ u_long iobase;
char buffer[BUFFERSIZE];
- static void *devfs_token;
+ struct cdev *dev;
};
typedef struct ${1}_softc *sc_p;
@@ -129,7 +209,7 @@
#endif /* DIAGNOSTIC */
static int
-${1}ioctl (dev_t dev, int cmd, caddr_t data, int flag, struct thread *td)
+${1}ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
@@ -139,7 +219,10 @@
switch (cmd) {
case DHIOCRESET:
/* whatever resets it */
- outb(scp->dev->id_iobase, 0xff);
+ (void)scp; /* Delete this line after using scp. */
+#if 0
+ ${UPPER}_OUTB(scp->iobase, 0xff);
+#endif
break;
default:
return ENXIO;
@@ -152,13 +235,14 @@
* This should get you started
*/
static int
-${1}open(dev_t dev, int oflags, int devtype, struct thread *td)
+${1}open(struct cdev *dev, int oflags, int devtype, struct thread *td)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
CHECKUNIT(ENXIO);
+ (void)scp; /* Delete this line after using scp. */
/*
* Do processing
*/
@@ -166,13 +250,14 @@
}
static int
-${1}close(dev_t dev, int fflag, int devtype, struct thread *td)
+${1}close(struct cdev *dev, int fflag, int devtype, struct thread *td)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
CHECKUNIT_DIAG(ENXIO);
+ (void)scp; /* Delete this line after using scp. */
/*
* Do processing
*/
@@ -180,7 +265,7 @@
}
static int
-${1}read(dev_t dev, struct uio *uio, int ioflag)
+${1}read(struct cdev *dev, struct uio *uio, int ioflag)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
@@ -198,7 +283,7 @@
}
static int
-${1}write(dev_t dev, struct uio *uio, int ioflag)
+${1}write(struct cdev *dev, struct uio *uio, int ioflag)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
@@ -215,13 +300,14 @@
}
static int
-${1}mmap(dev_t dev, int offset, int nprot)
+${1}mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
{
int unit = UNIT(dev);
sc_p scp = sca[unit];
CHECKUNIT_DIAG(-1);
+ (void)scp; /* Delete this line after using scp. */
/*
* Do processing
*/
@@ -236,13 +322,14 @@
}
static int
-${1}poll(dev_t dev, int which, struct thread *td)
+${1}poll(struct cdev *dev, int which, struct thread *td)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list