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

Fixed indentation.

merge-requests/1/head
Henning Geinitz 2003-07-24 16:57:26 +00:00
rodzic 7859f03a98
commit 9f1c673205
2 zmienionych plików z 23 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
ChangeLog
Wyświetl plik

@ -1,7 +1,7 @@
2003-07-24 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-07-24 Henning Meier-Geinitz <henning@meier-geinitz.de>
* tools/check-usb-chip.c: Added support for detecting Genesys * tools/check-usb-chip.c: Added support for detecting Genesys
Logic GL646. Logic GL646. Fixed indentation.
2003-07-23 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-07-23 Henning Meier-Geinitz <henning@meier-geinitz.de>

35
tools/check-usb-chip.c
Wyświetl plik

@ -988,15 +988,20 @@ check_merlin (struct usb_device *dev)
static int static int
gl646_write_reg (usb_dev_handle * handle, unsigned char reg, unsigned char val) gl646_write_reg (usb_dev_handle * handle, unsigned char reg,
unsigned char val)
{ {
int result; int result;
result = usb_control_msg (handle, 0x00, 0x00, 0x83, 0x00, (char *) &reg, 0x01, TIMEOUT); result =
usb_control_msg (handle, 0x00, 0x00, 0x83, 0x00, (char *) &reg, 0x01,
TIMEOUT);
if (result < 0) if (result < 0)
return 0; return 0;
result = usb_control_msg (handle, 0x00, 0x00, 0x85, 0x00, (char *) &val, 0x01, TIMEOUT); result =
usb_control_msg (handle, 0x00, 0x00, 0x85, 0x00, (char *) &val, 0x01,
TIMEOUT);
if (result < 0) if (result < 0)
return 0; return 0;
@ -1004,15 +1009,20 @@ gl646_write_reg (usb_dev_handle * handle, unsigned char reg, unsigned char val)
} }
static int static int
gl646_read_reg (usb_dev_handle * handle, unsigned char reg, unsigned char *val) gl646_read_reg (usb_dev_handle * handle, unsigned char reg,
unsigned char *val)
{ {
int result; int result;
result = usb_control_msg (handle, 0x00, 0x00, 0x83, 0x00, (char *) &reg, 0x01, TIMEOUT); result =
usb_control_msg (handle, 0x00, 0x00, 0x83, 0x00, (char *) &reg, 0x01,
TIMEOUT);
if (result < 0) if (result < 0)
return 0; return 0;
result = usb_control_msg (handle, 0x80, 0x00, 0x84, 0x00, (char *) val, 0x01, TIMEOUT); result =
usb_control_msg (handle, 0x80, 0x00, 0x84, 0x00, (char *) val, 0x01,
TIMEOUT);
if (result < 0) if (result < 0)
return 0; return 0;
@ -1031,9 +1041,8 @@ check_gl646 (struct usb_device *dev)
printf (" checking for GL646 ...\n"); printf (" checking for GL646 ...\n");
/* Check device descriptor */ /* Check device descriptor */
if ( (dev->descriptor.bDeviceClass != USB_CLASS_PER_INTERFACE) if ((dev->descriptor.bDeviceClass != USB_CLASS_PER_INTERFACE)
|| (dev->config[0].interface[0].altsetting[0].bInterfaceClass != || (dev->config[0].interface[0].altsetting[0].bInterfaceClass != 0x10))
0x10))
{ {
if (verbose > 2) if (verbose > 2)
printf printf
@ -1101,8 +1110,8 @@ check_gl646 (struct usb_device *dev)
bmAttributes != 0x02) bmAttributes != 0x02)
|| (dev->config[0].interface[0].altsetting[0].endpoint[1]. || (dev->config[0].interface[0].altsetting[0].endpoint[1].
wMaxPacketSize != 0x40) wMaxPacketSize != 0x40)
|| (dev->config[0].interface[0].altsetting[0].endpoint[1].bInterval != 0) || (dev->config[0].interface[0].altsetting[0].endpoint[1].bInterval !=
) 0))
{ {
if (verbose > 2) if (verbose > 2)
printf printf
@ -1123,8 +1132,8 @@ check_gl646 (struct usb_device *dev)
bmAttributes != 0x03) bmAttributes != 0x03)
|| (dev->config[0].interface[0].altsetting[0].endpoint[2]. || (dev->config[0].interface[0].altsetting[0].endpoint[2].
wMaxPacketSize != 0x1) wMaxPacketSize != 0x1)
|| (dev->config[0].interface[0].altsetting[0].endpoint[2].bInterval != 8) || (dev->config[0].interface[0].altsetting[0].endpoint[2].bInterval !=
) 8))
{ {
if (verbose > 2) if (verbose > 2)
printf printf