Date: Mon, 25 Jun 2007 09:58:19 GMT From: Rui Paulo <rpaulo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 122274 for review Message-ID: <200706250958.l5P9wJXG012507@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122274 Change 122274 by rpaulo@rpaulo_epsilon on 2007/06/25 09:57:41 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#15 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_aue.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_subr.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vfsops.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#3 delete .. //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/umapfs/Makefile#2 delete .. //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/atm_cm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/uniarp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#6 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ ############################################################## ### Basic configuration options ############################ @@ -135,7 +135,6 @@ portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS -#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS zfs_load="NO" # ZFS ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1436 2007/06/25 05:06:55 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -938,10 +938,12 @@ # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be -# buggy, and WILL panic your system if you attempt to do anything with -# them. They are included here as an incentive for some enterprising -# soul to sit down and fix them. +# NB: The PORTAL filesystem is known to be buggy, and WILL panic your +# system if you attempt to do anything with it. It is included here +# as an incentive for some enterprising soul to sit down and fix it. +# The UNION filesystem was known to be buggy in the past. It is now +# being actively maintained, although there are still some issues being +# resolved. # # One of these is mandatory: @@ -964,8 +966,6 @@ options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format -# Broken (seriously (functionally) broken): -#options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device ==== //depot/projects/soc2007/rpaulo-macbook/conf/files#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1200,9 +1200,6 @@ fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf -fs/umapfs/umap_subr.c optional umapfs -fs/umapfs/umap_vfsops.c optional umapfs -fs/umapfs/umap_vnops.c optional umapfs fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs ==== //depot/projects/soc2007/rpaulo-macbook/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ # # On the handling of kernel options # @@ -198,7 +198,6 @@ SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h -UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h # Pseudofs debugging ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -2890,6 +2890,10 @@ { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP61, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -23,7 +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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ */ /* structure holding chipset config info */ @@ -222,6 +222,10 @@ #define ATA_NFORCE_MCP55 0x036e10de #define ATA_NFORCE_MCP55_S1 0x037e10de #define ATA_NFORCE_MCP55_S2 0x037f10de +#define ATA_NFORCE_MCP61 0x03ec10de +#define ATA_NFORCE_MCP61_S1 0x03e710de +#define ATA_NFORCE_MCP61_S2 0x03f610de +#define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-usb.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.6 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -45,6 +45,7 @@ #include <machine/resource.h> #include <machine/bus.h> #include <sys/rman.h> +#include <dev/usb/usb_port.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> ==== //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.171 2007/06/11 03:36:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.172 2007/06/24 01:57:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4798,8 +4798,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); ==== //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.146 2007/05/05 20:17:22 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.147 2007/06/24 01:41:16 mjacob Exp $"); #include <dev/isp/isp_freebsd.h> #endif #ifdef __OpenBSD__ @@ -812,7 +812,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_32(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, @@ -875,7 +875,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_16(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, ==== //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.65 2007/06/17 05:55:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.66 2007/06/23 00:02:19 mjacob Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -202,7 +202,7 @@ } #define sym_que_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned int)(&((type *)0)->member))) + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) #define sym_insque(new, pos) __sym_que_add(new, pos, (pos)->flink) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_aue.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.115 2007/06/22 05:20:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.117 2007/06/23 05:59:53 imp Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -142,6 +142,10 @@ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3}, PII }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4}, PII }, + {{ USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET}, PII }, + {{ USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100}, PII }, + {{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T}, PII }, {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, @@ -156,6 +160,7 @@ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, LSYS }, + {{ USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN}, PNA|PII }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20}, PII }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0 }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, LSYS }, @@ -163,6 +168,7 @@ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, LSYS }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, PII }, {{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 }, + {{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W}, 0 }, {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, PII }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, PII }, {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 }, @@ -174,16 +180,18 @@ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, LSYS|PNA }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, LSYS }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, LSYS|PII }, - {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, PII }, + {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, PII }, {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, PII }, + {{ USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER}, PII }, {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},PII }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, PII }, {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 }, + {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, PII }, }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.23 2007/06/17 18:46:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.24 2007/06/23 06:47:43 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -113,15 +113,19 @@ static void cdce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static const struct cdce_type cdce_devs[] = { + {{ USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632 }, CDCE_NO_UNION }, + {{ USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250 }, CDCE_NO_UNION }, + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, + {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN2 }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, {{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501 }, CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500 }, CDCE_ZAURUS }, + {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, - {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, }; #define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p)) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.71 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.72 2007/06/23 06:29:19 imp Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -87,6 +87,7 @@ { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 }, { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK }, + /* Belkin F5U111 adapter covered by NETMATE entry */ { 0, 0 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.81 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.82 2007/06/23 06:47:43 imp Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -103,25 +103,40 @@ * Various supported device vendors/products. */ static struct kue_type kue_devs[] = { + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460 }, + { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX }, { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T }, - { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, - { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, - { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C }, { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C }, - { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, - { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2 }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, + { USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA }, + { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1 }, + { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN }, + { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3 }, - { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, - { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9 }, + { USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA }, + { USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA }, + { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E }, { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE }, + { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, { 0, 0 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -106,6 +106,7 @@ { USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_WL54G }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG }, { USB_VENDOR_SPAIRON, USB_PRODUCT_SPAIRON_WL54G }, + { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570 }, { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570 }, { USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.63 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.64 2007/06/25 06:40:20 imp Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -532,6 +532,16 @@ if (sc->sc_dying) return; + /* + * If there's no sc_oxfer, then ucomclose has removed it. The buffer + * has just been flushed in the ttyflush() in ttyclose(). ttyflush() + * then calls tt_stop(). ucomstop calls ucomstart, so the right thing + * to do here is just abort if sc_oxfer is NULL, as everything else + * is cleaned up elsewhere. + */ + if (sc->sc_oxfer == NULL) + return; + s = spltty(); if (tp->t_state & TS_TBLOCK) { ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.70 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.71 2007/06/23 04:20:24 imp Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -148,7 +148,7 @@ static devclass_t ukbd_devclass; MODULE_DEPEND(ukbd, usb, 1, 1, 1); -DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); static int ukbd_match(device_t self) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.68 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.69 2007/06/23 04:18:44 imp Exp $"); /*- * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>. * All rights reserved. @@ -292,8 +292,8 @@ sc->sc_udev = dev; sc->sc_ctl_iface = uaa->iface; + id = usbd_get_interface_descriptor(sc->sc_ctl_iface); sc->sc_ctl_iface_no = id->bInterfaceNumber; - id = usbd_get_interface_descriptor(sc->sc_ctl_iface); device_printf(self, "iclass %d/%d", id->bInterfaceClass, id->bInterfaceSubClass); ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.306 2007/06/22 06:02:19 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.309 2007/06/23 06:52:56 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -187,7 +187,7 @@ vendor ALTEC 0x04d2 Altec Lansing vendor LSI 0x04d4 LSI vendor MENTORGRAPHICS 0x04d6 Mentor Graphics -vendor ITUNERNET 0x04d8 I-Tuner Networks +vendor ITUNERNET 0x04d8 I-Tuner Networks vendor HOLTEK 0x04d9 Holtek vendor PANASONIC 0x04da Panasonic (Matsushita) vendor HUANHSIN 0x04dc Huan Hsin @@ -478,6 +478,7 @@ vendor ASIX 0x0b95 ASIX vendor O2MICRO 0x0b97 O2 Micro, Inc. vendor USR 0x0baf U.S. Robotics +vendor AMBIT 0x0bb2 Ambit Microsystems vendor REALTEK 0x0bda RealTek vendor ADDONICS2 0x0bf6 Addonics vendor AGATE 0x0c08 Agate @@ -494,6 +495,7 @@ vendor ABC 0x0d8c ABC vendor CONCEPTRONIC 0x0d8e Conceptronic vendor MSI 0x0db0 Micro Star International +vendor ELCON 0x0db7 ELCON Systemtechnik vendor SITECOMEU 0x0df6 Sitecom Europe vendor HAWKING 0x0e66 Hawking vendor FOSSIL 0x0e67 Fossil, Inc @@ -560,6 +562,7 @@ vendor HIROSE 0x2631 Hirose vendor NHJ 0x2770 NHJ vendor PLANEX 0x2c02 Planex +vendor AEI 0x3334 AEI vendor VIDZMEDIA 0x3275 VidzMedia vendor AEI 0x3334 AEI vendor PQI 0x3538 PQI @@ -624,6 +627,9 @@ /* Aceeca products */ product ACEECA MEZ1000 0x0001 Aceeca Mez1000 RDA +/* Acer Labs products */ +product ACERLABS M5632 0x5632 USB 2.0 Data Link + /* Acer Peripherals, Inc. products */ product ACERP ACERSCAN_C310U 0x12a6 Acerscan C310U product ACERP ACERSCAN_320U 0x2022 Acerscan 320U @@ -643,6 +649,7 @@ product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet /* ADMtek products */ +product ADMTEK PEGASUSII_4 0x07c2 AN986AEthernet product ADMTEK PEGASUS 0x0986 AN986 Ethernet product ADMTEK PEGASUSII 0x8511 AN8511 Ethernet product ADMTEK PEGASUSII_2 0x8513 AN8513 Ethernet @@ -657,7 +664,11 @@ /* ADS products */ product ADS UBS10BT 0x0008 UBS-10BT Ethernet +product ADS UBS10BTX 0x0009 UBS-10BT Ethernet +/* AEI products */ +product AEI FASTETHERNET 0x1701 Fast Ethernet + /* Agate Technologies products */ product AGATE QDRIVE 0x0378 Q-Drive @@ -691,8 +702,12 @@ product ALTEC ADA70 0x0070 ADA70 Speakers product ALTEC ASC495 0xff05 ASC495 Speakers -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply +/* Allied Telesyn International products */ +product ALLIEDTELESYN ATUSB100 0xb100 AT-USB100 + +/* Ambit Microsystems products */ +product AMBIT WLAN 0x0302 WLAN +product AMBIT NTL_250 0x6098 NTL 250 cable modem /* AMIT products */ product AMIT CGWLUSB2GO 0x0002 CG-WLUSB2GO @@ -707,6 +722,9 @@ /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet +/* American Power Conversion products */ +product APC UPS 0x0002 Uninterruptible Power Supply + /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse product APPLE SPEAKERS 0x1101 Speakers @@ -729,8 +747,11 @@ product ASAHIOPTICAL OPTIO230 0x0004 Digital camera product ASAHIOPTICAL OPTIO330 0x0006 Digital camera +/* Asante products */ +product ASANTE EA 0x1427 Ethernet + /* ASIX Electronics products */ -product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88172 0x1720 10/100 ethernet /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -740,7 +761,10 @@ /* ATen products */ product ATEN UC1284 0x2001 Parallel printer product ATEN UC10T 0x2002 10Mbps ethernet +product ATEN UC110T 0x2007 UC-110T Ethernet product ATEN UC232A 0x2008 Serial +product ATEN UC210T 0x2000 UC-210T Ethernet +product ATEN DSB650C 0x4000 DSB-650C /* Atheros Communications products */ product ATHEROS AR5523 0x0001 AR5523 @@ -936,6 +960,9 @@ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor +/* ELCON Systemtechnik products */ +product ELCON PLAN 0x0002 Goldpfeil P-LAN + /* Elecom products */ product ELECOM MOUSE29UO 0x0002 mouse 29UO product ELECOM LDUSBTX0 0x200c LD-USB/TX @@ -961,10 +988,12 @@ product ENTREGA 4S 0x0004 4S serial product ENTREGA E45 0x0005 E45 Ethernet product ENTREGA CENTRONICS 0x0006 Parallel Port +product ENTREGA XX1 0x0008 Ethernet product ENTREGA 1S9 0x0093 1S9 serial product ENTREGA EZUSB 0x8000 EZ-USB /*product ENTREGA SERIAL 0x8001 DB25 Serial*/ product ENTREGA 2U4S 0x8004 2U4S serial/usb hub +product ENTREGA XX2 0x8005 Ethernet /*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial*/ /* Epson products */ @@ -988,12 +1017,12 @@ product EPSON 1660 0x011e Perfection 1660 scanner product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner -product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 2480 0x0121 Perfection 2480 scanner product EPSON 3590 0x0122 Perfection 3590 scanner product EPSON 4990 0x012a Perfection 4990 Photo scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner -product EPSON 4200 0x0820 CX4200 MP scanner +product EPSON 4200 0x0820 CX4200 MP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial @@ -1150,7 +1179,7 @@ product HP 2200C 0x0605 ScanJet 2200C product HP 5300C 0x0701 Scanjet 5300C product HP 4400C 0x0705 Scanjet 4400C -product HP 82x0C 0x0b01 Scanjet 82x0C +product HP 82x0C 0x0b01 Scanjet 82x0C product HP 2300D 0x0b17 Laserjet 2300d product HP 970CSE 0x1004 Deskjet 970Cse product HP 5400C 0x1005 Scanjet 5400C @@ -1211,6 +1240,9 @@ /* Ituner networks products */ product ITUNERNET USBLCD2X20 0x0002 USB-LCD 2x20 +/* Jaton products */ +product JATON EDA 0x5704 Ethernet + /* JVC products */ product JVC GR_DX95 0x000a GR-DX95 product JVC MP_PRX1 0x3008 MP-PRX1 Ethernet @@ -1218,19 +1250,12 @@ /* JRC products */ product JRC AH_J3001V_J3002V 0x0001 AirH PHONE AH-J3001V/J3002V -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 USB ethernet -product KLSI DUH3E10BTN 0x0009 USB ethernet - /* Kawatsu products */ product KAWATSU MH4000P 0x0003 MiniHub 4000P /* Keisokugiken Corp. products */ product KEISOKUGIKEN USBDAQ 0x0068 HKS-0200 USBDAQ -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 DU-H3E 10BT Ethernet - /* Kensington products */ product KENSINGTON ORBIT 0x1003 Orbit USB/PS2 trackball product KENSINGTON TURBOBALL 0x1005 TurboBall @@ -1266,8 +1291,13 @@ product KEYSPAN UIA11 0x0202 UIA-11 remote control /* Kingston products */ +product KINGSTON XX1 0x0008 Ethernet product KINGSTON KNU101TX 0x000a KNU101TX USB Ethernet +/* Kawasaki products */ +product KLSI DUH3E10BT 0x0008 USB ethernet +product KLSI DUH3E10BTN 0x0009 USB ethernet + /* Kodak products */ product KODAK DC220 0x0100 Digital Science DC220 product KODAK DC260 0x0110 Digital Science DC260 @@ -1431,11 +1461,17 @@ product MITSUMI CDRRW 0x0000 CD-R/RW Drive product MITSUMI BT_DONGLE 0x641f Bluetooth USB dongle +/* Mobility products */ +product MOBILITY EA 0x0204 Ethernet +product MOBILITY EASIDOCK 0x0304 EasiDock Ethernet + /* Motorola products */ product MOTOROLA MC141555 0x1555 MC141555 hub controller product MOTOROLA SB4100 0x4100 SB4100 USB Cable Modem -product MOTOROLA2 A41XV32X 0x2a22 A41x/V32x Mobile Phones +product MOTOROLA2 A41XV32X 0x2a22 A41x/V32x Mobile Phones product MOTOROLA2 E398 0x4810 E398 Mobile Phone +product MOTOROLA2 USBLAN 0x600c USBLAN +product MOTOROLA2 USBLAN2 0x6027 USBLAN /* MultiTech products */ product MULTITECH ATLAS 0xf101 MT5634ZBA-USB modem @@ -1474,6 +1510,7 @@ /* Netgear products */ product NETGEAR EA101 0x1001 Ethernet +product NETGEAR EA101X 0x1002 Ethernet product NETGEAR FA101 0x1020 Ethernet 10/100, USB1.1 product NETGEAR FA120 0x1040 USB 2.0 Ethernet product NETGEAR3 WG111T 0x4250 WG111T @@ -1488,7 +1525,7 @@ product NIKON LS40 0x4000 CoolScan LS40 ED /* NovaTech Products */ -product NOVATECH NV902 0x9020 NovaTech NV-902W +product NOVATECH NV902 0x9020 NovaTech NV-902W product NOVATECH RT2573 0x9021 RT2573 /* Novatel Wireless products */ @@ -1561,6 +1598,13 @@ /* PNY products */ product PNY ATTACHE2 0x0010 USB 2.0 Flash Drive +/* PortGear products */ +product PORTGEAR EA8 0x0008 Ethernet +product PORTGEAR EA9 0x0009 Ethernet + +/* Portsmith products */ +product PORTSMITH EEA 0x3003 Express Ethernet + /* Primax products */ product PRIMAX G2X300 0x0300 G2-200 scanner product PRIMAX G2E300 0x0301 G2E-300 scanner @@ -1589,7 +1633,7 @@ product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface product PROLIFIC PHAROS 0xaaa0 Prolific Pharos product PROLIFIC RSAQ3 0xaaa2 PL2303 Serial adapter (IODATA USB-RSAQ3) -product PROLIFIC2 WSIM 0x2001 Willcom WSIM +product PROLIFIC2 WSIM 0x2001 Willcom WSIM /* Putercom products */ product PUTERCOM UPA100 0x047e USB-1284 BRIDGE @@ -1662,6 +1706,9 @@ product SCANLOGIC SL11R 0x0002 SL11R IDE Adapter product SCANLOGIC 336CX 0x0300 Phantom 336CX - C3 scanner +/* Shark products */ +product SHARK PA 0x0400 Pocket Adapter + /* Sharp products */ product SHARP SL5500 0x8004 Zaurus SL-5500 PDA product SHARP SLA300 0x8005 Zaurus SL-A300 PDA @@ -1694,11 +1741,14 @@ product SIGMATEL I_BEAD100 0x8008 i-Bead 100 MP3 Player /* SIIG products */ +/* Also: Omnidirectional Control Technology products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader product SIIG WINTERREADER 0x0330 WINTERREADER Reader +product SIIG2 USBTOETHER 0x0109 USB TO Ethernet product SIIG2 US2308 0x0421 Serial /* Silicom products */ +product SILICOM U2E 0x0001 U2E product SILICOM GPE 0x0002 Psion Gold Port Ethernet /* Silicon Portals Inc. */ @@ -1730,6 +1780,7 @@ /* SOHOware products */ product SOHOWARE NUB100 0x9100 10/100 USB Ethernet +product SOHOWARE NUB110 0x9110 10/100 USB Ethernet /* SOLID YEAR products */ product SOLIDYEAR KEYBOARD 0x2101 Solid Year USB keyboard @@ -1785,6 +1836,7 @@ product DIAMOND2 RIO800USB 0x5002 Rio 800 USB /* Surecom Technology products */ +product SURECOM RT2570 0x11f3 RT2570 product SURECOM RT2573 0x31f3 RT2573 /* System TALKS, Inc. */ @@ -1920,7 +1972,7 @@ /* Yano products */ product YANO U640MO 0x0101 U640MO-03 -product YANO FW800HD 0x05fc METALWEAR-HDD +product YANO FW800HD 0x05fc METALWEAR-HDD /* Zinwell products */ product ZINWELL RT2570 0x0260 RT2570 ==== //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.18 2007/05/13 18:21:54 mckusick Exp $ +# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.19 2007/06/25 05:06:56 rafan Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= ${.CURDIR}/.. @@ -37,7 +37,6 @@ ${SYS}/fs/procfs/*.[ch] \ ${SYS}/fs/smbfs/*.[ch] \ ${SYS}/fs/udf/*.[ch] \ - ${SYS}/fs/umapfs/*.[ch] \ ${SYS}/fs/unionfs/*.[ch] \ ${SYS}/kern/*.[ch] \ ${SYS}/net/*.[ch] \ @@ -96,7 +95,6 @@ ${SYS}/fs/portalfs \ ${SYS}/fs/procfs \ ${SYS}/fs/specfs \ - ${SYS}/fs/umapfs \ ${SYS}/fs/unionfs \ ${SYS}/fs/cd9660 \ ${SYS}/ufs/ffs \ ==== //depot/projects/soc2007/rpaulo-macbook/kern/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.14 2007/06/25 05:06:56 rafan Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -38,7 +38,7 @@ dev dev/scsi \ fs fs/deadfs fs/fdescfs fs/fifofs \ fs/lofs fs/nullfs fs/portalfs fs/procfs \ - fs/specfs fs/umapfs fs/unionfs \ + fs/specfs fs/unionfs \ hp hp/dev hp/hpux \ kern libkern \ net netinet nfs scripts sys \ ==== //depot/projects/soc2007/rpaulo-macbook/modules/acpi/acpi_video/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.6 2006/05/30 09:38:53 ru Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.7 2007/06/24 20:36:51 njl Exp $ .PATH: ${.CURDIR}/../../../dev/acpica KMOD= acpi_video -CFLAGS+= -I@/contrib/dev/acpica +CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_video.c SRCS+= opt_acpi.h acpi_if.h bus_if.h device_if.h ==== //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/alpm/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.1 2002/03/23 15:48:39 nsouch Exp $ +# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.2 2007/06/24 20:35:58 njl Exp $ .PATH: ${.CURDIR}/../../../../pci KMOD = alpm -CFLAGS += -DALPM_SMBIO_BASE_ADDR=0xbc00 SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ alpm.c ==== //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/viapm/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.2 2005/11/08 17:03:09 jhb Exp $ +# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.3 2007/06/24 20:35:59 njl Exp $ .PATH: ${.CURDIR}/../../../../pci KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ opt_isa.h viapm.c -CFLAGS += -DVIAPM_BASE_ADDR=0x6000 .include <bsd.kmod.mk> ==== //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.36 2007/03/14 20:55:51 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.37 2007/06/22 23:28:33 thompsa Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -916,8 +916,8 @@ if (!bs->bs_allsynced) { synced = 1; LIST_FOREACH(bp2, &bs->bs_bplist, bp_next) { - if (!(bp->bp_synced || - bp->bp_role == BSTP_ROLE_ROOT)) { + if (!(bp2->bp_synced || + bp2->bp_role == BSTP_ROLE_ROOT)) { synced = 0; break; } ==== //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#4 (text+ko) ==== @@ -22,7 +22,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/sys/net80211/ieee80211_freebsd.h,v 1.13 2007/06/11 03:36:54 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.14 2007/06/25 03:26:10 sam Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706250958.l5P9wJXG012507>