PERFORCE change 56192 for review
David Xu
davidxu at FreeBSD.org
Thu Jul 1 00:48:49 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=56192
Change 56192 by davidxu at davidxu_celeron on 2004/07/01 07:48:31
IFC
Affected files ...
.. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate
.. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.8#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.cc#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/boot/common/newvers.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/conf/newvers.sh#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#3 integrate
Differences ...
==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.450 2004/06/30 03:04:24 linimon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.452 2004/07/01 05:10:50 linimon Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1273,15 +1273,15 @@
subdirectories are specified by the variable
<makevar>CATEGORIES</makevar>. It is intended to make life easier
for the user when he is wading through the pile of packages on the
- FTP site or the CDROM. Please take a look at the existing <link
- linkend="porting-categories">categories</link> and pick the ones
+ FTP site or the CDROM. Please take a look at the <link
+ linkend="porting-categories">current list of categories</link> and pick the ones
that are suitable for your port.</para>
<para>This list also determines where in the ports tree the port is
imported. If you put more than one category here, it is assumed
that the port files will be put in the subdirectory with the name in
- the first category. See the <link
- linkend="porting-categories">categories</link> section for more
+ the first category. See <link
+ linkend="choosing-categories">below</link> for more
discussion about how to pick the right categories.</para>
<para>If your port truly belongs to something that is different from
@@ -1313,9 +1313,8 @@
<note>
<para>For non-virtual categories, you will find a one-line
- description in the <filename>pkg/COMMENT</filename> file in that
- subdirectory (e.g.,
- <filename>archivers/pkg/COMMENT</filename>).</para>
+ description in the <makevar>COMMENT</makevar> in that
+ subdirectory's <filename>Makefile</filename>.</para>
</note>
<informaltable frame="none">
@@ -1596,12 +1595,8 @@
<entry><filename>misc</filename></entry>
<entry>Miscellaneous utilities</entry>
<entry>Basically things that
- do not belong anywhere else. This is the only category
- that should not appear with any other non-virtual category.
- If you have <literal>misc</literal> with something else in
- your <makevar>CATEGORIES</makevar> line, that means you can
- safely delete <literal>misc</literal> and just put the port
- in that other subdirectory! If at all possible, try to
+ do not belong anywhere else.
+ If at all possible, try to
find a better category for your port than
<literal>misc</literal>, as ports tend to get overlooked
in here.</entry>
@@ -1895,7 +1890,7 @@
</informaltable>
</sect2>
- <sect2>
+ <sect2 id="choosing-categories">
<title>Choosing the right category</title>
<para>As many of the categories overlap, you often have to choose
@@ -1905,6 +1900,13 @@
<itemizedlist>
<listitem>
+ <para>The first category must be a physical category (see
+ <link linkend="porting-categories">above</link>). This is
+ necessary to make the packaging work. Virtual categories and
+ physical categories may be intermixed after that.
+ </listitem>
+
+ <listitem>
<para>Language specific categories always come first. For
example, if your port installs Japanese X11 fonts, then your
<makevar>CATEGORIES</makevar> line would read <filename>japanese
@@ -1912,7 +1914,7 @@
</listitem>
<listitem>
- <para>Specific categories win over less-specific ones. For
+ <para>Specific categories are listed before less-specific ones. For
instance, an HTML editor should be listed as <filename>www
editors</filename>, not the other way around. Also, you should not
list <filename>net</filename> when the port belongs to
@@ -1941,6 +1943,15 @@
</listitem>
<listitem>
+ <para><filename>misc</filename>
+ should not appear with any other non-virtual category.
+ If you have <literal>misc</literal> with something else in
+ your <makevar>CATEGORIES</makevar> line, that means you can
+ safely delete <literal>misc</literal> and just put the port
+ in that other subdirectory!</para>
+ </listitem>
+
+ <listitem>
<para>If your port truly does not belong anywhere else, put it in
<filename>misc</filename>.</para>
</listitem>
@@ -7135,6 +7146,7 @@
moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin
ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin
drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin
+courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin
qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin
ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh
bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin</programlisting>
@@ -7160,6 +7172,7 @@
maildrop:*:126:
rbldns:*:153:
moinmoin:*:192:
+courier:*:465:
qtss:*:554:
ircdru:*:555:</programlisting>
==== //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 (text+ko) ====
@@ -35,7 +35,7 @@
<corpauthor>The &os; Release Engineering Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.18 2004/06/30 13:59:40 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.19 2004/07/01 04:56:20 hrs Exp $</pubdate>
<copyright>
<year>2002</year>
@@ -155,7 +155,7 @@
<para>Therefore, the release engineering team will only create the
5-STABLE branch in the CVS repository after we have found a
relatively stable state to use as its basis. It is likely that
- there will be
+ there will be
multiple releases in the &release.5x; series
before this happens; we estimate
that the 5-STABLE branch will be created around the time of
@@ -191,7 +191,7 @@
Ongoing work aims to perform fine-grained locking of various
kernel subsystems to increase the number of threads of
execution that can be running in the kernel. More
- information can be found on the
+ information can be found on the
<ulink url="http://www.FreeBSD.org/smp/">FreeBSD SMP
Project</ulink> page.</para>
</listitem>
@@ -332,7 +332,7 @@
branch after a <quote>settling time</quote> in -CURRENT.
&os; &release.5x; does not have the stabilizing influence of a
-STABLE branch. (It is likely that the 5-STABLE development
- branch will be created sometime after
+ branch will be created sometime after
&release.5branchpoint;.)</para>
</listitem>
@@ -383,9 +383,9 @@
account user demand for future 4-STABLE releases. This demand,
however, will need to be balanced with release engineering
resources (particularly developers' time, computing resources, and mirror
- archive space). We note that in general, the &os; community
+ archive space). We note that in general, the &os; community
(both users and developers) has shown a preference for
- moving forward with new features in
+ moving forward with new features in
the &release.5x; branch and beyond, due to the difficulty
involved in backporting (and maintaining) new functionality in
&release.4x;.</para>
@@ -491,7 +491,7 @@
base system, and should be installed either
from a pre-built package or from the Ports Collection.
Building Perl as a part of the base system created a number of
- difficulties which made updates problematic.
+ difficulties which made updates problematic.
The base system utilities that used Perl have either
been rewritten (if still applicable) or discarded (if
obsolete). &man.sysinstall.8; will now install the
==== //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 (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.747 2004/06/30 16:38:02 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.748 2004/07/01 04:54:21 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -239,6 +239,11 @@
for instance) to allow users to set whether or not a given
device can wake the system.</para>
+ <para arch="i386">The &man.acpi.4; driver has been updated to
+ be disabled automatically when the machine has well-known broken BIOS.
+ This behavior can be disabled by setting a loader tunable
+ <varname>hint.acpi.0.disabled</varname> to <literal>0</literal>.</para>
+
<para arch="i386">The &man.ctau.4; driver has been added for Cronyx Tau
synchronous serial adapters. This driver was known for a long time as
<quote>ct</quote> in its previous life outside the &os; source tree. &merged;
@@ -1212,6 +1217,9 @@
<para>The timezone database has been updated from
<filename>tzdata2003a</filename> to
<filename>tzdata2004a</filename>.</para>
+
+ <para><application>zlib</application> has been updated to
+ from version 1.1.4 to version 1.2.1.</para>
</sect2>
<sect2 id="ports">
==== //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#2 (text+ko) ====
@@ -1,10 +1,10 @@
<!--
The FreeBSD Russian Documentation Project
- $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.1 2004/06/28 13:28:15 den Exp $
- $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.1 2004/06/28 13:24:45 den Exp $
+ $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.2 2004/07/01 07:22:17 den Exp $
+ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.2 2004/07/01 07:19:35 den Exp $
- Original revision: 1.17
+ Original revision: 1.19
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -31,7 +31,7 @@
<!ENTITY release.4x "4.<replaceable>X</replaceable>">
<!ENTITY release.5x "5.<replaceable>X</replaceable>">
-<!ENTITY release.4last "4.9-RELEASE">
+<!ENTITY release.4last "4.10-RELEASE">
<!ENTITY release.5branchpoint "5.3-RELEASE">
]>
@@ -44,11 +44,12 @@
<corpauthor>çÒÕÐÐÁ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× &os;</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.1 2004/06/28 13:28:15 den Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.2 2004/07/01 07:22:17 den Exp $</pubdate>
<copyright>
<year>2002</year>
<year>2003</year>
+ <year>2004</year>
<holder role="mailto:re at FreeBSD.org">çÒÕÐÐÁ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ×
&os;</holder>
</copyright>
@@ -359,7 +360,8 @@
<para>÷ÁÖÎÏ ÚÁÍÅÔÉÔØ, ÞÔÏ ÎÅ ÓÍÏÔÒÑ ÎÁ ×ÙÐÕÓË ÒÅÌÉÚÏ× ÓÅÒÉÉ
&release.5x;, ÐÏÄÄÅÒÖËÁ ÒÅÌÉÚÏ× &release.4x; ÐÒÏÄÏÌÖÉÔÓÑ ÅÝÅ
ÎÅËÏÔÏÒÏÅ ×ÒÅÍÑ. îÁ ÓÁÍÏÍ ÄÅÌÅ, &os; 4.8 ÂÙÌÁ ×ÙÐÕÝÅÎÁ
- Ä×ÕÍÑ ÍÅÓÑÃÁÍÉ ÐÏÓÌÅ 5.0, × ÁÐÒÅÌÅ 2003, ÚÁÔÅÍ 4.9 × ÏËÔÑÂÒÅ 2003.
+ Ä×ÕÍÑ ÍÅÓÑÃÁÍÉ ÐÏÓÌÅ 5.0, × ÁÐÒÅÌÅ 2003, ÚÁÔÅÍ 4.9 × ÏËÔÑÂÒÅ 2003
+ É 4.10 × ÍÁÅ 2004.
óÌÅÄÕÀÝÉÅ ÒÅÌÉÚÙ ÉÚ ×ÅÔ×É 4-STABLE ÂÕÄÕÔ ÚÁ×ÉÓÅÔØ ÏÔ ÎÅÓËÏÌØËÉÈ
ÆÁËÔÏÒÏ×. îÁÉÂÏÌÅÅ ×ÁÖÎÙÊ ÉÚ ÎÉÈ ÜÔÏ ÓÕÝÅÓÔ×Ï×ÁÎÉÅ É ÓÔÁÂÉÌØÎÏÓÔØ
×ÅÔ×É 5-STABLE. åÓÌÉ CURRENT ÎÅÄÏÓÔÁÔÏÞÎÏ ÓÔÁÂÉÌØÎÁ ÄÌÑ ÓÏÚÄÁÎÉÑ
@@ -388,8 +390,21 @@
É ÉÓÐÒÁ×ÌÅÎÉÑÍÉ ÂÅÚÏÐÁÓÎÏÓÔÉ. ðÏ ÓÏÂÓÔ×ÅÎÎÏÍÕ ÕÓÍÏÔÒÅÎÉÀ
ÇÒÕÐÐÁ ÍÏÖÅÔ ×ÎÏÓÉÔØ ÏÐÒÅÄÅÌÅÎÎÙÅ ÉÓÐÒÁ×ÌÅÎÉÑ É × ÄÒÕÇÉÅ ÒÅÌÉÚÙ.</para>
-<!-- skip completly outdated para -->
-
+ <para>îÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ Õ ÇÒÕÐÐÙ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× ÎÅÔ ÏÐÒÅÄÅÌÅÎÎÙÈ
+ ÐÌÁÎÏ× ÐÏ ÄÁÌØÎÅÊÛÉÍ ÒÅÌÉÚÁÍ ÉÚ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ 4-STABLE,
+ É ÍÙ ÒÅÛÉÌÉ ÐÒÏÄÏÌÖÁÔØ ÐÏÄÄÅÒÖËÕ 4.10-RELEASE × ËÁÞÅÓÔ×Å
+ <quote>×ÅÔ×É ÉÓÐÒÁ×ÌÅÎÉÊ</quote> (<quote>Errata Branch</quote>).
+ òÁÎÅÅ ×ÅÔ×Ø, ÉÚ ËÏÔÏÒÏÊ ×ÙÐÕÓËÁÌÓÑ ÒÅÌÉÚ, ÐÏÄÄÅÒÖÉ×ÁÌÁÓØ
+ &a.security-officer; × ËÁÞÅÓÔ×Å <quote>×ÅÔ×É ÂÅÚÏÐÁÓÎÏÓÔÉ</quote>
+ (<quote>Security Branch</quote>) × ÔÅÞÅÎÉÅ ÏÐÒÅÄÅÌÅÎÎÏÇÏ ÐÅÒÉÏÄÁ,
+ É × ÎÅÅ ×ÎÏÓÉÌÉÓØ ÔÏÌØËÏ ËÒÉÔÉÞÅÓËÉ ×ÁÖÎÙÅ ÉÓÐÒÁ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.
+ äÌÑ FreeBSD 4.10-RELEASE ÎÁÂÏÒ ÉÓÐÒÁ×ÌÅÎÉÊ ÂÕÄÅÔ ÒÁÓÛÉÒÅÎ
+ ÄÌÑ ×ËÌÀÞÅÎÉÑ ÉÓÐÒÁ×ÌÅÎÉÊ ÌÏËÁÌØÎÙÈ DoS, Á ÔÁËÖÅ ÄÒÕÇÉÈ
+ ËÌÀÞÅ×ÙÈ É ÈÏÒÏÛÏ ÐÒÏÔÅÓÔÉÒÏ×ÁÎÎÙÈ ÉÓÐÒÁ×ÌÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÇÕÔ
+ ÎÅ ÏÔÎÏÓÉÔØÓÑ Ë ÂÅÚÏÐÁÓÎÏÓÔÉ. èÏÔÑ ÜÔÉ ÉÓÐÒÁ×ÌÅÎÉÑ ÓËÏÒÅÅ ×ÓÅÇÏ
+ ÎÅ ÂÕÄÕÔ ÏÐÕÂÌÉËÏ×ÁÎÙ × ËÁÞÅÓÔ×Å <quote>ÒÅÌÉÚÁ</quote> ÉÚ ×ÅÔ×É,
+ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ &os; ÂÕÄÕÔ ×ËÌÀÞÁÔØ ÉÈ ÐÏÄÏÂÎÏ
+ ÓÏÏÂÝÅÎÉÑÍ ÂÅÚÏÐÁÓÎÏÓÔÉ &os;.</para>
</sect1>
<sect1 id="upgrade">
==== //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.8#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devd/devd.8,v 1.10 2003/09/26 12:24:16 rse Exp $
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.11 2004/07/01 07:24:18 imp Exp $
.\"
.Dd October 17, 2002
.Dt DEVD 8
@@ -109,6 +109,11 @@
.Nm
system without modifying the user's other
config files.
+.Pp
+All messages that
+.Nm
+receives are forwarded to the unix domain socket at
+.Pa /var/run/devd.pipe .
.Sh SEE ALSO
.Xr devctl 4 ,
.Xr devd.conf 5
==== //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.cc#2 (text+ko) ====
@@ -30,15 +30,18 @@
// TODO list:
// o devd.conf and devd man pages need a lot of help:
-// - devd.conf needs to lose the warning about zone files.
+// - devd needs to document the unix domain socket
// - devd.conf needs more details on the supported statements.
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.17 2003/10/24 22:02:29 imp Exp $");
+__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.18 2004/07/01 07:24:18 imp Exp $");
#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
#include <sys/types.h>
-#include <sys/sysctl.h>
+#include <sys/un.h>
#include <ctype.h>
#include <dirent.h>
@@ -54,11 +57,13 @@
#include <algorithm>
#include <map>
#include <string>
+#include <list>
#include <vector>
#include "devd.h" /* C compatible definitions */
#include "devd.hh" /* C++ class definitions */
+#define PIPE "/var/run/devd.pipe"
#define CF "/etc/devd.conf"
#define SYSCTL "hw.bus.devctl_disable"
@@ -585,6 +590,56 @@
cfg.pop_var_table();
}
+int
+create_socket(const char *name)
+{
+ int fd, slen;
+ struct sockaddr_un sun;
+
+ if ((fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0)
+ err(1, "socket");
+ bzero(&sun, sizeof(sun));
+ sun.sun_family = AF_UNIX;
+ strlcpy(sun.sun_path, name, sizeof(sun.sun_path));
+ slen = SUN_LEN(&sun);
+ unlink(name);
+ if (bind(fd, (struct sockaddr *) & sun, slen) < 0)
+ err(1, "bind");
+ listen(fd, 4);
+ fchown(fd, 0, 0); /* XXX - root.wheel */
+ fchmod(fd, 0660);
+ return (fd);
+}
+
+list<int> clients;
+
+void
+notify_clients(const char *data, int len)
+{
+ list<int> bad;
+ list<int>::const_iterator i;
+
+ for (i = clients.begin(); i != clients.end(); i++) {
+ if (write(*i, data, len) <= 0) {
+ bad.push_back(*i);
+ close(*i);
+ }
+ }
+
+ for (i = bad.begin(); i != bad.end(); i++)
+ clients.erase(find(clients.begin(), clients.end(), *i));
+}
+
+void
+new_client(int fd)
+{
+ int s;
+
+ s = accept(fd, NULL, NULL);
+ if (s != -1)
+ clients.push_back(s);
+}
+
static void
event_loop(void)
{
@@ -592,14 +647,17 @@
int fd;
char buffer[DEVCTL_MAXBUF];
int once = 0;
+ int server_fd, max_fd;
timeval tv;
fd_set fds;
fd = open(PATH_DEVCTL, O_RDONLY);
if (fd == -1)
- err(1, "Can't open devctl");
+ err(1, "Can't open devctl device %s", PATH_DEVCTL);
if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0)
- err(1, "Can't set close-on-exec flag");
+ err(1, "Can't set close-on-exec flag on devctl");
+ server_fd = create_socket(PIPE);
+ max_fd = max(fd, server_fd) + 1;
while (1) {
if (romeo_must_die)
break;
@@ -619,19 +677,33 @@
once++;
}
}
- rv = read(fd, buffer, sizeof(buffer) - 1);
- if (rv > 0) {
- buffer[rv] = '\0';
- while (buffer[--rv] == '\n')
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ FD_SET(server_fd, &fds);
+ rv = select(max_fd, &fds, NULL, NULL, NULL);
+ if (rv == -1) {
+ if (errno == EINTR)
+ continue;
+ err(1, "select");
+ }
+ if (FD_ISSET(fd, &fds)) {
+ rv = read(fd, buffer, sizeof(buffer) - 1);
+ if (rv > 0) {
+ notify_clients(buffer, rv);
buffer[rv] = '\0';
- process_event(buffer);
- } else if (rv < 0) {
- if (errno != EINTR)
+ while (buffer[--rv] == '\n')
+ buffer[rv] = '\0';
+ process_event(buffer);
+ } else if (rv < 0) {
+ if (errno != EINTR)
+ break;
+ } else {
+ /* EOF */
break;
- } else {
- /* EOF */
- break;
+ }
}
+ if (FD_ISSET(server_fd, &fds))
+ new_client(server_fd);
}
close(fd);
}
==== //depot/projects/davidxu_ksedbg/src/sys/boot/common/newvers.sh#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $
+# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $
# $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -33,7 +33,7 @@
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
LC_ALL=C; export LC_ALL
-u=${USER-root} h=`hostname` t=`date`
+u=${USER-root} h=${HOSTNAME-`hostname`} t=`date`
#r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
==== //depot/projects/davidxu_ksedbg/src/sys/conf/newvers.sh#2 (text+ko) ====
@@ -28,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $
TYPE="FreeBSD"
REVISION="5.2"
@@ -81,7 +81,7 @@
fi
touch version
-v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date`
+v=`cat version` u=${USER-root} d=`pwd` h=${HOSTNAME-`hostname`} t=`date`
i=`make -V KERN_IDENT`
cat << EOF > vers.c
$COPYRIGHT
==== //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr.c#2 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.52 2004/06/16 09:46:36 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.53 2004/07/01 06:56:10 ps Exp $");
/*
* Driver for the AMI MegaRaid family of controllers.
@@ -976,7 +976,7 @@
s = splbio();
- if (sc->amr_state & AMR_STATE_INTEN) {
+ if ((sc->amr_state & AMR_STATE_CRASHDUMP) == 0) {
count=0;
while (sc->amr_busyslots) {
tsleep(sc, PRIBIO | PCATCH, "amrpoll", hz);
@@ -1788,7 +1788,7 @@
debug_called(1);
- sc->amr_state &= ~AMR_STATE_INTEN;
+ sc->amr_state |= AMR_STATE_CRASHDUMP;
/* get ourselves a command buffer */
if ((ac = amr_alloccmd(sc)) == NULL)
@@ -1815,7 +1815,7 @@
if (ac != NULL)
amr_releasecmd(ac);
- sc->amr_state |= AMR_STATE_INTEN;
+ sc->amr_state &= ~AMR_STATE_CRASHDUMP;
return (error);
}
==== //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amrvar.h#2 (text+ko) ====
@@ -53,7 +53,7 @@
* SUCH DAMAGE.
*
*
- * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.21 2004/06/16 09:46:36 phk Exp $
+ * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.22 2004/07/01 06:56:10 ps Exp $
*/
#if __FreeBSD_version >= 500005
@@ -187,6 +187,7 @@
#define AMR_STATE_SUSPEND (1<<1)
#define AMR_STATE_INTEN (1<<2)
#define AMR_STATE_SHUTDOWN (1<<3)
+#define AMR_STATE_CRASHDUMP (1<<4)
/* per-controller queues */
struct bio_queue_head amr_bioq; /* pending I/O with no commands */
==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.16 2004/06/27 12:41:44 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.17 2004/07/01 05:14:12 brooks Exp $");
/*
* FTDI FT8U100AX serial adapter driver
@@ -165,6 +165,9 @@
uaa->product == USB_PRODUCT_FTDI_LK202 ||
uaa->product == USB_PRODUCT_FTDI_LK204))
return (UMATCH_VENDOR_PRODUCT);
+ if (uaa->vendor == USB_VENDOR_SIIG2 &&
+ (uaa->product == USB_PRODUCT_SIIG2_US2308))
+ return (UMATCH_VENDOR_PRODUCT);
return (UMATCH_NONE);
}
@@ -210,24 +213,43 @@
id = usbd_get_interface_descriptor(iface);
ucom->sc_iface = iface;
- switch( uaa->product ){
- case USB_PRODUCT_FTDI_SERIAL_8U100AX:
- sc->sc_type = UFTDI_TYPE_SIO;
- sc->sc_hdrlen = 1;
+ switch( uaa->vendor ){
+ case USB_VENDOR_FTDI:
+ switch( uaa->product ){
+ case USB_PRODUCT_FTDI_SERIAL_8U100AX:
+ sc->sc_type = UFTDI_TYPE_SIO;
+ sc->sc_hdrlen = 1;
+ break;
+ case USB_PRODUCT_FTDI_SEMC_DSS20:
+ case USB_PRODUCT_FTDI_SERIAL_8U232AM:
+ case USB_PRODUCT_FTDI_CFA_631:
+ case USB_PRODUCT_FTDI_CFA_632:
+ case USB_PRODUCT_FTDI_CFA_633:
+ case USB_PRODUCT_FTDI_CFA_634:
+ case USB_PRODUCT_FTDI_USBSERIAL:
+ case USB_PRODUCT_FTDI_MX2_3:
+ case USB_PRODUCT_FTDI_MX4_5:
+ case USB_PRODUCT_FTDI_LK202:
+ case USB_PRODUCT_FTDI_LK204:
+ sc->sc_type = UFTDI_TYPE_8U232AM;
+ sc->sc_hdrlen = 0;
+ break;
+
+ default: /* Can't happen */
+ goto bad;
+ }
break;
- case USB_PRODUCT_FTDI_SEMC_DSS20:
- case USB_PRODUCT_FTDI_SERIAL_8U232AM:
- case USB_PRODUCT_FTDI_CFA_631:
- case USB_PRODUCT_FTDI_CFA_632:
- case USB_PRODUCT_FTDI_CFA_633:
- case USB_PRODUCT_FTDI_CFA_634:
- case USB_PRODUCT_FTDI_USBSERIAL:
- case USB_PRODUCT_FTDI_MX2_3:
- case USB_PRODUCT_FTDI_MX4_5:
- case USB_PRODUCT_FTDI_LK202:
- case USB_PRODUCT_FTDI_LK204:
- sc->sc_type = UFTDI_TYPE_8U232AM;
- sc->sc_hdrlen = 0;
+
+ case USB_VENDOR_SIIG2:
+ switch( uaa->product ){
+ case USB_PRODUCT_SIIG2_US2308:
+ sc->sc_type = UFTDI_TYPE_8U232AM;
+ sc->sc_hdrlen = 0;
+ break;
+
+ default: /* Can't happen */
+ goto bad;
+ }
break;
default: /* Can't happen */
==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.86 2004/06/27 12:41:44 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.87 2004/07/01 02:07:01 green Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -406,6 +406,7 @@
if (endpt == USB_CONTROL_ENDPOINT) {
sc->sc_is_open[USB_CONTROL_ENDPOINT] = 1;
+ sc->sc_refcnt++;
return (0);
}
@@ -516,6 +517,7 @@
}
}
sc->sc_is_open[endpt] = 1;
+ sc->sc_refcnt++;
return (0);
}
@@ -543,6 +545,8 @@
if (endpt == USB_CONTROL_ENDPOINT) {
DPRINTFN(5, ("ugenclose: close control\n"));
sc->sc_is_open[endpt] = 0;
+ if (--sc->sc_refcnt == 0)
+ usb_detach_wakeup(USBDEV(sc->sc_dev));
return (0);
}
@@ -578,6 +582,8 @@
}
}
sc->sc_is_open[endpt] = 0;
+ if (--sc->sc_refcnt == 0)
+ usb_detach_wakeup(USBDEV(sc->sc_dev));
return (0);
}
@@ -734,10 +740,7 @@
USB_GET_SC(ugen, UGENUNIT(dev), sc);
- sc->sc_refcnt++;
error = ugen_do_read(sc, endpt, uio, flag);
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
@@ -834,10 +837,7 @@
USB_GET_SC(ugen, UGENUNIT(dev), sc);
- sc->sc_refcnt++;
error = ugen_do_write(sc, endpt, uio, flag);
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
@@ -886,12 +886,13 @@
}
s = splusb();
- if (--sc->sc_refcnt >= 0) {
+ if (sc->sc_refcnt > 0) {
/* Wake everyone */
for (i = 0; i < USB_MAX_ENDPOINTS; i++)
wakeup(&sc->sc_endpoints[i][IN]);
/* Wait for processes to go away. */
- usb_detach_wait(USBDEV(sc->sc_dev));
+ while (sc->sc_refcnt > 0)
+ usb_detach_wait(USBDEV(sc->sc_dev));
}
splx(s);
@@ -1401,10 +1402,7 @@
USB_GET_SC(ugen, UGENUNIT(dev), sc);
- sc->sc_refcnt++;
error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p);
- if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.184 2004/06/27 17:27:04 alex Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.185 2004/07/01 05:14:12 brooks Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -379,6 +379,7 @@
vendor DAISY 0x3579 Daisy Technology
vendor DELL 0x413c Dell
vendor INTEL 0x8086 Intel
+vendor SIIG2 0x0b39 SIIG
vendor HP2 0xf003 Hewlett Packard
/*
@@ -1192,6 +1193,7 @@
/* SIIG products */
product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader
+product SIIG2 US2308 0x0421 USB to Serial
/* Silicon Portals Inc. */
product SILICONPORTALS YAPPH_NF 0x0200 YAP Phone (no firmware)
==== //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#2 (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.1162 2004/06/23 17:33:24 brooks Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1163 2004/07/01 06:02:32 jhb Exp $
#
#
@@ -66,6 +66,7 @@
# deleting the specification for CPUs you don't need to use may make
# parts of the system run faster.
# I386_CPU is mutually exclusive with the other CPU types.
+# I386_CPU is deprecated and will be removed in 6.0-RELEASE.
#
#cpu I386_CPU
cpu I486_CPU
==== //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.7 2004/06/30 04:47:31 njl Exp $
+# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.8 2004/07/01 04:14:55 marks Exp $
.PATH: ${.CURDIR}/../../../contrib/dev/acpica \
${.CURDIR}/../../../pci \
@@ -7,6 +7,7 @@
${.CURDIR}/../../../${MACHINE_ARCH}/acpica
KMOD= acpi
+WARNS?= 2
# ACPI CA sources
CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
==== //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#3 (text+ko) ====
@@ -40,7 +40,7 @@
* SUCH DAMAGE.
*
* @(#)tty.h 8.6 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/tty.h,v 1.86 2004/06/30 21:38:08 phk Exp $
+ * $FreeBSD: src/sys/sys/tty.h,v 1.87 2004/07/01 03:08:15 marcel Exp $
*/
#ifndef _SYS_TTY_H_
@@ -65,6 +65,8 @@
char *c_cl; /* Pointer to the last cblock. */
};
+struct tty;
+
typedef void t_oproc_t(struct tty *);
typedef void t_stop_t(struct tty *, int);
typedef int t_param_t(struct tty *, struct termios *);
More information about the p4-projects
mailing list