PERFORCE change 55752 for review
Peter Wemm
peter at FreeBSD.org
Thu Jun 24 23:48:51 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=55752
Change 55752 by peter at peter_hammer on 2004/06/24 23:48:01
IFC @55748
Affected files ...
.. //depot/projects/hammer/bin/ps/extern.h#10 integrate
.. //depot/projects/hammer/bin/ps/keyword.c#12 integrate
.. //depot/projects/hammer/bin/ps/print.c#12 integrate
.. //depot/projects/hammer/bin/ps/ps.c#16 integrate
.. //depot/projects/hammer/bin/ps/ps.h#8 integrate
.. //depot/projects/hammer/etc/rc.subr#16 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#23 integrate
.. //depot/projects/hammer/lib/libc/sys/send.2#6 integrate
.. //depot/projects/hammer/lib/msun/Makefile#11 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/Makefile.inc#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.ent#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/i386/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#1 branch
.. //depot/projects/hammer/share/man/man4/Makefile#43 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#8 integrate
.. //depot/projects/hammer/share/man/man4/scsi.4#3 integrate
.. //depot/projects/hammer/share/man/man4/sd.4#2 delete
.. //depot/projects/hammer/share/man/man4/st.4#2 delete
.. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ucom.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uftdi.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uhid.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uhidev.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ulpt.4#3 integrate
.. //depot/projects/hammer/share/man/man4/umodem.4#2 integrate
.. //depot/projects/hammer/share/man/man4/uplcom.4#4 integrate
.. //depot/projects/hammer/share/man/man4/uvisor.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uvscom.4#2 integrate
.. //depot/projects/hammer/share/man/man4/vinum.4#3 integrate
.. //depot/projects/hammer/sys/boot/forth/loader.conf#11 integrate
.. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#6 integrate
.. //depot/projects/hammer/sys/conf/files#66 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#30 integrate
.. //depot/projects/hammer/sys/conf/options.sparc64#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#38 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#23 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#1 branch
.. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#12 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#10 integrate
.. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus.h#5 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.c#3 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#5 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_tty.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#37 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#36 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#36 integrate
.. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#9 integrate
.. //depot/projects/hammer/sys/geom/geom_slice.c#15 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#3 integrate
.. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#9 integrate
.. //depot/projects/hammer/sys/kern/tty.c#19 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#29 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#24 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#30 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#32 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#29 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#16 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#12 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#16 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#21 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#31 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#17 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#31 integrate
.. //depot/projects/hammer/sys/netinet/tcp_input.c#30 integrate
.. //depot/projects/hammer/sys/netipx/spx_usrreq.c#10 integrate
.. //depot/projects/hammer/sys/netnatm/natm.c#12 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#16 integrate
.. //depot/projects/hammer/sys/security/mac/mac_net.c#11 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#25 integrate
.. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#19 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#25 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#24 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#6 integrate
.. //depot/projects/hammer/sys/sys/mac_policy.h#20 integrate
.. //depot/projects/hammer/sys/sys/serial.h#1 branch
.. //depot/projects/hammer/sys/sys/socketvar.h#19 integrate
.. //depot/projects/hammer/sys/sys/ttycom.h#6 integrate
.. //depot/projects/hammer/sys/tools/acpi_quirks2h.awk#1 branch
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#11 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#36 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#27 integrate
.. //depot/projects/hammer/usr.bin/comm/comm.1#2 integrate
.. //depot/projects/hammer/usr.bin/expand/expand.c#3 integrate
.. //depot/projects/hammer/usr.bin/fetch/fetch.c#10 integrate
.. //depot/projects/hammer/usr.bin/fold/fold.c#3 integrate
.. //depot/projects/hammer/usr.bin/join/join.1#4 integrate
.. //depot/projects/hammer/usr.bin/unexpand/unexpand.c#4 integrate
.. //depot/projects/hammer/usr.bin/uniq/uniq.1#4 integrate
.. //depot/projects/hammer/usr.bin/vis/vis.1#2 integrate
Differences ...
==== //depot/projects/hammer/bin/ps/extern.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.36 2004/06/23 11:56:57 gad Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
*/
struct kinfo;
@@ -40,7 +40,7 @@
extern unsigned long mempages;
extern time_t now;
extern int sumrusage, termwidth, totwidth;
-extern VARENT *vhead;
+extern STAILQ_HEAD(velisthead, varent) varlist;
__BEGIN_DECLS
void arguments(KINFO *, VARENT *);
==== //depot/projects/hammer/bin/ps/keyword.c#12 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.69 2004/06/23 11:56:57 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.70 2004/06/23 23:48:09 gad Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -235,7 +235,6 @@
void
parsefmt(const char *p, int user)
{
- static struct varent *vtail;
char *tempstr, *tempstr1;
#define FMTSEP " \t,\n"
@@ -282,16 +281,10 @@
if (vent->var == NULL)
errx(1, "malloc failed");
memcpy(vent->var, v, sizeof(*vent->var));
- vent->next = NULL;
- if (vhead == NULL)
- vhead = vtail = vent;
- else {
- vtail->next = vent;
- vtail = vent;
- }
+ STAILQ_INSERT_TAIL(&varlist, vent, next_ve);
}
free(tempstr1);
- if (!vhead) {
+ if (STAILQ_EMPTY(&varlist)) {
warnx("no valid keywords; valid keywords:");
showkey();
exit(1);
==== //depot/projects/hammer/bin/ps/print.c#12 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.90 2004/06/23 12:18:36 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -69,26 +69,23 @@
{
VAR *v;
struct varent *vent;
- int allempty;
- allempty = 1;
- for (vent = vhead; vent; vent = vent->next)
- if (*vent->header != '\0') {
- allempty = 0;
+ STAILQ_FOREACH(vent, &varlist, next_ve)
+ if (*vent->header != '\0')
break;
- }
- if (allempty)
+ if (!vent)
return;
- for (vent = vhead; vent; vent = vent->next) {
+
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
v = vent->var;
if (v->flag & LJUST) {
- if (vent->next == NULL) /* last one */
+ if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */
(void)printf("%s", vent->header);
else
(void)printf("%-*s", v->width, vent->header);
} else
(void)printf("%*s", v->width, vent->header);
- if (vent->next != NULL)
+ if (STAILQ_NEXT(vent, next_ve) != NULL)
(void)putchar(' ');
}
(void)putchar('\n');
@@ -105,7 +102,7 @@
if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
errx(1, "malloc failed");
strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
- if (ve->next == NULL) {
+ if (STAILQ_NEXT(ve, next_ve) == NULL) {
/* last field */
if (termwidth == UNLIMITED) {
(void)printf("%s", vis_args);
@@ -131,7 +128,8 @@
v = ve->var;
if (cflag) {
- if (ve->next == NULL) /* last field, don't pad */
+ /* If it is the last field, then don't pad */
+ if (STAILQ_NEXT(ve, next_ve) == NULL)
(void)printf("%s", k->ki_p->ki_comm);
else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
@@ -147,7 +145,7 @@
} else
vis_env = NULL;
- if (ve->next == NULL) {
+ if (STAILQ_NEXT(ve, next_ve) == NULL) {
/* last field */
if (termwidth == UNLIMITED) {
if (vis_env)
@@ -180,7 +178,7 @@
VAR *v;
v = ve->var;
- if (ve->next == NULL) /* last field, don't pad */
+ if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */
(void)printf("%s", k->ki_p->ki_comm);
else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
==== //depot/projects/hammer/bin/ps/ps.c#16 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.102 2004/06/23 21:17:25 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -98,7 +98,7 @@
int termwidth; /* Width of the screen (0 == infinity). */
int totwidth; /* Calculated-width of requested variables. */
-struct varent *vhead;
+struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist);
static int forceuread = DEF_UREAD; /* Do extra work to get u-area. */
static kvm_t *kd;
@@ -600,9 +600,9 @@
* For each process, call each variable output function.
*/
for (i = lineno = 0; i < nkept; i++) {
- for (vent = vhead; vent; vent = vent->next) {
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
(vent->var->oproc)(&kinfo[i], vent);
- if (vent->next != NULL)
+ if (STAILQ_NEXT(vent, next_ve) != NULL)
(void)putchar(' ');
}
(void)putchar('\n');
@@ -703,6 +703,13 @@
}
#undef BSD_PID_MAX
+/*-
+ * The user can specify a device via one of three formats:
+ * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console
+ * 2) missing "/dev", e.g.: ttyp0 console
+ * 3) two-letters, e.g.: p0 co
+ * (matching letters that would be seen in the "TT" column)
+ */
static int
addelem_tty(struct listinfo *inf, const char *elem)
{
@@ -710,25 +717,46 @@
struct stat sb;
char pathbuf[PATH_MAX];
- if (strcmp(elem, "co") == 0)
- ttypath = strdup(_PATH_CONSOLE);
- else if (*elem == '/')
+ ttypath = NULL;
+ switch (*elem) {
+ case '/':
ttypath = elem;
- else {
+ break;
+ case 'c':
+ if (strcmp(elem, "co") == 0) {
+ ttypath = _PATH_CONSOLE;
+ break;
+ }
+ /* FALLTHROUGH */
+ default:
+ strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf));
+ strlcat(pathbuf, elem, sizeof(pathbuf));
+ ttypath = pathbuf;
+ if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0)
+ break;
+ if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
+ break;
+ if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) {
+ /* No need to repeat stat() && S_ISCHR() checks */
+ ttypath = NULL;
+ break;
+ }
+ /* /dev/${elem} does not exist, so try /dev/tty${elem} */
strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf));
strlcat(pathbuf, elem, sizeof(pathbuf));
- ttypath = pathbuf;
+ break;
}
-
- if (stat(ttypath, &sb) == -1) {
- warn("%s", ttypath);
- optfatal = 1;
- return (0);
- }
- if (!S_ISCHR(sb.st_mode)) {
- warn("%s: Not a terminal", ttypath);
- optfatal = 1;
- return (0);
+ if (ttypath) {
+ if (stat(ttypath, &sb) == -1) {
+ warn("%s", ttypath);
+ optfatal = 1;
+ return (0);
+ }
+ if (!S_ISCHR(sb.st_mode)) {
+ warn("%s: Not a terminal", ttypath);
+ optfatal = 1;
+ return (0);
+ }
}
if (inf->count >= inf->maxcount)
expand_list(inf);
@@ -886,7 +914,7 @@
{
struct varent *vent;
- for (vent = vhead; vent; vent = vent->next) {
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
if (strcmp(vent->var->name, v->name) == 0)
return vent;
}
@@ -899,7 +927,7 @@
struct varent *vent;
VAR *v;
- for (vent = vhead; vent; vent = vent->next) {
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
v = vent->var;
if (v->flag & DSIZ) {
v->dwidth = v->width;
@@ -919,7 +947,7 @@
VAR *v;
int i;
- for (vent = vhead; vent; vent = vent->next) {
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
v = vent->var;
if (!(v->flag & DSIZ))
continue;
@@ -938,7 +966,7 @@
VAR *v;
int i;
- for (vent = vhead; vent; vent = vent->next) {
+ STAILQ_FOREACH(vent, &varlist, next_ve) {
v = vent->var;
i = strlen(vent->header);
if (v->width < i)
@@ -985,7 +1013,7 @@
ki->ki_p->ki_comm, MAXCOMLEN));
else
asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm);
- if (ki->ki_env == NULL)
+ if (ki->ki_args == NULL)
errx(1, "malloc failed");
} else {
ki->ki_args = NULL;
==== //depot/projects/hammer/bin/ps/ps.h#8 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)ps.h 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ps/ps.h,v 1.18 2004/06/20 21:25:10 gad Exp $
+ * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $
*/
+#include <sys/queue.h>
+
#define UNLIMITED 0 /* unlimited terminal width */
enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK };
@@ -44,8 +46,8 @@
/* Variables. */
typedef struct varent {
+ STAILQ_ENTRY(varent) next_ve;
const char *header;
- struct varent *next;
struct var *var;
} VARENT;
==== //depot/projects/hammer/etc/rc.subr#16 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.27 2004/06/06 18:06:09 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.28 2004/06/24 16:57:49 mtm Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -194,7 +194,7 @@
err 3 'USAGE: check_pidfile pidfile procname [interpreter]'
fi
if [ ! -f $_pidfile ]; then
- debug "pid file {$_pidfile): not readable."
+ debug "pid file ($_pidfile): not readable."
return
fi
read _pid _junk < $_pidfile
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#23 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.137 2004/06/01 09:45:16 des Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.138 2004/06/24 03:08:44 wollman Exp $
%
-- Gifts for Children --
@@ -16100,6 +16100,9 @@
%
Yes, but which self do you want to be?
%
+Yes, I was surprised how easy it was to cut the door off my cat.
+ -- James D. Nicoll
+%
Yesterday I was a dog. Today I'm a dog. Tomorrow I'll probably still
be a dog. Sigh! There's so little hope for advancement.
-- Snoopy
==== //depot/projects/hammer/lib/libc/sys/send.2#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)send.2 8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.24 2004/06/21 18:57:32 mpp Exp $
+.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.25 2004/06/24 10:53:44 rik Exp $
.\"
.Dd February 15, 1995
.Dt SEND 2
@@ -194,7 +194,7 @@
address specified in the IP header did not match the IP
address bound to the prison.
.It Bq Er EPIPE
-The socket is unable to send anymore data (SS_CANTSENDMORE has
+The socket is unable to send anymore data (SBS_CANTSENDMORE has
been set on the socket). This typically means that the socket
is not connected.
.El
==== //depot/projects/hammer/lib/msun/Makefile#11 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 5.1beta 93/09/24
-# $FreeBSD: src/lib/msun/Makefile,v 1.44 2004/06/20 10:42:23 stefanf Exp $
+# $FreeBSD: src/lib/msun/Makefile,v 1.45 2004/06/24 00:02:32 marcel Exp $
#
# ====================================================
# Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -49,7 +49,7 @@
# Stock gcc 2.7.2.1 doesn't understand these options.
#CFLAGS += -mtrap-precision=i -mfp-trap-mode=su
.elif ${MACHINE_ARCH} == "i386"
-ARCH= i387
+ARCH_SUBDIR= i387
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \
e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \
s_cos.S s_finite.S s_floor.S s_logb.S \
@@ -58,7 +58,7 @@
# ARCH_SRCS+= s_log1p.S
.endif
-ARCH?= ${MACHINE_ARCH}
+ARCH_SUBDIR?= ${MACHINE_ARCH}
.PATH: ${.CURDIR}/bsdsrc
.PATH: ${.CURDIR}/man
@@ -114,7 +114,7 @@
#COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c
# Exclude the generic versions of what we provide in the MD area.
-.PATH: ${.CURDIR}/${ARCH}
+.PATH: ${.CURDIR}/${ARCH_SUBDIR}
.if defined(ARCH_SRCS)
.for i in ${ARCH_SRCS}
COMMON_SRCS:= ${COMMON_SRCS:N${i:R}.c}
==== //depot/projects/hammer/share/man/man4/Makefile#43 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.272 2004/06/22 09:09:18 ru Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.273 2004/06/24 05:01:52 imp Exp $
MAN= aac.4 \
acpi.4 \
@@ -244,7 +244,6 @@
sbsh.4 \
screen.4 \
scsi.4 \
- sd.4 \
sem.4 \
ses.4 \
sf.4 \
@@ -262,7 +261,6 @@
spic.4 \
splash.4 \
sppp.4 \
- st.4 \
ste.4 \
stf.4 \
stg.4 \
==== //depot/projects/hammer/share/man/man4/pcm.4#8 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.34 2004/06/16 08:33:54 ru Exp $
+.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.35 2004/06/24 17:43:12 josef Exp $
.\"
.Dd November 14, 2003
.Dt PCM 4
@@ -138,6 +138,11 @@
.Dq Li YES ,
load driver for card/chipset foo.
.El
+.Pp
+To define default values for the different mixer channels,
+set the channel to the prefered value using hints, e.g.:
+.Va hint.pcm.0.line Ns = Ns Qq Li 0 .
+This will mute the input channel per default.
.Ss VCHANs
Each device can optionally support more playback channels
that physical hardware provides by using
==== //depot/projects/hammer/share/man/man4/scsi.4#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.28 2003/06/28 23:53:37 ru Exp $
+.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.29 2004/06/24 04:05:08 scottl Exp $
.Dd October 15, 1998
.Dt SCSI 4
.Os
@@ -159,23 +159,46 @@
.Em counted
so that they appear as the next available unused unit.
.Pp
-To configure a driver in the kernel without wiring down the device use a
-config line similar to
-.Cd "device ch0"
-to include the changer driver.
+Units are wired down by setting kernel environment hints.
+This is usually done either interactively from the loader, or automatically via the
+.Pa /boot/device.hints
+file. The basic syntax is:
+.Bd -literal -offset indent
+hint.device.unit.property="value"
+.Ed
+.Pp
+Individual scsi bus numbers can be wired down to specific controllers with
+a config line similar to the following:
+.Bd -literal -offset indent
+hint.scbus.0.at="ahd1"
+.Ed
+.Pp
+This assigns scsi bus number 0 to the
+.Em ahd1
+driver instance.
+For controllers supporting more than one bus, a particular bus can be assigned
+as follows:
+.Bd -literal -offset indent
+hint.scbus.0.at="ahc1"
+hint.scbus.0.bus="1"
+.Ed
+.Pp
+This assigns scsi bus 0 to the bus 1 instance on
+.Em ahc0 .
+Peripheral drivers can be wired to a specific bus, target, and lun as so:
+.Bd -literal -offset indent
+hint.da.0.at="scbus0"
+hint.da.0.target="0"
+hint.da.0.unit="0"
+.Ed
.Pp
-To wire down a unit use a config line similar to
-.Cd "device ch1 at scbus0 target 4 unit 0"
-to assign changer 1 as the changer with SCSI ID 4,
-SCSI logical unit 0 on SCSI bus 0.
-Individual scbuses can be wired down to specific controllers with
-a config line similar to
-.Cd "device scbus0 at ahc0"
-which assigns scsi bus 0 to the first unit using the ahc driver.
-For controllers supporting more than one bus,
-the particular bus can be specified as in
-.Cd "device scbus3 at ahc1 bus 1"
-which assigns scbus 1 to the second bus probed on the ahc1 device.
+This assigns
+.Em da0
+to target 0, unit (lun) 0 of scbus 0.
+Omitting the target or unit hints will instruct CAM to treat them as wildcards
+and use the first respective counted instances.
+These examples can be combined together to allow a peripheral device to be
+wired to any particular controller, bus, target, and/or unit instance.
.Pp
When you have a mixture of wired down and counted devices then the
counting begins with the first non-wired down unit for a particular
==== //depot/projects/hammer/share/man/man4/ubtbcmfw.4#5 (text+ko) ====
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $
-.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.4 2004/03/02 18:38:32 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.5 2004/06/24 05:09:15 imp Exp $
.\"
.Dd April 28, 2003
.Dt UBTBCMFW 4
@@ -31,6 +31,8 @@
.Sh NAME
.Nm ubtbcmfw
.Nd Firmware driver for Broadcom BCM2033 chip based Bluetooth USB devices
+.Sh SYNOPSIS
+.Cd "device ubtbcmfw"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/ucom.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.3 2002/08/12 20:28:53 joe Exp $
+.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.4 2004/06/24 05:09:15 imp Exp $
.\"
.Dd November 25, 1999
.Dt UCOM 4
@@ -43,12 +43,7 @@
.Nm ucom
.Nd USB tty support
.Sh SYNOPSIS
-.Cd "ucom* at uftdi?"
-.Cd "ucom* at umct?"
-.Cd "ucom* at umodem?"
-.Cd "ucom* at uplcom?"
-.Cd "ucom* at uvisor? portno ?"
-.Cd "ucom* at uvscom?"
+.Cd "device ucom"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/uftdi.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.2 2004/06/13 22:46:32 obrien Exp $
+.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.3 2004/06/24 05:09:15 imp Exp $
.\"
.Dd April 13, 2000
.Dt UFTDI 4
@@ -43,8 +43,8 @@
.Nm uftdi
.Nd USB support for serial adapters based on the FT8U100AX and FT8U232AM
.Sh SYNOPSIS
-.Cd "uftdi* at uhub?"
-.Cd "ucom* at uftdi?"
+.Cd "device uftdi"
+.Cd "device ucom"
.Sh HARDWARE
The
.Nm
==== //depot/projects/hammer/share/man/man4/uhid.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.3 2002/08/16 05:01:11 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.4 2004/06/24 05:09:15 imp Exp $
.\"
.Dd July 12, 1998
.Dt UHID 4
@@ -43,7 +43,7 @@
.Nm uhid
.Nd USB generic HID support
.Sh SYNOPSIS
-.Cd "uhid* at uhidev? reportid ?"
+.Cd "device uhid"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/uhidev.4#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uhidev.4,v 1.2 2002/05/30 12:59:52 ru Exp $
+.\" $FreeBSD: src/share/man/man4/uhidev.4,v 1.3 2004/06/24 05:09:15 imp Exp $
.\"
.Dd December 27, 2001
.Dt UHIDEV 4
@@ -43,10 +43,9 @@
.Nm uhidev
.Nd USB Human Interface Device support
.Sh SYNOPSIS
-.Cd "uhidev* at uhub?"
-.Cd "uhid* at uhidev? reportid ?"
-.Cd "ukbd* at uhidev? reportid ?"
-.Cd "ums* at uhidev? reportid ?"
+.Cd "device uhid"
+.Cd "device ukbd"
+.Cd "device ums"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/ulpt.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.5 2003/09/20 15:16:56 se Exp $
+.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.6 2004/06/24 05:09:15 imp Exp $
.\"
.Dd July 12, 1998
.Dt ULPT 4
@@ -43,7 +43,7 @@
.Nm ulpt
.Nd USB printer support
.Sh SYNOPSIS
-.Cd "ulpt* at uhub?"
+.Cd "device ulpt"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/umodem.4#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.2 2002/05/30 12:59:52 ru Exp $
+.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.3 2004/06/24 05:09:15 imp Exp $
.\"
.Dd August 16, 1999
.Dt UMODEM 4
@@ -43,8 +43,8 @@
.Nm umodem
.Nd USB modem support
.Sh SYNOPSIS
-.Cd "umodem* at uhub?"
-.Cd "ucom* at umodem?"
+.Cd "device umodem"
+.Cd "device ucom"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/uplcom.4#4 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.5 2004/01/24 22:12:06 simon Exp $
+.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.6 2004/06/24 05:09:15 imp Exp $
.\"
.Dd May 21, 2001
.Dt UPLCOM 4
@@ -43,8 +43,8 @@
.Nm uplcom
.Nd USB support for Prolific PL-2303 serial adapters driver
.Sh SYNOPSIS
-.Cd "uplcom* at uhub?"
-.Cd "ucom* at uplcom?"
+.Cd "device uplcom"
+.Cd "device ucom"
.Sh HARDWARE
The
.Nm
==== //depot/projects/hammer/share/man/man4/uvisor.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.3 2002/12/10 14:21:55 ru Exp $
+.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.4 2004/06/24 05:09:15 imp Exp $
.\"
.Dd March 10, 2000
.Dt UVISOR 4
@@ -43,8 +43,8 @@
.Nm uvisor
.Nd USB support for the Handspring Visor, a Palmpilot compatible PDA
.Sh SYNOPSIS
-.Cd "uvisor* at uhub?"
-.Cd "ucom* at uvisor? portno ?"
+.Cd "device uvisor"
+.Cd "device ucom"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/uvscom.4#2 (text+ko) ====
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.2 2002/05/30 12:59:52 ru Exp $
+.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.3 2004/06/24 05:09:15 imp Exp $
.\"
.Dd May 21, 2001
.Dt UVSCOM 4
@@ -43,8 +43,8 @@
.Nm uvscom
.Nd USB support for SUNTAC Slipper U VS-10U serial adapters driver
.Sh SYNOPSIS
-.Cd "uvscom* at uhub?"
-.Cd "ucom* at uvscom?"
+.Cd "device uvscom"
+.Cd "device ucom"
.Sh DESCRIPTION
The
.Nm
==== //depot/projects/hammer/share/man/man4/vinum.4#3 (text+ko) ====
@@ -34,7 +34,7 @@
.\" otherwise) arising in any way out of the use of this software, even if
.\" advised of the possibility of such damage.
.\"
-.\" $FreeBSD: src/share/man/man4/vinum.4,v 1.48 2003/03/03 22:48:49 ru Exp $
+.\" $FreeBSD: src/share/man/man4/vinum.4,v 1.49 2004/06/24 05:09:15 imp Exp $
.\"
.Dd May 16, 2002
.Dt VINUM 4
@@ -43,7 +43,7 @@
.Nm vinum
.Nd Logical Volume Manager
.Sh SYNOPSIS
-.Cd "kldload vinum"
+.Cd "device vinum"
.Sh DESCRIPTION
.Nm
is a logical volume manager inspired by, but not derived from, the Veritas
==== //depot/projects/hammer/sys/boot/forth/loader.conf#11 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $
##############################################################
### Basic configuration options ############################
@@ -278,7 +278,6 @@
snd_via8233_load="NO" # via8233
snd_via82c686_load="NO" # via82c686
snd_driver_load="NO" # All sound drivers
-#pcm0.line="0" # Default value for a mixer channel
##############################################################
### USB modules ############################################
==== //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#6 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@
}
bss_size = round_page(a_out->a_bss);
#ifdef DEBUG
- printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size);
+ printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size);
#endif
/*
@@ -193,7 +193,7 @@
#ifdef DEBUG
printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr,
- a_out->a_text + a_out->a_data);
+ (u_long)a_out->a_text + a_out->a_data);
#endif
/*
* allow read/write of data
==== //depot/projects/hammer/sys/conf/files#66 (text+ko) ====
@@ -1,9 +1,14 @@
-# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $
+# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
# dependency lines other than the first are silently ignored.
#
+acpi_quirks.h standard \
+ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ no-obj no-implicit-rule \
+ clean "acpi_quirks.h"
aicasm optional ahc \
dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
==== //depot/projects/hammer/sys/conf/kmod.mk#30 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $
#
# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
# drivers (KLD's).
@@ -343,6 +343,17 @@
.endif
.endfor # _i
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list