PERFORCE change 38266 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Sep 19 01:11:24 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38266
Change 38266 by marcel at marcel_nfs on 2003/09/19 01:11:19
IFC @38265
Affected files ...
.. //depot/projects/ia64/etc/Makefile#34 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#42 integrate
.. //depot/projects/ia64/etc/services#11 integrate
.. //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#6 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#9 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#125 integrate
.. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#6 integrate
.. //depot/projects/ia64/share/examples/cvsup/doc-supfile#3 integrate
.. //depot/projects/ia64/share/examples/cvsup/gnats-supfile#4 integrate
.. //depot/projects/ia64/share/examples/cvsup/ports-supfile#5 integrate
.. //depot/projects/ia64/share/examples/cvsup/stable-supfile#3 integrate
.. //depot/projects/ia64/share/examples/cvsup/standard-supfile#3 integrate
.. //depot/projects/ia64/share/examples/cvsup/www-supfile#3 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#9 integrate
.. //depot/projects/ia64/share/man/man5/rc.conf.5#46 integrate
.. //depot/projects/ia64/sys/crypto/rijndael/rijndael-api-fst.c#6 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi.c#41 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#9 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/ia64/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/ia64/sys/dev/sio/sio.c#53 integrate
.. //depot/projects/ia64/sys/dev/usb/if_aue.c#23 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#45 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs.h#43 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#43 integrate
.. //depot/projects/ia64/sys/i386/conf/NOTES#46 integrate
.. //depot/projects/ia64/sys/i386/i386/trap.c#36 integrate
.. //depot/projects/ia64/sys/i386/include/pci_cfgreg.h#4 integrate
.. //depot/projects/ia64/sys/ia64/ia64/genassym.c#16 integrate
.. //depot/projects/ia64/sys/ia64/include/cpu.h#23 integrate
.. //depot/projects/ia64/sys/kern/kern_malloc.c#26 integrate
.. //depot/projects/ia64/sys/pc98/pc98/fd.c#23 integrate
.. //depot/projects/ia64/sys/pci/if_rlreg.h#19 integrate
.. //depot/projects/ia64/sys/vm/uma_core.c#51 integrate
.. //depot/projects/ia64/sys/vm/uma_int.h#16 integrate
.. //depot/projects/ia64/sys/vm/vm_fault.c#36 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.c#47 integrate
.. //depot/projects/ia64/sys/vm/vnode_pager.c#39 integrate
.. //depot/projects/ia64/usr.bin/make/var.c#13 integrate
.. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#33 integrate
.. //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.c#6 integrate
.. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#14 integrate
Differences ...
==== //depot/projects/ia64/etc/Makefile#34 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.317 2003/08/24 03:24:54 mtm Exp $
+# $FreeBSD: src/etc/Makefile,v 1.318 2003/09/18 16:35:43 markm Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -20,7 +20,7 @@
${.CURDIR}/../usr.bin/mail/misc/mail.rc \
${.CURDIR}/../usr.bin/locate/locate/locate.rc
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
${.CURDIR}/../crypto/openssh/sshd_config \
@@ -82,7 +82,7 @@
.if !defined(NO_SENDMAIL)
cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSH} ${DESTDIR}/etc/ssh
==== //depot/projects/ia64/etc/defaults/rc.conf#42 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.188 2003/09/15 16:44:24 nectar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.189 2003/09/18 09:59:37 dougb Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -41,6 +41,11 @@
local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
script_name_sep=" " # Change if your startup scripts' names contain spaces
rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
+
+# Experimental - test before enabling
+gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab
+gbde_devices="NO" # Devices to automatically attach (list, or AUTO)
+
fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
background_fsck="YES" # Attempt to run fsck in the background where possible.
background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
==== //depot/projects/ia64/etc/services#11 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.95 2003/09/16 23:17:43 obrien Exp $
+# $FreeBSD: src/etc/services,v 1.96 2003/09/18 09:21:09 dougb Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -1093,7 +1093,7 @@
ginad 634/udp
ldaps 636/tcp sldap #ldap protocol over TLS/SSL
ldaps 636/udp sldap
-aodv 654/tdp #Ad-Hoc On-Demand Distance Vector Routing Protocol
+aodv 654/tcp #Ad-Hoc On-Demand Distance Vector Routing Protocol
aodv 654/udp #Ad-Hoc On-Demand Distance Vector Routing Protocol
mdqs 666/tcp
mdqs 666/udp
==== //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.22 2003/09/10 00:07:28 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/man/manpath/manpath.config,v 1.23 2003/09/18 10:44:42 des Exp $
#
# This file is read by manpath(1) to configure the mandatory manpath,
# optional manpath and to map each path element to a manpath element.
@@ -18,6 +18,7 @@
#
OPTIONAL_MANPATH /usr/local/man
OPTIONAL_MANPATH /usr/local/lib/perl5/5.6.1/man
+OPTIONAL_MANPATH /usr/local/lib/perl5/5.8.0/man
OPTIONAL_MANPATH /usr/X11R6/man
#
# set up PATH to MANPATH mapping
==== //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#9 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpthread/thread/thr_sigmask.c,v 1.18 2003/09/15 00:06:46 davidxu Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_sigmask.c,v 1.19 2003/09/18 12:19:28 davidxu Exp $
*/
#include <sys/param.h>
#include <sys/types.h>
@@ -93,8 +93,7 @@
/* Trap invalid actions: */
default:
/* Return an invalid argument: */
- errno = EINVAL;
- ret = -1;
+ ret = EINVAL;
break;
}
SIG_CANTMASK(curthread->sigmask);
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#125 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.623 2003/09/16 23:25:48 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.624 2003/09/18 09:27:31 nyan Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -152,7 +152,7 @@
is no longer needed when only a USB keyboard is connected.
&merged;</para>
- <para arch="i386">The DRM kernel modules have been updated from
+ <para arch="i386,pc98">The DRM kernel modules have been updated from
DRI CVS as of 9 September 2003. Among other changes, this
import includes a newly-ported SiS 300/305/540/630/730
driver.</para>
==== //depot/projects/ia64/share/examples/cvsup/cvs-supfile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.37 2003/09/12 09:09:49 ceri Exp $
+# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.38 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# CVS development tree of the FreeBSD system.
@@ -55,7 +55,9 @@
*default release=cvs
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
## Main Source Tree.
==== //depot/projects/ia64/share/examples/cvsup/doc-supfile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/doc-supfile,v 1.7 2002/07/30 14:08:16 blackend Exp $
+# $FreeBSD: src/share/examples/cvsup/doc-supfile,v 1.8 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# source of the FreeBSD doc tree
@@ -59,7 +59,9 @@
*default release=cvs tag=.
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
# This will retrieve the entire doc branch of the FreeBSD repository.
==== //depot/projects/ia64/share/examples/cvsup/gnats-supfile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.5 2003/09/12 19:02:34 ceri Exp $
+# $FreeBSD: src/share/examples/cvsup/gnats-supfile,v 1.6 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD GNATS bug report database.
@@ -54,7 +54,9 @@
*default release=current
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
## GNATS database
==== //depot/projects/ia64/share/examples/cvsup/ports-supfile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.27 2003/09/12 09:09:49 ceri Exp $
+# $FreeBSD: src/share/examples/cvsup/ports-supfile,v 1.28 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD-current ports collection.
@@ -54,7 +54,9 @@
*default release=cvs tag=.
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
## Ports Collection.
==== //depot/projects/ia64/share/examples/cvsup/stable-supfile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.26 2002/07/30 14:08:16 blackend Exp $
+# $FreeBSD: src/share/examples/cvsup/stable-supfile,v 1.27 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD-stable source tree.
@@ -73,7 +73,9 @@
*default release=cvs tag=RELENG_4
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
## Main Source Tree.
==== //depot/projects/ia64/share/examples/cvsup/standard-supfile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.21 2002/07/30 14:08:16 blackend Exp $
+# $FreeBSD: src/share/examples/cvsup/standard-supfile,v 1.22 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# FreeBSD-current source tree.
@@ -54,7 +54,9 @@
*default release=cvs tag=.
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
## Main Source Tree.
==== //depot/projects/ia64/share/examples/cvsup/www-supfile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/cvsup/www-supfile,v 1.4 2002/07/30 14:08:16 blackend Exp $
+# $FreeBSD: src/share/examples/cvsup/www-supfile,v 1.5 2003/09/18 08:19:39 eivind Exp $
#
# This file contains all of the "CVSup collections" that make up the
# source of the FreeBSD www tree
@@ -54,7 +54,9 @@
*default release=cvs tag=.
*default delete use-rel-suffix
-# If your network link is a T1 or faster, comment out the following line.
+# If you seem to be limited by CPU rather than network or disk bandwidth, try
+# commenting out the following line. (Normally, today's CPUs are fast enough
+# that you want to run compression.)
*default compress
# This collection retrieves the www/ tree of the FreeBSD repository
==== //depot/projects/ia64/share/man/man4/ath.4#9 (text+ko) ====
@@ -29,9 +29,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGES.
.\"
-.\" $FreeBSD: src/share/man/man4/ath.4,v 1.9 2003/09/16 22:43:36 shiba Exp $
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.10 2003/09/19 01:41:18 sam Exp $
.\"/
-.Dd August 1, 2003
+.Dd September 18, 2003
.Dt ATH 4
.Os
.Sh NAME
@@ -114,6 +114,7 @@
D-Link DWL-AB650 AR5211 CardBus
D-Link DWL-AG520 AR5212 PCI
D-Link DWL-AG650 AR5212 CardBus
+D-Link DWL-G650 AR5212 CardBus
I/O Data WN-AG/CB AR5212 CardBus
Linksys WMP55AG AR5212 PCI
Linksys WPC51AB AR5211 CardBus
@@ -121,6 +122,9 @@
NEC PA-WL/54AG AR5212 CardBus
Netgear WAB501 AR5211 CardBus
Netgear WAG511 AR5212 CardBus
+Netgear WG311 AR5212 CardBus
+Nortel 2201 AR5212 CardBus
+Orinoco 8480 AR5212 CardBus
Proxim Skyline 4030 AR5210 CardBus
.El
.Sh EXAMPLES
@@ -279,17 +283,6 @@
Different regulatory domains may not be able to communicate with each
other with 802.11a as different regualtory domains do not necessarily
have overlapping channels.
-.Pp
-802.11g support is little tested and may have interoperability problems.
-The software is known to function with an Atheros 11g access point but
-interoperability may be problematic until vendors update firmware in
-existing 11g products.
-If you encounter problems using an 11g access point you should be able
-to workaround incompatibilities by locking the driver to 11b mode.
-Alternatively, most 11g compatibility issues are in the 802.11 layer
-and you may be able to work around issues by modifying the
-.Xr wlan 4
-module.
.Sh BUGS
.Pp
Performance in lossy environments is suboptimal.
==== //depot/projects/ia64/share/man/man5/rc.conf.5#46 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.200 2003/09/05 11:43:18 maxim Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.201 2003/09/18 09:59:37 dougb Exp $
.\"
.Dd March 3, 2002
.Dt RC.CONF 5
@@ -917,6 +917,18 @@
.Pa /etc/rc.conf
and
.Pa /etc/rc.conf.local
+.It Va gbde_autoattach_all
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+.Pa /etc/rc.d/gbde
+will attempt to automatically initialize your .bde devices in
+.Pa /etc/fstab .
+.It Va gbde_devices
+.Pq Vt str
+List the devices that the script should try to attach,
+or
+.Dq Li AUTO .
.It Va fsck_y_enable
.Pq Vt bool
If set to
==== //depot/projects/ia64/sys/crypto/rijndael/rijndael-api-fst.c#6 (text+ko) ====
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.c,v 1.6 2003/09/17 08:51:43 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/crypto/rijndael/rijndael-api-fst.c,v 1.7 2003/09/18 17:26:56 ume Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -246,7 +246,7 @@
outBuffer += 16;
}
padLen = 16 - (inputOctets - 16*numBlocks);
- if (padLen > 0 && padLen <= 16)
+ if (padLen <= 0 || padLen > 16)
return BAD_CIPHER_STATE;
for (i = 0; i < 16 - padLen; i++) {
block[i] = input[i] ^ iv[i];
==== //depot/projects/ia64/sys/dev/acpica/acpi.c#41 (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/dev/acpica/acpi.c,v 1.100 2003/09/15 06:29:31 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.102 2003/09/18 05:12:45 njl Exp $
*/
#include "opt_acpi.h"
@@ -1027,7 +1027,6 @@
acpi_enable_fixed_events(struct acpi_softc *sc)
{
static int first_time = 1;
-#define MSGFORMAT "%s button is handled as a fixed feature programming model.\n"
ACPI_ASSERTLOCK;
@@ -1039,7 +1038,7 @@
acpi_eventhandler_power_button_for_sleep,
sc);
if (first_time)
- device_printf(sc->acpi_dev, MSGFORMAT, "power");
+ device_printf(sc->acpi_dev, "Power Button (fixed)\n");
}
if (AcpiGbl_FADT != NULL && AcpiGbl_FADT->SleepButton == 0) {
AcpiEnableEvent(ACPI_EVENT_SLEEP_BUTTON, 0);
@@ -1048,7 +1047,7 @@
acpi_eventhandler_sleep_button_for_sleep,
sc);
if (first_time)
- device_printf(sc->acpi_dev, MSGFORMAT, "sleep");
+ device_printf(sc->acpi_dev, "Sleep Button (fixed)\n");
}
first_time = 0;
==== //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.13 2003/09/16 15:21:37 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.15 2003/09/18 16:44:54 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -329,6 +329,7 @@
/* if data write command, output the data */
if (request->flags & ATA_R_WRITE) {
+
/* if we get an error here we are done with the HW */
if (ata_wait(request->device,
(ATA_S_READY | ATA_S_DSC | ATA_S_DRQ)) < 0) {
@@ -336,11 +337,10 @@
request->status = ATA_IDX_INB(ch, ATA_STATUS);
break;
}
- else {
- /* output data and return waiting for new interrupt */
- ata_pio_write(request, request->transfersize);
- return;
- }
+
+ /* output data and return waiting for new interrupt */
+ ata_pio_write(request, request->transfersize);
+ return;
}
/* if data read command, return & wait for interrupt */
@@ -551,11 +551,8 @@
ch->devices |= ATA_ATA_MASTER;
}
}
- else if (err == lsb && err == msb) {
- ATA_IDX_OUTB(ch, ATA_ERROR, 0xff);
- DELAY(10);
- if (stat0 == ATA_IDX_INB(ch, ATA_STATUS))
- stat0 |= ATA_S_BUSY;
+ else if ((stat0 & 0x4f) && err == lsb && err == msb) {
+ stat0 |= ATA_S_BUSY;
}
}
}
@@ -579,11 +576,8 @@
ch->devices |= ATA_ATA_SLAVE;
}
}
- else if (err == lsb && err == msb) {
- ATA_IDX_OUTB(ch, ATA_ERROR, 0xff);
- DELAY(10);
- if (stat1 == ATA_IDX_INB(ch, ATA_STATUS))
- stat1 |= ATA_S_BUSY;
+ else if ((stat1 & 0x4f) && err == lsb && err == msb) {
+ stat1 |= ATA_S_BUSY;
}
}
}
==== //depot/projects/ia64/sys/dev/ata/ata-queue.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.4 2003/08/28 08:22:53 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.5 2003/09/18 09:22:14 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -47,7 +47,7 @@
/* prototypes */
static void ata_completed(void *, int);
static void ata_timeout(struct ata_request *);
-static char *ata_sensekey2str(u_int8_t);
+static char *ata_skey2str(u_int8_t);
/* local vars */
static MALLOC_DEFINE(M_ATA_REQ, "ATA request", "ATA request");
@@ -260,12 +260,12 @@
/* ATAPI errors */
case ATA_R_ATAPI:
- /* is result already set return */
+ /* skip if result already set */
if (request->result)
break;
if (request->error & ATA_E_MASK) {
- switch ((request->result & ATA_SK_MASK)) {
+ switch ((request->error & ATA_SK_MASK)) {
case ATA_SK_RECOVERED_ERROR:
ata_prtdev(request->device, "WARNING - %s recovered error\n",
ata_cmd2str(request));
@@ -285,18 +285,18 @@
break;
default:
+ if (!(request->flags & ATA_R_QUIET))
+ ata_prtdev(request->device,
+ "FAILURE - %s status=%b sensekey=%s error=%b\n",
+ ata_cmd2str(request),
+ request->status, "\20\10BUSY\7READY\6DMA"
+ "\5DSC\4DRQ\3CORRECTABLE\2INDEX\1ERROR",
+ ata_skey2str((request->error & ATA_SK_MASK)>>4),
+ (request->error & ATA_E_MASK),
+ "\20\4MEDIA_CHANGE_REQUEST\3ABORTED"
+ "\2NO_MEDIA\1ILLEGAL_LENGTH");
request->result = EIO;
}
- if (request->result && !(request->flags & ATA_R_QUIET))
- ata_prtdev(request->device,
- "FAILURE - %s status=%b sensekey=%s error=%b\n",
- ata_cmd2str(request),
- request->status, "\20\10BUSY\7READY\6DMA"
- "\5DSC\4DRQ\3CORRECTABLE\2INDEX\1ERROR",
- ata_sensekey2str((request->error & ATA_SK_MASK)>>4),
- (request->error & ATA_E_MASK),
- "\20\4MEDIA_CHANGE_REQUEST\3ABORTED"
- "\2NO_MEDIA\1ILLEGAL_LENGTH");
}
break;
}
@@ -449,7 +449,7 @@
}
static char *
-ata_sensekey2str(u_int8_t skey)
+ata_skey2str(u_int8_t skey)
{
switch (skey) {
case 0x00: return ("NO SENSE");
==== //depot/projects/ia64/sys/dev/re/if_re.c#5 (text+ko) ====
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.7 2003/09/13 23:51:35 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.9 2003/09/19 02:35:03 wpaul Exp $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -740,11 +740,13 @@
eh->ether_type = htons(ETHERTYPE_IP);
m0->m_pkthdr.len = m0->m_len = ETHER_MIN_LEN - ETHER_CRC_LEN;
- /* Queue the packet, start transmission */
+ /*
+ * Queue the packet, start transmission.
+ * Note: IF_HANDOFF() ultimately calls re_start() for us.
+ */
+ CSR_WRITE_2(sc, RL_ISR, 0xFFFF);
IF_HANDOFF(&ifp->if_snd, m0, ifp);
- CSR_WRITE_2(sc, RL_ISR, 0xFFFF);
- re_start(ifp);
m0 = NULL;
/* Wait for it to propagate through the chip */
@@ -996,7 +998,7 @@
nseg = 32;
error = bus_dma_tag_create(sc->rl_parent_tag, ETHER_ALIGN, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
- NULL, MCLBYTES * nseg, nseg, RL_JLEN, BUS_DMA_ALLOCNOW,
+ NULL, MCLBYTES * nseg, nseg, MCLBYTES, BUS_DMA_ALLOCNOW,
NULL, NULL, &sc->rl_ldata.rl_mtag);
if (error) {
device_printf(dev, "could not allocate dma tag\n");
@@ -1892,7 +1894,7 @@
int error;
struct m_tag *mtag;
- if (sc->rl_ldata.rl_tx_free < 4)
+ if (sc->rl_ldata.rl_tx_free <= 4)
return(EFBIG);
/*
@@ -1914,6 +1916,8 @@
arg.sc = sc;
arg.rl_idx = *idx;
arg.rl_maxsegs = sc->rl_ldata.rl_tx_free;
+ if (arg.rl_maxsegs > 4)
+ arg.rl_maxsegs -= 4;
arg.rl_ring = sc->rl_ldata.rl_tx_list;
map = sc->rl_ldata.rl_tx_dmamap[*idx];
==== //depot/projects/ia64/sys/dev/sio/sio.c#53 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.408 2003/09/17 17:26:00 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.409 2003/09/18 07:46:40 bde Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
@@ -185,7 +185,6 @@
/* com device structure */
struct com_s {
- u_int flags; /* Copy isa device flags */
u_char state; /* miscellaneous flag bits */
bool_t active_out; /* nonzero if the callout device is open */
u_char cfcr_image; /* copy of value written to CFCR */
@@ -207,6 +206,7 @@
bool_t st16650a; /* nonzero if Startech 16650A compatible */
int unit; /* unit number */
int dtr_wait; /* time to hold DTR down on close (* 1/hz) */
+ u_int flags; /* copy of device flags */
u_int tx_fifo_size;
u_int wopeners; /* # processes waiting for DCD in open() */
@@ -238,11 +238,11 @@
#ifdef COM_ESP
Port_t esp_port;
#endif
+ Port_t int_ctl_port;
Port_t int_id_port;
Port_t modem_ctl_port;
Port_t line_status_port;
Port_t modem_status_port;
- Port_t intr_ctl_port; /* Ports of IIR register */
struct tty *tp; /* cross reference */
@@ -714,30 +714,37 @@
sio_setreg(com, com_cfcr, CFCR_8BITS);
/*
- * Some pcmcia cards have the "TXRDY bug", so we check everyone
- * for IIR_TXRDY implementation ( Palido 321s, DC-1S... )
+ * Some PCMCIA cards (Palido 321s, DC-1S, ...) have the "TXRDY bug",
+ * so we probe for a buggy IIR_TXRDY implementation even in the
+ * noprobe case. We don't probe for it in the !noprobe case because
+ * noprobe is always set for PCMCIA cards and the problem is not
+ * known to affect any other cards.
*/
if (noprobe) {
- /* Reading IIR register twice */
+ /* Read IIR a few times. */
for (fn = 0; fn < 2; fn ++) {
DELAY(10000);
failures[6] = sio_getreg(com, com_iir);
}
- /* Check IIR_TXRDY clear ? */
+
+ /* IIR_TXRDY should be clear. Is it? */
result = 0;
if (failures[6] & IIR_TXRDY) {
- /* No, Double check with clearing IER */
+ /*
+ * No. We seem to have the bug. Does our fix for
+ * it work?
+ */
sio_setreg(com, com_ier, 0);
if (sio_getreg(com, com_iir) & IIR_NOPEND) {
- /* Ok. We discovered TXRDY bug! */
+ /* Yes. We discovered the TXRDY bug! */
SET_FLAG(dev, COM_C_IIR_TXRDYBUG);
} else {
- /* Unknown, Just omit this chip.. XXX */
+ /* No. Just fail. XXX */
result = ENXIO;
sio_setreg(com, com_mcr, 0);
}
} else {
- /* OK. this is well-known guys */
+ /* Yes. No bug. */
CLR_FLAG(dev, COM_C_IIR_TXRDYBUG);
}
sio_setreg(com, com_ier, 0);
@@ -953,12 +960,12 @@
com->obufs[1].l_head = com->obuf2;
com->data_port = iobase + com_data;
+ com->int_ctl_port = iobase + com_ier;
com->int_id_port = iobase + com_iir;
com->modem_ctl_port = iobase + com_mcr;
com->mcr_image = inb(com->modem_ctl_port);
com->line_status_port = iobase + com_lsr;
com->modem_status_port = iobase + com_msr;
- com->intr_ctl_port = iobase + com_ier;
if (rclk == 0)
rclk = DEFAULT_RCLK;
@@ -1113,7 +1120,7 @@
if (unit == comconsole)
printf(", console");
if (COM_IIR_TXRDYBUG(flags))
- printf(" with a bogus IIR_TXRDY register");
+ printf(" with a buggy IIR_TXRDY implementation");
printf("\n");
if (sio_fast_ih == NULL) {
@@ -1316,13 +1323,9 @@
(void) inb(com->data_port);
com->prev_modem_status = com->last_modem_status
= inb(com->modem_status_port);
- if (COM_IIR_TXRDYBUG(com->flags)) {
- outb(com->intr_ctl_port, IER_ERXRDY | IER_ERLS
- | IER_EMSC);
- } else {
- outb(com->intr_ctl_port, IER_ERXRDY | IER_ETXRDY
- | IER_ERLS | IER_EMSC);
- }
+ outb(com->int_ctl_port,
+ IER_ERXRDY | IER_ERLS | IER_EMSC
+ | (COM_IIR_TXRDYBUG(com->flags) ? 0 : IER_ETXRDY));
mtx_unlock_spin(&sio_lock);
/*
* Handle initial DCD. Callout devices get a fake initial
@@ -1761,15 +1764,15 @@
siointr1(com)
struct com_s *com;
{
+ u_char int_ctl;
+ u_char int_ctl_new;
u_char line_status;
u_char modem_status;
u_char *ioptr;
u_char recv_data;
- u_char int_ctl;
- u_char int_ctl_new;
if (COM_IIR_TXRDYBUG(com->flags)) {
- int_ctl = inb(com->intr_ctl_port);
+ int_ctl = inb(com->int_ctl_port);
int_ctl_new = int_ctl;
} else {
int_ctl = 0;
@@ -1923,9 +1926,8 @@
}
}
com->obufq.l_head = ioptr;
- if (COM_IIR_TXRDYBUG(com->flags)) {
+ if (COM_IIR_TXRDYBUG(com->flags))
int_ctl_new = int_ctl | IER_ETXRDY;
- }
if (ioptr >= com->obufq.l_tail) {
struct lbq *qp;
@@ -1938,9 +1940,9 @@
com->obufq.l_next = qp;
} else {
/* output just completed */
- if (COM_IIR_TXRDYBUG(com->flags)) {
- int_ctl_new = int_ctl & ~IER_ETXRDY;
- }
+ if (COM_IIR_TXRDYBUG(com->flags))
+ int_ctl_new = int_ctl
+ & ~IER_ETXRDY;
com->state &= ~CS_BUSY;
}
if (!(com->state & CS_ODONE)) {
@@ -1950,9 +1952,9 @@
swi_sched(sio_fast_ih, 0);
}
}
- if (COM_IIR_TXRDYBUG(com->flags) && (int_ctl != int_ctl_new)) {
- outb(com->intr_ctl_port, int_ctl_new);
- }
+ if (COM_IIR_TXRDYBUG(com->flags)
+ && int_ctl != int_ctl_new)
+ outb(com->int_ctl_port, int_ctl_new);
}
/* finished? */
==== //depot/projects/ia64/sys/dev/usb/if_aue.c#23 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.71 2003/08/24 17:55:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.72 2003/09/18 15:41:06 obrien Exp $");
/*
* ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.71 2003/08/24 17:55:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.72 2003/09/18 15:41:06 obrien Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,6 +151,7 @@
{{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, LSYS },
{{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, PII },
{{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 },
+ {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, PII },
{{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 },
{{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS}, PII },
{{ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX}, 0 },
==== //depot/projects/ia64/sys/dev/usb/usbdevs#45 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.135 2003/08/22 05:43:29 njl Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.136 2003/09/18 15:41:06 obrien Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -343,6 +343,7 @@
vendor AGATE 0x0c08 Agate Technologies
vendor DMI 0x0c0b DMI
vendor LUWEN 0x0c76 Luwen
+vendor HAWKING 0x0e66 Hawking Technologies
vendor MOTOROLA 0x1063 Motorola
vendor PLX 0x10b5 PLX
vendor ASANTE 0x10bd Asante
@@ -672,6 +673,9 @@
/* Hauppauge Computer Works */
product HAUPPAUGE WINTV_USB_FM 0x4d12 WinTV USB FM
+/* Hawking Technologies products */
+product HAWKING UF100 0x400c 10/100 USB Ethernet
+
/* Hitachi, Ltd. products */
product HITACHI DVDCAM_USB 0x001e DVDCAM USB HS Interface
==== //depot/projects/ia64/sys/dev/usb/usbdevs.h#43 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.143 2003/08/22 05:43:29 njl Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.144 2003/09/18 15:41:06 obrien Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.134 2003/07/14 19:30:01 joe Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.135 2003/08/22 05:43:29 njl Exp
*/
/*
@@ -350,6 +350,7 @@
#define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */
#define USB_VENDOR_DMI 0x0c0b /* DMI */
#define USB_VENDOR_LUWEN 0x0c76 /* Luwen */
+#define USB_VENDOR_HAWKING 0x0e66 /* Hawking Technologies */
#define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */
#define USB_VENDOR_PLX 0x10b5 /* PLX */
#define USB_VENDOR_ASANTE 0x10bd /* Asante */
@@ -679,6 +680,9 @@
/* Hauppauge Computer Works */
#define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */
+/* Hawking Technologies products */
+#define USB_PRODUCT_HAWKING_UF100 0x400c /* 10/100 USB Ethernet */
+
/* Hitachi, Ltd. products */
#define USB_PRODUCT_HITACHI_DVDCAM_USB 0x001e /* DVDCAM USB HS Interface */
==== //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#43 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.143 2003/08/22 05:43:30 njl Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.144 2003/09/18 15:41:07 obrien Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.134 2003/07/14 19:30:01 joe Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.135 2003/08/22 05:43:29 njl Exp
*/
/*
@@ -1102,6 +1102,12 @@
"WinTV USB FM",
},
{
+ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
+ 0,
+ "Hawking Technologies",
+ "10/100 USB Ethernet",
+ },
+ {
USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_USB,
0,
"Hitachi, Ltd.",
@@ -4708,6 +4714,12 @@
NULL,
},
{
+ USB_VENDOR_HAWKING, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Hawking Technologies",
+ NULL,
+ },
+ {
USB_VENDOR_MOTOROLA, 0,
USB_KNOWNDEV_NOPROD,
"Motorola",
==== //depot/projects/ia64/sys/i386/conf/NOTES#46 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1093 2003/09/09 00:29:01 anholt Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1094 2003/09/19 01:42:24 sam Exp $
#
#
@@ -453,6 +453,7 @@
# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver
# (requires sppp)
+# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
# cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing)
# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf)
@@ -533,6 +534,10 @@
options WLCACHE # enables the signal-strength cache
options WLDEBUG # enables verbose debugging output
+device ath
+device ath_hal # Atheros HAL (includes binary component)
+#device wlan # 802.11 layer
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list