d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,664 Commits 6 Branches 133 Tags 2.6 GiB
219b479f9f
Commit Graph

42 Commits

Author SHA1 Message Date
Josef Karthauser
219b479f9f Fix the cdevsw compatibility for -stable. 2003-08-25 22:01:06 +00:00
David E. O'Brien
aad970f1fe Use __FBSDID(). 
Also some minor style cleanups.
 2003-08-24 17:55:58 +00:00
Josef Karthauser
d4322278fa MFNetBSD: 
date: 2002/09/23 05:51:20;  author: simonb;
    Remove breaks after returns, unreachable returns and returns after
    returns(!).
 2003-07-14 18:25:47 +00:00
Andrey A. Chernov
171f8dccf7 Add ID for UMAX Astra 2100U 2003-07-09 17:05:59 +00:00
Josef Karthauser
4f1e4d55e7 USB scanner support for Mustek BearPaw scanner. 
Submitted by:	netchild
 2003-07-01 12:16:46 +00:00
Josef Karthauser
702966f238 Support the Epson GT-9300UF usb scanner. 
PR:		kern/53929
 2003-07-01 08:46:01 +00:00
Josef Karthauser
62db9d4d27 Allow the EPSON USB scanner 1250 to be recognised as a uscanner device. 
Submitted by:	Cristiano Deana <deana@bmm.it>
By way of:	n_hibma
MFC after:	3 days
 2003-06-13 11:20:26 +00:00
Poul-Henning Kamp
7ac40f5f59 Gigacommit to improve device-driver source compatibility between 
branches:

Initialize struct cdevsw using C99 sparse initializtion and remove
all initializations to default values.

This patch is automatically generated and has been tested by compiling
LINT with all the fields in struct cdevsw in reverse order on alpha,
sparc64 and i386.

Approved by:    re(scottl)
 2003-03-03 12:15:54 +00:00
Warner Losh
a163d034fa Back out M_* changes, per decision of the TRB. 
Approved by: trb
 2003-02-19 05:47:46 +00:00
Josef Karthauser
652fde6f1f Add support for Epson 1660 scanner. 
Submitted by:	Bruno Schwander <bruno@tinkerbox.org>
MFC after:	3 days
 2003-01-21 11:37:54 +00:00
Alfred Perlstein
44956c9863 Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0. 
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
 2003-01-21 08:56:16 +00:00
Josef Karthauser
6ee4bee25a Support for the "Seiko Epson Perfection 1260 scanner". 
Submitted by:	Michael Lestinsky <michael@lestinsky.de>
MFC After:	3 days
 2003-01-20 00:41:30 +00:00
Josef Karthauser
3b7efc56d0 Use the hw.usb sysctl tree instead of debug.usb. 
Requested by:	imp
 2002-08-08 12:05:51 +00:00
Josef Karthauser
528d1a7fbc Replace the FOO_DEBUG definitions with USB_DEBUG, and switch the 
debugging levels to off by default.  Now that debug levels can be
tweaked by sysctl we don't need to go through hoops to get the
different usb parts to produce debug data.
 2002-07-31 14:34:36 +00:00
Josef Karthauser
0e6b196686 Get bored with hard coded debug level variables and introduce a debug.usb 
sysctl tree for tweaking them real-time.

Reviewed by:	iedowse
 2002-07-31 13:33:55 +00:00
Josef Karthauser
7ab45e978a Enable the HP 2200C and Visioneer Scanport 3000 scanners, and remove 
some trailing spaces whilst I'm here.

Obtained from:	NetBSD.
 2002-07-31 09:05:52 +00:00
Josef Karthauser
b2dd67bba5 Add the Primax (Visioneer) 6200 scanner. 
Obtained from:	OpenBSD (via NetBSD)
 2002-07-31 08:51:32 +00:00
Josef Karthauser
be036866cf Be more specific about when block major numbers disappeared from 
the cdev switch.
 2002-03-11 16:22:15 +00:00
Josef Karthauser
09ecaa66fc Support the HP 5400C scanner. 
PR:		kern/34783
 2002-02-14 02:51:12 +00:00
Josef Karthauser
7dcd88f85f Rework revision 1.12, and wrap the bmaj entry with an #if doesn't 
compile it in on FreeBSD-current, but does in all other cases
(-stable, NetBSD, OpenBSD, etc).
 2002-02-14 00:35:03 +00:00
Josef Karthauser
d0d80d05a6 Reinstate revision 1.14. The empty uscannerioctl() was accidently 
re-added during a recent NetBSD merge.
 2002-02-14 00:32:03 +00:00
Josef Karthauser
2097055fac Merge from NetBSD. 
Add lots of new scanner devices:

	AGFA SNAPSCAN1236U
	AGFA SNAPSCANE40
	AGFA SNAPSCANE50
	AGFA SNAPSCANE20
	AGFA SNAPSCANE25
	AGFA SNAPSCANE26
	AGFA SNAPSCANE52
	CANON N656U
	HP 3400CSE
	SCANLOGIC 336CX
	MUSTEK BEARPAW1200F
	MUSTEK 600USB
	MUSTEK 1200USBPLUS
	NATIONAL BEARPAW2400
	EPSON 640U
	EPSON 1650
	EPSON GT9700F
	UMAX ASTRA3400
	ULTIMA 1200UBPLUS
 2002-02-11 03:35:53 +00:00
Josef Karthauser
4f26a426ab Quiet a qualifier warning. 2002-02-11 03:29:35 +00:00
Josef Karthauser
50a56fbebd Merge from NetBSD: revs 1.12 and 1.21 - 1.23 
Original NetBSD log messages are:

	----------------------------
	revision 1.23
	date: 2001/12/12 15:48:18;  author: augustss;  lines: +132 -114
	Add a scanner quirk for keeping the pipes open between device opening.
	Idea from Enami.
	----------------------------
	revision 1.22
	date: 2001/12/03 01:47:13;  author: augustss;  lines: +8 -16
	Handle vendor/product lookup with a common routine.
	----------------------------
	revision 1.21
	date: 2001/12/01 09:42:39;  author: enami;  lines: +4 -4
	Shorten wmesg so that they can be distinguished in ps/top output.
	----------------------------
	revision 1.12
	date: 2001/01/23 14:04:14;  author: augustss;  lines: +7 -1
	Make sure driver attach/detach events are generated in a
	consistent manner.
	----------------------------

PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
MFC after:
 2002-02-11 02:57:50 +00:00
Josef Karthauser
2c0634eab6 ANSIfy the function declarations, in line with NetBSD. 2002-02-11 02:25:47 +00:00
Josef Karthauser
44ae5917e2 NetBSD have introduced usb_proc_ptr for us (they'll be needing it soon too) 
to hide the distinction between struct proc and struct thread.
 2002-01-02 16:33:53 +00:00
Maxim Sobolev
134290641e Add Mustek 1200 CU Plus scanner. 
Submitted by:	"Ilmar S. Habibulin" <ilmar@watson.org>
 2001-11-28 12:37:04 +00:00
Julian Elischer
b40ce4165d KSE Milestone 2 
Note ALL MODULES MUST BE RECOMPILED
make the kernel aware that there are smaller units of scheduling than the
process. (but only allow one thread per process at this time).
This is functionally equivalent to teh previousl -current except
that there is a thread associated with each process.

Sorry john! (your next MFC will be a doosie!)

Reviewed by: peter@freebsd.org, dillon@freebsd.org

X-MFC after:    ha ha ha ha
 2001-09-12 08:38:13 +00:00
Nick Hibma
6e155c1b96 Add support for the HP 4300C scanner. 
Submitted by:		Ernst de Haan <ernst@jollem.com>
 2001-08-21 22:16:44 +00:00
Nick Hibma
9a9a00ec47 Regen. 
National BearPaw 1200 has changed name USB_PRODUCT_NATIONAL_BEARPAW1200.
 2001-08-21 21:36:58 +00:00
Poul-Henning Kamp
3b6c05fa7f Remove the empty uscannerioctl() and use noioctl() instead. 2001-05-23 17:51:43 +00:00
Poul-Henning Kamp
3f865320ba Small patch is required to the USB susbsystem to include support for 
Epson Perfection 1240U scanner.

PR:		25565
Submitted by:	Martin Machacek <m@m3a.cz>
 2001-03-28 17:58:31 +00:00
Poul-Henning Kamp
f83880518b Send the remains (such as I have located) of "block major numbers" to 
the bit-bucket.
 2001-03-26 12:41:29 +00:00
Garrett Wollman
0a2c3d48c6 select() DKI is now in <sys/selinfo.h>. 2001-01-09 04:33:49 +00:00
Nick Hibma
1458cde760 Readd the id removed by sheldon in the previous commit to uscanner.c. 
Change the ID in if_aue.c to match the new name in usbdevs.h.
 2001-01-04 11:55:24 +00:00
Sheldon Hearn
63ccc06ffe Revert rev 1.8, which broke the installkernel target. 2001-01-04 11:12:15 +00:00
Nick Hibma
7b58790dbf Add the Id of the Epson 1640 scanner. 
Submitted by:	Chris Shenton <chris@shenton.org>
 2001-01-03 11:46:09 +00:00
Nick Hibma
64e3d839ec Remove a warning. 
Reported by:	phk
 2000-12-08 10:44:15 +00:00
Nick Hibma
60295bde4c Set OPEN Flag on open. 
Make set_config(1) print warning message if it fails.
 2000-11-15 10:36:08 +00:00
Nick Hibma
59490b7d67 Cut&paste bug: Set USBD_SHORT_XFER_OK unconditionally 2000-11-01 00:28:40 +00:00
Nick Hibma
d69d452a55 remove an unused function (and a warning) 2000-10-30 10:58:02 +00:00
Nick Hibma
2fd84f56d5 The USB scanner driver. To be used together with SANE. 2000-10-25 10:34:38 +00:00