From 7659d068f2743c84432f6ead42c77ad7f4010ec6 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Mon, 4 Oct 2010 16:41:24 -0400 Subject: [PATCH] Updated ChangeLog and whitespace --- ChangeLog | 4 ++++ src/probe.cc | 4 ++-- src/probe.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fcd71b5..200f6c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ Release: version 0.17 - 2010/01/?? ------------------------------------------------------------------------------ 2010/10/04 + - merged from Toby Gray: + - missing header in builder.h + - added try/catch in SimpleReadThread() + - added fallback to set_altinterface() in probe - added gettext.h convenience header to support --disable-nls Toby Gray discovered that when --disable-nls is used or on systems that do not support well, it diff --git a/src/probe.cc b/src/probe.cc index c6e99a24..80bcdd91 100644 --- a/src/probe.cc +++ b/src/probe.cc @@ -240,7 +240,7 @@ void Probe::ProbeDevice(Usb::DeviceIDType devid) if( !result.m_ep.IsComplete() ) { // Probing of end-points failed, so try reprobing // after calling usb_set_altinterface(). - // + // // Calling usb_set_altinterface() should be harmless // and can help the host and device to synchronize the // USB state, especially on FreeBSD and Mac OS X. @@ -331,7 +331,7 @@ void Probe::ProbeDeviceEndpoints(Device &dev, EndpointDiscovery &ed, ProbeResult result.m_epModem = ep; } } - } + } } bool Probe::ProbePair(Usb::Device &dev, diff --git a/src/probe.h b/src/probe.h index c9ff08cc..e064dec9 100644 --- a/src/probe.h +++ b/src/probe.h @@ -47,7 +47,7 @@ struct BXEXPORT ProbeResult bool m_needClearHalt; // Specifieds if it's necessary to call usb_set_altinterface() // before attempting to use the end points for this device. - // + // // This can help to re-synchronize the state between the USB // host and the device. However it can also cause usb-storage // URBs to be lost on some device, so it's only used as a -- 2.11.4.GIT