Commit Graph

29 Commits

Author SHA1 Message Date
jmg
66ca0a8b51 fix spelling of ATTACH
Submitted by:	Johny Mattsson
MFC after:	2 week
(do to code freeze)
2003-10-25 22:03:10 +00:00
tmm
b739c4c7cd The second argument to fgetln() is a size_t *, not an int *. 2003-07-12 17:56:50 +00:00
imp
0fcc0bc2e1 Include sys/param.h for both modfind and kldload
Include sys/linker.h for kldload
Include sys/module.h for modfind
sort sys includes
2003-06-09 06:26:50 +00:00
imp
b8cbfc8a9b Use stdlib.h for getopt interface. 2003-06-07 19:13:57 +00:00
maxim
a59d939300 Fix usbd.conf parsing: fgetln(3) returns a string without terminating
NUL character so do not expect it.

PR:		bin/46489
MFC after:	1 week
2002-12-24 11:58:05 +00:00
des
4d6b787d2d Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.
2002-04-22 13:44:47 +00:00
alfred
7b6d78ef23 Prefix structure members to protect them against clashes with eg.
c++ keywords.

This keeps us in sync with NetBSD because they actually committed
my delta first.

Ok'd by: lennard
2002-02-20 20:47:21 +00:00
joe
3311f87be6 Merge from NetBSD.
uhub.c:     revision 1.37
    usb.4:      revision 1.30
    usb.c:      revision 1.38
    usb.h:      revision 1.40
    usb_port.h: revision 1.21
    usb_subr.c: revision 1.65
    usbdi.h:    revision 1.40

Split the attach/detach events up into device, driver and controller
attach and detach events.

The commit message from NetBSD was:
        date: 2000/02/02 07:34:00;  author: augustss;  state: Exp;
        Change the USB event mechanism to include more information
        about devices and drivers.  Partly from FreeBSD.

Also rework usbd to take these new event types into account.
2002-01-28 01:03:19 +00:00
joe
dc37dfab78 Sync usb.h with NetBSD, apart from usb_device_info.speed, which
requires logic changes.  For now leave it as usb_device_info.lowspeed.
It will get addressed when the usb.c code is sync'd.
2002-01-02 20:16:53 +00:00
n_hibma
cf9f174823 Check the return value of strdup
Submitted by:	Chris Faulhaber <jedgar@fxp.org>
2000-11-12 10:55:35 +00:00
n_hibma
827cc0ab25 Don't check for ohci/uhci to be loaded, check for the usb module. 2000-09-02 10:17:58 +00:00
n_hibma
6429949771 And another buffer overflow. Maybe next time I should read the manpage for
strlen.

This one only occurs if there is exactly one element on the line without any
whitespace. This is however never a valid line, so not a big chance that
this would ever cause any problems.
2000-07-16 17:28:01 +00:00
peter
d5b4e49e29 Oops. I originally extended the bcopy to 8 characters to include the
original \0 on the terminating string, however I changed my mind to
make it more obvious that the termination was being taken care of and
explicitly added the nul terminator.  I forgot to reset the bcopy length.
2000-07-14 01:22:07 +00:00
peter
758f41c92d Correct an additional off-by-one bug and buffer overflow. A malloc()
was being made one byte too short, and the string assembled in it was not
null terminated.  The string was passed to regcomp() so it never matched
anything in /etc/usbd.conf.  This is the cause of usbd not working for the
last few days..  The new malloc.conf default of AJ triggered this.
2000-07-14 00:29:00 +00:00
green
305d74b0be Fix an off-by-one error which breaks this (detected by malloc flags):
the line being read in was terminated one byte too late.
2000-07-11 00:06:44 +00:00
jake
961b97d434 Back out the previous change to the queue(3) interface.
It was not discussed and should probably not happen.

Requested by:		msmith and others
2000-05-26 02:09:24 +00:00
jake
d93fbc9916 Change the way that the queue(3) structures are declared; don't assume that
the type argument to *_HEAD and *_ENTRY is a struct.

Suggested by:	phk
Reviewed by:	phk
Approved by:	mdodd
2000-05-23 20:41:01 +00:00
n_hibma
f410042455 Add a comment to deconfuse a few lines of code I've tripped over two
times now.
2000-05-12 23:42:06 +00:00
jmb
e9c1e57b92 if USB support is not compiled into the kernel,
and has not been loaded via a kldload,
	running usbd(8) will autoload the "usb.ko" kld.

	thanks to Peter Wemm for enlightening me on the
	differences between kldfind(2) and modfind(2).
2000-04-02 06:28:40 +00:00
n_hibma
6ee166cb62 Don't fail if less then MAXDEV /dev/usb\d+ entries exist. 2000-01-10 22:35:33 +00:00
n_hibma
ec77c8ed33 Complain if we get an error that is not ENXIO while opening /dev/usb\d+
devices. For example, starting 'usbd -e' would give a 'No USB
controllers found' message instead of a '/dev/usb0: Permission denied'.

Submitted-By:  Dirk-Willem van Gulik <dirkx@webweaving.org>
1999-12-06 14:50:41 +00:00
n_hibma
66bb1ef94c Add the ability to match on device names attached to.
If a device is attached to ums4, you can reference this devname in
the configuration file as ${DEVNAME} (a shell variable, yes).
1999-11-28 21:27:31 +00:00
n_hibma
e0cf3d9b90 Avoid null dereference on verbose output.
Submitted-By: Doug Ambrisko <ambrisko@whistle.com>

Don't print a warning on exit status 0.
1999-11-24 19:18:57 +00:00
n_hibma
dc9f13f434 Flip the sequence of vendor, product around, to make it consistent
with the rest of the world. This avoids confusion when talking about
VID.PID.RID vs. PID.VID.RID. The former is the sequence normally used.
1999-11-22 19:08:36 +00:00
n_hibma
8e826fbb57 Add event queue handling. It triggers activities on events read from
/dev/usb. The actions are specified in the file /etc/usbd.conf.

usbd.c:
   - Add event queue (/dev/usb) handling.
   - Add comments
   - Clean up code some more

usbd.8:
   - Update manpage for the new command line flags
   - Remove a duplicate FreeBSD tag from it).

usbd.conf, usbd.conf.5, Makefile:
   - Add the usbd.conf configuration file and the man page for it.

NOTE: MAKEDEV already creates the /dev/usb device tree node, no change
needed there anymore.
1999-11-21 17:44:43 +00:00
n_hibma
bab819dcdd Cleanup of the code before we add a few thins.
- remove the use of NDEV. It is confusing. MAXUSBDEV should do.
- add some comments.
- add more explanation in usage()
- change the timeout value for undetected USB devices from 300 to 30
  seconds.  I don't think anyone wants to wait 5 minutes for broken
  devices to show up. The overhead CPU wise is very little.
- print 'no controllers found' as a fatal error.
- remove inclusion of malloc.h. It's unused.
1999-11-18 18:04:17 +00:00
n_hibma
cb5131e1df Syncing with NetBSD version 1998/12/14 1999-04-11 21:03:28 +00:00
n_hibma
bb7a814654 Added Id 1998-12-14 09:40:15 +00:00
n_hibma
1f1ab4819c Initial commit of ported NetBSD USB stack 1998-11-26 23:13:13 +00:00