PERFORCE change 166088 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Jul 14 17:23:05 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166088
Change 166088 by trasz at trasz_victim on 2009/07/14 17:22:54
IFC.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/share/man/man4/pcm.4#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/mklocale/yacc.y#2 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/share/man/man4/pcm.4#6 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.60 2009/07/11 15:25:13 joel Exp $
+.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.61 2009/07/13 18:55:46 joel Exp $
.\"
-.Dd July 11, 2009
+.Dd July 13, 2009
.Dt SOUND 4
.Os
.Sh NAME
@@ -146,13 +146,14 @@
.Dq surround sound
is supported and enabled by default.
The FreeBSD multichannel matrix processor supports up to 18 interleaved
-channels, but the limit is currently set to 8 channels (known as 7.1).
+channels, but the limit is currently set to 8 channels (as commonly used
+for 7.1 surround sound).
The internal matrix mapping can handle reduction, expansion or
re-routing of channels.
This provides a base interface for related multichannel
.Fn ioctl
support.
-Works with or without
+Multichannel audio works both with and without
.Tn VCHANs .
Most bridge device drivers are still missing multichannel matrixing support
, but in most cases this should be trivial to implement.
@@ -437,9 +438,9 @@
.It s16le:1.0
Mono
.It s16le:2.0
-Stereo, 2 channels, (left, right).
+Stereo, 2 channels (left, right).
.It s16le:2.1
-3 channels (left, right, LFE).
+3 channels (left, right, LFE).
.It s16le:3.0
3 channels (left, right, rear center).
.It s16le:4.0
==== //depot/projects/soc2009/trasz_limits/sys/amd64/pci/pci_bus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.123 2009/02/08 07:02:42 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.124 2009/07/13 21:36:31 jkim Exp $");
#include "opt_cpu.h"
@@ -386,6 +386,7 @@
*/
static struct isa_pnp_id pcibus_pnp_ids[] = {
{ 0x030ad041 /* PNP0A03 */, "PCI Bus" },
+ { 0x080ad041 /* PNP0A08 */, "PCIe Bus" },
{ 0 }
};
==== //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_xpt.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.2 2009/07/13 06:12:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.3 2009/07/13 21:21:30 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1204,7 +1204,7 @@
scan_info->request_ccb->ccb_h.path, 1);
cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
cts.type = CTS_TYPE_CURRENT_SETTINGS;
- cts.xport_specific.sata.pm_present = 1;
+ cts.xport_specific.sata.pm_present = 0;
cts.xport_specific.sata.valid = CTS_SATA_VALID_PM;
xpt_action((union ccb *)&cts);
}
==== //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib_acpi.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.58 2009/06/09 13:44:17 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.59 2009/07/13 21:36:31 jkim Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -131,7 +131,7 @@
static int
acpi_pcib_acpi_probe(device_t dev)
{
- static char *pcib_ids[] = { "PNP0A03", NULL };
+ static char *pcib_ids[] = { "PNP0A03", "PNP0A08", NULL };
if (acpi_disabled("pcib") ||
ACPI_ID_PROBE(device_get_parent(dev), dev, pcib_ids) == NULL)
==== //depot/projects/soc2009/trasz_limits/sys/dev/ciss/cissvar.h#3 (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/ciss/cissvar.h,v 1.13 2009/07/10 08:18:08 scottl Exp $
+ * $FreeBSD: src/sys/dev/ciss/cissvar.h,v 1.14 2009/07/13 20:19:29 scottl Exp $
*/
/*
@@ -142,7 +142,7 @@
/ sizeof(struct ciss_sg_entry))
/* XXX Prep for increasing max i/o */
-#define CISS_MAX_SG_ELEMENTS 33
+#define CISS_MAX_SG_ELEMENTS 17
/*
* Per-logical-drive data.
==== //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.33 2009/07/13 11:51:02 lstewart Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.34 2009/07/14 11:53:21 lstewart Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3585,7 +3585,7 @@
{
struct in_conninfo inc;
- struct toeopt to;
+ struct toeopt toeo;
struct tcphdr th;
int mss, wsf, sack, ts;
struct mbuf *m = NULL;
==== //depot/projects/soc2009/trasz_limits/sys/dev/re/if_re.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.159 2009/06/26 11:45:06 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.160 2009/07/14 04:35:13 avatar Exp $");
/*
* RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -211,6 +211,7 @@
{ RL_HWREV_8101E, RL_8169, "8101E"},
{ RL_HWREV_8102E, RL_8169, "8102E"},
{ RL_HWREV_8102EL, RL_8169, "8102EL"},
+ { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL"},
{ RL_HWREV_8168_SPIN2, RL_8169, "8168"},
{ RL_HWREV_8168_SPIN3, RL_8169, "8168"},
{ RL_HWREV_8168C, RL_8169, "8168C/8111C"},
@@ -1260,6 +1261,7 @@
break;
case RL_HWREV_8102E:
case RL_HWREV_8102EL:
+ case RL_HWREV_8102EL_SPIN1:
sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE |
RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT |
RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD;
==== //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_bus.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.129 2009/06/11 17:06:31 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.130 2009/07/13 21:36:31 jkim Exp $");
#include "opt_cpu.h"
@@ -598,6 +598,7 @@
*/
static struct isa_pnp_id pcibus_pnp_ids[] = {
{ 0x030ad041 /* PNP0A03 */, "PCI Bus" },
+ { 0x080ad041 /* PNP0A08 */, "PCIe Bus" },
{ 0 }
};
==== //depot/projects/soc2009/trasz_limits/sys/pci/if_rlreg.h#2 (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/pci/if_rlreg.h,v 1.96 2009/04/20 07:13:04 yongari Exp $
+ * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.97 2009/07/14 04:35:13 avatar Exp $
*/
/*
@@ -159,6 +159,7 @@
#define RL_HWREV_8169_8110SB 0x10000000
#define RL_HWREV_8169_8110SC 0x18000000
#define RL_HWREV_8102EL 0x24800000
+#define RL_HWREV_8102EL_SPIN1 0x24c00000
#define RL_HWREV_8168D 0x28000000
#define RL_HWREV_8168_SPIN1 0x30000000
#define RL_HWREV_8100E 0x30800000
==== //depot/projects/soc2009/trasz_limits/usr.bin/mklocale/yacc.y#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.28 2008/01/22 00:04:50 ache Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.29 2009/07/14 09:19:33 ed Exp $");
#include <arpa/inet.h>
@@ -730,8 +730,8 @@
/*
* PART 6: And finally the variable data
*/
- if (fwrite(variable,
- ntohl(new_locale.variable_len), 1, fp) != 1) {
+ if (new_locale.variable_len != 0 &&
+ fwrite(variable, ntohl(new_locale.variable_len), 1, fp) != 1) {
perror(locale_file);
exit(1);
}
More information about the p4-projects
mailing list