PERFORCE change 55380 for review
Robert Watson
rwatson at FreeBSD.org
Sun Jun 20 17:25:57 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=55380
Change 55380 by rwatson at rwatson_paprika on 2004/06/20 17:25:03
Integrate netperf_socket.
Affected files ...
.. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#3 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#5 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.77 2004/04/15 12:12:15 cperciva Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $
##############################################################
### Basic configuration options ############################
@@ -280,6 +280,7 @@
snd_via8233_load="NO" # via8233
snd_via82c686_load="NO" # via82c686
snd_driver_load="NO" # All sound drivers
+#pcm0.line="0" # Default value for a mixer channel
##############################################################
### USB modules ############################################
==== //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#4 (text+ko) ====
@@ -25,10 +25,11 @@
*/
#include <dev/sound/pcm/sound.h>
+#include <sys/kernel.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.37 2004/06/17 17:16:45 phk Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.38 2004/06/20 15:38:11 josef Exp $");
MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
@@ -189,9 +190,10 @@
{
struct snddev_info *snddev;
struct snd_mixer *m;
+ char devname[20];
u_int16_t v;
struct cdev *pdev;
- int i, unit;
+ int i, unit, val;
m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO);
snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev));
@@ -204,7 +206,14 @@
goto bad;
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- v = snd_mixerdefaults[i];
+ snprintf(devname, sizeof(devname), "%s.%s", device_get_nameunit(dev), snd_mixernames[i]);
+ TUNABLE_INT_FETCH(devname, &val);
+
+ if (val >= 0 && val <= 100)
+ v = (u_int16_t) val;
+ else
+ v = snd_mixerdefaults[i];
+
mixer_set(m, i, v | (v << 8));
}
==== //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#3 (text+ko) ====
@@ -1,5 +1,5 @@
-/* $NetBSD: ehcireg.h,v 1.13 2001/11/23 01:16:27 augustss Exp $ */
-/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.2 2004/03/19 07:14:23 julian Exp $ */
+/* $NetBSD: ehcireg.h,v 1.15 2004/06/12 16:02:42 mycroft Exp $ */
+/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.3 2004/06/20 15:32:19 le Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -262,7 +262,7 @@
#define EHCI_QH_GET_MPL(x) (((x) >> 16) & 0x7ff) /* max packet len */
#define EHCI_QH_SET_MPL(x) ((x) << 16)
#define EHCI_QG_MPLMASK 0x07ff0000
-#define EHCI_QH_GET_CTL(x) (((x) >> 26) & 0x01) /* control endpoint */
+#define EHCI_QH_GET_CTL(x) (((x) >> 27) & 0x01) /* control endpoint */
#define EHCI_QH_CTL 0x08000000
#define EHCI_QH_GET_NRL(x) (((x) >> 28) & 0x0f) /* NAK reload */
#define EHCI_QH_SET_NRL(x) ((x) << 28)
More information about the p4-projects
mailing list