Attachment 55355 Details for Bug 130144

[patch] Patch mentioned in Comment #4

brother-1.0.0.diff (text/plain), 1.75 KB, created by Andreas Pfaller on 2005-10-25 18:01:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Pfaller

Created: 2005-10-25 18:01:27 UTC

Size: 1.75 KB

patch

obsolete

>diff -ur brother-1.0.0/backend/brother.c brother-1.0.0.apf/backend/brother.c
>--- brother-1.0.0/backend/brother.c	2003-10-28 08:47:17.000000000 +0100
>+++ brother-1.0.0.apf/backend/brother.c	2005-10-25 19:34:26.000000000 +0200
>@@ -382,7 +382,8 @@
>   MODELINF          modelInfList;
> 
>   WriteLog( "<<< sane_init start >>> " );
>- 
>+  DBG_INIT();
>+  
>   authCB++; /* compiler */
> 
>   DBG(DEBUG_VERBOSE,"brother init\n");
>@@ -395,13 +396,12 @@
> 
>   pdevFirst=NULL;
> 
>-  usb_init();
>-  rc=usb_find_busses();
>-  if (rc)
>-    return SANE_STATUS_GOOD;
>-  usb_find_devices();
>-  if (!usb_busses)
>-    return SANE_STATUS_IO_ERROR;
>+/* Check for devices using libusb */
>+  usb_init ();
>+  if (!usb_get_busses ()) {
>+    usb_find_busses ();
>+    usb_find_devices ();
>+  }
> 
>   rc=init_model_info();
>   if (!rc)
>@@ -543,10 +543,10 @@
>   if (!this->hScanner)
>     return SANE_STATUS_IO_ERROR;
> 
>-  if (usb_claim_interface(this->hScanner, 1))
>+  if (usb_set_configuration(this->hScanner, 1))
>     return SANE_STATUS_IO_ERROR;
> 
>-  if (usb_set_configuration(this->hScanner, 1))
>+  if (usb_claim_interface(this->hScanner, 1))
>     return SANE_STATUS_IO_ERROR;
> 
>   // ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó
>diff -ur brother-1.0.0/backend/brother_scanner.c brother-1.0.0.apf/backend/brother_scanner.c
>--- brother-1.0.0/backend/brother_scanner.c	2003-10-27 06:58:52.000000000 +0100
>+++ brother-1.0.0.apf/backend/brother_scanner.c	2005-10-25 19:37:11.000000000 +0200
>@@ -223,10 +223,10 @@
> 		if (!this->hScanner)
> 			return SANE_STATUS_IO_ERROR;
> 
>-		if (usb_claim_interface(this->hScanner, 1))
>+		if (usb_set_configuration(this->hScanner, 1))
> 			return SANE_STATUS_IO_ERROR;
> 
>-		if (usb_set_configuration(this->hScanner, 1))
>+		if (usb_claim_interface(this->hScanner, 1))
> 			return SANE_STATUS_IO_ERROR;
> 
> 		// ¥Ç¥Ð¥¤¥¹¥ª¡¼¥×¥ó

Actions: View | Diff

Attachments on bug 130144: 55355