← Back to branch summary

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

« back to all changes in this revision

Viewing changes to backend/genesys_gl646.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/genesys_gl646.c
4497
4497
  dev->reg[reg_0x01].value &= ~REG01_DVDSET;
4498
4498
  /* XXX STEF XXX
4499
4499
     dev->reg[reg_0x05].value &= ~REG05_GMMENB; */
 
4500
  
 
4501
  /* copy to local_reg */
 
4502
  memcpy (local_reg, dev->reg, (GENESYS_GL646_MAX_REGS + 1) * sizeof (Genesys_Register_Set));
4500
4503
 
4501
4504
  /* turn off motor during this scan */
4502
4505
  gl646_set_motor_power (local_reg, SANE_FALSE);
4503
4506
 
4504
4507
  /* returned value to higher level warmup function */
4505
4508
  *channels = 1;
4506
 
  lines = gl646_get_triple_reg (dev->reg, REG_LINCNT) + 1;
 
4509
  lines = gl646_get_triple_reg (local_reg, REG_LINCNT) + 1;
4507
4510
  *total_size = lines * settings.pixels;
4508
4511
 
4509
4512
  /* now registers are ok, write them to scanner */
4889
4892
#ifndef UNIT_TESTING
4890
4893
static
4891
4894
#endif
 
4895
SANE_Status
4892
4896
gl646_move_to_ta (Genesys_Device * dev)
4893
4897
{
4894
4898
  SANE_Status status = SANE_STATUS_GOOD;
5511
5515
      return SANE_STATUS_UNSUPPORTED;
5512
5516
    }
5513
5517
 
5514
 
  /* a cache entry expires after 30 minutes for non CIS scanners */
 
5518
  /* a cache entry expires after 30 minutes for non sheetfed scanners */
5515
5519
#ifdef HAVE_SYS_TIME_H
5516
5520
  gettimeofday (&time, NULL);
5517
5521
  if ((time.tv_sec - cache->last_calibration > 30 * 60)
5518
 
      && (dev->model->is_cis == SANE_FALSE)
5519
 
      && (dev->settings.scan_method == SCAN_METHOD_FLATBED))
 
5522
      && (dev->model->is_sheetfed == SANE_FALSE))
5520
5523
    {
5521
5524
      DBG (DBG_proc,
5522
5525
           "gl646_is_compatible_calibration: expired entry, non compatible cache\n");
5752
5755
  gl646_search_strip,
5753
5756
 
5754
5757
  gl646_is_compatible_calibration,
5755
 
  gl646_move_to_ta
 
5758
  gl646_move_to_ta,
 
5759
  NULL
5756
5760
};
5757
5761
 
5758
5762
SANE_Status