Syncing with NetBSD version 1998/12/14

This commit is contained in:
Nick Hibma 1999-04-11 21:03:28 +00:00
parent 7dc1a5bd17
commit 6f749ef4fc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=45606
5 changed files with 20 additions and 16 deletions

View File

@ -1,5 +1,5 @@
.\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
.\" FreeBSD $Id$
.\" $FreeBSD$
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"

View File

@ -1,11 +1,12 @@
/* $NetBSD: usbd.c,v 1.2 1998/07/23 18:39:53 augustss Exp $ */
/* FreeBSD $Id$ */
/* $NetBSD: usbd.c,v 1.4 1998/12/09 00:57:19 augustss Exp $ */
/* $FreeBSD$ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Author: Lennart Augustsson
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (augustss@netbsd.org).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -72,7 +73,7 @@ usage(void)
* driven explore to find it. Therefore we run an exploration
* at regular intervals to catch those.
*/
#define TIMEOUT 30
#define TIMEOUT 300
int
main(int argc, char **argv)
@ -160,15 +161,13 @@ main(int argc, char **argv)
if (!debug)
daemon(0, 0);
FD_ZERO(&fdset);
for (;;) {
FD_ZERO(&fdset);
for (i = 0; i < ndevs; i++)
FD_SET(fds[i], &fdset);
timo.tv_usec = 0;
timo.tv_sec = itimo;
r = select(maxfd+1, &fdset, &fdset, 0, itimo ? &timo : 0);
r = select(maxfd+1, 0, &fdset, 0, itimo ? &timo : 0);
if (r < 0)
warn("select failed\n");
for (i = 0; i < ndevs; i++)

View File

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.2 1998/07/12 20:40:45 augustss Exp $
# FreeBSD $Id: Makefile,v 1.2 1998/12/13 15:52:26 bde Exp $
# FreeBSD $Id: Makefile,v 1.3 1998/12/14 09:40:15 n_hibma Exp $
PROG= usbdevs
SRCS= usbdevs.c
MAN8= usbdevs.8
CFLAGS+=-I${.CURDIR}/../../sys

View File

@ -1,5 +1,5 @@
.\" $NetBSD: usbdevs.8,v 1.3 1998/07/23 13:57:51 augustss Exp $
.\" FreeBSD $Id$
.\" $FreeBSD$
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"

View File

@ -1,11 +1,12 @@
/* $NetBSD: usbdevs.c,v 1.4 1998/07/23 13:57:51 augustss Exp $ */
/* FreeBSD $Id$ */
/* $FreeBSD$ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Author: Lennart Augustsson
* This code is derived from software contributed to The NetBSD Foundation
* by Lennart Augustsson (augustss@netbsd.org).
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -98,9 +99,12 @@ usbdev(f, a, rec)
else
printf("unconfigured, ");
}
printf("%s, %s", di.product, di.vendor);
if (verbose)
printf(", rev %s", di.revision);
if (verbose) {
printf("%s(0x%04x), %s(0x%04x), rev %s",
di.product, di.productNo,
di.vendor, di.vendorNo, di.revision);
} else
printf("%s, %s", di.product, di.vendor);
printf("\n");
if (!rec)
return;