PERFORCE change 156734 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Mon Jan 26 21:13:53 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=156734
Change 156734 by hselasky at hselasky_laptop001 on 2009/01/27 05:13:00
IFC @ 156733
Affected files ...
.. //depot/projects/usb/src/share/man/man4/usb2_bluetooth.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_controller.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_core.4#5 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_ethernet.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_image.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_input.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_misc.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_ndis.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_quirk.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_serial.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_sound.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_storage.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_template.4#2 integrate
.. //depot/projects/usb/src/share/man/man4/usb2_wlan.4#2 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#13 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91.c#13 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#10 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#8 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#4 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91var.h#3 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#11 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#14 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#7 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#13 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#5 integrate
.. //depot/projects/usb/src/sys/conf/files.amd64#15 integrate
.. //depot/projects/usb/src/sys/conf/files.i386#17 integrate
.. //depot/projects/usb/src/sys/conf/files.pc98#14 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#16 integrate
.. //depot/projects/usb/src/sys/conf/kmod.mk#11 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_via.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/iic.c#8 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/iic.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#10 integrate
.. //depot/projects/usb/src/sys/dev/sound/macio/aoa.c#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/aoa.h#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/davbus.c#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/davbusreg.h#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/i2s.c#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/snapper.c#1 branch
.. //depot/projects/usb/src/sys/dev/sound/macio/tumbler.c#1 branch
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#21 integrate
.. //depot/projects/usb/src/sys/dev/speaker/spkr.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_urtw.c#1 branch
.. //depot/projects/usb/src/sys/dev/usb/if_urtwreg.h#1 branch
.. //depot/projects/usb/src/sys/dev/usb/if_urtwvar.h#1 branch
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#41 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#20 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#26 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#27 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#27 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#28 integrate
.. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#24 integrate
.. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/geom/geom_dev.c#9 integrate
.. //depot/projects/usb/src/sys/i386/cpufreq/smist.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#12 integrate
.. //depot/projects/usb/src/sys/kern/imgact_elf.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_jail.c#14 integrate
.. //depot/projects/usb/src/sys/kern/kern_malloc.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#16 integrate
.. //depot/projects/usb/src/sys/kern/kern_sysctl.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_timeout.c#10 integrate
.. //depot/projects/usb/src/sys/kern/sched_4bsd.c#11 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/usb/src/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/usb/src/sys/kern/sys_generic.c#10 integrate
.. //depot/projects/usb/src/sys/kern/tty.c#15 integrate
.. //depot/projects/usb/src/sys/kern/tty_pty.c#8 integrate
.. //depot/projects/usb/src/sys/kern/vfs_aio.c#10 integrate
.. //depot/projects/usb/src/sys/kern/vfs_cache.c#15 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#16 integrate
.. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#26 integrate
.. //depot/projects/usb/src/sys/modules/agp/Makefile#4 integrate
.. //depot/projects/usb/src/sys/modules/sound/driver/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/sound/driver/ai2s/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/sound/driver/davbus/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/urtw/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/usb2/Makefile#9 integrate
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#11 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_atmegadci/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#11 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#9 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#9 integrate
.. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_3g/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#9 integrate
.. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#5 integrate
.. //depot/projects/usb/src/sys/net/if.c#16 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#17 integrate
.. //depot/projects/usb/src/sys/net80211/_ieee80211.h#9 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#15 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#16 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#15 integrate
.. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#15 integrate
.. //depot/projects/usb/src/sys/powerpc/conf/NOTES#11 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_audit.c#4 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_framework.c#4 integrate
.. //depot/projects/usb/src/sys/security/mac/mac_priv.c#2 integrate
.. //depot/projects/usb/src/sys/sys/jail.h#8 integrate
.. //depot/projects/usb/src/sys/sys/pcpu.h#9 integrate
.. //depot/projects/usb/src/sys/sys/sysctl.h#13 integrate
.. //depot/projects/usb/src/sys/vm/uma.h#6 integrate
.. //depot/projects/usb/src/sys/vm/uma_core.c#10 integrate
.. //depot/projects/usb/src/sys/vm/uma_dbg.c#2 integrate
.. //depot/projects/usb/src/sys/vm/uma_int.h#3 integrate
.. //depot/projects/usb/src/sys/vm/vm_meter.c#9 integrate
Differences ...
==== //depot/projects/usb/src/share/man/man4/usb2_bluetooth.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_bluetooth.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_controller.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_controller.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_core.4#5 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_core.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_ethernet.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_ethernet.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_image.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_image.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_input.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_input.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_misc.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_misc.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_ndis.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_ndis.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_quirk.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_quirk.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_serial.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_serial.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_sound.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_sound.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_storage.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_storage.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_template.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_template.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/share/man/man4/usb2_wlan.4#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/share/man/man4/usb2_wlan.4,v 1.1 2008/11/04 02:31:03 alfred Exp $
.\"
.\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
.\"
==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#13 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.170 2009/01/12 19:17:35 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.171 2009/01/22 21:04:46 jkim Exp $");
#include "opt_cpu.h"
@@ -392,7 +392,8 @@
break;
case CPU_VENDOR_CENTAUR:
if (AMD64_CPU_FAMILY(cpu_id) == 0x6 &&
- AMD64_CPU_MODEL(cpu_id) >= 0xf)
+ AMD64_CPU_MODEL(cpu_id) >= 0xf &&
+ (rdmsr(0x1203) & 0x100000000ULL) == 0)
tsc_is_invariant = 1;
break;
}
==== //depot/projects/usb/src/sys/arm/at91/at91.c#13 (text) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.21 2008/11/25 00:13:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.22 2009/01/22 21:54:26 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,6 +50,8 @@
static void at91_eoi(void *);
+uint32_t at91_master_clock = AT91C_MASTER_CLOCK;
+
static int
at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
==== //depot/projects/usb/src/sys/arm/at91/at91_mci.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.16 2009/01/23 00:51:25 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,6 +67,9 @@
struct at91_mci_softc {
void *intrhand; /* Interrupt handle */
device_t dev;
+ int sc_cap;
+#define CAP_HAS_4WIRE 1 /* Has 4 wire bus */
+#define CAP_NEEDS_BOUNCE 2 /* broken hardware needing bounce */
int flags;
#define CMD_STARTED 1
#define STOP_STARTED 2
@@ -77,11 +80,10 @@
bus_dmamap_t map;
int mapped;
struct mmc_host host;
- int wire4;
int bus_busy;
struct mmc_request *req;
struct mmc_command *curcmd;
- uint32_t bounce_buffer[BBSZ/4];
+ char bounce_buffer[BBSZ];
};
static inline uint32_t
@@ -167,6 +169,7 @@
device_t child;
sc->dev = dev;
+ sc->sc_cap = CAP_NEEDS_BOUNCE;
err = at91_mci_activate(dev);
if (err)
goto out;
@@ -201,7 +204,7 @@
sc->host.f_min = 375000;
sc->host.f_max = at91_master_clock / 2; /* Typically 30MHz */
sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
- if (sc->wire4)
+ if (sc->sc_cap & CAP_HAS_4WIRE)
sc->host.caps = MMC_CAP_4_BIT_DATA;
else
sc->host.caps = 0;
@@ -277,7 +280,6 @@
static int
at91_mci_update_ios(device_t brdev, device_t reqdev)
{
- uint32_t at91_master_clock = AT91C_MASTER_CLOCK;
struct at91_mci_softc *sc;
struct mmc_host *host;
struct mmc_ios *ios;
@@ -302,6 +304,7 @@
else
WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS);
WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv);
+ /* Do we need a settle time here? */
/* XXX We need to turn the device on/off here with a GPIO pin */
return (0);
}
@@ -314,7 +317,6 @@
int i;
struct mmc_data *data;
struct mmc_request *req;
- size_t block_size = 1 << 9; // Fixed, per mmc/sd spec for 2GB cards
void *vaddr;
bus_addr_t paddr;
@@ -356,19 +358,21 @@
// Set block size and turn on PDC mode for dma xfer and disable
// PDC until we're ready.
mr = RD4(sc, MCI_MR) & ~MCI_MR_BLKLEN;
- WR4(sc, MCI_MR, mr | (block_size << 16) | MCI_MR_PDCMODE);
+ WR4(sc, MCI_MR, mr | (data->len << 16) | MCI_MR_PDCMODE);
WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS);
if (cmdr & MCI_CMDR_TRCMD_START) {
if (cmdr & MCI_CMDR_TRDIR)
vaddr = cmd->data->data;
else {
- if (data->len != BBSZ)
- panic("Write multiblock write support");
- vaddr = sc->bounce_buffer;
- src = (uint32_t *)cmd->data->data;
- dst = (uint32_t *)vaddr;
- for (i = 0; i < data->len / 4; i++)
- dst[i] = bswap32(src[i]);
+ if (sc->sc_cap & CAP_NEEDS_BOUNCE) {
+ vaddr = sc->bounce_buffer;
+ src = (uint32_t *)cmd->data->data;
+ dst = (uint32_t *)vaddr;
+ for (i = 0; i < data->len / 4; i++)
+ dst[i] = bswap32(src[i]);
+ }
+ else
+ vaddr = cmd->data->data;
}
data->xfer_len = 0;
if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, data->len,
@@ -499,10 +503,12 @@
bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD);
bus_dmamap_unload(sc->dmatag, sc->map);
sc->mapped--;
- walker = (uint32_t *)cmd->data->data;
- len = cmd->data->len / 4;
- for (i = 0; i < len; i++)
- walker[i] = bswap32(walker[i]);
+ if (sc->sc_cap & CAP_NEEDS_BOUNCE) {
+ walker = (uint32_t *)cmd->data->data;
+ len = cmd->data->len / 4;
+ for (i = 0; i < len; i++)
+ walker[i] = bswap32(walker[i]);
+ }
// Finish up the sequence...
WR4(sc, MCI_IDR, MCI_SR_ENDRX);
WR4(sc, MCI_IER, MCI_SR_RXBUFF);
==== //depot/projects/usb/src/sys/arm/at91/at91_twi.c#8 (text) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.13 2008/11/25 00:13:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.14 2009/01/22 21:55:37 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@
#include <arm/at91/at91rm92reg.h>
#include <arm/at91/at91_twireg.h>
+#include <arm/at91/at91var.h>
#include <dev/iicbus/iiconf.h>
#include <dev/iicbus/iicbus.h>
@@ -128,7 +129,7 @@
AT91_TWI_LOCK_DESTROY(sc);
goto out;
}
- sc->cwgr = TWI_CWGR_CKDIV(8 * AT91C_MASTER_CLOCK / TWI_FASTEST_CLOCK) |
+ sc->cwgr = TWI_CWGR_CKDIV(8 * at91_master_clock / TWI_FASTEST_CLOCK) |
TWI_CWGR_CHDIV(TWI_CWGR_DIV(TWI_DEF_CLK)) |
TWI_CWGR_CLDIV(TWI_CWGR_DIV(TWI_DEF_CLK));
WR4(sc, TWI_CR, TWI_CR_SWRST);
==== //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#4 (text) ====
@@ -23,7 +23,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91_twireg.h,v 1.4 2009/01/22 21:55:37 imp Exp $ */
#ifndef ARM_AT91_AT91_TWIREG_H
#define ARM_AT91_AT91_TWIREG_H
@@ -63,7 +63,7 @@
#define TWI_CWGR_CKDIV(x) ((x) << 16) /* Clock Divider */
#define TWI_CWGR_CHDIV(x) ((x) << 8) /* Clock High Divider */
#define TWI_CWGR_CLDIV(x) ((x) << 0) /* Clock Low Divider */
-#define TWI_CWGR_DIV(rate) ((AT91C_MASTER_CLOCK /(4*(rate))) - 2)
+#define TWI_CWGR_DIV(rate) ((at91_master_clock /(4*(rate))) - 2)
/* TWI_SR */
/* TWI_IER */
==== //depot/projects/usb/src/sys/arm/at91/at91var.h#3 (text) ====
@@ -23,7 +23,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.3 2008/11/25 18:40:40 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.4 2009/01/22 21:54:26 imp Exp $ */
#ifndef _AT91VAR_H_
#define _AT91VAR_H_
@@ -43,4 +43,6 @@
struct resource_list resources;
};
+extern uint32_t at91_master_clock;
+
#endif /* _AT91VAR_H_ */
==== //depot/projects/usb/src/sys/arm/at91/uart_bus_at91usart.c#3 (text) ====
@@ -26,7 +26,7 @@
#include "opt_uart.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.4 2008/11/25 00:13:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.5 2009/01/22 21:56:41 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,13 +38,12 @@
#include <sys/rman.h>
#include <machine/resource.h>
-#include <dev/pci/pcivar.h>
-
#include <dev/uart/uart.h>
#include <dev/uart/uart_bus.h>
#include <dev/uart/uart_cpu.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91var.h>
#include "uart_if.h"
@@ -103,6 +102,8 @@
break;
}
sc->sc_class = &at91_usart_class;
+ if (sc->sc_class->uc_rclk == 0)
+ sc->sc_class->uc_rclk = at91_master_clock;
return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev)));
}
==== //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 (text) ====
@@ -29,18 +29,22 @@
#include "opt_uart.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.6 2008/11/25 00:13:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.7 2009/01/22 21:56:41 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/cons.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
#include <machine/bus.h>
#include <dev/uart/uart.h>
+#include <dev/uart/uart_bus.h>
#include <dev/uart/uart_cpu.h>
#include <arm/at91/at91rm92reg.h>
+#include <arm/at91/at91var.h>
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
@@ -60,6 +64,8 @@
struct uart_class *class;
class = &at91_usart_class;
+ if (class->uc_rclk == 0)
+ class->uc_rclk = at91_master_clock;
di->ops = uart_getops(class);
di->bas.chan = 0;
di->bas.bst = &at91_bs_tag;
==== //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#11 (text) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.18 2008/11/25 00:13:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.19 2009/01/22 21:56:41 imp Exp $");
#include "opt_comconsole.h"
@@ -45,10 +45,11 @@
#include <arm/at91/at91rm92reg.h>
#include <arm/at91/at91_usartreg.h>
#include <arm/at91/at91_pdcreg.h>
+#include <arm/at91/at91var.h>
#include "uart_if.h"
-#define DEFAULT_RCLK AT91C_MASTER_CLOCK
+#define DEFAULT_RCLK at91_master_clock
#define USART_BUFFER_SIZE 128
/*
@@ -684,6 +685,5 @@
at91_usart_methods,
sizeof(struct at91_usart_softc),
.uc_ops = &at91_usart_ops,
- .uc_range = 8,
- .uc_rclk = DEFAULT_RCLK
+ .uc_range = 8
};
==== //depot/projects/usb/src/sys/boot/forth/loader.conf#14 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.135 2008/11/12 09:52:06 yongari Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.136 2009/01/23 05:56:09 weongyo Exp $
##############################################################
### Basic configuration options ############################
@@ -278,6 +278,7 @@
if_udav_load="NO" # Davicom DM9601 USB Ethernet
if_upgt_load="NO" # Conexant/Intersil PrismGT USB wireless
if_ural_load="NO" # Ralink Technology USB wireless
+if_urtw_load="NO" # Realtek 8187L USB wireless
if_vr_load="NO" # VIA Rhine I and Rhine II
if_vx_load="NO" # 3Com 3C590 family
if_wb_load="NO" # Winbond W89C840F
==== //depot/projects/usb/src/sys/cam/cam_periph.c#7 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.74 2008/12/19 14:31:40 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.76 2009/01/26 15:01:47 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,6 +171,10 @@
break;
}
xpt_unlock_buses();
+ if (p_drv == NULL) {
+ printf("cam_periph_alloc: invalid periph name '%s'\n", name);
+ return (CAM_REQ_INVALID);
+ }
sim = xpt_path_sim(path);
path_id = xpt_path_path_id(path);
@@ -322,7 +326,6 @@
int
cam_periph_hold(struct cam_periph *periph, int priority)
{
- struct mtx *mtx;
int error;
/*
@@ -335,14 +338,11 @@
if (cam_periph_acquire(periph) != CAM_REQ_CMP)
return (ENXIO);
- mtx = periph->sim->mtx;
- mtx_assert(mtx, MA_OWNED);
- if (mtx == &Giant)
- mtx = NULL;
-
+ mtx_assert(periph->sim->mtx, MA_OWNED);
while ((periph->flags & CAM_PERIPH_LOCKED) != 0) {
periph->flags |= CAM_PERIPH_LOCK_WANTED;
- if ((error = msleep(periph, mtx, priority, "caplck", 0)) != 0) {
+ if ((error = mtx_sleep(periph, periph->sim->mtx, priority,
+ "caplck", 0)) != 0) {
cam_periph_release_locked(periph);
return (error);
}
@@ -763,7 +763,6 @@
cam_periph_getccb(struct cam_periph *periph, u_int32_t priority)
{
struct ccb_hdr *ccb_h;
- struct mtx *mtx;
mtx_assert(periph->sim->mtx, MA_OWNED);
CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n"));
@@ -776,11 +775,8 @@
&& (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority))
break;
mtx_assert(periph->sim->mtx, MA_OWNED);
- if (periph->sim->mtx == &Giant)
- mtx = NULL;
- else
- mtx = periph->sim->mtx;
- msleep(&periph->ccb_list, mtx, PRIBIO, "cgticb", 0);
+ mtx_sleep(&periph->ccb_list, periph->sim->mtx, PRIBIO, "cgticb",
+ 0);
}
ccb_h = SLIST_FIRST(&periph->ccb_list);
@@ -791,17 +787,12 @@
void
cam_periph_ccbwait(union ccb *ccb)
{
- struct mtx *mtx;
struct cam_sim *sim;
sim = xpt_path_sim(ccb->ccb_h.path);
- if (sim->mtx == &Giant)
- mtx = NULL;
- else
- mtx = sim->mtx;
if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX)
|| ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG))
- msleep(&ccb->ccb_h.cbfcnp, mtx, PRIBIO, "cbwait", 0);
+ mtx_sleep(&ccb->ccb_h.cbfcnp, sim->mtx, PRIBIO, "cbwait", 0);
}
int
==== //depot/projects/usb/src/sys/cam/cam_xpt.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.206 2009/01/14 21:29:20 trasz Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.208 2009/01/23 21:08:00 trasz Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -4177,7 +4177,10 @@
{
struct sbuf sb;
- mtx_assert(path->bus->sim->mtx, MA_OWNED);
+#ifdef INVARIANTS
+ if (path != NULL && path->bus != NULL && path->bus->sim != NULL)
+ mtx_assert(path->bus->sim->mtx, MA_OWNED);
+#endif
sbuf_new(&sb, str, str_len, 0);
@@ -5191,6 +5194,11 @@
/* Save some state for use while we probe for devices */
scan_info = (xpt_scan_bus_info *)
malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT);
+ if (scan_info == NULL) {
+ request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+ xpt_done(request_ccb);
+ return;
+ }
scan_info->request_ccb = request_ccb;
scan_info->cpi = &work_ccb->cpi;
==== //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#5 (text+ko) ====
@@ -2,7 +2,7 @@
/* $NetBSD$ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.29 2007/06/17 05:55:54 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.30 2009/01/23 21:06:16 trasz Exp $");
#define SCSI_LOW_STATICS
#define SCSI_LOW_DEBUG
@@ -966,16 +966,16 @@
struct scsi_low_softc *slp;
{
struct cam_path *path;
- union ccb *ccb = xpt_alloc_ccb();
+ union ccb *ccb;
cam_status status;
- bzero(ccb, sizeof(union ccb));
-
status = xpt_create_path(&path, xpt_periph,
cam_sim_path(slp->sl_si.sim), -1, 0);
if (status != CAM_REQ_CMP)
return;
+ ccb = xpt_alloc_ccb();
+ bzero(ccb, sizeof(union ccb));
xpt_setup_ccb(&ccb->ccb_h, path, 5);
ccb->ccb_h.func_code = XPT_SCAN_BUS;
ccb->ccb_h.cbfcnp = scsi_low_cam_rescan_callback;
==== //depot/projects/usb/src/sys/conf/files.amd64#15 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.128 2009/01/12 19:23:46 jkim Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.129 2009/01/23 17:48:18 jkim Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -132,9 +132,10 @@
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/acpica/acpi_if.m standard
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
+dev/agp/agp_via.c optional agp
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/asmc/asmc.c optional asmc isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
==== //depot/projects/usb/src/sys/conf/files.i386#17 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.612 2009/01/01 13:26:53 ed Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.613 2009/01/23 17:48:18 jkim Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -118,15 +118,15 @@
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/advansys/adv_isa.c optional adv isa
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_ati.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_ati.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_isa.c optional aic isa
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/ar/if_ar.c optional ar
==== //depot/projects/usb/src/sys/conf/files.pc98#14 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.370 2008/12/01 16:53:01 sam Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.371 2009/01/23 17:48:18 jkim Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -77,13 +77,13 @@
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_cbus.c optional aic isa
dev/ar/if_ar.c optional ar
dev/ar/if_ar_pci.c optional ar pci
==== //depot/projects/usb/src/sys/conf/files.powerpc#16 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.91 2009/01/15 02:52:31 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.92 2009/01/25 18:20:15 nwhitehorn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -39,6 +39,11 @@
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx
dev/scc/scc_bfe_macio.c optional scc powermac
+dev/sound/macio/aoa.c optional snd_davbus | snd_ai2s powermac
+dev/sound/macio/davbus.c optional snd_davbus powermac
+dev/sound/macio/i2s.c optional snd_ai2s powermac
+dev/sound/macio/snapper.c optional snd_ai2s iicbus powermac
+dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac
dev/syscons/scgfbrndr.c optional sc
dev/syscons/scterm-teken.c optional sc
dev/syscons/scvtb.c optional sc
==== //depot/projects/usb/src/sys/conf/kmod.mk#11 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.224 2008/11/04 03:42:01 alfred Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.225 2009/01/26 17:00:58 rdivacky Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -89,10 +89,9 @@
.if ${CC} == "icc"
NOSTDINC= -X
.else
-C_DIALECT= -std=c99
+CSTD= c99
NOSTDINC= -nostdinc
.endif
-CFLAGS+= ${C_DIALECT}
CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
.if defined(KERNBUILDDIR)
CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
==== //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#12 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.38 2008/12/02 21:37:28 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.41 2009/01/25 16:52:41 ed Exp $");
#endif
#ifdef __FreeBSD__
==== //depot/projects/usb/src/sys/dev/agp/agp_via.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.26 2007/11/12 21:51:37 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.27 2009/01/23 17:48:18 jkim Exp $");
#include "opt_bus.h"
@@ -85,8 +85,14 @@
return ("VIA 3296 (P4M800) host to PCI bridge");
case 0x03051106:
return ("VIA 82C8363 (Apollo KT133x/KM133) host to PCI bridge");
+ case 0x03141106:
+ return ("VIA 3314 (P4M800CE) host to PCI bridge");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list