PERFORCE change 148493 for review
Ed Schouten
ed at FreeBSD.org
Tue Aug 26 06:15:38 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=148493
Change 148493 by ed at ed_dull on 2008/08/26 06:15:05
IFC.
Affected files ...
.. //depot/projects/mpsafetty/etc/defaults/rc.conf#6 integrate
.. //depot/projects/mpsafetty/etc/rc.d/Makefile#3 integrate
.. //depot/projects/mpsafetty/etc/rc.d/kernel_symlink#3 delete
.. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/Makefile#10 integrate
.. //depot/projects/mpsafetty/share/man/man4/rum.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/uipaq.4#1 branch
.. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate
.. //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/mpsafetty/sys/conf/options#9 integrate
.. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/uart/uart_bus_isa.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#5 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.h#5 integrate
.. //depot/projects/mpsafetty/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/syscalls.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/syscalls.master#5 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/mpsafetty/sys/modules/Makefile#11 integrate
.. //depot/projects/mpsafetty/sys/net/bpf.h#2 integrate
.. //depot/projects/mpsafetty/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/bpf_jitter.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/bpf_jitter.h#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_var.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#10 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/pmap_prot.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/rpcb_prot.c#2 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_syscalls.c#5 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#3 integrate
.. //depot/projects/mpsafetty/sys/sys/syscall.h#3 integrate
.. //depot/projects/mpsafetty/sys/sys/syscall.mk#3 integrate
.. //depot/projects/mpsafetty/sys/sys/sysproto.h#3 integrate
.. //depot/projects/mpsafetty/sys/sys/vimage.h#3 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#2 integrate
.. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/cpio/test/test_basic.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/ntp/libntp/Makefile#3 integrate
Differences ...
==== //depot/projects/mpsafetty/etc/defaults/rc.conf#6 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.342 2008/08/19 14:23:31 obrien Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.343 2008/08/25 16:31:53 des Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -552,7 +552,6 @@
sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO).
linux_enable="NO" # Linux binary compatibility loaded at startup (or NO).
svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO).
-kernel_symlink_enable="NO" # Symlink booted kernel to /boot/kernel if missing.
clear_tmp_enable="NO" # Clear /tmp at startup.
clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp
ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks
==== //depot/projects/mpsafetty/etc/rc.d/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.93 2008/08/20 03:02:06 obrien Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.94 2008/08/25 16:28:54 des Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@
ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
ipnat ipsec ipxrouted \
jail \
- kadmind kerberos kernel_symlink keyserv kldxref kpasswdd \
+ kadmind kerberos keyserv kldxref kpasswdd \
ldconfig local localpkg lockd lpd \
mixer motd mountcritlocal mountcritremote mountlate \
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
==== //depot/projects/mpsafetty/lib/libarchive/test/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.23 2008/06/26 11:58:26 des Exp $
+# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.24 2008/08/25 06:08:22 kientzle Exp $
# Where to find the libarchive sources
LA_SRCDIR=${.CURDIR}/..
@@ -51,21 +51,21 @@
test_tar_filenames.c \
test_tar_large.c \
test_ustar_filenames.c \
+ test_write_compress.c \
test_write_compress_program.c \
- test_write_compress.c \
test_write_disk.c \
test_write_disk_hardlink.c \
test_write_disk_perms.c \
test_write_disk_secure.c \
test_write_format_ar.c \
test_write_format_cpio.c \
+ test_write_format_cpio_empty.c \
+ test_write_format_cpio_newc.c \
test_write_format_cpio_odc.c \
- test_write_format_cpio_newc.c \
- test_write_format_cpio_empty.c \
test_write_format_shar_empty.c \
test_write_format_tar.c \
+ test_write_format_tar_empty.c \
test_write_format_tar_ustar.c \
- test_write_format_tar_empty.c \
test_write_open_memory.c
==== //depot/projects/mpsafetty/share/man/man4/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.429 2008/08/21 00:40:55 rpaulo Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.430 2008/08/25 02:05:04 imp Exp $
MAN= aac.4 \
acpi.4 \
@@ -399,6 +399,7 @@
ugen.4 \
uhci.4 \
uhid.4 \
+ uipaq.4 \
ukbd.4 \
ulpt.4 \
umass.4 \
==== //depot/projects/mpsafetty/share/man/man4/rum.4#2 (text+ko) ====
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/rum.4,v 1.4 2008/04/20 20:35:45 sam Exp $
+.\" $FreeBSD: src/share/man/man4/rum.4,v 1.5 2008/08/25 05:51:58 kevlo Exp $
.\"
.Dd April 13, 2008
.Os
@@ -95,6 +95,8 @@
.It "CNet CWD-854 ver F" Ta USB
.It "Conceptronic C54RU ver 2" Ta USB
.It "Corega CG-WLUSB2GO" Ta USB
+.It "D-Link DWA-110" Ta USB
+.It "D-Link DWA-111" Ta USB
.It "D-Link DWL-G122 rev C1" Ta USB
.It "D-Link WUA-1340" Ta USB
.It "Digitus DN-7003GR" Ta USB
==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#5 (text+ko) ====
@@ -23,14 +23,14 @@
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.13 2008/08/25 20:43:13 jkim Exp $");
#ifdef _KERNEL
#include "opt_bpf.h"
==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#5 (text+ko) ====
@@ -23,12 +23,12 @@
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS intERRUPTION) HOWEVER CAUSED AND ON ANY
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.10 2008/08/25 20:43:13 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
==== //depot/projects/mpsafetty/sys/bsm/audit_kevents.h#4 (text) ====
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#34
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.14 2008/08/20 08:31:58 ed Exp $
+ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.15 2008/08/24 21:20:35 rwatson Exp $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -548,7 +548,7 @@
#define AUE_MKNODAT 43150 /* FreeBSD. */
#define AUE_READLINKAT 43151 /* FreeBSD. */
#define AUE_SYMLINKAT 43152 /* FreeBSD. */
-#define AUE_POSIXOPENPT 43153 /* FreeBSD. */
+#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.88 2008/08/20 08:39:10 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.89 2008/08/24 21:23:08 rwatson Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.87 2008/08/20 08:39:10 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.88 2008/08/24 21:23:08 rwatson Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson
*/
#define FREEBSD32_SYS_syscall 0
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.78 2008/08/20 08:39:10 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.79 2008/08/24 21:23:08 rwatson Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson
*/
const char *freebsd32_syscallnames[] = {
==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.88 2008/08/20 08:39:10 ed Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 181905 2008-08-20 08:31:58Z ed
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.89 2008/08/24 21:23:08 rwatson Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 182123 2008-08-24 21:20:35Z rwatson
*/
#include "opt_compat.h"
@@ -542,5 +542,5 @@
{ AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */
{ AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */
{ AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */
- { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */
+ { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */
};
==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#5 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.103 2008/08/21 22:57:31 obrien Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.104 2008/08/24 21:20:35 rwatson Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -853,4 +853,4 @@
char *path2); }
503 AUE_UNLINKAT NOPROTO { int unlinkat(int fd, char *path, \
int flag); }
-504 AUE_POSIXOPENPT NOPROTO { int posix_openpt(int flags); }
+504 AUE_POSIX_OPENPT NOPROTO { int posix_openpt(int flags); }
==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ====
@@ -39,8 +39,10 @@
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*/
+#include "opt_compat.h"
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.121 2008/08/25 04:55:29 julian Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -89,7 +91,6 @@
#include <machine/md_var.h>
#endif /* __i386__ || __amd64__ */
-#include "opt_compat.h"
#ifdef COMPAT_LINUX32 /* XXX */
#include <machine/../linux32/linux.h>
#else
==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#7 (text+ko) ====
@@ -26,8 +26,10 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_compat.h"
+
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.142 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.143 2008/08/25 04:55:29 julian Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +64,6 @@
#include <net/if_dl.h>
#include <net/if_types.h>
-#include "opt_compat.h"
-
#ifdef COMPAT_LINUX32
#include <machine/../linux32/linux.h>
#include <machine/../linux32/linux32_proto.h>
==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.20 2008/08/25 05:38:18 julian Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -37,9 +37,9 @@
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/vimage.h>
+
#include <net/if.h>
-
#include <compat/svr4/svr4.h>
#include <compat/svr4/svr4_util.h>
#include <compat/svr4/svr4_ioctl.h>
==== //depot/projects/mpsafetty/sys/conf/options#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.637 2008/08/23 15:26:36 rwatson Exp $
+# $FreeBSD: src/sys/conf/options,v 1.638 2008/08/24 21:33:10 julian Exp $
#
# On the handling of kernel options
#
@@ -768,4 +768,4 @@
TCP_OFFLOAD_DISABLE opt_inet.h
# Virtualize the network stack
-VIMAGE
+VIMAGE opt_global.h
==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */
+/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.12 2008/08/25 07:33:17 julian Exp $ */
/* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */
/*
@@ -29,12 +29,10 @@
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
-#if (__FreeBSD__ != 2)
#include "opt_inet.h"
#ifdef __FreeBSD__
#include "opt_inet6.h"
#endif
-#endif
#endif /* __FreeBSD__ || __NetBSD__ */
#include <sys/param.h>
==== //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.c#2 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.14 2008/01/07 09:46:39 des Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.15 2008/08/25 15:23:54 jhb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,23 +82,32 @@
{ DEVICEID_82801DB, "Intel 82801DB watchdog timer", 4 },
{ DEVICEID_82801DBM, "Intel 82801DBM watchdog timer", 4 },
{ DEVICEID_82801E, "Intel 82801E watchdog timer", 5 },
- { DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer", 5 },
+ { DEVICEID_82801EB, "Intel 82801EB watchdog timer", 5 },
+ { DEVICEID_82801EBR, "Intel 82801EB/ER watchdog timer", 5 },
{ DEVICEID_6300ESB, "Intel 6300ESB watchdog timer", 5 },
- { DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer", 6 },
+ { DEVICEID_82801FBR, "Intel 82801FB/FR watchdog timer", 6 },
{ DEVICEID_ICH6M, "Intel ICH6M watchdog timer", 6 },
{ DEVICEID_ICH6W, "Intel ICH6W watchdog timer", 6 },
{ DEVICEID_ICH7, "Intel ICH7 watchdog timer", 7 },
+ { DEVICEID_ICH7DH, "Intel ICH7DH watchdog timer", 7 },
{ DEVICEID_ICH7M, "Intel ICH7M watchdog timer", 7 },
{ DEVICEID_ICH7MDH, "Intel ICH7MDH watchdog timer", 7 },
{ DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 },
{ DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 },
{ DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 },
- { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 },
+ { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 },
+ { DEVICEID_ICH8ME, "Intel ICH8M-E watchdog timer", 8 },
{ DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 },
{ DEVICEID_ICH9, "Intel ICH9 watchdog timer", 9 },
- { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 },
{ DEVICEID_ICH9DH, "Intel ICH9DH watchdog timer", 9 },
{ DEVICEID_ICH9DO, "Intel ICH9DO watchdog timer", 9 },
+ { DEVICEID_ICH9M, "Intel ICH9M watchdog timer", 9 },
+ { DEVICEID_ICH9ME, "Intel ICH9M-E watchdog timer", 9 },
+ { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 },
+ { DEVICEID_ICH10, "Intel ICH10 watchdog timer", 10 },
+ { DEVICEID_ICH10D, "Intel ICH10D watchdog timer", 10 },
+ { DEVICEID_ICH10DO, "Intel ICH10DO watchdog timer", 10 },
+ { DEVICEID_ICH10R, "Intel ICH10R watchdog timer", 10 },
{ 0, NULL, 0 },
};
==== //depot/projects/mpsafetty/sys/dev/ichwd/ichwd.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/dev/ichwd/ichwd.h,v 1.8 2008/01/07 09:46:39 des Exp $
+ * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.9 2008/08/25 15:23:54 jhb Exp $
*/
#ifndef _ICHWD_H_
@@ -73,6 +73,7 @@
#define DEVICEID_82801DB 0x24c0
#define DEVICEID_82801DBM 0x24cc
#define DEVICEID_82801E 0x2450
+#define DEVICEID_82801EB 0x24dc
#define DEVICEID_82801EBR 0x24d0
#define DEVICEID_6300ESB 0x25a1
#define DEVICEID_82801FBR 0x2640
@@ -80,16 +81,24 @@
#define DEVICEID_ICH6W 0x2642
#define DEVICEID_63XXESB 0x2670
#define DEVICEID_ICH7 0x27b8
+#define DEVICEID_ICH7DH 0x27b0
#define DEVICEID_ICH7M 0x27b9
#define DEVICEID_ICH7MDH 0x27bd
#define DEVICEID_ICH8 0x2810
#define DEVICEID_ICH8DH 0x2812
#define DEVICEID_ICH8DO 0x2814
#define DEVICEID_ICH8M 0x2815
+#define DEVICEID_ICH8ME 0x2811
#define DEVICEID_ICH9 0x2918
-#define DEVICEID_ICH9R 0x2916
#define DEVICEID_ICH9DH 0x2912
#define DEVICEID_ICH9DO 0x2914
+#define DEVICEID_ICH9M 0x2919
+#define DEVICEID_ICH9ME 0x2917
+#define DEVICEID_ICH9R 0x2916
+#define DEVICEID_ICH10 0x3a18
+#define DEVICEID_ICH10D 0x3a1a
+#define DEVICEID_ICH10DO 0x3a14
+#define DEVICEID_ICH10R 0x3a16
/* ICH LPC Interface Bridge Registers (ICH5 and older) */
#define ICH_GEN_STA 0xd4
==== //depot/projects/mpsafetty/sys/dev/lmc/if_lmc.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.33 2008/07/05 16:39:24 rwatson Exp $
+ * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.34 2008/08/24 18:27:19 bz Exp $
*
* Copyright (c) 2002-2004 David Boggs. <boggs at boggs.palo-alto.ca.us>
* All rights reserved.
@@ -80,6 +80,12 @@
# ifdef HAVE_KERNEL_OPTION_HEADERS
# include "opt_device_polling.h" /* DEVICE_POLLING */
# endif
+# ifndef INET
+# define INET 0
+# endif
+# ifndef INET6
+# define INET6 0
+# endif
# ifndef NETGRAPH
# define NETGRAPH 0
# endif
==== //depot/projects/mpsafetty/sys/dev/pccard/pccard_cis_quirks.c#2 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: pcmcia_cis_quirks.c,v 1.6 2000/04/12 21:07:55 scw Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.17 2007/10/12 08:26:15 remko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard_cis_quirks.c,v 1.18 2008/08/25 04:59:43 imp Exp $");
#define PCCARDDEBUG
@@ -137,6 +137,27 @@
0, /* maxtwins */
};
+static struct pccard_function pccard_3c1_func0 = {
+ 0, /* function number */
+ PCCARD_FUNCTION_NETWORK,
+ 0x05, /* last cfe number */
+ 0x400, /* ccr_base */
+ 0x267, /* ccr_mask */
+};
+
+static struct pccard_config_entry pccard_3c1_func0_cfe0 = {
+ 0x05, /* cfe number */
+ PCCARD_CFE_IO8 | PCCARD_CFE_IO16 | PCCARD_CFE_IRQLEVEL,
+ PCCARD_IFTYPE_IO,
+ 1, /* num_iospace */
+ 5, /* iomask */
+ { { 0x0010, 0 } }, /* iospace */
+ 0xffff, /* irqmask */
+ 0, /* num_memspace */
+ { }, /* memspace */
+ 0, /* maxtwins */
+};
+
static struct pccard_function pccard_sveclancard_func0 = {
0, /* function number */
PCCARD_FUNCTION_NETWORK,
@@ -228,6 +249,8 @@
{ PCMCIA_VENDOR_SIERRA, PCMCIA_PRODUCT_SIERRA_AC710,
PCMCIA_CIS_INVALID,
&pccard_sierra_a555_func1, &pccard_sierra_a555_func1_cfe0 },
+ { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3C1, PCMCIA_CIS_INVALID,
+ &pccard_3c1_func0, &pccard_3c1_func0_cfe0 },
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD,
&pccard_sveclancard_func0, &pccard_sveclancard_func0_cfe0 },
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E,
==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.461 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.462 2008/08/24 19:50:57 ed Exp $");
#include "opt_compat.h"
#include "opt_syscons.h"
@@ -103,7 +103,6 @@
static int sc_console_unit = -1;
static int sc_saver_keyb_only = 1;
static scr_stat *sc_console;
-static struct tty *sc_console_tty;
static struct consdev *sc_consptr;
static void *kernel_console_ts;
static scr_stat main_console;
@@ -362,6 +361,7 @@
video_info_t info;
#endif
int vc;
+ struct tty *tp;
flags &= ~SC_KERNEL_CONSOLE;
@@ -457,8 +457,8 @@
*/
}
- sc_console_tty = sc_alloc_tty(0, "consolectl");
- SC_STAT(sc_console_tty) = sc_console;
+ tp = sc_alloc_tty(0, "consolectl");
+ SC_STAT(tp) = sc_console;
return 0;
}
@@ -639,13 +639,8 @@
while ((c = scgetc(sc, SCGETC_NONBLOCK)) != NOKEY) {
cur_tty = SC_DEV(sc, sc->cur_scp->index);
- if (!tty_opened(cur_tty)) {
- cur_tty = sc_console_tty;
- if (cur_tty == NULL)
- continue;
- if (!tty_opened(cur_tty))
- continue;
- }
+ if (!tty_opened(cur_tty))
+ continue;
if ((*sc->cur_scp->tsw->te_input)(sc->cur_scp, c, cur_tty))
continue;
@@ -1473,7 +1468,7 @@
return;
/* initialize required fields */
- sprintf(cp->cn_name, "consolectl");
+ strcpy(cp->cn_name, "ttyv0");
}
static void
==== //depot/projects/mpsafetty/sys/dev/uart/uart.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/uart/uart.h,v 1.8 2008/03/12 19:09:20 sam Exp $
+ * $FreeBSD: src/sys/dev/uart/uart.h,v 1.9 2008/08/25 14:45:24 nyan Exp $
*/
#ifndef _DEV_UART_H_
@@ -69,6 +69,10 @@
extern struct uart_class uart_sab82532_class __attribute__((weak));
extern struct uart_class uart_z8530_class __attribute__((weak));
+#ifdef PC98
+struct uart_class *uart_pc98_getdev(u_long port);
+#endif
+
/*
* Device flags.
*/
==== //depot/projects/mpsafetty/sys/dev/uart/uart_bus_isa.c#2 (text+ko) ====
@@ -1,5 +1,8 @@
/*-
- * Copyright (c) 2001 M. Warner Losh. All rights reserved.
+ * Copyright (c) 2008 TAKAHASHI Yoshihiro
+ * Copyright (c) 2008 Marcel Moolenaar
+ * Copyright (c) 2001 M. Warner Losh
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.6 2005/01/06 01:43:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_isa.c,v 1.7 2008/08/25 14:45:24 nyan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,6 +144,18 @@
{0x0300695c, NULL}, /* WCI0003 - Fax/Voice/Modem/Speakphone/Asvd */
{0x01a0896a, NULL}, /* ZTIA001 - Zoom Internal V90 Faxmodem */
{0x61f7896a, NULL}, /* ZTIF761 - Zoom ComStar 33.6 */
+ /* The following are found in PC98 hardware. */
+ {0x4180a3b8, NULL}, /* NEC8041 - PC-9821CB-B04 */
+ {0x0181a3b8, NULL}, /* NEC8101 - PC-9821CB2-B04 */
+ {0x5181a3b8, NULL}, /* NEC8151 - Internal FAX/Modem for Cx3, Cb3 */
+ {0x9181a3b8, NULL}, /* NEC8191 - PC-9801-120 */
+ {0xe181a3b8, NULL}, /* NEC81E1 - Internal FAX/Modem */
+ {0x1182a3b8, NULL}, /* NEC8211 - PC-9801-123 */
+ {0x3182a3b8, NULL}, /* NEC8231 - Internal FAX/Modem (Voice) */
+ {0x4182a3b8, NULL}, /* NEC8241 - PC-9821NR-B05 */
+ {0x5182a3b8, NULL}, /* NEC8251 - Internel FAX/Modem */
+ {0x7182a3b8, NULL}, /* NEC8271 - PC-9801-125 */
+ {0x11802fbf, NULL}, /* OYO8011 - Internal FAX/Modem (Ring) */
{0}
};
@@ -153,14 +168,21 @@
parent = device_get_parent(dev);
sc = device_get_softc(dev);
+ /* Check PnP IDs */
+ if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == ENXIO)
+ return (ENXIO);
+
/* Probe PnP _and_ non-PnP ns8250 here. */
- if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) {
+#ifdef PC98
+ if (isa_get_logicalid(dev))
sc->sc_class = &uart_ns8250_class;
- return (uart_bus_probe(dev, 0, 0, 0, 0));
- }
-
- /* Add checks for non-ns8250 IDs here. */
- return (ENXIO);
+ else
+ sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev,
+ SYS_RES_IOPORT, 0));
+#else
+ sc->sc_class = &uart_ns8250_class;
+#endif
+ return (uart_bus_probe(dev, 0, 0, 0, 0));
}
DRIVER_MODULE(uart, isa, uart_isa_driver, uart_devclass, 0, 0);
==== //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_pc98.c#2 (text+ko) ====
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2008 TAKAHASHI Yoshihiro
* Copyright (c) 2003 M. Warner Losh, Marcel Moolenaar
* All rights reserved.
*
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.17 2007/04/02 22:00:22 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_pc98.c,v 1.18 2008/08/25 14:45:24 nyan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,18 +40,41 @@
bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO;
bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM;
+static struct {
+ u_long iobase;
+ struct uart_class *class;
+} uart_pc98_devs[] = {
+ { 0x238, &uart_ns8250_class },
+ { 0, NULL }
+};
+
+struct uart_class *
+uart_pc98_getdev(u_long port)
+{
+ int i;
+
+ for (i = 0; uart_pc98_devs[i].iobase; i++) {
+ if (port == uart_pc98_devs[i].iobase)
+ return (uart_pc98_devs[i].class);
+ }
+ return (NULL);
+}
+
int
uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
{
- return (0); /* XXX */
+ if (i386_memio_compare(b1->bst, b1->bsh, b2->bst, b2->bsh) == 0)
+ return (1);
+
+ return (0);
}
int
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
{
struct uart_class *class;
- unsigned int i, ivar, flags;
+ unsigned int i, ivar;
class = &uart_ns8250_class;
if (class == NULL)
@@ -63,16 +87,14 @@
/*
* There is a serial port on all pc98 hardware. It is 8251 or
* an enhance version of that. Some pc98 have the second serial
- * port which is 16550A compatible. However, for the sio driver,
- * flags selected which type of uart was in the sytem. We use
- * something similar to sort things out.
+ * port which is 16550A compatible.
*/
- for (i = 0; i < 1; i++) {
- if (resource_int_value("uart", i, "flags", &flags))
+ for (i = 0; i < 2; i++) {
+ if (resource_int_value("uart", i, "flags", &ivar))
continue;
- if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(flags))
+ if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar))
continue;
- if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(flags))
+ if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar))
continue;
/*
* We have a possible device. Make sure it's enabled and
@@ -85,6 +107,10 @@
ivar == 0)
continue;
+ class = uart_pc98_getdev(ivar);
+ if (class == NULL)
+ continue;
+
di->ops = uart_getops(class);
di->bas.chan = 0;
di->bas.bst = uart_bus_space_io;
==== //depot/projects/mpsafetty/sys/dev/usb/uipaq.c#3 (text+ko) ====
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.12 2008/08/02 12:15:18 remko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uipaq.c,v 1.15 2008/08/25 02:42:13 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,16 +119,465 @@
u_int16_t uv_flags;
};
+/*
+ * Much of this list is generated from lists of other drivers that support
+ * the same hardware. Numeric values are used where no usbdevs entries
+ * exist.
+ */
static const struct uipaq_type uipaq_devs[] = {
+ {{ 0x0104, 0x00be }, 0}, /* Socket USB Sync */
+ {{ 0x04ad, 0x0301 }, 0}, /* USB Sync 0301 */
+ {{ 0x04ad, 0x0302 }, 0}, /* USB Sync 0302 */
+ {{ 0x04ad, 0x0303 }, 0}, /* USB Sync 0303 */
+ {{ 0x04ad, 0x0306 }, 0}, /* GPS Pocket PC USB Sync */
+ {{ 0x0536, 0x01a0 }, 0}, /* HHP PDT */
+ {{ 0x067e, 0x1001 }, 0}, /* Intermec Mobile Computer */
+ {{ 0x094b, 0x0001 }, 0}, /* Linkup Systems USB Sync */
+ {{ 0x0960, 0x0065 }, 0}, /* BCOM USB Sync 0065 */
+ {{ 0x0960, 0x0066 }, 0}, /* BCOM USB Sync 0066 */
+ {{ 0x0960, 0x0067 }, 0}, /* BCOM USB Sync 0067 */
+ {{ 0x0961, 0x0010 }, 0}, /* Portatec USB Sync */
+ {{ 0x099e, 0x0052 }, 0}, /* Trimble GeoExplorer */
+ {{ 0x099e, 0x4000 }, 0}, /* TDS Data Collector */
+ {{ 0x0c44, 0x03a2 }, 0}, /* Motorola iDEN Smartphone */
+ {{ 0x0c8e, 0x6000 }, 0}, /* Cesscom Luxian Series */
+ {{ 0x0cad, 0x9001 }, 0}, /* Motorola PowerPad Pocket PCDevice */
+ {{ 0x0f4e, 0x0200 }, 0}, /* Freedom Scientific USB Sync */
+ {{ 0x0f98, 0x0201 }, 0}, /* Cyberbank USB Sync */
+ {{ 0x0fb8, 0x3001 }, 0}, /* Wistron USB Sync */
+ {{ 0x0fb8, 0x3002 }, 0}, /* Wistron USB Sync */
+ {{ 0x0fb8, 0x3003 }, 0}, /* Wistron USB Sync */
+ {{ 0x0fb8, 0x4001 }, 0}, /* Wistron USB Sync */
+ {{ 0x1066, 0x00ce }, 0}, /* E-TEN USB Sync */
+ {{ 0x1066, 0x0300 }, 0}, /* E-TEN P3XX Pocket PC */
+ {{ 0x1066, 0x0500 }, 0}, /* E-TEN P5XX Pocket PC */
+ {{ 0x1066, 0x0600 }, 0}, /* E-TEN P6XX Pocket PC */
+ {{ 0x1066, 0x0700 }, 0}, /* E-TEN P7XX Pocket PC */
+ {{ 0x1114, 0x0001 }, 0}, /* Psion Teklogix Sync 753x */
+ {{ 0x1114, 0x0004 }, 0}, /* Psion Teklogix Sync netBookPro */
+ {{ 0x1114, 0x0006 }, 0}, /* Psion Teklogix Sync 7525 */
+ {{ 0x1182, 0x1388 }, 0}, /* VES USB Sync */
+ {{ 0x11d9, 0x1002 }, 0}, /* Rugged Pocket PC 2003 */
+ {{ 0x11d9, 0x1003 }, 0}, /* Rugged Pocket PC 2003 */
+ {{ 0x1231, 0xce01 }, 0}, /* USB Sync 03 */
+ {{ 0x1231, 0xce02 }, 0}, /* USB Sync 03 */
+ {{ 0x3340, 0x011c }, 0}, /* Mio DigiWalker PPC StrongARM */
+ {{ 0x3340, 0x0326 }, 0}, /* Mio DigiWalker 338 */
+ {{ 0x3340, 0x0426 }, 0}, /* Mio DigiWalker 338 */
+ {{ 0x3340, 0x043a }, 0}, /* Mio DigiWalker USB Sync */
+ {{ 0x3340, 0x051c }, 0}, /* MiTAC USB Sync 528 */
+ {{ 0x3340, 0x053a }, 0}, /* Mio DigiWalker SmartPhone USB Sync */
+ {{ 0x3340, 0x071c }, 0}, /* MiTAC USB Sync */
+ {{ 0x3340, 0x0b1c }, 0}, /* Generic PPC StrongARM */
+ {{ 0x3340, 0x0e3a }, 0}, /* Generic PPC USB Sync */
+ {{ 0x3340, 0x0f1c }, 0}, /* Itautec USB Sync */
+ {{ 0x3340, 0x0f3a }, 0}, /* Generic SmartPhone USB Sync */
+ {{ 0x3340, 0x1326 }, 0}, /* Itautec USB Sync */
+ {{ 0x3340, 0x191c }, 0}, /* YAKUMO USB Sync */
+ {{ 0x3340, 0x2326 }, 0}, /* Vobis USB Sync */
+ {{ 0x3340, 0x3326 }, 0}, /* MEDION Winodws Moble USB Sync */
+ {{ 0x3708, 0x20ce }, 0}, /* Legend USB Sync */
+ {{ 0x3708, 0x21ce }, 0}, /* Lenovo USB Sync */
+ {{ 0x4113, 0x0210 }, 0}, /* Mobile Media Technology USB Sync */
+ {{ 0x4113, 0x0211 }, 0}, /* Mobile Media Technology USB Sync */
+ {{ 0x4113, 0x0400 }, 0}, /* Mobile Media Technology USB Sync */
+ {{ 0x4113, 0x0410 }, 0}, /* Mobile Media Technology USB Sync */
+ {{ 0x4505, 0x0010 }, 0}, /* Smartphone */
+ {{ 0x5e04, 0xce00 }, 0}, /* SAGEM Wireless Assistant */
+ {{ USB_VENDOR_ACER, 0x1631 }, 0}, /* c10 Series */
+ {{ USB_VENDOR_ACER, 0x1632 }, 0}, /* c20 Series */
+ {{ USB_VENDOR_ACER, 0x16e1 }, 0}, /* Acer n10 Handheld USB Sync */
+ {{ USB_VENDOR_ACER, 0x16e2 }, 0}, /* Acer n20 Handheld USB Sync */
+ {{ USB_VENDOR_ACER, 0x16e3 }, 0}, /* Acer n30 Handheld USB Sync */
+ {{ USB_VENDOR_ASUS, 0x4200 }, 0}, /* ASUS USB Sync */
+ {{ USB_VENDOR_ASUS, 0x4201 }, 0}, /* ASUS USB Sync */
+ {{ USB_VENDOR_ASUS, 0x4202 }, 0}, /* ASUS USB Sync */
+ {{ USB_VENDOR_ASUS, 0x9200 }, 0}, /* ASUS USB Sync */
+ {{ USB_VENDOR_ASUS, 0x9202 }, 0}, /* ASUS USB Sync */
+ {{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_P535 }, 0},
+ {{ USB_VENDOR_CASIO, 0x2001 }, 0}, /* CASIO USB Sync 2001 */
+ {{ USB_VENDOR_CASIO, 0x2003 }, 0}, /* CASIO USB Sync 2003 */
+ {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0},
+ {{ USB_VENDOR_COMPAL, 0x0531 }, 0}, /* MyGuide 7000 XL USB Sync */
+ {{ USB_VENDOR_COMPAQ, 0x0032 }, 0}, /* Compaq iPAQ USB Sync */
+ {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0},
+ {{ USB_VENDOR_DELL, 0x4001 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4002 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4003 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4004 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4005 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4006 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4007 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4008 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_DELL, 0x4009 }, 0}, /* Dell Axim USB Sync */
+ {{ USB_VENDOR_FSC, 0x1001 }, 0}, /* Fujitsu Siemens Computers USB Sync */
+ {{ USB_VENDOR_FUJITSU, 0x1058 }, 0}, /* FUJITSU USB Sync */
+ {{ USB_VENDOR_FUJITSU, 0x1079 }, 0}, /* FUJITSU USB Sync */
+ {{ USB_VENDOR_GIGASET, 0x0601 }, 0}, /* Askey USB Sync */
+ {{ USB_VENDOR_HITACHI, 0x0014 }, 0}, /* Hitachi USB Sync */
+ {{ USB_VENDOR_HP, 0x1216 }, 0}, /* HP USB Sync 1612 */
+ {{ USB_VENDOR_HP, 0x2016 }, 0}, /* HP USB Sync 1620 */
+ {{ USB_VENDOR_HP, 0x2116 }, 0}, /* HP USB Sync 1621 */
+ {{ USB_VENDOR_HP, 0x2216 }, 0}, /* HP USB Sync 1622 */
+ {{ USB_VENDOR_HP, 0x3016 }, 0}, /* HP USB Sync 1630 */
+ {{ USB_VENDOR_HP, 0x3116 }, 0}, /* HP USB Sync 1631 */
+ {{ USB_VENDOR_HP, 0x3216 }, 0}, /* HP USB Sync 1632 */
+ {{ USB_VENDOR_HP, 0x4016 }, 0}, /* HP USB Sync 1640 */
+ {{ USB_VENDOR_HP, 0x4116 }, 0}, /* HP USB Sync 1641 */
+ {{ USB_VENDOR_HP, 0x4216 }, 0}, /* HP USB Sync 1642 */
+ {{ USB_VENDOR_HP, 0x5016 }, 0}, /* HP USB Sync 1650 */
+ {{ USB_VENDOR_HP, 0x5116 }, 0}, /* HP USB Sync 1651 */
+ {{ USB_VENDOR_HP, 0x5216 }, 0}, /* HP USB Sync 1652 */
{{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 },
{{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0},
- {{ USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE }, 0},
+ {{ USB_VENDOR_HTC, 0x00cf }, 0}, /* HTC USB Modem */
+ {{ USB_VENDOR_HTC, 0x0a01 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a02 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a03 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a04 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a05 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a06 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a07 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a08 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a09 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0a }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0b }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0c }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0d }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0e }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a0f }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a10 }, 0}, /* PocketPC USB Sync */
+ {{ USB_VENDOR_HTC, 0x0a11 }, 0}, /* PocketPC USB Sync */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list