PERFORCE change 207235 for review
John Baldwin
jhb at FreeBSD.org
Fri Mar 2 19:47:52 UTC 2012
http://p4web.freebsd.org/@@207235?ac=10
Change 207235 by jhb at jhb_jhbbsd on 2012/03/02 19:47:36
IFC @207233
Affected files ...
.. //depot/projects/pci/sys/amd64/include/endian.h#3 integrate
.. //depot/projects/pci/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/pci/sys/amd64/include/stdarg.h#2 integrate
.. //depot/projects/pci/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/pci/sys/arm/mv/mv_machdep.c#4 integrate
.. //depot/projects/pci/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/pci/sys/boot/i386/libi386/vidconsole.c#3 integrate
.. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/pci/sys/compat/linsysfs/linsysfs.c#2 integrate
.. //depot/projects/pci/sys/conf/NOTES#9 integrate
.. //depot/projects/pci/sys/conf/files#9 integrate
.. //depot/projects/pci/sys/conf/kern.mk#5 integrate
.. //depot/projects/pci/sys/conf/kern.pre.mk#5 integrate
.. //depot/projects/pci/sys/conf/kmod.mk#5 integrate
.. //depot/projects/pci/sys/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/pci/sys/dev/ahci/ahci.c#8 integrate
.. //depot/projects/pci/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-ahci.c#4 integrate
.. //depot/projects/pci/sys/dev/ata/chipsets/ata-marvell.c#3 integrate
.. //depot/projects/pci/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/pci/sys/dev/e1000/if_igb.c#9 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.c#3 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_intel.c#2 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_uncore.c#3 integrate
.. //depot/projects/pci/sys/dev/hwpmc/hwpmc_uncore.h#3 integrate
.. //depot/projects/pci/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/pci/sys/dev/iicbus/ds1775.c#3 integrate
.. //depot/projects/pci/sys/dev/iicbus/iicbb.c#3 integrate
.. //depot/projects/pci/sys/dev/iicbus/iicbb_if.m#2 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#30 integrate
.. //depot/projects/pci/sys/dev/pci/pcivar.h#7 integrate
.. //depot/projects/pci/sys/dev/sound/pci/hdspe-pcm.c#1 branch
.. //depot/projects/pci/sys/dev/sound/pci/hdspe.c#1 branch
.. //depot/projects/pci/sys/dev/sound/pci/hdspe.h#1 branch
.. //depot/projects/pci/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/pci/sys/fs/devfs/devfs_vfsops.c#3 integrate
.. //depot/projects/pci/sys/fs/nfsclient/nfs_clbio.c#6 integrate
.. //depot/projects/pci/sys/fs/nullfs/null_subr.c#3 integrate
.. //depot/projects/pci/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/pci/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/pci/sys/fs/procfs/procfs.c#3 integrate
.. //depot/projects/pci/sys/fs/pseudofs/pseudofs.h#3 integrate
.. //depot/projects/pci/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/pci/sys/i386/include/endian.h#3 integrate
.. //depot/projects/pci/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/pci/sys/i386/include/stdarg.h#2 integrate
.. //depot/projects/pci/sys/ia64/ia64/busdma_machdep.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/pci/sys/kern/kern_malloc.c#4 integrate
.. //depot/projects/pci/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/pci/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/pci/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/pci/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/pci/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/pci/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/pci/sys/kern/vnode_if.src#5 integrate
.. //depot/projects/pci/sys/mips/cavium/files.octeon1#3 integrate
.. //depot/projects/pci/sys/mips/cavium/if_octm.c#4 integrate
.. //depot/projects/pci/sys/mips/cavium/octe/ethernet-common.c#4 integrate
.. //depot/projects/pci/sys/mips/mips/busdma_machdep.c#3 integrate
.. //depot/projects/pci/sys/modules/sound/driver/Makefile#3 integrate
.. //depot/projects/pci/sys/modules/sound/driver/hdspe/Makefile#1 branch
.. //depot/projects/pci/sys/net/if_bridge.c#3 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/pci/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/pci/sys/netinet/ipfw/ip_fw_dynamic.c#4 integrate
.. //depot/projects/pci/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/pci/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/pci/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/pci/sys/pc98/include/endian.h#2 integrate
.. //depot/projects/pci/sys/pc98/include/setjmp.h#2 integrate
.. //depot/projects/pci/sys/pc98/include/stdarg.h#2 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/busdma_machdep.c#3 integrate
.. //depot/projects/pci/sys/powerpc/powerpc/iommu_if.m#2 integrate
.. //depot/projects/pci/sys/powerpc/ps3/ps3bus.c#7 integrate
.. //depot/projects/pci/sys/sparc64/include/bus_dma.h#3 integrate
.. //depot/projects/pci/sys/sparc64/sparc64/bus_machdep.c#4 integrate
.. //depot/projects/pci/sys/sys/buf.h#3 integrate
.. //depot/projects/pci/sys/sys/bus_dma.h#2 integrate
.. //depot/projects/pci/sys/sys/jail.h#5 integrate
.. //depot/projects/pci/sys/sys/malloc.h#3 integrate
.. //depot/projects/pci/sys/sys/pmc.h#3 integrate
.. //depot/projects/pci/sys/sys/vnode.h#6 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_extern.h#7 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_inode.c#5 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_snapshot.c#5 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_softdep.c#9 integrate
.. //depot/projects/pci/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/pci/sys/ufs/ufs/inode.h#5 integrate
.. //depot/projects/pci/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/pci/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/pci/sys/vm/vm_mmap.c#5 integrate
.. //depot/projects/pci/sys/x86/include/endian.h#1 branch
.. //depot/projects/pci/sys/x86/include/setjmp.h#1 branch
.. //depot/projects/pci/sys/x86/include/stdarg.h#1 branch
.. //depot/projects/pci/sys/x86/x86/busdma_machdep.c#3 integrate
.. //depot/projects/pci/sys/xen/interface/io/blkif.h#3 integrate
Differences ...
==== //depot/projects/pci/sys/amd64/include/endian.h#3 (text+ko) ====
@@ -1,145 +1,6 @@
/*-
- * Copyright (c) 1987, 1991 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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 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.
- *
- * @(#)endian.h 7.8 (Berkeley) 4/3/91
- * $FreeBSD: src/sys/amd64/include/endian.h,v 1.11 2011/03/21 09:40:01 jeff Exp $
+ * This file is in the public domain.
*/
+/* $FreeBSD: src/sys/amd64/include/endian.h,v 1.12 2012/02/28 19:39:54 tijl Exp $ */
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */
-#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */
-#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */
-
-#define _BYTE_ORDER _LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define LITTLE_ENDIAN _LITTLE_ENDIAN
-#define BIG_ENDIAN _BIG_ENDIAN
-#define PDP_ENDIAN _PDP_ENDIAN
-#define BYTE_ORDER _BYTE_ORDER
-#endif
-
-#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-
-#define __bswap64_const(_x) \
- (((_x) >> 56) | \
- (((_x) >> 40) & (0xffUL << 8)) | \
- (((_x) >> 24) & (0xffUL << 16)) | \
- (((_x) >> 8) & (0xffUL << 24)) | \
- (((_x) << 8) & (0xffUL << 32)) | \
- (((_x) << 24) & (0xffUL << 40)) | \
- (((_x) << 40) & (0xffUL << 48)) | \
- ((_x) << 56))
-
-#define __bswap32_const(_x) \
- (((_x) >> 24) | \
- (((_x) & (0xff << 16)) >> 8) | \
- (((_x) & (0xff << 8)) << 8) | \
- ((_x) << 24))
-
-#define __bswap16_const(_x) (__uint16_t)((_x) << 8 | (_x) >> 8)
-
-static __inline __uint64_t
-__bswap64_var(__uint64_t _x)
-{
-
- __asm ("bswap %0" : "+r" (_x));
- return (_x);
-}
-
-static __inline __uint32_t
-__bswap32_var(__uint32_t _x)
-{
-
- __asm ("bswap %0" : "+r" (_x));
- return (_x);
-}
-
-static __inline __uint16_t
-__bswap16_var(__uint16_t _x)
-{
-
- return (__bswap16_const(_x));
-}
-
-#define __bswap64(_x) \
- (__builtin_constant_p(_x) ? \
- __bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
-
-#define __bswap32(_x) \
- (__builtin_constant_p(_x) ? \
- __bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
-
-#define __bswap16(_x) \
- (__builtin_constant_p(_x) ? \
- __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
-
-#define __htonl(x) __bswap32(x)
-#define __htons(x) __bswap16(x)
-#define __ntohl(x) __bswap32(x)
-#define __ntohs(x) __bswap16(x)
-
-#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
-
-/*
- * No optimizations are available for this compiler. Fall back to
- * non-optimized functions by defining the constant usually used to prevent
- * redefinition.
- */
-#define _BYTEORDER_FUNC_DEFINED
-
-#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_MACHINE_ENDIAN_H_ */
+#include <x86/endian.h>
==== //depot/projects/pci/sys/amd64/include/setjmp.h#2 (text+ko) ====
@@ -1,50 +1,6 @@
/*-
- * Copyright (c) 1998 John Birrell <jb at cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS 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 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/include/setjmp.h,v 1.10 2007/01/12 07:24:06 imp Exp $
+ * This file is in the public domain.
*/
+/* $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.11 2012/02/28 22:17:52 tijl Exp $ */
-#ifndef _MACHINE_SETJMP_H_
-#define _MACHINE_SETJMP_H_
-
-#include <sys/cdefs.h>
-
-#define _JBLEN 12 /* Size of the jmp_buf on AMD64. */
-
-/*
- * jmp_buf and sigjmp_buf are encapsulated in different structs to force
- * compile-time diagnostics for mismatches. The structs are the same
- * internally to avoid some run-time errors for mismatches.
- */
-#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
-typedef struct _sigjmp_buf { long _sjb[_JBLEN]; } sigjmp_buf[1];
-#endif
-
-typedef struct _jmp_buf { long _jb[_JBLEN]; } jmp_buf[1];
-
-#endif /* !_MACHINE_SETJMP_H_ */
+#include <x86/setjmp.h>
==== //depot/projects/pci/sys/amd64/include/stdarg.h#2 (text+ko) ====
@@ -1,75 +1,6 @@
/*-
- * Copyright (c) 2002 David E. O'Brien. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 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/include/stdarg.h,v 1.9 2006/09/21 01:37:01 kan Exp $
+ * This file is in the public domain.
*/
+/* $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.10 2012/02/28 22:30:58 tijl Exp $ */
-#ifndef _MACHINE_STDARG_H_
-#define _MACHINE_STDARG_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define _VA_LIST_DECLARED
-typedef __va_list va_list;
-#endif
-
-#ifdef __GNUCLIKE_BUILTIN_STDARG
-
-#define va_start(ap, last) \
- __builtin_va_start((ap), (last))
-
-#define va_arg(ap, type) \
- __builtin_va_arg((ap), type)
-
-#define __va_copy(dest, src) \
- __builtin_va_copy((dest), (src))
-
-#if __ISO_C_VISIBLE >= 1999
-#define va_copy(dest, src) \
- __va_copy(dest, src)
-#endif
-
-#define va_end(ap) \
- __builtin_va_end(ap)
-
-#elif defined(lint)
-/* Provide a fake implementation for lint's benefit */
-#define __va_size(type) \
- (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#define va_start(ap, last) \
- ((ap) = (va_list)&(last) + __va_size(last))
-#define va_arg(ap, type) \
- (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
-#define va_end(ap)
-
-#else
-#error this file needs to be ported to your compiler
-#endif
-
-#endif /* !_MACHINE_STDARG_H_ */
+#include <x86/stdarg.h>
==== //depot/projects/pci/sys/arm/arm/busdma_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.51 2011/11/07 15:43:11 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.52 2012/03/01 19:58:34 jhb Exp $");
/*
* ARM bus dma support routines
@@ -68,7 +68,7 @@
struct bus_dma_tag {
bus_dma_tag_t parent;
bus_size_t alignment;
- bus_size_t boundary;
+ bus_addr_t boundary;
bus_addr_t lowaddr;
bus_addr_t highaddr;
bus_dma_filter_t *filter;
@@ -332,7 +332,7 @@
int
bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
- bus_size_t boundary, bus_addr_t lowaddr,
+ bus_addr_t boundary, bus_addr_t lowaddr,
bus_addr_t highaddr, bus_dma_filter_t *filter,
void *filterarg, bus_size_t maxsize, int nsegments,
bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
@@ -378,12 +378,12 @@
* Take into account any restrictions imposed by our parent tag
*/
if (parent != NULL) {
- newtag->lowaddr = min(parent->lowaddr, newtag->lowaddr);
- newtag->highaddr = max(parent->highaddr, newtag->highaddr);
+ newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
+ newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
if (newtag->boundary == 0)
newtag->boundary = parent->boundary;
else if (parent->boundary != 0)
- newtag->boundary = min(parent->boundary,
+ newtag->boundary = MIN(parent->boundary,
newtag->boundary);
if ((newtag->filter != NULL) ||
((parent->flags & BUS_DMA_COULD_BOUNCE) != 0))
==== //depot/projects/pci/sys/arm/mv/mv_machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
#include "opt_platform.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.21 2011/12/02 15:24:39 jchandra Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.22 2012/02/29 12:44:34 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -287,9 +287,19 @@
availmem_regions[i].mr_start + availmem_regions[i].mr_size,
availmem_regions[i].mr_size);
- phys_avail[j] = availmem_regions[i].mr_start;
- phys_avail[j + 1] = availmem_regions[i].mr_start +
- availmem_regions[i].mr_size;
+ /*
+ * We should not map the page at PA 0x0000000, the VM can't
+ * handle it, as pmap_extract() == 0 means failure.
+ */
+ if (availmem_regions[i].mr_start > 0 ||
+ availmem_regions[i].mr_size > PAGE_SIZE) {
+ phys_avail[j] = availmem_regions[i].mr_start;
+ if (phys_avail[j] == 0)
+ phys_avail[j] += PAGE_SIZE;
+ phys_avail[j + 1] = availmem_regions[i].mr_start +
+ availmem_regions[i].mr_size;
+ } else
+ j -= 2;
}
phys_avail[j] = 0;
phys_avail[j + 1] = 0;
==== //depot/projects/pci/sys/arm/xscale/i8134x/crb_machdep.c#3 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.12 2011/04/19 15:05:12 pluknet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.13 2012/02/29 12:44:34 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -381,8 +381,8 @@
i = 0;
#ifdef ARM_USE_SMALL_ALLOC
- phys_avail[i++] = 0x00000000;
- phys_avail[i++] = 0x00001000; /*
+ phys_avail[i++] = 0x00001000;
+ phys_avail[i++] = 0x00002000; /*
*XXX: Gross hack to get our
* pages in the vm_page_array
. */
==== //depot/projects/pci/sys/boot/i386/libi386/vidconsole.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/vidconsole.c,v 1.22 2011/10/25 19:45:12 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/vidconsole.c,v 1.23 2012/02/29 18:11:33 jkim Exp $");
#include <stand.h>
#include <bootstrap.h>
@@ -623,10 +623,10 @@
#endif
if (i == KBD_ECHO) {
/* got the right answer */
- return (0);
+ return (1);
}
}
- return (1);
+ return (0);
}
#endif /* KEYBOARD_PROBE */
==== //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#7 (text+ko) ====
@@ -42,7 +42,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.164 2012/01/15 18:47:24 trociny Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.165 2012/02/29 00:30:18 mm Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -1460,7 +1460,7 @@
return (0);
}
-PSEUDOFS(linprocfs, 1);
+PSEUDOFS(linprocfs, 1, 0);
MODULE_DEPEND(linprocfs, linux, 1, 1, 1);
MODULE_DEPEND(linprocfs, procfs, 1, 1, 1);
MODULE_DEPEND(linprocfs, sysvmsg, 1, 1, 1);
==== //depot/projects/pci/sys/compat/linsysfs/linsysfs.c#2 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.5 2010/11/15 23:14:14 des Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linsysfs/linsysfs.c,v 1.6 2012/02/29 00:30:18 mm Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -280,5 +280,5 @@
return (0);
}
-PSEUDOFS(linsysfs, 1);
+PSEUDOFS(linsysfs, 1, 0);
MODULE_DEPEND(linsysfs, linux, 1, 1, 1);
==== //depot/projects/pci/sys/conf/NOTES#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1638 2012/02/28 13:19:34 gavin Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1639 2012/03/01 13:10:18 mav Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2257,6 +2257,7 @@
# snd_gusc: Gravis UltraSound ISA PnP/non-PnP.
# snd_hda: Intel High Definition Audio (Controller) and
# compatible.
+# snd_hdspe: RME HDSPe AIO and RayDAT.
# snd_ich: Intel ICH AC'97 and some more audio controllers
# embedded in a chipset, for example nVidia
# nForce controllers.
@@ -2296,6 +2297,7 @@
device snd_fm801
device snd_gusc
device snd_hda
+device snd_hdspe
device snd_ich
device snd_maestro
device snd_maestro3
==== //depot/projects/pci/sys/conf/files#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1658 2012/02/23 21:32:32 dim Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1659 2012/03/01 13:10:18 mav Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1771,6 +1771,8 @@
dev/sound/pci/hda/hdac.c optional snd_hda pci
dev/sound/pci/hda/hdac_if.m optional snd_hda pci
dev/sound/pci/hda/hdacc.c optional snd_hda pci
+dev/sound/pci/hdspe.c optional snd_hdspe pci
+dev/sound/pci/hdspe-pcm.c optional snd_hdspe pci
dev/sound/pcm/ac97.c optional sound
dev/sound/pcm/ac97_if.m optional sound
dev/sound/pcm/ac97_patch.c optional sound
==== //depot/projects/pci/sys/conf/kern.mk#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.92 2012/02/23 21:32:32 dim Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.93 2012/02/29 22:58:51 dim Exp $
#
# Warning flags for compiling the kernel and components of the kernel:
@@ -15,7 +15,7 @@
# Disable a few warnings for clang, since there are several places in the
# kernel where fixing them is more trouble than it is worth, or where there is
# a false positive.
-.if ${CC:T:Mclang} == "clang"
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
NO_WCONSTANT_CONVERSION= -Wno-constant-conversion
NO_WARRAY_BOUNDS= -Wno-array-bounds
NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-count-negative
@@ -50,7 +50,7 @@
# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
#
.if ${MACHINE_CPUARCH} == "i386"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
.else
CFLAGS+= -mno-aes -mno-avx
@@ -98,7 +98,7 @@
# (-mfpmath= is not supported)
#
.if ${MACHINE_CPUARCH} == "amd64"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -mno-sse
.else
CFLAGS+= -mno-aes -mno-avx
==== //depot/projects/pci/sys/conf/kern.pre.mk#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.137 2012/02/28 18:30:18 dim Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.138 2012/02/29 22:58:51 dim Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -34,7 +34,7 @@
.endif
.endif
.if ${MACHINE_CPUARCH} == "amd64"
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
COPTFLAGS?=-O2 -frename-registers -pipe
.else
COPTFLAGS?=-O2 -pipe
@@ -84,7 +84,7 @@
CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
.if ${MACHINE_CPUARCH} != "mips"
CFLAGS+= --param inline-unit-growth=100
==== //depot/projects/pci/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.250 2012/01/18 15:25:34 bz Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.251 2012/02/29 22:58:51 dim Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -108,7 +108,7 @@
# for example.
CFLAGS+= -I@/contrib/altq
-.if ${CC:T:Mclang} != "clang"
+.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
CFLAGS+= -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
==== //depot/projects/pci/sys/dev/aac/aac_pci.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.76 2012/02/28 17:29:31 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.77 2012/02/28 19:50:14 emaste Exp $");
/*
* PCI bus interface and resource allocation.
@@ -403,8 +403,7 @@
* Note that some of these controllers are 64-bit capable.
*/
if (bus_dma_tag_create(bus_get_dma_tag(sc->aac_dev), /* parent */
- PAGE_SIZE, /* alignment */
- 0, /* boundary*/
+ PAGE_SIZE, 0, /* algnmnt, boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
NULL, NULL, /* filter, filterarg */
==== //depot/projects/pci/sys/dev/ahci/ahci.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.81 2012/01/06 00:22:55 jimharris Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.82 2012/03/02 08:49:07 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -186,13 +186,13 @@
{0x2365197b, 0x00, "JMicron JMB365", AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366", AHCI_Q_NOFORCE},
{0x2368197b, 0x00, "JMicron JMB368", AHCI_Q_NOFORCE},
- {0x611111ab, 0x00, "Marvell 88SX6111", AHCI_Q_NOFORCE | AHCI_Q_1CH |
+ {0x611111ab, 0x00, "Marvell 88SE6111", AHCI_Q_NOFORCE | AHCI_Q_1CH |
AHCI_Q_EDGEIS},
- {0x612111ab, 0x00, "Marvell 88SX6121", AHCI_Q_NOFORCE | AHCI_Q_2CH |
+ {0x612111ab, 0x00, "Marvell 88SE6121", AHCI_Q_NOFORCE | AHCI_Q_2CH |
AHCI_Q_EDGEIS | AHCI_Q_NONCQ | AHCI_Q_NOCOUNT},
- {0x614111ab, 0x00, "Marvell 88SX6141", AHCI_Q_NOFORCE | AHCI_Q_4CH |
+ {0x614111ab, 0x00, "Marvell 88SE6141", AHCI_Q_NOFORCE | AHCI_Q_4CH |
AHCI_Q_EDGEIS | AHCI_Q_NONCQ | AHCI_Q_NOCOUNT},
- {0x614511ab, 0x00, "Marvell 88SX6145", AHCI_Q_NOFORCE | AHCI_Q_4CH |
+ {0x614511ab, 0x00, "Marvell 88SE6145", AHCI_Q_NOFORCE | AHCI_Q_4CH |
AHCI_Q_EDGEIS | AHCI_Q_NONCQ | AHCI_Q_NOCOUNT},
{0x91201b4b, 0x00, "Marvell 88SE912x", AHCI_Q_EDGEIS|AHCI_Q_NOBSYRES},
{0x91231b4b, 0x11, "Marvell 88SE912x", AHCI_Q_NOBSYRES|AHCI_Q_ALTSIG},
==== //depot/projects/pci/sys/dev/ata/ata-pci.h#6 (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/ata/ata-pci.h,v 1.132 2012/01/15 13:23:18 uqs Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.133 2012/03/02 08:49:07 mav Exp $
*/
/* structure holding chipset config info */
@@ -278,12 +278,12 @@
#define ATA_M88SX6042 0x604211ab
#define ATA_M88SX6081 0x608111ab
#define ATA_M88SX7042 0x704211ab
-#define ATA_M88SX6101 0x610111ab
-#define ATA_M88SX6102 0x610211ab
-#define ATA_M88SX6111 0x611111ab
-#define ATA_M88SX6121 0x612111ab
-#define ATA_M88SX6141 0x614111ab
-#define ATA_M88SX6145 0x614511ab
+#define ATA_M88SE6101 0x610111ab
+#define ATA_M88SE6102 0x610211ab
+#define ATA_M88SE6111 0x611111ab
+#define ATA_M88SE6121 0x612111ab
+#define ATA_M88SE6141 0x614111ab
+#define ATA_M88SE6145 0x614511ab
#define ATA_MARVELL2_ID 0x1b4b
#define ATA_MICRON_ID 0x1042
==== //depot/projects/pci/sys/dev/ata/chipsets/ata-ahci.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.38 2012/01/15 13:23:18 uqs Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.39 2012/03/02 08:49:07 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -180,12 +180,12 @@
ctlr->ichannels = ATA_INL(ctlr->r_res2, ATA_AHCI_PI);
ctlr->channels = MAX(flsl(ctlr->ichannels),
(ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_NPMASK) + 1);
- if (pci_get_devid(dev) == ATA_M88SX6111)
+ if (pci_get_devid(dev) == ATA_M88SE6111)
ctlr->channels = 1;
- else if (pci_get_devid(dev) == ATA_M88SX6121)
+ else if (pci_get_devid(dev) == ATA_M88SE6121)
ctlr->channels = 2;
- else if (pci_get_devid(dev) == ATA_M88SX6141 ||
- pci_get_devid(dev) == ATA_M88SX6145)
+ else if (pci_get_devid(dev) == ATA_M88SE6141 ||
+ pci_get_devid(dev) == ATA_M88SE6145)
ctlr->channels = 4;
ctlr->reset = ata_ahci_reset;
==== //depot/projects/pci/sys/dev/ata/chipsets/ata-marvell.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.24 2012/01/15 13:23:18 uqs Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.25 2012/03/02 08:49:07 mav Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -108,12 +108,12 @@
{ ATA_M88SX6042, 0, 4, MV_6042, ATA_SA300, "88SX6042" },
{ ATA_M88SX6081, 0, 8, MV_60XX, ATA_SA300, "88SX6081" },
{ ATA_M88SX7042, 0, 4, MV_7042, ATA_SA300, "88SX7042" },
- { ATA_M88SX6101, 0, 0, MV_61XX, ATA_UDMA6, "88SX6101" },
- { ATA_M88SX6102, 0, 0, MV_61XX, ATA_UDMA6, "88SX6102" },
- { ATA_M88SX6111, 0, 1, MV_61XX, ATA_UDMA6, "88SX6111" },
- { ATA_M88SX6121, 0, 2, MV_61XX, ATA_UDMA6, "88SX6121" },
- { ATA_M88SX6141, 0, 4, MV_61XX, ATA_UDMA6, "88SX6141" },
- { ATA_M88SX6145, 0, 4, MV_61XX, ATA_UDMA6, "88SX6145" },
+ { ATA_M88SE6101, 0, 0, MV_61XX, ATA_UDMA6, "88SE6101" },
+ { ATA_M88SE6102, 0, 0, MV_61XX, ATA_UDMA6, "88SE6102" },
+ { ATA_M88SE6111, 0, 1, MV_61XX, ATA_UDMA6, "88SE6111" },
+ { ATA_M88SE6121, 0, 2, MV_61XX, ATA_UDMA6, "88SE6121" },
+ { ATA_M88SE6141, 0, 4, MV_61XX, ATA_UDMA6, "88SE6141" },
+ { ATA_M88SE6145, 0, 4, MV_61XX, ATA_UDMA6, "88SE6145" },
{ 0x91a41b4b, 0, 0, MV_91XX, ATA_UDMA6, "88SE912x" },
{ 0, 0, 0, 0, 0, 0}};
==== //depot/projects/pci/sys/dev/ath/if_ath.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.388 2012/02/25 19:12:54 adrian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.390 2012/03/02 03:11:53 adrian Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -5637,11 +5637,16 @@
/* XXX calibration timer? */
+ ATH_LOCK(sc);
sc->sc_scanning = 1;
sc->sc_syncbeacon = 0;
rfilt = ath_calcrxfilter(sc);
+ ATH_UNLOCK(sc);
+
+ ATH_PCU_LOCK(sc);
ath_hal_setrxfilter(ah, rfilt);
ath_hal_setassocid(ah, ifp->if_broadcastaddr, 0);
+ ATH_PCU_UNLOCK(sc);
DPRINTF(sc, ATH_DEBUG_STATE, "%s: RX filter 0x%x bssid %s aid 0\n",
__func__, rfilt, ether_sprintf(ifp->if_broadcastaddr));
@@ -5655,12 +5660,17 @@
struct ath_hal *ah = sc->sc_ah;
u_int32_t rfilt;
+ ATH_LOCK(sc);
sc->sc_scanning = 0;
rfilt = ath_calcrxfilter(sc);
+ ATH_UNLOCK(sc);
+
+ ATH_PCU_LOCK(sc);
ath_hal_setrxfilter(ah, rfilt);
ath_hal_setassocid(ah, sc->sc_curbssid, sc->sc_curaid);
ath_hal_process_noisefloor(ah);
+ ATH_PCU_UNLOCK(sc);
DPRINTF(sc, ATH_DEBUG_STATE, "%s: RX filter 0x%x bssid %s aid 0x%x\n",
__func__, rfilt, ether_sprintf(sc->sc_curbssid),
@@ -5680,8 +5690,10 @@
* beacon timers. Note that since we only hear beacons in
* sta/ibss mode this has no effect in other operating modes.
*/
+ ATH_LOCK(sc);
if (!sc->sc_scanning && ic->ic_curchan == ic->ic_bsschan)
sc->sc_syncbeacon = 1;
+ ATH_UNLOCK(sc);
}
/*
==== //depot/projects/pci/sys/dev/e1000/if_igb.c#9 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.85 2012/02/27 19:05:01 luigi Exp $*/
+/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.86 2012/03/01 22:13:10 jhb Exp $*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
@@ -2711,7 +2711,7 @@
"MSIX Configuration Problem, "
"%d vectors configured, but %d queues wanted!\n",
msgs, want);
- return (ENXIO);
+ return (0);
}
if ((msgs) && pci_alloc_msix(dev, &msgs) == 0) {
device_printf(adapter->dev,
@@ -2721,9 +2721,11 @@
}
msi:
msgs = pci_msi_count(dev);
- if (msgs == 1 && pci_alloc_msi(dev, &msgs) == 0)
- device_printf(adapter->dev,"Using MSI interrupt\n");
- return (msgs);
+ if (msgs == 1 && pci_alloc_msi(dev, &msgs) == 0) {
+ device_printf(adapter->dev," Using MSI interrupt\n");
+ return (msgs);
+ }
+ return (0);
}
/*********************************************************************
==== //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.17 2012/01/04 07:58:36 fabient Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.18 2012/03/01 21:23:26 davide Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -556,7 +556,8 @@
#define IAP_F_I7 (1 << 4) /* CPU: Core i7 */
#define IAP_F_I7O (1 << 4) /* CPU: Core i7 (old) */
#define IAP_F_WM (1 << 5) /* CPU: Westmere */
-#define IAP_F_FM (1 << 6) /* Fixed mask */
+#define IAP_F_SB (1 << 6) /* CPU: Sandy Brdige */
+#define IAP_F_FM (1 << 7) /* Fixed mask */
#define IAP_F_ALLCPUSCORE2 \
(IAP_F_CC | IAP_F_CC2 | IAP_F_CC2E | IAP_F_CA)
@@ -596,11 +597,12 @@
IAPDESCR(02H_81H, 0x02, 0x81, IAP_F_FM | IAP_F_CA),
IAPDESCR(03H_00H, 0x03, 0x00, IAP_F_FM | IAP_F_CC),
- IAPDESCR(03H_01H, 0x03, 0x01, IAP_F_FM | IAP_F_I7O),
- IAPDESCR(03H_02H, 0x03, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_WM),
+ IAPDESCR(03H_01H, 0x03, 0x01, IAP_F_FM | IAP_F_I7O | IAP_F_SB),
+ IAPDESCR(03H_02H, 0x03, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+ IAP_F_WM | IAP_F_SB),
IAPDESCR(03H_04H, 0x03, 0x04, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O),
- IAPDESCR(03H_08H, 0x03, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
- IAPDESCR(03H_10H, 0x03, 0x10, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+ IAPDESCR(03H_08H, 0x03, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_SB),
+ IAPDESCR(03H_10H, 0x03, 0x10, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_SB),
IAPDESCR(03H_20H, 0x03, 0x20, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
IAPDESCR(04H_00H, 0x04, 0x00, IAP_F_FM | IAP_F_CC),
@@ -610,8 +612,8 @@
IAPDESCR(04H_08H, 0x04, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
IAPDESCR(05H_00H, 0x05, 0x00, IAP_F_FM | IAP_F_CC),
- IAPDESCR(05H_01H, 0x05, 0x01, IAP_F_FM | IAP_F_I7O),
- IAPDESCR(05H_02H, 0x05, 0x02, IAP_F_FM | IAP_F_I7O | IAP_F_WM),
+ IAPDESCR(05H_01H, 0x05, 0x01, IAP_F_FM | IAP_F_I7O | IAP_F_SB),
+ IAPDESCR(05H_02H, 0x05, 0x02, IAP_F_FM | IAP_F_I7O | IAP_F_WM | IAP_F_SB),
IAPDESCR(05H_03H, 0x05, 0x03, IAP_F_FM | IAP_F_I7O),
IAPDESCR(06H_00H, 0x06, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2 |
@@ -623,24 +625,25 @@
IAPDESCR(06H_0FH, 0x06, 0x0F, IAP_F_FM | IAP_F_I7O),
IAPDESCR(07H_00H, 0x07, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2),
- IAPDESCR(07H_01H, 0x07, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 | IAP_F_I7 | IAP_F_WM),
+ IAPDESCR(07H_01H, 0x07, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 |
+ IAP_F_I7 | IAP_F_WM | IAP_F_SB),
IAPDESCR(07H_02H, 0x07, 0x02, IAP_F_FM | IAP_F_ALLCPUSCORE2),
IAPDESCR(07H_03H, 0x07, 0x03, IAP_F_FM | IAP_F_ALLCPUSCORE2),
IAPDESCR(07H_06H, 0x07, 0x06, IAP_F_FM | IAP_F_CA),
- IAPDESCR(07H_08H, 0x07, 0x08, IAP_F_FM | IAP_F_CA),
+ IAPDESCR(07H_08H, 0x07, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_SB),
IAPDESCR(08H_01H, 0x08, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
- IAP_F_I7 | IAP_F_WM),
+ IAP_F_I7 | IAP_F_WM | IAP_F_SB),
IAPDESCR(08H_02H, 0x08, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
- IAP_F_I7 | IAP_F_WM),
+ IAP_F_I7 | IAP_F_WM | IAP_F_SB),
IAPDESCR(08H_04H, 0x08, 0x04, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
- IAP_F_WM),
+ IAP_F_WM | IAP_F_SB),
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list