From owner-p4-projects@FreeBSD.ORG Mon Jun 22 19:44:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 333FC1065675; Mon, 22 Jun 2009 19:44:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE520106566C for ; Mon, 22 Jun 2009 19:44:54 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB32B8FC15 for ; Mon, 22 Jun 2009 19:44:54 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5MJis7A054932 for ; Mon, 22 Jun 2009 19:44:54 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5MJist2054930 for perforce@freebsd.org; Mon, 22 Jun 2009 19:44:54 GMT (envelope-from zec@fer.hr) Date: Mon, 22 Jun 2009 19:44:54 GMT Message-Id: <200906221944.n5MJist2054930@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 164889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2009 19:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=164889 Change 164889 by zec@zec_amdx4 on 2009/06/22 19:44:52 IFC @ 164888 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSynch.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ic/ns16550.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/vimage-commit2/src/sys/libkern/iconv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/libkern/iconv_converter_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/fddi.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/firewire.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#78 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_arc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#33 integrate .. //depot/projects/vimage-commit2/src/sys/net/iso88025.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#44 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#26 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/at_control.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/at_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#43 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/README#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/MPC85XX#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ds1553_core.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ds1553_reg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/i2c.c#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/fcntl.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/iconv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ktr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lock.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lock_profile.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mutex.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#46 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sched.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sx.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#75 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#8 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.150 2009/03/22 18:56:26 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.151 2009/06/22 04:21:02 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -175,9 +175,7 @@ #define PML4pml4e ((pd_entry_t *)(addr_PML4pml4e)) extern u_int64_t KPML4phys; /* physical address of kernel level 4 */ -#endif -#ifdef _KERNEL /* * virtual address to page table entry and * to physical address. @@ -294,14 +292,6 @@ #ifdef _KERNEL -#define NPPROVMTRR 8 -#define PPRO_VMTRRphysBase0 0x200 -#define PPRO_VMTRRphysMask0 0x201 -struct ppro_vmtrr { - u_int64_t base, mask; -}; -extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR]; - extern caddr_t CADDR1; extern pt_entry_t *CMAP1; extern vm_paddr_t phys_avail[]; ==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.24 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.25 2009/06/21 21:38:12 cognet Exp $"); #include #include #include @@ -550,7 +550,7 @@ for (addr = physstart; addr < physend; addr += L1_S_SIZE) { pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)| L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr; - if (write_back) + if (write_back && 0) pd[addr >> L1_S_SHIFT] |= L1_S_B; } /* XXX: See below */ @@ -610,12 +610,6 @@ (unsigned int)&func_end + 800 , 0); if (altdst > dst) dst = altdst; - cpu_idcache_wbinv_all(); - cpu_l2cache_wbinv_all(); - __asm __volatile("mrc p15, 0, %0, c1, c0, 0\n" - "bic %0, %0, #1\n" /* MMU_ENABLE */ - "mcr p15, 0, %0, c1, c0, 0\n" - : "=r" (pt_addr)); } else #endif dst = 4 + load_kernel((unsigned int)&kernel_start, ==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/version#2 (text+ko) ==== @@ -1,8 +1,9 @@ -$FreeBSD: src/sys/boot/powerpc/uboot/version,v 1.1 2008/02/16 22:40:55 marcel Exp $ +$FreeBSD: src/sys/boot/powerpc/uboot/version,v 1.2 2009/06/22 15:57:12 raj Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.0: Added storage support. 0.6: Integrated with the new U-Boot API 0.5: Full network functionality. 0.2: Initial U-Boot/PowerPC version derived from the existing ==== //depot/projects/vimage-commit2/src/sys/cam/cam_periph.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.78 2009/05/12 15:14:37 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.79 2009/06/22 14:43:48 scottl Exp $"); #include #include @@ -797,7 +797,7 @@ } int -cam_periph_ioctl(struct cam_periph *periph, int cmd, caddr_t addr, +cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr, int (*error_routine)(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags)) ==== //depot/projects/vimage-commit2/src/sys/cam/cam_periph.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.19 2008/12/19 14:31:40 trasz Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.20 2009/06/22 14:43:48 scottl Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -158,7 +158,7 @@ u_int32_t sense_flags), cam_flags camflags, u_int32_t sense_flags, struct devstat *ds); -int cam_periph_ioctl(struct cam_periph *periph, int cmd, +int cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr, int (*error_routine)(union ccb *ccb, cam_flags camflags, ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c,v 1.9 2008/11/25 21:14:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c,v 1.11 2009/06/22 10:08:48 kib Exp $"); #include #include @@ -83,9 +83,9 @@ } FILEDESC_XUNLOCK(fd); - flags = FREAD; + flags = FREAD | O_NOFOLLOW; NDINIT(&nd, LOOKUP, MPSAFE, UIO_SYSSPACE, file, td); - error = vn_open_cred(&nd, &flags, O_NOFOLLOW, curthread->td_ucred, NULL); + error = vn_open_cred(&nd, &flags, 0, 0, curthread->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) return (NULL); ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.11 2009/05/07 23:02:15 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.12 2009/06/21 13:41:32 kib Exp $ */ #ifndef _OPENSOLARIS_SYS_VNODE_H_ @@ -182,7 +182,7 @@ vref(startvp); NDINIT_ATVP(&nd, operation, MPSAFE, UIO_SYSSPACE, pnamep, startvp, td); filemode |= O_NOFOLLOW; - error = vn_open_cred(&nd, &filemode, createmode, td->td_ucred, NULL); + error = vn_open_cred(&nd, &filemode, createmode, 0, td->td_ucred, NULL); NDFREE(&nd, NDF_ONLY_PNBUF); if (error == 0) { /* We just unlock so we hold a reference. */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 (text+ko) ==== @@ -4519,7 +4519,7 @@ flags = FREAD; NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, attrname, xvp, td); - error = vn_open_cred(&nd, &flags, 0, ap->a_cred, NULL); + error = vn_open_cred(&nd, &flags, 0, 0, ap->a_cred, NULL); vp = nd.ni_vp; NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) { @@ -4640,7 +4640,7 @@ flags = FFLAGS(O_WRONLY | O_CREAT); NDINIT_ATVP(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, attrname, xvp, td); - error = vn_open_cred(&nd, &flags, 0600, ap->a_cred, NULL); + error = vn_open_cred(&nd, &flags, 0600, 0, ap->a_cred, NULL); vp = nd.ni_vp; NDFREE(&nd, NDF_ONLY_PNBUF); if (error != 0) { ==== //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#15 (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.103 2009/06/06 09:37:55 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.106 2009/06/22 15:53:41 raj Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -109,6 +109,9 @@ powerpc/fpu/fpu_sqrt.c optional fpu_emu powerpc/fpu/fpu_subr.c optional fpu_emu powerpc/mpc85xx/atpic.c optional mpc85xx isa +powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553 +powerpc/mpc85xx/ds1553_core.c optional ds1553 +powerpc/mpc85xx/i2c.c optional iicbus mpc85xx powerpc/mpc85xx/isa.c optional mpc85xx isa powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx ==== //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSynch.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.36 2009/06/08 20:50:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.37 2009/06/22 17:46:55 jkim Exp $"); #include #include @@ -417,9 +417,11 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (am == NULL) + if (am == NULL) { ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "cannot release null mutex\n")); + return_VOID; + } mtx_lock(&am->am_lock); ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.3 2009/06/01 21:17:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.4 2009/06/22 10:59:34 rwatson Exp $"); #include #include @@ -1337,12 +1337,13 @@ is_loopback_dst(struct iw_cm_id *cm_id) { uint16_t port = cm_id->remote_addr.sin_port; - struct ifaddr *ifa; + int ifa_present; cm_id->remote_addr.sin_port = 0; - ifa = ifa_ifwithaddr((struct sockaddr *)&cm_id->remote_addr); + ifa_present = ifa_ifwithaddr_check( + (struct sockaddr *)&cm_id->remote_addr); cm_id->remote_addr.sin_port = port; - return (ifa != NULL); + return (ifa_present); } int ==== //depot/projects/vimage-commit2/src/sys/dev/ic/ns16550.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)ns16550.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.18 2008/08/29 12:25:58 nyan Exp $ + * $FreeBSD: src/sys/dev/ic/ns16550.h,v 1.19 2009/06/21 19:17:22 sam Exp $ */ /* @@ -46,6 +46,8 @@ #define IER_ERLS 0x4 #define IER_EMSC 0x8 +#define IER_BITS "\20\1ERXRDY\2ETXRDY\3ERLS\4EMSC" + #define com_iir 2 /* interrupt identification register (R) */ #define REG_IIR com_iir #define IIR_IMASK 0xf @@ -57,6 +59,8 @@ #define IIR_MLSC 0x0 #define IIR_FIFO_MASK 0xc0 /* set if FIFOs are enabled */ +#define IIR_BITS "\20\1NOPEND\2TXRDY\3RXRDY" + #define com_lcr 3 /* line control register (R/W) */ #define com_cfcr com_lcr /* character format control register (R/W) */ #define REG_LCR com_lcr @@ -97,6 +101,8 @@ #define MCR_RTS 0x02 #define MCR_DTR 0x01 +#define MCR_BITS "\20\1DTR\2RTS\3DRS\4IE\5LOOPBACK\10PRESCALE" + #define com_lsr 5 /* line status register (R/W) */ #define REG_LSR com_lsr #define LSR_RCV_FIFO 0x80 @@ -111,6 +117,8 @@ #define LSR_RXRDY 0x01 #define LSR_RCV_MASK 0x1f +#define LSR_BITS "\20\1RXRDY\2OE\3PE\4FE\5BI\6THRE\7TEMT\10RCV_FIFO" + #define com_msr 6 /* modem status register (R/W) */ #define REG_MSR com_msr #define MSR_DCD 0x80 @@ -122,6 +130,8 @@ #define MSR_DDSR 0x02 #define MSR_DCTS 0x01 +#define MSR_BITS "\20\1DCTS\2DDSR\3TERI\4DDCD\5CTS\6DSR\7RI\10DCD" + /* 8250 multiplexed registers #[0-1]. Access enabled by LCR[7]. */ #define com_dll 0 /* divisor latch low (R/W) */ #define com_dlbl com_dll @@ -154,6 +164,8 @@ #define FCR_RX_HIGH 0xc0 #define FIFO_RX_HIGH FCR_RX_HIGH +#define FCR_BITS "\20\1ENABLE\2RCV_RST\3XMT_RST\4DMA" + /* 16650 registers #2,[4-7]. Access enabled by LCR_EFR_ENABLE. */ #define com_efr 2 /* enhanced features register (R/W) */ ==== //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.17 2009/06/15 01:02:43 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.19 2009/06/21 13:13:13 remko Exp $"); /*- * Copyright (c) 1999 MAEKAWA Masahide , @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.17 2009/06/15 01:02:43 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.19 2009/06/21 13:13:13 remko Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -629,6 +629,10 @@ UMASS_PROTO_DEFAULT, IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE }, + {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN_8813, RID_WILDCARD, + UMASS_PROTO_DEFAULT, + NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, RID_WILDCARD, UMASS_PROTO_DEFAULT, NO_SYNCHRONIZE_CACHE ==== //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#27 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.416 2009/06/13 11:18:47 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.417 2009/06/21 11:21:16 remko Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1819,6 +1819,7 @@ product MSYSTEMS DISKONKEY2 0x0011 DiskOnKey /* Myson products */ +product MYSON HEDEN_8813 0x8813 USB-IDE product MYSON HEDEN 0x8818 USB-IDE product MYSON STARREADER 0x9920 USB flash card adapter ==== //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.20 2005/09/11 15:57:07 rodrigc Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.21 2009/06/21 08:36:30 rdivacky Exp $ */ /*#define NTFS_DEBUG 1*/ @@ -296,11 +296,11 @@ #if NTFS_DEBUG > 1 #define ddprintf(a) printf a #else -#define ddprintf(a) +#define ddprintf(a) (void)0 #endif #else -#define dprintf(a) -#define ddprintf(a) +#define dprintf(a) (void)0 +#define ddprintf(a) (void)0 #endif extern struct vop_vector ntfs_vnodeops; ==== //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.110 2009/05/31 14:58:43 kib Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.111 2009/06/21 19:21:01 kib Exp $ */ /* @@ -747,6 +747,7 @@ struct vnode *vp = ap->a_vp; struct vnode **dvp = ap->a_vpp; struct vnode *lvp, *ldvp; + struct ucred *cred = ap->a_cred; int error, locked; if (vp->v_type == VDIR) @@ -757,7 +758,7 @@ vhold(lvp); VOP_UNLOCK(vp, 0); /* vp is held by vn_vptocnp_locked that called us */ ldvp = lvp; - error = vn_vptocnp(&ldvp, ap->a_buf, ap->a_buflen); + error = vn_vptocnp(&ldvp, cred, ap->a_buf, ap->a_buflen); vdrop(lvp); if (error != 0) { vn_lock(vp, locked | LK_RETRY); ==== //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.137 2009/06/13 13:56:06 ed Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.138 2009/06/22 04:21:02 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -185,9 +185,7 @@ extern pdpt_entry_t *IdlePDPT; #endif extern pd_entry_t *IdlePTD; /* physical address of "Idle" state directory */ -#endif -#ifdef _KERNEL /* * virtual address to page table entry and * to physical address. @@ -450,14 +448,6 @@ #ifdef _KERNEL -#define NPPROVMTRR 8 -#define PPRO_VMTRRphysBase0 0x200 -#define PPRO_VMTRRphysMask0 0x201 -struct ppro_vmtrr { - u_int64_t base, mask; -}; -extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR]; - extern caddr_t CADDR1; extern pt_entry_t *CMAP1; extern vm_paddr_t phys_avail[]; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_alq.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.26 2009/06/05 14:55:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.27 2009/06/21 13:41:32 kib Exp $"); #include #include @@ -351,7 +351,7 @@ NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, file, td); flags = FWRITE | O_NOFOLLOW | O_CREAT; - error = vn_open_cred(&nd, &flags, cmode, cred, NULL); + error = vn_open_cred(&nd, &flags, cmode, 0, cred, NULL); if (error) return (error); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.368 2009/04/10 10:52:19 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.369 2009/06/21 13:41:32 kib Exp $"); #include "opt_compat.h" #include "opt_kdtrace.h" @@ -2940,7 +2940,8 @@ restart: NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, name, td); flags = O_CREAT | FWRITE | O_NOFOLLOW; - error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, NULL); + error = vn_open_cred(&nd, &flags, S_IRUSR | S_IWUSR, VN_OPEN_NOAUDIT, + NULL, NULL); if (error) { #ifdef AUDIT audit_proc_coredump(td, name, error); ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.183 2009/06/05 14:55:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.184 2009/06/22 19:35:39 andre Exp $"); #include "opt_param.h" #include "opt_mbuf_stress_test.h" @@ -320,11 +320,13 @@ m->m_flags &= ~M_PKTHDR; bzero(&m->m_pkthdr, sizeof(struct pkthdr)); } - if (m->m_type == MT_HEADER) - m->m_type = MT_DATA; - if (m != m0 && m->m_nextpkt != NULL) + if (m != m0 && m->m_nextpkt != NULL) { + KASSERT(m->m_nextpkt == NULL, + ("%s: m_nextpkt not NULL", __func__)); + m_freem(m->m_nextpkt); m->m_nextpkt = NULL; - m->m_flags = m->m_flags & (M_EXT|M_EOR|M_RDONLY|M_FREELIST); + } + m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_FREELIST|M_NOFREE); } } ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.157 2009/06/05 16:44:42 marcus Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.158 2009/06/21 19:21:01 kib Exp $"); #include "opt_kdtrace.h" #include "opt_ktrace.h" @@ -206,7 +206,8 @@ static void cache_zap(struct namecache *ncp); -static int vn_vptocnp_locked(struct vnode **vp, char *buf, u_int *buflen); +static int vn_vptocnp_locked(struct vnode **vp, struct ucred *cred, char *buf, + u_int *buflen); static int vn_fullpath1(struct thread *td, struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, u_int buflen); @@ -1037,12 +1038,12 @@ } int -vn_vptocnp(struct vnode **vp, char *buf, u_int *buflen) +vn_vptocnp(struct vnode **vp, struct ucred *cred, char *buf, u_int *buflen) { int error; CACHE_RLOCK(); - error = vn_vptocnp_locked(vp, buf, buflen); + error = vn_vptocnp_locked(vp, cred, buf, buflen); if (error == 0) { /* * vn_vptocnp_locked() dropped hold acquired by @@ -1057,7 +1058,8 @@ } static int -vn_vptocnp_locked(struct vnode **vp, char *buf, u_int *buflen) +vn_vptocnp_locked(struct vnode **vp, struct ucred *cred, char *buf, + u_int *buflen) { struct vnode *dvp; struct namecache *ncp; @@ -1089,7 +1091,7 @@ CACHE_RUNLOCK(); vfslocked = VFS_LOCK_GIANT((*vp)->v_mount); vn_lock(*vp, LK_SHARED | LK_RETRY); - error = VOP_VPTOCNP(*vp, &dvp, buf, buflen); + error = VOP_VPTOCNP(*vp, &dvp, cred, buf, buflen); VOP_UNLOCK(*vp, 0); vdrop(*vp); VFS_UNLOCK_GIANT(vfslocked); @@ -1137,7 +1139,7 @@ numfullpathcalls++; CACHE_RLOCK(); if (vp->v_type != VDIR) { - error = vn_vptocnp_locked(&vp, buf, &buflen); + error = vn_vptocnp_locked(&vp, td->td_ucred, buf, &buflen); if (error) return (error); if (buflen == 0) { @@ -1167,7 +1169,7 @@ error, vp, NULL, 0, 0); break; } - error = vn_vptocnp_locked(&vp, buf, &buflen); + error = vn_vptocnp_locked(&vp, td->td_ucred, buf, &buflen); if (error) break; if (buflen == 0) { ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.152 2009/06/05 14:23:24 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_default.c,v 1.154 2009/06/21 19:21:01 kib Exp $"); #include #include @@ -693,6 +693,7 @@ { struct vnode *vp = ap->a_vp; struct vnode **dvp = ap->a_vpp; + struct ucred *cred = ap->a_cred; char *buf = ap->a_buf; int *buflen = ap->a_buflen; char *dirbuf, *cpos; @@ -713,7 +714,7 @@ if (vp->v_type != VDIR) return (ENOENT); - error = VOP_GETATTR(vp, &va, td->td_ucred); + error = VOP_GETATTR(vp, &va, cred); if (error) return (error); @@ -723,7 +724,7 @@ NDINIT_ATVP(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, "..", vp, td); flags = FREAD; - error = vn_open(&nd, &flags, 0, NULL); + error = vn_open_cred(&nd, &flags, 0, VN_OPEN_NOAUDIT, cred, NULL); if (error) { vn_lock(vp, locked | LK_RETRY); return (error); @@ -738,7 +739,7 @@ *dvp = (*dvp)->v_mount->mnt_vnodecovered; VREF(mvp); VOP_UNLOCK(mvp, 0); - vn_close(mvp, FREAD, td->td_ucred, td); + vn_close(mvp, FREAD, cred, td); VREF(*dvp); vn_lock(*dvp, LK_EXCLUSIVE | LK_RETRY); covered = 1; @@ -803,7 +804,7 @@ vrele(mvp); } else { VOP_UNLOCK(mvp, 0); - vn_close(mvp, FREAD, td->td_ucred, td); + vn_close(mvp, FREAD, cred, td); } vn_lock(vp, locked | LK_RETRY); return (error); ==== //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#19 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.284 2009/06/08 21:23:54 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.285 2009/06/21 13:41:32 kib Exp $"); #include #include @@ -91,7 +91,7 @@ { struct thread *td = ndp->ni_cnd.cn_thread; - return (vn_open_cred(ndp, flagp, cmode, td->td_ucred, fp)); + return (vn_open_cred(ndp, flagp, cmode, 0, td->td_ucred, fp)); } /* @@ -102,11 +102,8 @@ * due to the NDINIT being done elsewhere. */ int -vn_open_cred(ndp, flagp, cmode, cred, fp) - struct nameidata *ndp; - int *flagp, cmode; - struct ucred *cred; - struct file *fp; +vn_open_cred(struct nameidata *ndp, int *flagp, int cmode, u_int vn_open_flags, + struct ucred *cred, struct file *fp) { struct vnode *vp; struct mount *mp; @@ -124,9 +121,11 @@ if (fmode & O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; ndp->ni_cnd.cn_flags = ISOPEN | LOCKPARENT | LOCKLEAF | - MPSAFE | AUDITVNODE1; + MPSAFE; if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) ndp->ni_cnd.cn_flags |= FOLLOW; + if (!(vn_open_flags & VN_OPEN_NOAUDIT)) + ndp->ni_cnd.cn_flags |= AUDITVNODE1; bwillwrite(); if ((error = namei(ndp)) != 0) return (error); @@ -181,9 +180,11 @@ ndp->ni_cnd.cn_nameiop = LOOKUP; ndp->ni_cnd.cn_flags = ISOPEN | ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) | - LOCKLEAF | MPSAFE | AUDITVNODE1; + LOCKLEAF | MPSAFE; if (!(fmode & FWRITE)) ndp->ni_cnd.cn_flags |= LOCKSHARED; + if (!(vn_open_flags & VN_OPEN_NOAUDIT)) + ndp->ni_cnd.cn_flags |= AUDITVNODE1; if ((error = namei(ndp)) != 0) return (error); if (!mpsafe) ==== //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#11 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.101 2009/06/11 17:06:45 ps Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.102 2009/06/21 19:21:01 kib Exp $ # # @@ -607,6 +607,7 @@ vop_vptocnp { IN struct vnode *vp; OUT struct vnode **vpp; + IN struct ucred *cred; INOUT char *buf; INOUT int *buflen; }; ==== //depot/projects/vimage-commit2/src/sys/libkern/iconv.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/libkern/iconv.c,v 1.13 2008/12/05 21:19:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/libkern/iconv.c,v 1.14 2009/06/22 17:09:46 delphij Exp $"); #include #include @@ -307,6 +307,18 @@ return ICONV_CONVERTER_CONV(handle, inbuf, inbytesleft, outbuf, outbytesleft, 1, casetype); } +int +towlower(int c, void *handle) +{ + return ICONV_CONVERTER_TOLOWER(handle, c); +} + +int +towupper(int c, void *handle) +{ + return ICONV_CONVERTER_TOUPPER(handle, c); +} + /* * Give a list of loaded converters. Each name terminated with 0. * An empty string terminates the list. @@ -442,6 +454,12 @@ } int +iconv_converter_tolowerstub(int c, void *handle) +{ + return (c); +} + +int iconv_converter_handler(module_t mod, int type, void *data) { struct iconv_converter_class *dcp = data; ==== //depot/projects/vimage-commit2/src/sys/libkern/iconv_converter_if.m#2 (text+ko) ==== @@ -29,7 +29,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/libkern/iconv_converter_if.m,v 1.3 2005/01/07 00:24:32 imp Exp $ +# $FreeBSD: src/sys/libkern/iconv_converter_if.m,v 1.4 2009/06/22 17:09:46 delphij Exp $ # #include @@ -68,3 +68,13 @@ STATICMETHOD const char * name { struct iconv_converter_class *dcp; }; + +METHOD int tolower { + void *handle; + int c; +} DEFAULT iconv_converter_tolowerstub; + +METHOD int toupper { + void *handle; + int c; +} DEFAULT iconv_converter_tolowerstub; ==== //depot/projects/vimage-commit2/src/sys/libkern/iconv_xlat16.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003, Ryuichiro Imura + * Copyright (c) 2003, 2005 Ryuichiro Imura * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat16.c,v 1.3 2005/05/24 15:38:08 imura Exp $"); +__FBSDID("$FreeBSD: src/sys/libkern/iconv_xlat16.c,v 1.4 2009/06/22 17:09:46 delphij Exp $"); #include #include @@ -43,12 +43,17 @@ MODULE_DEPEND(iconv_xlat16, libiconv, 2, 2, 2); #endif +#define C2I1(c) ((c) & 0x8000 ? ((c) & 0xff) | 0x100 : (c) & 0xff) +#define C2I2(c) ((c) & 0x8000 ? ((c) >> 8) & 0x7f : ((c) >> 8) & 0xff) + /* * XLAT16 converter instance */ struct iconv_xlat16 { KOBJ_FIELDS; uint32_t * d_table[0x200]; + void * f_ctp; + void * t_ctp; struct iconv_cspair * d_csp; }; @@ -72,6 +77,16 @@ } idxp++; } + + if (strcmp(csp->cp_to, KICONV_WCTYPE_NAME) != 0) { + if (iconv_open(KICONV_WCTYPE_NAME, csp->cp_from, &dp->f_ctp) != 0) + dp->f_ctp = NULL; + if (iconv_open(KICONV_WCTYPE_NAME, csp->cp_to, &dp->t_ctp) != 0) + dp->t_ctp = NULL; + } else { + dp->f_ctp = dp->t_ctp = dp; + } + dp->d_csp = csp; csp->cp_refcount++; *dpp = (void*)dp; @@ -83,6 +98,10 @@ { struct iconv_xlat16 *dp = data; + if (dp->f_ctp && dp->f_ctp != data) + iconv_close(dp->f_ctp); + if (dp->t_ctp && dp->t_ctp != data) + iconv_close(dp->t_ctp); dp->d_csp->cp_refcount--; kobj_delete((struct kobj*)data, M_ICONV); return (0); @@ -100,7 +119,7 @@ size_t in, on, ir, or, inlen; uint32_t code; u_char u, l; - uint16_t c1, c2; + uint16_t c1, c2, ctmp; if (inbuf == NULL || *inbuf == NULL || outbuf == NULL || *outbuf == NULL) return (0); @@ -112,21 +131,32 @@ while(ir > 0 && or > 0) { inlen = 0; - code = '\0'; >>> TRUNCATED FOR MAIL (1000 lines) <<<