PERFORCE change 120074 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sat May 19 20:34:28 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120074
Change 120074 by hselasky at hselasky_mini_itx on 2007/05/19 20:33:30
IFC @120061
- and fix duplicate USB ID assignment for BELKIN product 0x705a
- and make all USB network drivers use ALTQ
Affected files ...
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/amd64/include/md_var.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/usb/src/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/usb/src/sys/arm/include/asm.h#3 integrate
.. //depot/projects/usb/src/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/usb/src/sys/arm/include/profile.h#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#6 integrate
.. //depot/projects/usb/src/sys/conf/kern.mk#4 integrate
.. //depot/projects/usb/src/sys/conf/kern.pre.mk#5 integrate
.. //depot/projects/usb/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#25 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#23 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#22 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/rt2573_ucode.h#1 branch
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/ums.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#12 edit
.. //depot/projects/usb/src/sys/i386/include/smp.h#3 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/mca.c#2 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_mib.c#4 integrate
.. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#3 integrate
.. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.h#3 integrate
.. //depot/projects/usb/src/sys/net/if_fwsubr.c#4 integrate
.. //depot/projects/usb/src/sys/net/if_lagg.c#3 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/usb/src/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/usb/src/sys/sys/param.h#6 integrate
.. //depot/projects/usb/src/sys/sys/sysctl.h#5 integrate
Differences ...
==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -80,6 +80,8 @@
int boot_cpu_id = -1; /* designated BSP */
extern int nkpt;
+extern struct pcpu __pcpu[];
+
/*
* CPU topology map datastructures for HTT.
*/
==== //depot/projects/usb/src/sys/amd64/include/md_var.h#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $
*/
#ifndef _MACHINE_MD_VAR_H_
@@ -57,8 +57,6 @@
extern uint64_t *vm_page_dump;
extern int vm_page_dump_size;
-extern struct pcpu __pcpu[];
-
typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
struct thread;
struct reg;
==== //depot/projects/usb/src/sys/amd64/include/smp.h#3 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $
*
*/
@@ -23,6 +23,7 @@
#include <machine/frame.h>
#include <machine/intr_machdep.h>
#include <machine/apicvar.h>
+#include <machine/pcb.h>
/* global symbols in mpboot.S */
extern char mptramp_start[];
==== //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $");
/*
* ARM bus dma support routines
@@ -1003,7 +1003,7 @@
bus_dmamap_callback2_t *callback, void *callback_arg,
int flags)
{
- vm_offset_t lastaddr;
+ vm_offset_t lastaddr = 0;
#ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT
bus_dma_segment_t dm_segments[dmat->nsegments];
#else
@@ -1079,7 +1079,7 @@
return;
}
-static __inline void
+static void
bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op)
{
char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
==== //depot/projects/usb/src/sys/arm/arm/machdep.c#4 (text+ko) ====
@@ -44,7 +44,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.26 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -547,7 +547,7 @@
set_mcontext(struct thread *td, const mcontext_t *mcp)
{
struct trapframe *tf = td->td_frame;
- __greg_t *gr = mcp->__gregs;
+ const __greg_t *gr = mcp->__gregs;
tf->tf_r0 = gr[_REG_R0];
tf->tf_r1 = gr[_REG_R1];
==== //depot/projects/usb/src/sys/arm/arm/pmap.c#6 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.79 2007/05/18 07:10:43 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -431,10 +431,10 @@
l1->l1_kva = l1pt;
l1->l1_domain_use_count = 0;
- l1->l1_domain_first = 0;
+ l1->l1_domain_first = 1;
for (i = 0; i < PMAP_DOMAINS; i++)
- l1->l1_domain_free[i] = i + 1;
+ l1->l1_domain_free[i] = i + 2;
/*
* Copy the kernel's L1 entries to each new L1.
@@ -2910,7 +2910,7 @@
/*
* remove a page rom the kernel pagetables
*/
-PMAP_INLINE void
+void
pmap_kremove(vm_offset_t va)
{
struct l2_bucket *l2b;
==== //depot/projects/usb/src/sys/arm/include/asm.h#3 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*
- * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -80,7 +80,7 @@
#ifdef GPROF
# define _PROF_PROLOGUE \
- mov ip, lr; bl _mcount
+ mov ip, lr; bl __mcount
#else
# define _PROF_PROLOGUE
#endif
==== //depot/projects/usb/src/sys/arm/include/pmap.h#4 (text+ko) ====
@@ -44,7 +44,7 @@
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
* from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30
*
- * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -237,8 +237,8 @@
/*
* Definitions for MMU domains
*/
-#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */
-#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */
+#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */
+#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */
/*
* The new pmap ensures that page-tables are always mapping Write-Thru.
==== //depot/projects/usb/src/sys/arm/include/profile.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -61,9 +61,9 @@
#define MCOUNT \
__asm__(".text"); \
__asm__(".align 0"); \
- __asm__(".type _mcount ,%function"); \
- __asm__(".global _mcount"); \
- __asm__("_mcount:"); \
+ __asm__(".type __mcount ,%function"); \
+ __asm__(".global __mcount"); \
+ __asm__("__mcount:"); \
/* \
* Preserve registers that are trashed during mcount \
*/ \
==== //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $
+# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $
FILES= boot boot1 boot2
@@ -36,7 +36,8 @@
-I${.CURDIR}/../btx/lib -I. \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
- -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ -Winline --param max-inline-insns-single=100
LDFLAGS=-static -N --gc-sections
==== //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $");
#include <sys/param.h>
@@ -1303,9 +1303,8 @@
struct ccb_scsiio *csio;
struct scsi_read_capacity_data *rcap;
- rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap),
- M_SCSIDA,
- M_NOWAIT);
+ rcap = (struct scsi_read_capacity_data *)
+ malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO);
if (rcap == NULL) {
printf("dastart: Couldn't malloc read_capacity data\n");
/* da_free_periph??? */
@@ -1330,7 +1329,7 @@
struct scsi_read_capacity_data_long *rcaplong;
rcaplong = (struct scsi_read_capacity_data_long *)
- malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT);
+ malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO);
if (rcaplong == NULL) {
printf("dastart: Couldn't malloc read_capacity data\n");
/* da_free_periph??? */
==== //depot/projects/usb/src/sys/conf/kern.mk#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -12,7 +12,7 @@
.else
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
- ${_wundef} -fformat-extensions
+ ${_wundef} -Wno-pointer-sign -fformat-extensions
.if !defined(NO_UNDEF)
_wundef= -Wundef
.endif
@@ -46,7 +46,7 @@
# a very small subset of float registers for integer divides.
#
.if ${MACHINE_ARCH} == "ia64"
-CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata
+CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata
INLINE_LIMIT?= 15000
.endif
==== //depot/projects/usb/src/sys/conf/kern.pre.mk#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -53,7 +53,7 @@
NOSTDINC= -nostdinc
.endif
-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
# This hack lets us use the OpenBSD altq code without spamming a new
# include path into contrib'ed source files.
@@ -90,7 +90,7 @@
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
-WERROR?= -Werror
+#WERROR?= -Werror
.endif
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
==== //depot/projects/usb/src/sys/conf/kmod.mk#5 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -79,7 +79,7 @@
. if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
CFLAGS+= -fno-strict-aliasing
. endif
-WERROR?= -Werror
+#WERROR?= -Werror
.endif
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
@@ -93,7 +93,7 @@
NOSTDINC= -nostdinc
.endif
CFLAGS+= ${C_DIALECT}
-CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
+CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
.if defined(KERNBUILDDIR)
CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
.endif
==== //depot/projects/usb/src/sys/dev/sound/isa/mss.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
#include <dev/sound/pcm/sound.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $");
/* board-specific include files */
#include <dev/sound/isa/mss.h>
@@ -1320,7 +1320,7 @@
goto mss_probe_end;
}
tmp &= 0x3f;
- if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) {
+ if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) {
BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n",
rman_get_start(mss->io_base), tmpx));
goto no;
==== //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $");
MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
@@ -859,7 +859,7 @@
spicds_setcif(ptr->info, ptr->parent->cfg->cif);
spicds_setformat(ptr->info,
AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X);
- spicds_setdvc(ptr->info, 0);
+ spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF);
/* for the time being, init only first codec */
if (ptr->num == 0)
spicds_init(ptr->info);
==== //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $");
MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
@@ -932,7 +932,7 @@
ptr->parent->cfg->type == SPICDS_TYPE_AK4528) {
spicds_setformat(ptr->info,
AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X);
- spicds_setdvc(ptr->info, 0);
+ spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF);
}
/* for the time being, init only first codec */
==== //depot/projects/usb/src/sys/dev/sound/pci/fm801.c#3 (text+ko) ====
@@ -29,11 +29,11 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $");
#define PCI_VENDOR_FORTEMEDIA 0x1319
-#define PCI_DEVICE_FORTEMEDIA1 0x08011319
-#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */
+#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */
+#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */
#define FM_PCM_VOLUME 0x00
#define FM_FM_VOLUME 0x02
@@ -417,15 +417,16 @@
struct fm801_chinfo *ch = data;
struct fm801_info *fm801 = ch->parent;
- if(ch->dir == PCMDIR_PLAY) {
- if(fm801->play_flip) return fm801->play_blksize;
+ /*
+ * Don't mind for play_flip, set the blocksize to the
+ * desired values in any case - otherwise sound playback
+ * breaks here.
+ */
+ if(ch->dir == PCMDIR_PLAY)
fm801->play_blksize = blocksize;
- }
- if(ch->dir == PCMDIR_REC) {
- if(fm801->rec_flip) return fm801->rec_blksize;
+ if(ch->dir == PCMDIR_REC)
fm801->rec_blksize = blocksize;
- }
DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir);
==== //depot/projects/usb/src/sys/dev/twa/tw_osl.h#3 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $
+ * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $
*/
/*
@@ -52,7 +52,7 @@
#define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS
#define TW_OSLI_MAX_NUM_AENS 0x100
-#define TW_OSLI_DEFERRED_INTR_USED
+//#define TW_OSLI_DEFERRED_INTR_USED
/* Possible values of req->state. */
#define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */
==== //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $
+ * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $
*/
/*
@@ -75,7 +75,7 @@
#define TW_OSL_ENCLOSURE_SUPPORT
#endif
-#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006"
+#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007"
#define TW_OSL_CAN_SLEEP
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#25 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.42 2007/03/31 23:23:41 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.44 2007/05/12 05:56:10 brueffer Exp $");
/*
* ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
@@ -889,7 +889,9 @@
ifp->if_start = axe_start_cb;
ifp->if_watchdog = NULL;
ifp->if_init = axe_init_cb;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
/* XXX need Giant when accessing
* the device structures !
@@ -1267,7 +1269,7 @@
while (1) {
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
if (pos > 0)
==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#13 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.10 2006/06/04 14:42:38 iedowse Exp $
+ * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.11 2007/05/01 11:17:29 brueffer Exp $
*/
/*
==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#18 (text+ko) ====
@@ -383,7 +383,9 @@
ifp->if_start = cdce_start_cb;
ifp->if_init = cdce_init_cb;
ifp->if_baudrate = 11000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
/* no IFM type for 11Mbps USB, so go with 10baseT */
ifmedia_add(&sc->sc_ifmedia, IFM_ETHER | IFM_10_T, 0, 0);
@@ -522,7 +524,7 @@
goto done;
}
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
goto done;
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#21 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.63 2006/09/07 00:06:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.64 2007/05/12 05:53:52 brueffer Exp $");
/*
* CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
@@ -567,7 +567,9 @@
ifp->if_watchdog = NULL;
ifp->if_init = cue_init_cb;
ifp->if_baudrate = 10000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
sc->sc_ifp = ifp;
@@ -834,7 +836,7 @@
goto done;
}
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
goto done;
==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#9 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
+ * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.19 2007/05/12 05:53:52 brueffer Exp $
*/
/*
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#23 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.71 2006/10/07 18:03:39 flz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.73 2007/05/12 05:56:58 brueffer Exp $");
/*
* Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
@@ -604,7 +604,9 @@
ifp->if_watchdog = NULL;
ifp->if_init = kue_init_cb;
ifp->if_baudrate = 10000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
sc->sc_ifp = ifp;
@@ -820,7 +822,7 @@
goto done;
}
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
goto done;
==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#9 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
+ * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.19 2007/05/12 05:53:53 brueffer Exp $
*/
/*
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#22 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.30 2006/09/07 00:06:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.31 2007/05/12 05:53:53 brueffer Exp $");
/*
* RealTek RTL8150 USB to fast ethernet controller driver.
@@ -794,7 +794,9 @@
ifp->if_start = rue_start_cb;
ifp->if_watchdog = NULL;
ifp->if_init = rue_init_cb;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
/* XXX need Giant when accessing
* the device structures !
@@ -1113,7 +1115,7 @@
goto done;
}
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
goto done;
==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#10 (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/dev/usb/if_ruereg.h,v 1.6 2005/06/10 16:49:15 brooks Exp $
+ * $FreeBSD: src/sys/dev/usb/if_ruereg.h,v 1.7 2007/05/12 05:53:53 brueffer Exp $
*/
#define RUE_CONFIG_NO 1
==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#5 (text+ko) ====
@@ -158,7 +158,7 @@
{ USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO },
{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_1 },
{ USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_2 },
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A },
+ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D705A },
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3 },
{ USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC },
{ USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR },
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#22 (text+ko) ====
@@ -1,6 +1,5 @@
/* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
-/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.24 2006/10/19 01:15:58 iedowse Exp $ */
/*-
* Copyright (c) 2003
* Shingo WATANABE <nabe at nabechan.org>. All rights reserved.
@@ -50,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.24 2006/10/19 01:15:58 iedowse Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.25 2007/05/12 05:53:53 brueffer Exp $");
#include "opt_inet.h"
@@ -407,7 +406,9 @@
ifp->if_ioctl = udav_ioctl_cb;
ifp->if_watchdog = NULL;
ifp->if_init = udav_init_cb;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_READY(&ifp->if_snd);
/* XXX need Giant when accessing
* the device structures !
@@ -925,7 +926,7 @@
goto done;
}
- IF_DEQUEUE(&(ifp->if_snd), m);
+ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m);
if (m == NULL) {
goto done;
==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#28 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.52 2007/04/24 11:18:55 sephe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.53 2007/05/09 09:32:41 kevlo Exp $");
/*-
* Ralink Technology RT2500USB chipset driver
@@ -220,7 +220,6 @@
{ USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 },
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 },
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7051 },
- { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D705A },
{ USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU },
{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 },
{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG },
==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#16 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.7 2006/09/07 00:06:41 imp Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.8 2007/05/09 09:32:41 kevlo Exp $ */
/*-
* Copyright (c) 2005
==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.22 2007/02/09 15:59:28 le Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.23 2007/05/08 18:51:39 maxim Exp $");
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -260,6 +260,8 @@
u_int16_t vendor;
u_int16_t product;
} ubsa_products [] = {
+ /* AnyData ADU-E100A/H */
+ { USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X },
/* BELKIN F5U103 */
{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103 },
/* BELKIN F5U120 */
==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#17 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $");
/*-
* Copyright (c) 2005, Takanori Watanabe
* Copyright (c) 2003, M. Warner Losh <imp at freebsd.org>.
==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#16 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.24 2006/09/07 00:06:41 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.25 2007/04/30 16:15:19 takawata Exp $");
/*
* NOTE: all function names beginning like "uftdi_cfg_" can only
* be called from within the config thread function !
@@ -265,6 +265,9 @@
(uaa->product == USB_PRODUCT_BBELECTRONICS_USOTL4)) {
return UMATCH_VENDOR_PRODUCT;
}
+ if (uaa->vendor == USB_VENDOR_MELCO &&
+ (uaa->product == USB_PRODUCT_MELCO_PCOPRS1))
+ return (UMATCH_VENDOR_PRODUCT);
return (UMATCH_NONE);
}
@@ -373,6 +376,18 @@
}
break;
+ case USB_VENDOR_MELCO:
+ switch( uaa->product ){
+ case USB_PRODUCT_MELCO_PCOPRS1:
+ sc->sc_type = UFTDI_TYPE_8U232AM;
+ sc->sc_hdrlen = 0;
+ break;
+
+ default: /* Can't happen */
+ goto detach;
+ }
+ break;
+
default: /* Can't happen */
goto detach;
}
==== //depot/projects/usb/src/sys/dev/usb/uhid.c#14 (text+ko) ====
==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#15 (text+ko) ====
@@ -71,7 +71,7 @@
#include "ukbdmap.h"
#endif
-__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.59 2006/11/28 21:13:07 flz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.60 2007/05/12 05:53:53 brueffer Exp $");
#ifdef USB_DEBUG
#define DPRINTF(n,fmt,...) \
==== //depot/projects/usb/src/sys/dev/usb/ums.c#17 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.83 2007/01/17 03:50:45 markus Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.84 2007/05/12 05:53:53 brueffer Exp $");
/*
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
==== //depot/projects/usb/src/sys/dev/usb/usb.c#12 (text+ko) ====
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.111 2006/10/19 01:15:58 iedowse Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.112 2007/05/12 05:53:53 brueffer Exp $");
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -747,11 +747,7 @@
case FIOASYNC:
if(*(int *)data)
-#if __FreeBSD_version >= 500000
usb_async_proc = p->td_proc;
-#else
- usb_async_proc = p;
-#endif
else
usb_async_proc = 0;
@@ -775,11 +771,9 @@
switch (cmd)
{
-#if defined(__FreeBSD__)
/* this part should be deleted */
case USB_DISCOVER:
break;
-#endif
case USB_REQUEST:
{
struct usb_ctl_request *ur = (void *)data;
==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#36 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.89 2007/02/27 17:23:28 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.90 2007/05/08 03:25:05 kevlo Exp $");
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -698,8 +698,16 @@
cdp = udev->cdesc;
- /* get the full descriptor */
- err = usbreq_get_desc(udev, UDESC_CONFIG, index, len, cdp, 3);
+ /* Get the full descriptor. Try a few times for slow devices. */
+ for (nifc = 0; nifc < 3; nifc++) {
+
+ err = usbreq_get_desc(udev, UDESC_CONFIG, index, len, cdp, 3);
+
+ if (!err) break;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list