mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Added USB support for DragonFlyBSD (bug #303183).

merge-requests/1/head
Henning Geinitz 2006-03-11 12:56:34 +00:00
rodzic 9fbc4ad57f
commit 92d177c049
3 zmienionych plików z 12 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2006-03-11 Henning Meier-Geinitz <henning@meier-geinitz.de>
* sanei/sanei_usb.c tools/sane-find-scanner.c: Added USB support
for DragonFlyBSD (bug #303183).
2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org> 2006-03-09 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c backend/genesys_low.h: Removed little endian * backend/genesys.c backend/genesys_low.h: Removed little endian

7
sanei/sanei_usb.c
Wyświetl plik

@ -90,6 +90,9 @@ struct usb_descriptor_header *GetNextDescriptor( struct usb_descriptor_header *c
#if defined (__FreeBSD__) #if defined (__FreeBSD__)
#include <dev/usb/usb.h> #include <dev/usb/usb.h>
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
#if defined (__DragonFly__)
#include <bus/usb/usb.h>
#endif
#define BACKEND_NAME sanei_usb #define BACKEND_NAME sanei_usb
#include "../include/sane/sane.h" #include "../include/sane/sane.h"
@ -249,7 +252,7 @@ kernel_get_vendor_product (int fd, const char *name, int *vendorID, int *product
*vendorID = vendor; *vendorID = vendor;
*productID = product; *productID = product;
} }
#elif defined (__FreeBSD__) #elif defined (__FreeBSD__) || defined (__DragonFly__)
{ {
int controller; int controller;
int ctrl_fd; int ctrl_fd;
@ -301,7 +304,7 @@ sanei_usb_init (void)
#if defined(__linux__) #if defined(__linux__)
"/dev/", "usbscanner", "/dev/", "usbscanner",
"/dev/usb/", "scanner", "/dev/usb/", "scanner",
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__)
"/dev/", "uscanner", "/dev/", "uscanner",
#elif defined(__BEOS__) #elif defined(__BEOS__)
"/dev/scanner/usb/", "", "/dev/scanner/usb/", "",

22
tools/sane-find-scanner.c
Wyświetl plik

@ -1394,27 +1394,7 @@ main (int argc, char **argv)
"/dev/usbscanner10", "/dev/usbscanner11", "/dev/usbscanner10", "/dev/usbscanner11",
"/dev/usbscanner12", "/dev/usbscanner13", "/dev/usbscanner12", "/dev/usbscanner13",
"/dev/usbscanner14", "/dev/usbscanner15", "/dev/usbscanner14", "/dev/usbscanner15",
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
"/dev/uscanner",
"/dev/uscanner0", "/dev/uscanner1",
"/dev/uscanner2", "/dev/uscanner3",
"/dev/uscanner4", "/dev/uscanner5",
"/dev/uscanner6", "/dev/uscanner7",
"/dev/uscanner8", "/dev/uscanner9",
"/dev/uscanner10", "/dev/uscanner11",
"/dev/uscanner12", "/dev/uscanner13",
"/dev/uscanner14", "/dev/uscanner15",
#elif defined(__NetBSD__)
"/dev/uscanner",
"/dev/uscanner0", "/dev/uscanner1",
"/dev/uscanner2", "/dev/uscanner3",
"/dev/uscanner4", "/dev/uscanner5",
"/dev/uscanner6", "/dev/uscanner7",
"/dev/uscanner8", "/dev/uscanner9",
"/dev/uscanner10", "/dev/uscanner11",
"/dev/uscanner12", "/dev/uscanner13",
"/dev/uscanner14", "/dev/uscanner15",
#elif defined(__OpenBSD__)
"/dev/uscanner", "/dev/uscanner",
"/dev/uscanner0", "/dev/uscanner1", "/dev/uscanner0", "/dev/uscanner1",
"/dev/uscanner2", "/dev/uscanner3", "/dev/uscanner2", "/dev/uscanner3",