Date: Tue, 29 Apr 2008 17:07:03 GMT From: Rui Paulo <rpaulo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 140870 for review Message-ID: <200804291707.m3TH73Ih003422@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140870 Change 140870 by rpaulo@rpaulo_zoo on 2008/04/29 17:06:29 IFC Affected files ... .. //depot/projects/tcpecn/conf/files#9 integrate .. //depot/projects/tcpecn/conf/files.powerpc#6 integrate .. //depot/projects/tcpecn/conf/files.sparc64#4 integrate .. //depot/projects/tcpecn/conf/files.sun4v#3 integrate .. //depot/projects/tcpecn/conf/kern.mk#2 integrate .. //depot/projects/tcpecn/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/tcpecn/dev/ath/if_ath.c#5 integrate .. //depot/projects/tcpecn/dev/bce/if_bce.c#4 integrate .. //depot/projects/tcpecn/dev/bge/if_bge.c#6 integrate .. //depot/projects/tcpecn/dev/em/e1000_82571.c#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_82571.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_api.c#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_api.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_defines.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_hw.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_phy.c#4 integrate .. //depot/projects/tcpecn/dev/em/e1000_phy.h#4 integrate .. //depot/projects/tcpecn/dev/em/if_em.c#5 integrate .. //depot/projects/tcpecn/dev/em/if_em.h#5 integrate .. //depot/projects/tcpecn/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/tcpecn/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/tcpecn/dev/igb/e1000_82575.c#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_api.c#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_api.h#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_defines.h#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_hw.h#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_mac.c#3 integrate .. //depot/projects/tcpecn/dev/igb/e1000_manage.h#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_osdep.c#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_osdep.h#2 integrate .. //depot/projects/tcpecn/dev/igb/e1000_phy.c#2 integrate .. //depot/projects/tcpecn/dev/igb/if_igb.c#3 integrate .. //depot/projects/tcpecn/dev/igb/if_igb.h#2 integrate .. //depot/projects/tcpecn/dev/mii/ciphy.c#3 integrate .. //depot/projects/tcpecn/dev/mii/miidevs#5 integrate .. //depot/projects/tcpecn/dev/pci/pcivar.h#3 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe_quicc.c#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/tcpecn/dev/scc/scc_core.c#2 integrate .. //depot/projects/tcpecn/dev/ti/if_ti.c#4 integrate .. //depot/projects/tcpecn/dev/usb/if_rum.c#5 integrate .. //depot/projects/tcpecn/dev/usb/if_udav.c#4 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#8 integrate .. //depot/projects/tcpecn/dev/usb/uscanner.c#3 integrate .. //depot/projects/tcpecn/kern/kern_descrip.c#9 integrate .. //depot/projects/tcpecn/kern/kern_thr.c#3 integrate .. //depot/projects/tcpecn/kern/kern_umtx.c#5 integrate .. //depot/projects/tcpecn/kern/uipc_syscalls.c#7 integrate .. //depot/projects/tcpecn/kern/vfs_subr.c#9 integrate .. //depot/projects/tcpecn/mips/include/pmap.h#2 integrate .. //depot/projects/tcpecn/mips/mips/pmap.c#2 integrate .. //depot/projects/tcpecn/modules/em/Makefile#5 integrate .. //depot/projects/tcpecn/modules/scc/Makefile#2 integrate .. //depot/projects/tcpecn/net/bpf.c#6 integrate .. //depot/projects/tcpecn/net80211/ieee80211.c#4 integrate .. //depot/projects/tcpecn/powerpc/aim/clock.c#4 integrate .. //depot/projects/tcpecn/powerpc/aim/locore.S#5 integrate .. //depot/projects/tcpecn/powerpc/aim/machdep.c#6 integrate .. //depot/projects/tcpecn/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/tcpecn/powerpc/aim/mp_cpudep.c#1 branch .. //depot/projects/tcpecn/powerpc/aim/swtch.S#3 integrate .. //depot/projects/tcpecn/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/tcpecn/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/tcpecn/powerpc/booke/pmap.c#2 integrate .. //depot/projects/tcpecn/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/tcpecn/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/tcpecn/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/tcpecn/powerpc/conf/NOTES#6 integrate .. //depot/projects/tcpecn/powerpc/include/cpufunc.h#2 integrate .. //depot/projects/tcpecn/powerpc/include/pcpu.h#4 integrate .. //depot/projects/tcpecn/powerpc/include/smp.h#2 integrate .. //depot/projects/tcpecn/powerpc/include/spr.h#3 integrate .. //depot/projects/tcpecn/powerpc/mpc85xx/mpc85xx.c#1 branch .. //depot/projects/tcpecn/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/tcpecn/powerpc/mpc85xx/ocpbus.h#2 integrate .. //depot/projects/tcpecn/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/tcpecn/powerpc/powermac/macio.c#3 integrate .. //depot/projects/tcpecn/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/tcpecn/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/tcpecn/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/tcpecn/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/tcpecn/security/audit/audit.h#3 integrate .. //depot/projects/tcpecn/sparc64/isa/isa.c#2 integrate .. //depot/projects/tcpecn/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/tcpecn/sparc64/pci/ofw_pci_if.m#3 delete .. //depot/projects/tcpecn/sparc64/pci/psycho.c#5 integrate .. //depot/projects/tcpecn/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/tcpecn/sys/mount.h#3 integrate .. //depot/projects/tcpecn/sys/umtx.h#3 integrate .. //depot/projects/tcpecn/sys/user.h#5 integrate .. //depot/projects/tcpecn/vm/vm_kern.c#5 integrate .. //depot/projects/tcpecn/vm/vm_map.c#5 integrate .. //depot/projects/tcpecn/vm/vm_map.h#3 integrate .. //depot/projects/tcpecn/vm/vm_mmap.c#4 integrate Differences ... ==== //depot/projects/tcpecn/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -732,6 +732,48 @@ dev/ips/ips_ioctl.c optional ips dev/ips/ips_pci.c optional ips pci dev/ipw/if_ipw.c optional ipw +ipwbssfw.c optional ipwbssfw | ipwfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "ipwbssfw.c" +ipw_bss.fwo optional ipwbssfw | ipwfw \ + dependency "ipw_bss.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \ + no-implicit-rule \ + clean "ipw_bss.fwo" +ipw_bss.fw optional ipwbssfw | ipwfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \ + no-obj no-implicit-rule \ + clean "ipw_bss.fw" +ipwibssfw.c optional ipwibssfw | ipwfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "ipwibssfw.c" +ipw_ibss.fwo optional ipwibssfw | ipwfw \ + dependency "ipw_ibss.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \ + no-implicit-rule \ + clean "ipw_ibss.fwo" +ipw_ibss.fw optional ipwibssfw | ipwfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \ + no-obj no-implicit-rule \ + clean "ipw_ibss.fw" +ipwmonitorfw.c optional ipwmonitorfw | ipwfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "ipwmonitorfw.c" +ipw_monitor.fwo optional ipwmonitorfw | ipwfw \ + dependency "ipw_monitor.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \ + no-implicit-rule \ + clean "ipw_monitor.fwo" +ipw_monitor.fw optional ipwmonitorfw | ipwfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \ + no-obj no-implicit-rule \ + clean "ipw_monitor.fw" dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus @@ -746,6 +788,48 @@ dev/isp/isp_target.c optional isp dev/ispfw/ispfw.c optional ispfw dev/iwi/if_iwi.c optional iwi +iwibssfw.c optional iwibssfw | iwifw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwibssfw.c" +iwi_bss.fwo optional iwibssfw | iwifw \ + dependency "iwi_bss.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \ + no-implicit-rule \ + clean "iwi_bss.fwo" +iwi_bss.fw optional iwibssfw | iwifw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwi_bss.fw" +iwiibssfw.c optional iwiibssfw | iwifw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwiibssfw.c" +iwi_ibss.fwo optional iwiibssfw | iwifw \ + dependency "iwi_ibss.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \ + no-implicit-rule \ + clean "iwi_ibss.fwo" +iwi_ibss.fw optional iwiibssfw | iwifw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwi_ibss.fw" +iwimonitorfw.c optional iwimonitorfw | iwifw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwimonitorfw.c" +iwi_monitor.fwo optional iwimonitorfw | iwifw \ + dependency "iwi_monitor.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \ + no-implicit-rule \ + clean "iwi_monitor.fwo" +iwi_monitor.fw optional iwimonitorfw | iwifw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwi_monitor.fw" dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb @@ -922,6 +1006,62 @@ dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral dev/ral/if_ral_pci.c optional ral pci +rt2561fw.c optional rt2561fw | ralfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "rt2561fw.c" +rt2561fw.fwo optional rt2561fw | ralfw \ + dependency "rt2561.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \ + no-implicit-rule \ + clean "rt2561.fwo" +rt2561.fw optional rt2561fw | ralfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \ + no-obj no-implicit-rule \ + clean "rt2561.fw" +rt2561sfw.c optional rt2561sfw | ralfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "rt2561sfw.c" +rt2561sfw.fwo optional rt2561sfw | ralfw \ + dependency "rt2561s.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \ + no-implicit-rule \ + clean "rt2561s.fwo" +rt2561s.fw optional rt2561sfw | ralfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \ + no-obj no-implicit-rule \ + clean "rt2561s.fw" +rt2661fw.c optional rt2661fw | ralfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "rt2661fw.c" +rt2661fw.fwo optional rt2661fw | ralfw \ + dependency "rt2661.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \ + no-implicit-rule \ + clean "rt2661.fwo" +rt2661.fw optional rt2661fw | ralfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \ + no-obj no-implicit-rule \ + clean "rt2661.fw" +rt2860fw.c optional rt2860fw | ralfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "rt2860fw.c" +rt2860fw.fwo optional rt2860fw | ralfw \ + dependency "rt2860.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \ + no-implicit-rule \ + clean "rt2860.fwo" +rt2860.fw optional rt2860fw | ralfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \ + no-obj no-implicit-rule \ + clean "rt2860.fw" dev/random/harvest.c standard dev/random/hash.c optional random dev/random/probe.c optional random @@ -1183,6 +1323,20 @@ dev/wi/if_wi_pccard.c optional wi pccard dev/wi/if_wi_pci.c optional wi pci dev/wl/if_wl.c optional wl isa +wpifw.c optional wpifw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "wpifw.c" +wpifw.fwo optional wpifw \ + dependency "wpi.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \ + no-implicit-rule \ + clean "wpi.fwo" +wpi.fw optional wpifw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \ + no-obj no-implicit-rule \ + clean "wpi.fw" dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard fs/coda/coda_fbsd.c optional vcoda ==== //depot/projects/tcpecn/conf/files.powerpc#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.74 2008/03/03 20:40:19 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.76 2008/04/27 22:33:41 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -68,6 +68,7 @@ powerpc/aim/locore.S optional aim no-obj powerpc/aim/machdep.c optional aim powerpc/aim/mmu_oea.c optional aim +powerpc/aim/mp_cpudep.c optional aim smp powerpc/aim/nexus.c optional aim powerpc/aim/ofw_machdep.c optional aim powerpc/aim/ofwmagic.S optional aim @@ -96,6 +97,7 @@ powerpc/fpu/fpu_mul.c optional fpu_emu powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu +powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx ==== //depot/projects/tcpecn/conf/files.sparc64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.94 2008/02/11 21:40:22 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.95 2008/04/26 11:01:37 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -83,7 +83,6 @@ sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci -sparc64/pci/ofw_pci_if.m optional pci sparc64/pci/psycho.c optional pci sparc64/sbus/dma_sbus.c optional sbus sparc64/sbus/sbus.c optional sbus ==== //depot/projects/tcpecn/conf/files.sun4v#3 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.13 2007/12/02 20:40:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -49,7 +49,6 @@ sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci -sparc64/pci/ofw_pci_if.m optional pci # XXX hvcons should be optional sun4v/sun4v/hvcons.c standard ==== //depot/projects/tcpecn/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.53 2008/04/29 11:28:10 gonzo Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -85,6 +85,15 @@ .endif # +# For MIPS we also tell gcc to use floating point emulation and +# disable MIPS DSP ASE Instruction set. +# +.if ${MACHINE_ARCH} == "mips" +CFLAGS+= -msoft-float -mno-dsp +INLINE_LIMIT?= 15000 +.endif + +# # GCC 3.0 and above like to do certain optimizations based on the # assumption that the program is linked against libc. Stop this. # ==== //depot/projects/tcpecn/dev/acpica/acpi_thermal.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -90,6 +90,7 @@ int tz_temperature; /*Current temperature*/ int tz_active; /*Current active cooling*/ #define TZ_ACTIVE_NONE -1 +#define TZ_ACTIVE_UNKNOWN -2 int tz_requested; /*Minimum active cooling*/ int tz_thflags; /*Current temp-related flags*/ #define TZ_THFLAG_NONE 0 @@ -202,7 +203,7 @@ sc->tz_dev = dev; sc->tz_handle = acpi_get_handle(dev); sc->tz_requested = TZ_ACTIVE_NONE; - sc->tz_active = TZ_ACTIVE_NONE; + sc->tz_active = TZ_ACTIVE_UNKNOWN; sc->tz_thflags = TZ_THFLAG_NONE; sc->tz_cooling_proc = NULL; sc->tz_cooling_proc_running = FALSE; @@ -520,6 +521,7 @@ * minimum cooling run time if requested. */ if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE && + sc->tz_active != TZ_ACTIVE_UNKNOWN && (newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) { getnanotime(&curtime); @@ -543,6 +545,23 @@ newflags |= TZ_THFLAG_CRT; /* If the active cooling state has changed, we have to switch things. */ + if (sc->tz_active == TZ_ACTIVE_UNKNOWN) { + /* + * We don't know which cooling device is on or off, + * so stop them all, because we now know which + * should be on (if any). + */ + for (i = 0; i < TZ_NUMLEVELS; i++) { + if (sc->tz_zone.al[i].Pointer != NULL) { + acpi_ForeachPackageObject( + (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer, + acpi_tz_switch_cooler_off, sc); + } + } + /* now we know that all devices are off */ + sc->tz_active = TZ_ACTIVE_NONE; + } + if (newactive != sc->tz_active) { /* Turn off the cooling devices that are on, if any are */ if (sc->tz_active != TZ_ACTIVE_NONE) ==== //depot/projects/tcpecn/dev/ath/if_ath.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.180 2008/04/20 20:35:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.181 2008/04/27 22:03:56 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -5920,7 +5920,12 @@ ath_hal_setregdomain(ah, 0); /* XXX not quite right but close enough for now */ getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE); + + /* NB: restore previous state */ ath_hal_setregdomain(ah, ord); + (void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country, + ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE, + ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE); } static int ==== //depot/projects/tcpecn/dev/bce/if_bce.c#4 (text) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.37 2008/04/11 23:10:40 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.38 2008/04/26 14:13:48 marius Exp $"); /* * The following controllers are supported by this driver: @@ -502,7 +502,7 @@ /* Allocate PCI memory resources. */ rid = PCIR_BAR(0); sc->bce_res_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &rid, RF_ACTIVE | PCI_RF_DENSE); + &rid, RF_ACTIVE); if (sc->bce_res_mem == NULL) { BCE_PRINTF("%s(%d): PCI memory allocation failed\n", ==== //depot/projects/tcpecn/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.205 2008/04/08 11:51:17 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.207 2008/04/26 14:13:48 marius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1894,16 +1894,10 @@ /* * Allocate the parent bus DMA tag appropriate for PCI. */ - error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), /* parent */ - 1, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */ - BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ - 0, /* flags */ - NULL, NULL, /* lockfunc, lockarg */ - &sc->bge_cdata.bge_parent_tag); + error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), + 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, + NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, + 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag); if (error != 0) { device_printf(sc->bge_dev, @@ -1912,7 +1906,7 @@ } /* - * Create tag for RX mbufs. + * Create tag for mbufs. */ error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, @@ -2246,7 +2240,7 @@ rid = BGE_PCI_BAR0; sc->bge_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE | PCI_RF_DENSE); + RF_ACTIVE); if (sc->bge_res == NULL) { device_printf (sc->bge_dev, "couldn't map memory\n"); @@ -3402,7 +3396,7 @@ error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs, &nsegs, BUS_DMA_NOWAIT); if (error == EFBIG) { - m = m_defrag(m, M_DONTWAIT); + m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW); if (m == NULL) { m_freem(*m_head); *m_head = NULL; ==== //depot/projects/tcpecn/dev/em/e1000_82571.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/ /* e1000_82571 * e1000_82572 @@ -150,6 +150,25 @@ goto out; } break; + case e1000_82574: + phy->type = e1000_phy_bm; + phy->ops.get_cfg_done = e1000_get_cfg_done_generic; + phy->ops.get_info = e1000_get_phy_info_m88; + phy->ops.commit = e1000_phy_sw_reset_generic; + phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88; + phy->ops.get_cable_length = e1000_get_cable_length_m88; + phy->ops.read_reg = e1000_read_phy_reg_bm2; + phy->ops.write_reg = e1000_write_phy_reg_bm2; + + /* This uses above function pointers */ + ret_val = e1000_get_phy_id_82571(hw); + /* Verify PHY ID */ + if (phy->id != BME1000_E_PHY_ID_R2) { + ret_val = -E1000_ERR_PHY; + DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id); + goto out; + } + break; default: ret_val = -E1000_ERR_PHY; goto out; @@ -193,6 +212,7 @@ switch (hw->mac.type) { case e1000_82573: + case e1000_82574: if (((eecd >> 15) & 0x3) == 0x3) { nvm->type = e1000_nvm_flash_hw; nvm->word_size = 2048; @@ -374,6 +394,7 @@ { struct e1000_phy_info *phy = &hw->phy; s32 ret_val = E1000_SUCCESS; + u16 phy_id = 0; DEBUGFUNC("e1000_get_phy_id_82571"); @@ -391,11 +412,26 @@ case e1000_82573: ret_val = e1000_get_phy_id(hw); break; + case e1000_82574: + ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id); + if (ret_val) + goto out; + + phy->id = (u32)(phy_id << 16); + usec_delay(20); + ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id); + if (ret_val) + goto out; + + phy->id |= (u32)(phy_id); + phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK); + break; default: ret_val = -E1000_ERR_PHY; break; } +out: return ret_val; } @@ -476,7 +512,7 @@ if (ret_val) goto out; - if (hw->mac.type != e1000_82573) + if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574) ret_val = e1000_acquire_nvm_generic(hw); if (ret_val) @@ -521,6 +557,7 @@ switch (hw->mac.type) { case e1000_82573: + case e1000_82574: ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data); break; case e1000_82571: @@ -825,7 +862,7 @@ * Must acquire the MDIO ownership before MAC reset. * Ownership defaults to firmware after a reset. */ - if (hw->mac.type == e1000_82573) { + if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) { extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL); extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP; @@ -866,7 +903,7 @@ * Need to wait for Phy configuration completion before accessing * NVM and Phy. */ - if (hw->mac.type == e1000_82573) + if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) msec_delay(25); /* Clear any pending interrupt events. */ @@ -934,7 +971,7 @@ E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data); /* ...for both queues. */ - if (mac->type != e1000_82573) { + if (mac->type != e1000_82573 && mac->type != e1000_82574) { reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1)); reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB | @@ -1014,14 +1051,14 @@ } /* Device Control */ - if (hw->mac.type == e1000_82573) { + if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) { reg = E1000_READ_REG(hw, E1000_CTRL); reg &= ~(1 << 29); E1000_WRITE_REG(hw, E1000_CTRL, reg); } /* Extended Device Control */ - if (hw->mac.type == e1000_82573) { + if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) { reg = E1000_READ_REG(hw, E1000_CTRL_EXT); reg &= ~(1 << 23); reg |= (1 << 22); @@ -1048,7 +1085,7 @@ DEBUGFUNC("e1000_clear_vfta_82571"); - if (hw->mac.type == e1000_82573) { + if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) { if (hw->mng_cookie.vlan_id != 0) { /* * The VFTA is a 4096b bit-field, each identifying @@ -1121,7 +1158,8 @@ * the default flow control setting, so we explicitly * set it to full. */ - if (hw->mac.type == e1000_82573 && hw->fc.type == e1000_fc_default) + if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) && + hw->fc.type == e1000_fc_default) hw->fc.type = e1000_fc_full; return e1000_setup_link_generic(hw); @@ -1224,11 +1262,10 @@ goto out; } - if (hw->mac.type == e1000_82573 && + if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) && *data == ID_LED_RESERVED_F746) *data = ID_LED_DEFAULT_82573; - else if (*data == ID_LED_RESERVED_0000 || - *data == ID_LED_RESERVED_FFFF) + else if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF) *data = ID_LED_DEFAULT; out: return ret_val; ==== //depot/projects/tcpecn/dev/em/e1000_82571.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/ #ifndef _E1000_82571_H_ #define _E1000_82571_H_ @@ -43,4 +43,12 @@ #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000 +/* Intr Throttling - RW */ +#define E1000_EITR_82574(_n) (0x000E8 + (0x4 * (_n))) + +#define E1000_EIAC_82574 0x000DC /* Ext. Interrupt Auto Clear - RW */ +#define E1000_EIAC_MASK_82574 0x01500000 + +#define E1000_RXCFGL 0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */ + #endif ==== //depot/projects/tcpecn/dev/em/e1000_api.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/ #include "e1000_api.h" #include "e1000_mac.h" @@ -216,6 +216,9 @@ case E1000_DEV_ID_82573L: mac->type = e1000_82573; break; + case E1000_DEV_ID_82574L: + mac->type = e1000_82574; + break; case E1000_DEV_ID_80003ES2LAN_COPPER_DPT: case E1000_DEV_ID_80003ES2LAN_SERDES_DPT: case E1000_DEV_ID_80003ES2LAN_COPPER_SPT: @@ -238,14 +241,24 @@ case E1000_DEV_ID_ICH9_IGP_M_AMT: case E1000_DEV_ID_ICH9_IGP_M_V: case E1000_DEV_ID_ICH9_IGP_AMT: + case E1000_DEV_ID_ICH9_BM: case E1000_DEV_ID_ICH9_IGP_C: + case E1000_DEV_ID_ICH10_R_BM_LM: + case E1000_DEV_ID_ICH10_R_BM_LF: + case E1000_DEV_ID_ICH10_R_BM_V: mac->type = e1000_ich9lan; break; + case E1000_DEV_ID_ICH10_D_BM_LM: + case E1000_DEV_ID_ICH10_D_BM_LF: + mac->type = e1000_ich10lan; + break; +#ifndef NO_82575_SUPPORT case E1000_DEV_ID_82575EB_COPPER: case E1000_DEV_ID_82575EB_FIBER_SERDES: case E1000_DEV_ID_82575GB_QUAD_COPPER: mac->type = e1000_82575; break; +#endif default: /* Should never have loaded on this device */ ret_val = -E1000_ERR_MAC_INIT; @@ -323,6 +336,7 @@ case e1000_82571: case e1000_82572: case e1000_82573: + case e1000_82574: e1000_init_function_pointers_82571(hw); break; case e1000_80003es2lan: @@ -330,11 +344,14 @@ break; case e1000_ich8lan: case e1000_ich9lan: + case e1000_ich10lan: e1000_init_function_pointers_ich8lan(hw); break; +#ifndef NO_82575_SUPPORT case e1000_82575: e1000_init_function_pointers_82575(hw); break; +#endif default: DEBUGOUT("Hardware not supported\n"); ret_val = -E1000_ERR_CONFIG; @@ -403,7 +420,7 @@ void e1000_clear_vfta(struct e1000_hw *hw) { if (hw->mac.ops.clear_vfta) - hw->mac.ops.clear_vfta (hw); + hw->mac.ops.clear_vfta(hw); } /** ==== //depot/projects/tcpecn/dev/em/e1000_api.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/ #ifndef _E1000_API_H_ #define _E1000_API_H_ @@ -46,7 +46,9 @@ extern void e1000_init_function_pointers_82541(struct e1000_hw *hw); extern void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw); extern void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw); +#ifndef NO_82575_SUPPORT extern void e1000_init_function_pointers_82575(struct e1000_hw *hw); +#endif s32 e1000_set_mac_type(struct e1000_hw *hw); s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device); ==== //depot/projects/tcpecn/dev/em/e1000_defines.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.7 2008/04/25 21:19:40 jfv Exp $*/ #ifndef _E1000_DEFINES_H_ #define _E1000_DEFINES_H_ @@ -154,6 +154,7 @@ #define E1000_CTRL_EXT_DF_PAREN 0x02000000 /* descriptor FIFO parity error detection enable */ #define E1000_CTRL_EXT_GHOST_PAREN 0x40000000 #define E1000_CTRL_EXT_PBA_CLR 0x80000000 /* PBA Clear */ +#define E1000_CTRL_EXT_LSECCK 0x00001000 #define E1000_I2CCMD_REG_ADDR_SHIFT 16 #define E1000_I2CCMD_REG_ADDR 0x00FF0000 #define E1000_I2CCMD_PHY_ADDR_SHIFT 24 @@ -202,6 +203,13 @@ #define E1000_RXDEXT_STATERR_IPE 0x40000000 #define E1000_RXDEXT_STATERR_RXE 0x80000000 +#define E1000_RXDEXT_LSECH 0x01000000 +#define E1000_RXDEXT_LSECE_MASK 0x60000000 +#define E1000_RXDEXT_LSECE_NO_ERROR 0x00000000 +#define E1000_RXDEXT_LSECE_NO_SA_MATCH 0x20000000 +#define E1000_RXDEXT_LSECE_REPLAY_DETECT 0x40000000 +#define E1000_RXDEXT_LSECE_BAD_SIG 0x60000000 + /* mask to determine if packets should be dropped due to frame errors */ #define E1000_RXD_ERR_FRAME_ERR_MASK ( \ E1000_RXD_ERR_CE | \ @@ -397,6 +405,7 @@ #define E1000_CTRL_PHY_RESET4 E1000_CTRL_EXT_SDP4_DATA #define E1000_CONNSW_ENRGSRC 0x4 +#define E1000_PCS_CFG_PCS_EN 8 #define E1000_PCS_LCTL_FLV_LINK_UP 1 #define E1000_PCS_LCTL_FSV_10 0 #define E1000_PCS_LCTL_FSV_100 2 @@ -556,6 +565,8 @@ #define E1000_TXD_CMD_TSE 0x04000000 /* TCP Seg enable */ #define E1000_TXD_STAT_TC 0x00000004 /* Tx Underrun */ /* Extended desc bits for Linksec and timesync */ +#define E1000_TXD_CMD_LINKSEC 0x10000000 /* Apply LinkSec on packet */ +#define E1000_TXD_EXTCMD_TSTAMP 0x00000010 /* IEEE1588 Timestamp packet */ /* Transmit Control */ #define E1000_TCTL_RST 0x00000001 /* software reset */ @@ -715,6 +726,11 @@ #define E1000_ICR_DSW 0x00000020 /* FW changed the status of DISSW bit in the FWSM */ #define E1000_ICR_PHYINT 0x00001000 /* LAN connected device generates an interrupt */ #define E1000_ICR_EPRST 0x00100000 /* ME hardware reset occurs */ +#define E1000_ICR_RXQ0 0x00100000 /* Rx Queue 0 Interrupt */ +#define E1000_ICR_RXQ1 0x00200000 /* Rx Queue 1 Interrupt */ +#define E1000_ICR_TXQ0 0x00400000 /* Tx Queue 0 Interrupt */ +#define E1000_ICR_TXQ1 0x00800000 /* Tx Queue 1 Interrupt */ +#define E1000_ICR_OTHER 0x01000000 /* Other Interrupts */ /* Extended Interrupt Cause Read */ #define E1000_EICR_RX_QUEUE0 0x00000001 /* Rx Queue 0 Interrupt */ @@ -787,6 +803,11 @@ #define E1000_IMS_DSW E1000_ICR_DSW #define E1000_IMS_PHYINT E1000_ICR_PHYINT #define E1000_IMS_EPRST E1000_ICR_EPRST +#define E1000_IMS_RXQ0 E1000_ICR_RXQ0 /* Rx Queue 0 Interrupt */ +#define E1000_IMS_RXQ1 E1000_ICR_RXQ1 /* Rx Queue 1 Interrupt */ +#define E1000_IMS_TXQ0 E1000_ICR_TXQ0 /* Tx Queue 0 Interrupt */ +#define E1000_IMS_TXQ1 E1000_ICR_TXQ1 /* Tx Queue 1 Interrupt */ +#define E1000_IMS_OTHER E1000_ICR_OTHER /* Other Interrupts */ /* Extended Interrupt Mask Set */ #define E1000_EIMS_RX_QUEUE0 E1000_EICR_RX_QUEUE0 /* Rx Queue 0 Interrupt */ ==== //depot/projects/tcpecn/dev/em/e1000_hw.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_hw.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_hw.h,v 1.7 2008/04/25 21:19:40 jfv Exp $*/ #ifndef _E1000_HW_H_ #define _E1000_HW_H_ @@ -95,6 +95,7 @@ #define E1000_DEV_ID_82573E 0x108B #define E1000_DEV_ID_82573E_IAMT 0x108C #define E1000_DEV_ID_82573L 0x109A +#define E1000_DEV_ID_82574L 0x10D3 #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT 0x1096 #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT 0x1098 #define E1000_DEV_ID_80003ES2LAN_COPPER_SPT 0x10BA @@ -110,10 +111,16 @@ #define E1000_DEV_ID_ICH9_IGP_M_AMT 0x10F5 #define E1000_DEV_ID_ICH9_IGP_M_V 0x10CB #define E1000_DEV_ID_ICH9_IGP_AMT 0x10BD +#define E1000_DEV_ID_ICH9_BM 0x10E5 #define E1000_DEV_ID_ICH9_IGP_C 0x294C #define E1000_DEV_ID_ICH9_IFE 0x10C0 #define E1000_DEV_ID_ICH9_IFE_GT 0x10C3 #define E1000_DEV_ID_ICH9_IFE_G 0x10C2 +#define E1000_DEV_ID_ICH10_R_BM_LM 0x10CC +#define E1000_DEV_ID_ICH10_R_BM_LF 0x10CD +#define E1000_DEV_ID_ICH10_R_BM_V 0x10CE +#define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE +#define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF #define E1000_DEV_ID_82575EB_COPPER 0x10A7 #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 @@ -146,9 +153,11 @@ e1000_82571, e1000_82572, e1000_82573, + e1000_82574, e1000_80003es2lan, e1000_ich8lan, e1000_ich9lan, + e1000_ich10lan, e1000_82575, e1000_num_macs /* List is 1-based, so subtract 1 for TRUE count. */ } e1000_mac_type; ==== //depot/projects/tcpecn/dev/em/e1000_ich8lan.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/e1000_ich8lan.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/em/e1000_ich8lan.c,v 1.7 2008/04/25 21:19:40 jfv Exp $*/ /* e1000_ich8lan * e1000_ich9lan @@ -79,6 +79,8 @@ static s32 e1000_get_phy_info_ife_ich8lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw); static s32 e1000_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804291707.m3TH73Ih003422>