← Back to branch summary

~vibhavp/ubuntu/raring/dahdi-tools/merge-from-debian

« back to all changes in this revision

Viewing changes to xpp/astribank_usb.h

  • Committer: Vibhav Pant
  • Date: 2012-12-26 17:23:16 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: vibhavp@gmail.com-20121226172316-o2jojsfcnr0aqrme
* Merge from Debian unstable. Remaining changes:
  - Bug Fix: If linux-headers are not installed, don't block, and print
    information for the user.
  - added debian/dahdi.postinst
  - added --error-handler=init_failed to debian/rules
  - debian/control: Added gawk as dependency for dkms build (LP: #493304)
  - Changes from Debian:
    - debian/control: Change Maintainer
    - debian/control: Removed Uploaders field.
    - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
    - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source 

Show diffs side-by-side

added added

removed removed

Lines of Context:
xpp/astribank_usb.h
23
23
 */
24
24
 
25
25
#include <stdio.h>
26
 
#include <usb.h>
 
26
#include <xusb.h>
 
27
#include <xtalk.h>
27
28
#include "mpp.h"
28
29
 
29
30
/*
63
64
};
64
65
 
65
66
struct astribank_device {
66
 
        struct usb_device       *dev;
 
67
        struct xusb             *xusb;
 
68
        struct xtalk_device     *xtalk_dev;
67
69
        usb_dev_handle          *handle;
68
70
        int                     my_interface_num;
69
71
        int                     my_ep_out;
70
72
        int                     my_ep_in;
71
 
        char                    iManufacturer[BUFSIZ];
72
 
        char                    iProduct[BUFSIZ];
73
 
        char                    iSerialNumber[BUFSIZ];
74
73
        char                    iInterface[BUFSIZ];
75
74
        int                     is_usb2;
76
75
        enum eeprom_type        eeprom_type;
79
78
        uint8_t                 mpp_proto_version;
80
79
        struct eeprom_table     *eeprom;
81
80
        struct firmware_versions        fw_versions;
82
 
        const struct interface_type     *fwtype;
83
81
        uint16_t                tx_sequenceno;
84
82
};
85
83