← Back to branch summary

~ubuntu-branches/ubuntu/trusty/argyll/trusty-proposed

« back to all changes in this revision

Viewing changes to spectro/dtp51.h

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-02-12 00:35:39 UTC
  • mfrom: (13.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20140212003539-24tautzlitsiz61w
Tags: 1.5.1-5ubuntu1
https://launchpad.net/bugs/1275572
* Merge from Debian unstable. (LP: #1275572) Remaining changes:
  - debian/control:
    + Build-depend on libtiff-dev rather than libtiff4-dev.
  - debian/control, debian/patches/06_fix_udev_rule.patch:
    + Fix udev rules to actually work; ENV{ACL_MANAGE} has
      stopped working ages ago, and with logind it's now the
      "uaccess" tag. Dropping also consolekit from Recommends.
  - debian/patches/drop-usb-db.patch:
    + Use hwdb builtin, instead of the obsolete usb-db
      in the udev rules.
* debian/patches/05_ftbfs-underlinkage.diff:
  - Dropped change, no needed anymore.
* Refresh the patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spectro/dtp51.h
8
8
 * Author: Graeme W. Gill
9
9
 * Date:   5/10/1996
10
10
 *
11
 
 * Copyright 1996 - 2007, Graeme W. Gill
 
11
 * Copyright 1996 - 2013, Graeme W. Gill
12
12
 * All rights reserved.
13
13
 *
14
14
 * This material is licenced under the GNU GENERAL PUBLIC LICENSE Version 2 or later :-
40
40
#define DTP51_COMS_FAIL                         0x62                    /* Communication failure */
41
41
#define DTP51_UNKNOWN_MODEL                     0x63                    /* Not a DPT51 or DTP52 */
42
42
#define DTP51_DATA_PARSE_ERROR          0x64                    /* Read data parsing error */
43
 
#define DTP51_USER_ABORT                    0x65                        /* User hit abort */
44
 
#define DTP51_USER_TERM                 0x66                    /* User hit terminate */
45
 
#define DTP51_USER_TRIG                     0x67                        /* User hit trigger */
46
 
#define DTP51_USER_CMND                 0x68                    /* User hit command */
47
43
 
48
44
/* Real error code */
49
45
#define DTP51_OK                                        0x00
93
89
        INST_OBJ_BASE
94
90
 
95
91
        int need_cal;                           /* needs calibration */
96
 
        inst_opt_mode trig;                     /* Reading trigger mode */
97
 
        int trig_return;                        /* Emit "\n" after trigger */
 
92
        inst_opt_type trig;                     /* Reading trigger mode */
98
93
        
99
94
        }; typedef struct _dtp51 dtp51;
100
95
 
101
96
/* Constructor */
102
 
extern dtp51 *new_dtp51(icoms *icom, instType itype, int debug, int verb);
 
97
extern dtp51 *new_dtp51(icoms *icom, instType itype);
103
98
 
104
99
 
105
100