probe.h   probe.h 
skipping to change at line 48 skipping to change at line 48
uint8_t m_zeroSocketSequence; uint8_t m_zeroSocketSequence;
std::string m_description; std::string m_description;
}; };
std::ostream& operator<< (std::ostream &os, const ProbeResult &pr); std::ostream& operator<< (std::ostream &os, const ProbeResult &pr);
class Probe class Probe
{ {
std::vector<ProbeResult> m_results; std::vector<ProbeResult> m_results;
std::vector<std::string> m_fail_msgs;
int m_fail_count;
bool CheckSize(const Data &data, unsigned int required); bool CheckSize(const Data &data, unsigned int required);
bool ParsePIN(const Data &data, ProbeResult &result); bool ParsePIN(const Data &data, ProbeResult &result);
bool ParseDesc(const Data &data, ProbeResult &result); bool ParseDesc(const Data &data, ProbeResult &result);
protected: protected:
void ProbeMatching(int vendor, int product,
const char *busname, const char *devname);
void ProbeDevice(Usb::DeviceIDType devid); void ProbeDevice(Usb::DeviceIDType devid);
public: public:
Probe(); Probe(const char *busname = 0, const char *devname = 0);
int GetCount() const { return m_results.size(); } int GetCount() const { return m_results.size(); }
int GetFailCount() const { return m_fail_count; }
const std::string& GetFailMsg(int index) const { return m_fail_msgs[
index]; }
const ProbeResult& Get(int index) const { return m_results[index]; } const ProbeResult& Get(int index) const { return m_results[index]; }
int FindActive(uint32_t pin = 0) const; // returns -1 if pin not fou nd int FindActive(uint32_t pin = 0) const; // returns -1 if pin not fou nd
// or if no devices // or if no devices
}; };
} // namespace Barry } // namespace Barry
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added


 usbwrap.h   usbwrap.h 
skipping to change at line 76 skipping to change at line 76
typedef struct usb_device* DeviceIDType; typedef struct usb_device* DeviceIDType;
typedef struct usb_dev_handle* DeviceHandleType; typedef struct usb_dev_handle* DeviceHandleType;
class Match class Match
{ {
private: private:
struct usb_bus *m_busses; struct usb_bus *m_busses;
struct usb_device *m_dev; struct usb_device *m_dev;
int m_vendor, m_product; int m_vendor, m_product;
int m_lasterror; int m_lasterror;
const char *m_busname;
const char *m_devname;
protected:
static bool ToNum(const char *str, long &num);
static bool NameCompare(const char *n1, const char *n2);
public: public:
Match(int vendor, int product); Match(int vendor, int product,
const char *busname = 0, const char *devname = 0);
~Match(); ~Match();
// searches for next match, and if found, fills devid with // searches for next match, and if found, fills devid with
// something you can pass on to DeviceDiscover, etc // something you can pass on to DeviceDiscover, etc
// returns true if next is found, false if no more // returns true if next is found, false if no more
bool next_device(Usb::DeviceIDType *devid); bool next_device(Usb::DeviceIDType *devid);
}; };
class Device class Device
{ {
skipping to change at line 123 skipping to change at line 129
///////////////////////////// /////////////////////////////
// IO functions // IO functions
bool BulkRead(int ep, Barry::Data &data, int timeout = -1); bool BulkRead(int ep, Barry::Data &data, int timeout = -1);
bool BulkWrite(int ep, const Barry::Data &data, int timeout = -1); bool BulkWrite(int ep, const Barry::Data &data, int timeout = -1);
bool BulkWrite(int ep, const void *data, size_t size, int timeout = -1); bool BulkWrite(int ep, const void *data, size_t size, int timeout = -1);
bool InterruptRead(int ep, Barry::Data &data, int timeout = -1); bool InterruptRead(int ep, Barry::Data &data, int timeout = -1);
bool InterruptWrite(int ep, const Barry::Data &data, int timeout = - 1); bool InterruptWrite(int ep, const Barry::Data &data, int timeout = - 1);
void BulkDrain(int ep); void BulkDrain(int ep);
/////////////////////////////
// Combo functions
bool GetConfiguration(unsigned char &cfg);
}; };
class Interface class Interface
{ {
Device &m_dev; Device &m_dev;
int m_iface; int m_iface;
public: public:
Interface(Device &dev, int iface); Interface(Device &dev, int iface);
~Interface(); ~Interface();
}; };
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/