PERFORCE change 127814 for review
Zhouyi ZHOU
zhouzhouyi at FreeBSD.org
Sat Oct 20 02:05:34 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127814
Change 127814 by zhouzhouyi at zhouzhouyi_mactest on 2007/10/20 09:04:23
Integrate from main branch
Affected files ...
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.amd64#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/options#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ctau/if_ct.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/cx/if_cx.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_isic.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sys_process.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/syscalls.master#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/bpf.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_bridge.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_gre.c#2 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_lagg.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_gre.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsserver/nfs_syscalls.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/if_xl.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/ata.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/mbuf.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/param.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/systm.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_mmap.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_page.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_page.h#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_phys.h#3 integrate
Differences ...
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#3 (text+ko) ====
@@ -16,13 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/conf/GENERIC#101
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.482 2007/06/14 17:14:25 delphij Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/amd64/conf/GENERIC#104
# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.485 2007/10/19 12:30:33 kensmith Exp $
-==== YOURS //zhouzhouyi_mactest/sys/amd64/conf/GENERIC
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $
-<<<<
cpu HAMMER
ident GENERIC
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#3 (text+ko) ====
@@ -45,13 +45,7 @@
* Created : 30/01/97
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/cpufunc.c#16
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/cpufunc.c#19
__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.19 2007/10/18 05:33:05 imp Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/arm/arm/cpufunc.c
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $");
-<<<<
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#3 (text+ko) ====
@@ -42,13 +42,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/identcpu.c#10
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/identcpu.c#12
__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.12 2007/10/18 05:33:05 imp Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/arm/arm/identcpu.c
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $");
-<<<<
#include <sys/systm.h>
#include <sys/param.h>
#include <sys/malloc.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#3 (text+ko) ====
@@ -147,13 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/pmap.c#83
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.83 2007/06/11 21:29:26 cognet Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/pmap.c#87
__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/arm/arm/pmap.c
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.85 2007/09/19 15:30:25 cognet Exp $");
-<<<<
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#3 (text+ko) ====
@@ -83,13 +83,7 @@
#include <machine/asm.h>
#include <machine/asmacros.h>
#include <machine/armreg.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/swtch.S#19
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/swtch.S#21
__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/arm/arm/swtch.S
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $");
-<<<<
/*
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#3 (text+ko) ====
@@ -35,13 +35,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/include/armreg.h#5
- * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/include/armreg.h#7
* $FreeBSD: src/sys/arm/include/armreg.h,v 1.7 2007/10/18 05:06:58 imp Exp $
-==== YOURS //zhouzhouyi_mactest/sys/arm/include/armreg.h
- * $FreeBSD: src/sys/arm/include/armreg.h,v 1.6 2007/07/27 14:54:27 cognet Exp $
-<<<<
*/
#ifndef MACHINE_ARMREG_H
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#3 (text+ko) ====
@@ -38,13 +38,7 @@
*
* Prototypes for cpu, mmu and tlb related functions.
*
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/include/cpufunc.h#11
- * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.11 2007/03/21 03:28:16 kevlo Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/include/cpufunc.h#13
* $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.13 2007/10/18 05:33:06 imp Exp $
-==== YOURS //zhouzhouyi_mactest/sys/arm/include/cpufunc.h
- * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.12 2007/07/27 14:39:41 cognet Exp $
-<<<<
*/
#ifndef _MACHINE_CPUFUNC_H_
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#3 (text+ko) ====
@@ -40,13 +40,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/xscale/i80321/i80321_pci.c#10
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.10 2007/02/23 12:18:28 piso Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/arm/xscale/i80321/i80321_pci.c#12
__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/arm/xscale/i80321/i80321_pci.c
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
-<<<<
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#3 (text+ko) ====
@@ -6,13 +6,7 @@
#
# All arguments must be in double quotes.
#
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/boot/forth/loader.conf#72
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/boot/forth/loader.conf#74
# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
-==== YOURS //zhouzhouyi_mactest/sys/boot/forth/loader.conf
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $
-<<<<
##############################################################
### Basic configuration options ############################
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ====
@@ -26,13 +26,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#20
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#22
__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/compat/ia32/ia32_sysvec.c
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $");
-<<<<
#include "opt_compat.h"
@@ -108,8 +102,6 @@
static u_long ia32_maxdsiz = IA32_MAXDSIZ;
SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#20
-==== THEIRS //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#22
TUNABLE_ULONG("compat.ia32.maxdsiz", &ia32_maxdsiz);
static u_long ia32_maxssiz = IA32_MAXSSIZ;
SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
@@ -118,13 +110,6 @@
SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem);
-==== YOURS //zhouzhouyi_mactest/sys/compat/ia32/ia32_sysvec.c
-static u_long ia32_maxssiz = IA32_MAXSSIZ;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
-static u_long ia32_maxvmem = IA32_MAXVMEM;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
-
-<<<<
struct sysentvec ia32_freebsd_sysvec = {
FREEBSD32_SYS_MAXSYSCALL,
freebsd32_sysent,
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/NOTES#3 (text+ko) ====
@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/NOTES#416
-# $FreeBSD: src/sys/conf/NOTES,v 1.1435 2007/06/23 06:42:40 rafan Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/conf/NOTES#435
# $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $
-==== YOURS //zhouzhouyi_mactest/sys/conf/NOTES
-# $FreeBSD: src/sys/conf/NOTES,v 1.1451 2007/09/19 18:12:44 imp Exp $
-<<<<
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.amd64#3 (text+ko) ====
@@ -1,13 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/files.amd64#93
-# $FreeBSD: src/sys/conf/files.amd64,v 1.104 2007/06/11 00:38:05 marcel Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/conf/files.amd64#98
# $FreeBSD: src/sys/conf/files.amd64,v 1.109 2007/10/15 20:00:21 netchild Exp $
-==== YOURS //zhouzhouyi_mactest/sys/conf/files.amd64
-# $FreeBSD: src/sys/conf/files.amd64,v 1.107 2007/08/15 19:26:01 des Exp $
-<<<<
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.i386#3 (text+ko) ====
@@ -1,13 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/files.i386#211
-# $FreeBSD: src/sys/conf/files.i386,v 1.577 2007/06/11 00:38:05 marcel Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/conf/files.i386#216
# $FreeBSD: src/sys/conf/files.i386,v 1.582 2007/10/15 20:00:21 netchild Exp $
-==== YOURS //zhouzhouyi_mactest/sys/conf/files.i386
-# $FreeBSD: src/sys/conf/files.i386,v 1.580 2007/08/15 19:26:01 des Exp $
-<<<<
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/kern.pre.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.92 2007/08/08 19:12:06 marcel Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -76,9 +76,6 @@
# .. and the same for twa
INCLUDES+= -I$S/dev/twa
-# .. and the same for em
-INCLUDES+= -I$S/dev/em
-
# ... and XFS
INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
@@ -90,7 +87,11 @@
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
-#WERROR?= -Werror
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
+ ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
+ ${MACHINE_ARCH} == "sparc64"
+WERROR?= -Werror
+.endif
.endif
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/options#3 (text+ko) ====
@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/options#312
-# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/conf/options#324
# $FreeBSD: src/sys/conf/options,v 1.608 2007/09/23 07:34:23 pjd Exp $
-==== YOURS //zhouzhouyi_mactest/sys/conf/options
-# $FreeBSD: src/sys/conf/options,v 1.606 2007/09/12 07:43:42 ariff Exp $
-<<<<
#
# On the handling of kernel options
#
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ddb/db_ps.c#3 (text+ko) ====
@@ -28,13 +28,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/ddb/db_ps.c#43
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.65 2006/12/06 06:34:54 julian Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/ddb/db_ps.c#45
__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/ddb/db_ps.c
-__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $");
-<<<<
#include <sys/param.h>
#include <sys/cons.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac_pci.c#3 (text+ko) ====
@@ -28,13 +28,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#55
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.61 2006/12/11 18:28:28 mjacob Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#57
__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.63 2007/10/14 19:40:15 emaste Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/aac/aac_pci.c
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62 2007/08/23 20:12:40 emaste Exp $");
-<<<<
/*
* PCI bus interface and resource allocation.
@@ -202,8 +196,6 @@
"ICP ICP9047MA SATA RAID"},
{0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
"ICP ICP9087MA SATA RAID"},
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#55
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#57
{0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0,
"ICP9067MA SATA RAID"},
{0x9005, 0x0285, 0x9005, 0x02b5, AAC_HWIF_I960RX, 0,
@@ -246,12 +238,6 @@
"Adaptec RAID 3085"},
{0x9005, 0x0285, 0x9005, 0x02c8, AAC_HWIF_I960RX, 0,
"ICP RAID ICP5805BL"},
-==== YOURS //zhouzhouyi_mactest/sys/dev/aac/aac_pci.c
- {0x9005, 0x0285, 0x9005, 0x02bb, AAC_HWIF_I960RX, 0,
- "Adaptec RAID 3405"},
- {0x9005, 0x0285, 0x9005, 0x02bc, AAC_HWIF_I960RX, 0,
- "Adaptec RAID 3805"},
-<<<<
{0x9005, 0x0286, 0x1014, 0x9580, AAC_HWIF_RKT, 0,
"IBM ServeRAID-8k"},
{0x9005, 0x0285, 0x1014, 0x034d, AAC_HWIF_I960RX, 0,
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi.c#3 (text+ko) ====
@@ -28,13 +28,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/acpica/acpi.c#214
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/acpica/acpi.c#217
__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243 2007/10/09 07:48:07 njl Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/acpica/acpi.c
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.242 2007/09/13 01:37:17 njl Exp $");
-<<<<
#include "opt_acpi.h"
#include <sys/param.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_hpet.c#3 (text+ko) ====
@@ -25,13 +25,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/acpica/acpi_hpet.c#9
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.9 2007/06/15 18:02:34 njl Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/acpica/acpi_hpet.c#12
__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.12 2007/10/09 07:48:07 njl Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/acpica/acpi_hpet.c
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.11 2007/07/30 15:21:26 njl Exp $");
-<<<<
#include "opt_acpi.h"
#include <sys/param.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#3 (text+ko) ====
@@ -25,13 +25,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ata/ata-chipset.c#197
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ata/ata-chipset.c#202
__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.202 2007/10/09 20:15:09 delphij Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/ata/ata-chipset.c
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $");
-<<<<
#include "opt_ata.h"
#include <sys/param.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#3 (text+ko) ====
@@ -23,13 +23,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.
*
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ata/ata-pci.h#76
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ata/ata-pci.h#81
* $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.81 2007/10/09 20:15:09 delphij Exp $
-==== YOURS //zhouzhouyi_mactest/sys/dev/ata/ata-pci.h
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $
-<<<<
*/
/* structure holding chipset config info */
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ath/ath_rate/sample/sample.c#3 (text+ko) ====
@@ -36,13 +36,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ath/ath_rate/sample/sample.c#17
-__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.17 2007/06/11 03:36:50 sam Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ath/ath_rate/sample/sample.c#19
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.19 2007/10/13 22:30:41 sam Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/ath/ath_rate/sample/sample.c
-__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.18 2007/09/17 16:25:02 sam Exp $");
-<<<<
/*
* John Bicket's SampleRate control algorithm.
@@ -144,6 +138,17 @@
return packet_size_bins[index];
}
+static __inline int
+rate_to_ndx(struct sample_node *sn, int rate) {
+ int x = 0;
+ for (x = 0; x < sn->num_rates; x++) {
+ if (sn->rates[x].rate == rate) {
+ return x;
+ }
+ }
+ return -1;
+}
+
void
ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
{
@@ -510,11 +515,10 @@
struct sample_node *sn = ATH_NODE_SAMPLE(an);
const struct ath_tx_status *ts = &bf->bf_status.ds_txstat;
const struct ath_desc *ds0 = &bf->bf_desc[0];
- const HAL_RATE_TABLE *rt = sc->sc_currates;
- int short_tries, long_tries, frame_size;
- int mrr, ndx0, ndx1, ndx2, ndx3;
+ int final_rate, short_tries, long_tries, frame_size;
+ int mrr;
- ndx0 = rt->rateCodeToIndex[ts->ts_rate &~ HAL_TXSTAT_ALTRATE];
+ final_rate = sc->sc_hwmap[ts->ts_rate &~ HAL_TXSTAT_ALTRATE].ieeerate;
short_tries = ts->ts_shortretry;
long_tries = ts->ts_longretry + 1;
frame_size = ds0->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */
@@ -532,6 +536,8 @@
}
mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) {
+ int ndx = rate_to_ndx(sn, final_rate);
+
/*
* Only one rate was used; optimize work.
*/
@@ -540,18 +546,18 @@
__func__, ether_sprintf(an->an_node.ni_macaddr),
bin_to_size(size_to_bin(frame_size)),
ts->ts_status ? "FAIL" : "OK",
- sn->rates[ndx0].rate, short_tries, long_tries);
+ final_rate, short_tries, long_tries);
update_stats(sc, an, frame_size,
- ndx0, long_tries,
+ ndx, long_tries,
0, 0,
0, 0,
0, 0,
short_tries, long_tries, ts->ts_status);
} else {
- int hwrate0, tries0;
- int hwrate1, tries1;
- int hwrate2, tries2;
- int hwrate3, tries3;
+ int hwrate0, rate0, tries0, ndx0;
+ int hwrate1, rate1, tries1, ndx1;
+ int hwrate2, rate2, tries2, ndx2;
+ int hwrate3, rate3, tries3, ndx3;
int finalTSIdx = ts->ts_finaltsi;
/*
@@ -569,17 +575,21 @@
hwrate3 = MS(ds0->ds_ctl3, AR5416_XmitRate3);
}
- ndx0 = rt->rateCodeToIndex[hwrate0];
+ rate0 = sc->sc_hwmap[hwrate0].ieeerate;
tries0 = MS(ds0->ds_ctl2, AR_XmitDataTries0);
+ ndx0 = rate_to_ndx(sn, rate0);
- ndx1 = rt->rateCodeToIndex[hwrate1];
+ rate1 = sc->sc_hwmap[hwrate1].ieeerate;
tries1 = MS(ds0->ds_ctl2, AR_XmitDataTries1);
+ ndx1 = rate_to_ndx(sn, rate1);
- ndx2 = rt->rateCodeToIndex[hwrate2];
+ rate2 = sc->sc_hwmap[hwrate2].ieeerate;
tries2 = MS(ds0->ds_ctl2, AR_XmitDataTries2);
+ ndx2 = rate_to_ndx(sn, rate2);
- ndx3 = rt->rateCodeToIndex[hwrate3];
+ rate3 = sc->sc_hwmap[hwrate3].ieeerate;
tries3 = MS(ds0->ds_ctl2, AR_XmitDataTries3);
+ ndx3 = rate_to_ndx(sn, rate3);
DPRINTF(sc, ATH_DEBUG_RATE,
"%s: %s size %d finaltsidx %d tries %d %s rate/try [%d/%d %d/%d %d/%d %d/%d]\n",
@@ -588,10 +598,10 @@
finalTSIdx,
long_tries,
ts->ts_status ? "FAIL" : "OK",
- sn->rates[ndx0].rate, tries0,
- sn->rates[ndx1].rate, tries1,
- sn->rates[ndx2].rate, tries2,
- sn->rates[ndx3].rate, tries3);
+ rate0, tries0,
+ rate1, tries1,
+ rate2, tries2,
+ rate3, tries3);
/*
* NB: series > 0 are not penalized for failure
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ctau/if_ct.c#3 (text+ko) ====
@@ -22,13 +22,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ctau/if_ct.c#32
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.33 2007/03/21 03:38:35 nyan Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ctau/if_ct.c#34
__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.35 2007/10/12 06:03:43 kevlo Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/ctau/if_ct.c
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.34 2007/07/27 11:59:56 rwatson Exp $");
-<<<<
#include <sys/param.h>
#include <sys/proc.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/cx/if_cx.c#3 (text+ko) ====
@@ -23,13 +23,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/cx/if_cx.c#55
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.56 2007/03/21 03:38:35 nyan Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/cx/if_cx.c#57
__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.58 2007/10/12 06:03:43 kevlo Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/cx/if_cx.c
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.57 2007/07/27 11:59:56 rwatson Exp $");
-<<<<
#include <sys/param.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ipw/if_ipw.c#3 (text+ko) ====
@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27
-/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.27 2007/06/11 03:36:51 sam Exp $ */
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32
/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.32 2007/10/12 10:00:26 thompsa Exp $ */
-==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c
-/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30 2007/09/05 21:31:31 sam Exp $ */
-<<<<
/*-
* Copyright (c) 2004-2006
@@ -36,13 +30,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27
-__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.27 2007/06/11 03:36:51 sam Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32
__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.32 2007/10/12 10:00:26 thompsa Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c
-__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30 2007/09/05 21:31:31 sam Exp $");
-<<<<
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -357,13 +345,7 @@
ic->ic_scan_mindwell = ipw_scan_mindwell;
bpfattach2(ifp, DLT_IEEE802_11_RADIO,
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27
- sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf);
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32
sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap),
-==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c
- sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap),
-<<<<
&sc->sc_drvbpf);
sc->sc_rxtap_len = sizeof sc->sc_rxtap;
@@ -2304,30 +2286,7 @@
if (error != 0)
return error;
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27
-#ifdef IPW_DEBUG
- if (ipw_debug > 0) {
- printf("Setting ESSID to ");
- ieee80211_print_essid(ic->ic_des_essid, ic->ic_des_esslen);
- printf("\n");
- }
-#endif
- error = ipw_cmd(sc, IPW_CMD_SET_ESSID, ic->ic_des_ssid[0].ssid,
- ic->ic_des_ssid[0].len);
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32
error = ipw_setssid(sc, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len);
-==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c
-#ifdef IPW_DEBUG
- if (ipw_debug > 0) {
- printf("Setting ESSID to ");
- ieee80211_print_essid(ic->ic_des_ssid[0].ssid,
- ic->ic_des_ssid[0].len);
- printf("\n");
- }
-#endif
- error = ipw_cmd(sc, IPW_CMD_SET_ESSID, ic->ic_des_ssid[0].ssid,
- ic->ic_des_ssid[0].len);
-<<<<
if (error != 0)
return error;
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt.c#3 (text+ko) ====
@@ -96,13 +96,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/mpt/mpt.c#43
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.43 2007/06/04 06:18:07 scottl Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/mpt/mpt.c#45
__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.45 2007/10/12 06:03:43 kevlo Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/mpt/mpt.c
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.44 2007/08/14 19:17:35 scottl Exp $");
-<<<<
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt_cam.c#3 (text+ko) ====
@@ -94,13 +94,7 @@
* OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/mpt/mpt_cam.c#59
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.60 2007/06/18 18:28:43 scottl Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/mpt/mpt_cam.c#61
__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.62 2007/10/12 16:54:51 scottl Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/mpt/mpt_cam.c
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.61 2007/08/14 19:17:35 scottl Exp $");
-<<<<
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pccard/pccarddevs#3 (text+ko) ====
@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/pccard/pccarddevs#114
-$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.128 2007/02/16 07:51:23 imp Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/pccard/pccarddevs#116
$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.130 2007/10/12 08:26:15 remko Exp $
-==== YOURS //zhouzhouyi_mactest/sys/dev/pccard/pccarddevs
-$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.129 2007/07/11 04:14:41 imp Exp $
-<<<<
/* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pci/pci.c#3 (text+ko) ====
@@ -27,13 +27,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/pci/pci.c#172
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.353 2007/05/16 23:42:04 jhb Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/pci/pci.c#174
__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.355 2007/09/30 11:05:15 marius Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/pci/pci.c
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.354 2007/07/29 02:44:41 marcel Exp $");
-<<<<
#include "opt_bus.h"
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.c#3 (text+ko) ====
@@ -63,13 +63,7 @@
#include <dev/sound/pci/atiixp.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/atiixp.c#18
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.18 2007/06/14 11:13:37 ariff Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/atiixp.c#20
SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.20 2007/10/12 06:03:44 kevlo Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/atiixp.c
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.19 2007/07/09 20:41:23 ariff Exp $");
-<<<<
#define ATI_IXP_DMA_RETRY_MAX 100
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/emu10kx.c#3 (text+ko) ====
@@ -24,13 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/emu10kx.c#11
- * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.11 2007/06/04 18:25:04 dwmalone Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/emu10kx.c#13
* $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.13 2007/10/12 06:03:44 kevlo Exp $
-==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/emu10kx.c
- * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.12 2007/09/12 07:43:42 ariff Exp $
-<<<<
*/
#include <sys/param.h>
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/hda/hdac.c#3 (text+ko) ====
@@ -81,22 +81,10 @@
#include "mixer_if.h"
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#42
-#define HDA_DRV_TEST_REV "20070619_0045"
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#45
#define HDA_DRV_TEST_REV "20071020_0048"
-==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/hda/hdac.c
-#define HDA_DRV_TEST_REV "20070710_0047"
-<<<<
#define HDA_WIDGET_PARSER_REV 1
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#42
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.42 2007/06/18 22:39:27 ariff Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#45
SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.45 2007/10/19 15:49:39 ariff Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/hda/hdac.c
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.44 2007/07/09 20:42:11 ariff Exp $");
-<<<<
#define HDA_BOOTVERBOSE(stmt) do { \
if (bootverbose != 0 || snd_verbose > 3) { \
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axe.c#3 (text+ko) ====
@@ -31,13 +31,7 @@
*/
#include <sys/cdefs.h>
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.51 2007/06/18 22:25:45 imp Exp $");
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55
__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.55 2007/09/25 21:08:33 imp Exp $");
-==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.53 2007/08/09 04:40:07 imp Exp $");
-<<<<
/*
* ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver.
@@ -611,16 +605,10 @@
/*
* Get station address.
*/
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51
- axe_cmd(sc, AXE_CMD_READ_NODEID, 0, 0, &eaddr);
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55
if (sc->axe_flags & (AX178|AX772))
axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, &eaddr);
else
axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, &eaddr);
-==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c
- axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, &eaddr);
-<<<<
/*
* Fetch IPG values.
@@ -1087,11 +1075,6 @@
}
/* Set transmitter IPG values */
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51
- axe_cmd(sc, AXE_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL);
- axe_cmd(sc, AXE_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL);
- axe_cmd(sc, AXE_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL);
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55
if (sc->axe_flags & (AX178|AX772)) {
axe_cmd(sc, AXE_178_CMD_WRITE_IPG012, sc->axe_ipgs[2],
(sc->axe_ipgs[1]<<8) | sc->axe_ipgs[0], NULL);
@@ -1100,25 +1083,14 @@
axe_cmd(sc, AXE_172_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL);
axe_cmd(sc, AXE_172_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL);
}
-==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c
- axe_cmd(sc, AXE_172_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL);
- axe_cmd(sc, AXE_172_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL);
- axe_cmd(sc, AXE_172_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL);
-<<<<
/* Enable receiver, set RX mode */
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51
- rxmode = AXE_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE;
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55
rxmode = AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE;
if (sc->axe_flags & (AX178|AX772)) {
if (sc->axe_bufsz == AXE_178_MAX_BUFSZ)
rxmode |= AXE_178_RXCMD_MFB_16384;
} else
rxmode |= AXE_172_RXCMD_UNICAST;
-==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c
- rxmode = AXE_172_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE;
-<<<<
/* If we want promiscuous mode, set the allframes bit. */
if (ifp->if_flags & IFF_PROMISC)
==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axereg.h#3 (text+ko) ====
@@ -29,13 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#12
- * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.12 2007/06/10 07:24:32 imp Exp $
-==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#16
* $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.16 2007/09/25 21:08:33 imp Exp $
-==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axereg.h
- * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.14 2007/08/09 04:40:07 imp Exp $
-<<<<
*/
/*
@@ -113,8 +107,6 @@
#define AXE_178_MEDIA_GMII 0x0001
#define AXE_MEDIA_FULL_DUPLEX 0x0002
#define AXE_172_MEDIA_TX_ABORT_ALLOW 0x0004
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#12
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list