← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sane-backends/saucy

« back to all changes in this revision

Viewing changes to backend/kvs1025_usb.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-14 14:28:56 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110214142856-6gxjetg88q9zctid
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/control:
  - Use standards version 3.9.1
* debian/patches/allow_dll.d_symlinks.patch:
* debian/patches/fix_epson2_cancel.patch:
* debian/patches/fix_epson2_commands.patch:
* debian/patches/fix_xerox_mfp_color_mode.patch:
* debian/patches/genesys_disable_raw_data_log.patch:
* debian/patches/no_translations.patch:
* debian/patches/saned_exit_avahi_process.patch:
* debian/patches/scsi_perfection_2450.patch:
* debian/patches/scsi_scanjet_4c.patch:
* debian/patches/xerox_mfp_new_ids.patch:
  - Applied upstream
* debian/watch:
  - Dropped, the URL is not consistent between releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
backend/kvs1025_usb.c
95
95
 
96
96
/* Get all supported scanners, and store into g_devlist */
97
97
SANE_Status
98
 
kv_usb_enum_devices ()
 
98
kv_usb_enum_devices (void)
99
99
{
100
100
  int cnt = 0;
101
101
  int i;
189
189
 
190
190
/* Clean up the USB bus and release all resources allocated to devices */
191
191
void
192
 
kv_usb_cleanup ()
 
192
kv_usb_cleanup (void)
193
193
{
194
194
}
195
195
 
250
250
      if (size_read != size)
251
251
        {
252
252
          DBG (DBG_shortread, "usb_bulk_read: Warning - short read\n");
253
 
          DBG (DBG_shortread, "usb_bulk_read: bytes to read = %d\n", size);
 
253
          DBG (DBG_shortread, "usb_bulk_read: bytes to read = %lu\n", (unsigned long)size);
254
254
          DBG (DBG_shortread,
255
 
               "usb_bulk_read: bytes actual read = %d\n", size_read);
 
255
               "usb_bulk_read: bytes actual read = %lu\n", (unsigned long)size_read);
256
256
          /*hexdump (DBG_shortread, "data", data, size_read); */
257
257
        }
258
258
    }
286
286
      if (size_written != size)
287
287
        {
288
288
          DBG (DBG_shortread, "usb_bulk_write: Warning - short written\n");
289
 
          DBG (DBG_shortread, "usb_bulk_write: bytes to write = %d\n", size);
 
289
          DBG (DBG_shortread, "usb_bulk_write: bytes to write = %lu\n", (unsigned long)size);
290
290
          DBG (DBG_shortread,
291
 
               "usb_bulk_write: bytes actual written = %d\n", size_written);
 
291
               "usb_bulk_write: bytes actual written = %lu\n", (unsigned long)size_written);
292
292
          hexdump (DBG_shortread, "data", data, size_written);
293
293
        }
294
294
    }
304
304
      if (ret || len != 16)
305
305
        {
306
306
          DBG (DBG_error, "usb_bulk_read: Error reading response."
307
 
               " read %d bytes\n", len);
 
307
               " read %lu bytes\n", (unsigned long)len);
308
308
          sanei_usb_clear_halt (dev->usb_fd);
309
309
          return SANE_STATUS_IO_ERROR;
310
310
        }