diff --git a/DSLogic-gui/CMakeLists.txt b/DSLogic-gui/CMakeLists.txt index 87d693ad..70550081 100644 --- a/DSLogic-gui/CMakeLists.txt +++ b/DSLogic-gui/CMakeLists.txt @@ -86,7 +86,7 @@ set(DS_DESCRIPTION "A GUI for DSLogic") set(DS_VERSION_MAJOR 0) set(DS_VERSION_MINOR 2) -set(DS_VERSION_MICRO 0) +set(DS_VERSION_MICRO 1) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) @@ -191,7 +191,6 @@ set(DSLogic_HEADERS set(DSLogic_FORMS pv/dialogs/about.ui - pv/dialogs/search.ui pv/decoder/dmx512config.ui pv/decoder/i2cconfig.ui pv/decoder/serialconfig.ui diff --git a/DSLogic-gui/main.cpp b/DSLogic-gui/main.cpp index 8ae7a66c..807f3ced 100644 --- a/DSLogic-gui/main.cpp +++ b/DSLogic-gui/main.cpp @@ -61,9 +61,9 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); // Set some application metadata - QApplication::setApplicationVersion(DS_VERSION_STRING); - QApplication::setApplicationName("DSLogic(Beta)"); - QApplication::setOrganizationDomain("http://www.DreamSourceLab.com"); + QApplication::setApplicationVersion(DS_VERSION_STRING); + QApplication::setApplicationName("DSLogic(Beta)"); + QApplication::setOrganizationDomain("http://www.DreamSourceLab.com"); // Parse arguments while (1) { @@ -134,11 +134,11 @@ int main(int argc, char *argv[]) pv::DeviceManager device_manager(sr_ctx); // Initialise the main window - pv::MainWindow w(device_manager, open_file); - QFile qss(":/stylesheet.qss"); - qss.open(QFile::ReadOnly); - a.setStyleSheet(qss.readAll()); - qss.close(); + pv::MainWindow w(device_manager, open_file); + QFile qss(":/stylesheet.qss"); + qss.open(QFile::ReadOnly); + a.setStyleSheet(qss.readAll()); + qss.close(); w.show(); // Run the application diff --git a/DSLogic-gui/pv/data/analog.cpp b/DSLogic-gui/pv/data/analog.cpp index a62e2884..d4e6304c 100644 --- a/DSLogic-gui/pv/data/analog.cpp +++ b/DSLogic-gui/pv/data/analog.cpp @@ -35,12 +35,12 @@ Analog::Analog(unsigned int num_probes, uint64_t samplerate) : { } -void Analog::push_snapshot(shared_ptr &snapshot) +void Analog::push_snapshot(boost::shared_ptr &snapshot) { _snapshots.push_front(snapshot); } -deque< shared_ptr >& Analog::get_snapshots() +deque< boost::shared_ptr >& Analog::get_snapshots() { return _snapshots; } diff --git a/DSLogic-gui/pv/data/analogsnapshot.cpp b/DSLogic-gui/pv/data/analogsnapshot.cpp index 3ff8e804..f613983c 100644 --- a/DSLogic-gui/pv/data/analogsnapshot.cpp +++ b/DSLogic-gui/pv/data/analogsnapshot.cpp @@ -49,7 +49,7 @@ const uint64_t AnalogSnapshot::EnvelopeDataUnit = 64*1024; // bytes AnalogSnapshot::AnalogSnapshot(const sr_datafeed_analog &analog, uint64_t _total_sample_len, unsigned int channel_num) : Snapshot(sizeof(uint16_t), _total_sample_len, channel_num) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); memset(_envelope_levels, 0, sizeof(_envelope_levels)); init(_total_sample_len * channel_num); append_payload(analog); @@ -57,7 +57,7 @@ AnalogSnapshot::AnalogSnapshot(const sr_datafeed_analog &analog, uint64_t _total AnalogSnapshot::~AnalogSnapshot() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); BOOST_FOREACH(Envelope &e, _envelope_levels[0]) free(e.samples); } @@ -65,7 +65,7 @@ AnalogSnapshot::~AnalogSnapshot() void AnalogSnapshot::append_payload( const sr_datafeed_analog &analog) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); append_data(analog.data, analog.num_samples); // Generate the first mip-map from the data @@ -81,7 +81,7 @@ const uint16_t* AnalogSnapshot::get_samples( assert(end_sample < (int64_t)get_sample_count()); assert(start_sample <= end_sample); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); // uint16_t *const data = new uint16_t[end_sample - start_sample]; // memcpy(data, (uint16_t*)_data + start_sample, sizeof(uint16_t) * @@ -97,7 +97,7 @@ void AnalogSnapshot::get_envelope_section(EnvelopeSection &s, assert(start <= end); assert(min_length > 0); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const unsigned int min_level = max((int)floorf(logf(min_length) / LogEnvelopeScaleFactor) - 1, 0); diff --git a/DSLogic-gui/pv/data/dso.cpp b/DSLogic-gui/pv/data/dso.cpp index 079d617e..fc967ffd 100644 --- a/DSLogic-gui/pv/data/dso.cpp +++ b/DSLogic-gui/pv/data/dso.cpp @@ -34,12 +34,12 @@ Dso::Dso(unsigned int num_probes, uint64_t samplerate) : { } -void Dso::push_snapshot(shared_ptr &snapshot) +void Dso::push_snapshot(boost::shared_ptr &snapshot) { _snapshots.push_front(snapshot); } -deque< shared_ptr >& Dso::get_snapshots() +deque< boost::shared_ptr >& Dso::get_snapshots() { return _snapshots; } diff --git a/DSLogic-gui/pv/data/dsosnapshot.cpp b/DSLogic-gui/pv/data/dsosnapshot.cpp index 6c340b99..b121a01c 100644 --- a/DSLogic-gui/pv/data/dsosnapshot.cpp +++ b/DSLogic-gui/pv/data/dsosnapshot.cpp @@ -48,7 +48,7 @@ const uint64_t DsoSnapshot::EnvelopeDataUnit = 64*1024; // bytes DsoSnapshot::DsoSnapshot(const sr_datafeed_dso &dso, uint64_t _total_sample_len, unsigned int channel_num) : Snapshot(sizeof(uint16_t), _total_sample_len, channel_num) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); memset(_envelope_levels, 0, sizeof(_envelope_levels)); init(_total_sample_len * channel_num); append_payload(dso); @@ -56,14 +56,14 @@ DsoSnapshot::DsoSnapshot(const sr_datafeed_dso &dso, uint64_t _total_sample_len, DsoSnapshot::~DsoSnapshot() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); BOOST_FOREACH(Envelope &e, _envelope_levels[0]) free(e.samples); } void DsoSnapshot::append_payload(const sr_datafeed_dso &dso) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); append_data(dso.data, dso.num_samples); // Generate the first mip-map from the data @@ -79,7 +79,7 @@ const uint16_t* DsoSnapshot::get_samples( assert(end_sample < (int64_t)get_sample_count()); assert(start_sample <= end_sample); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); // uint16_t *const data = new uint16_t[end_sample - start_sample]; // memcpy(data, (uint16_t*)_data + start_sample, sizeof(uint16_t) * @@ -95,7 +95,7 @@ void DsoSnapshot::get_envelope_section(EnvelopeSection &s, assert(start <= end); assert(min_length > 0); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const unsigned int min_level = max((int)floorf(logf(min_length) / LogEnvelopeScaleFactor) - 1, 0); diff --git a/DSLogic-gui/pv/data/group.cpp b/DSLogic-gui/pv/data/group.cpp index 26cccd7f..6df3ee88 100644 --- a/DSLogic-gui/pv/data/group.cpp +++ b/DSLogic-gui/pv/data/group.cpp @@ -35,12 +35,12 @@ Group::Group(unsigned int num_probes, uint64_t samplerate) : { } -void Group::push_snapshot(shared_ptr &snapshot) +void Group::push_snapshot(boost::shared_ptr &snapshot) { _snapshots.push_back(snapshot); } -deque< shared_ptr >& Group::get_snapshots() +deque< boost::shared_ptr >& Group::get_snapshots() { return _snapshots; } diff --git a/DSLogic-gui/pv/data/groupsnapshot.cpp b/DSLogic-gui/pv/data/groupsnapshot.cpp index d46da5bd..939ffca6 100644 --- a/DSLogic-gui/pv/data/groupsnapshot.cpp +++ b/DSLogic-gui/pv/data/groupsnapshot.cpp @@ -51,11 +51,11 @@ const uint16_t GroupSnapshot::value_mask[16] = {0x1, 0x2, 0x4, 0x8, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000}; -GroupSnapshot::GroupSnapshot(const shared_ptr &_logic_snapshot, std::list index_list) +GroupSnapshot::GroupSnapshot(const boost::shared_ptr &_logic_snapshot, std::list index_list) { assert(_logic_snapshot); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); memset(_envelope_levels, 0, sizeof(_envelope_levels)); _data = _logic_snapshot->get_data(); _sample_count = _logic_snapshot->get_sample_count(); @@ -66,20 +66,20 @@ GroupSnapshot::GroupSnapshot(const shared_ptr &_logic_snapshot, s GroupSnapshot::~GroupSnapshot() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); BOOST_FOREACH(Envelope &e, _envelope_levels) free(e.samples); } uint64_t GroupSnapshot::get_sample_count() const { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); return _sample_count; } void GroupSnapshot::append_payload() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); // Generate the first mip-map from the data append_payload_to_envelope_levels(); @@ -96,7 +96,7 @@ const uint16_t* GroupSnapshot::get_samples( int64_t i; uint64_t pow; - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); uint16_t *const data = new uint16_t[end_sample - start_sample]; // memcpy(data, (uint16_t*)_data + start_sample, sizeof(uint16_t) * @@ -121,7 +121,7 @@ void GroupSnapshot::get_envelope_section(EnvelopeSection &s, assert(start <= end); assert(min_length > 0); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const unsigned int min_level = max((int)floorf(logf(min_length) / LogEnvelopeScaleFactor) - 1, 0); diff --git a/DSLogic-gui/pv/data/logic.cpp b/DSLogic-gui/pv/data/logic.cpp index 036cc543..4cdfe2ae 100644 --- a/DSLogic-gui/pv/data/logic.cpp +++ b/DSLogic-gui/pv/data/logic.cpp @@ -37,12 +37,12 @@ Logic::Logic(unsigned int num_probes, uint64_t samplerate) : } void Logic::push_snapshot( - shared_ptr &snapshot) + boost::shared_ptr &snapshot) { _snapshots.push_front(snapshot); } -deque< shared_ptr >& Logic::get_snapshots() +deque< boost::shared_ptr >& Logic::get_snapshots() { return _snapshots; } diff --git a/DSLogic-gui/pv/data/logicsnapshot.cpp b/DSLogic-gui/pv/data/logicsnapshot.cpp index e01386a4..9a6b2d2e 100644 --- a/DSLogic-gui/pv/data/logicsnapshot.cpp +++ b/DSLogic-gui/pv/data/logicsnapshot.cpp @@ -47,7 +47,7 @@ LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic, uint64_t _total_sam Snapshot(logic.unitsize, _total_sample_len, channel_num), _last_append_sample(0) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); memset(_mip_map, 0, sizeof(_mip_map)); if (init(_total_sample_len * channel_num) == SR_OK) append_payload(logic); @@ -55,7 +55,7 @@ LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic, uint64_t _total_sam LogicSnapshot::~LogicSnapshot() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); BOOST_FOREACH(MipMapLevel &l, _mip_map) free(l.data); } @@ -66,7 +66,7 @@ void LogicSnapshot::append_payload( assert(_unit_size == logic.unitsize); assert((logic.length % _unit_size) == 0); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); append_data(logic.data, logic.length / _unit_size); @@ -194,7 +194,7 @@ void LogicSnapshot::get_subsampled_edges( assert(sig_index >= 0); assert(sig_index < 64); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const uint64_t block_length = (uint64_t)max(min_length, 1.0f); const unsigned int min_level = max((int)floorf(logf(min_length) / @@ -378,7 +378,7 @@ int LogicSnapshot::get_first_edge( assert(sig_index >= 0); assert(sig_index < 64); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const uint64_t block_length = 1; const unsigned int min_level = 0; @@ -550,7 +550,7 @@ void LogicSnapshot::get_edges( assert(sig_index >= 0); assert(sig_index < 64); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const uint64_t block_length = 1; const unsigned int min_level = 0; @@ -706,7 +706,7 @@ uint64_t LogicSnapshot::get_min_pulse(uint64_t start, uint64_t end, int sig_inde assert(sig_index >= 0); assert(sig_index < 64); - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); const uint64_t block_length = 1; const unsigned int min_level = 0; diff --git a/DSLogic-gui/pv/data/snapshot.cpp b/DSLogic-gui/pv/data/snapshot.cpp index 8cf4b6ff..f05452a0 100644 --- a/DSLogic-gui/pv/data/snapshot.cpp +++ b/DSLogic-gui/pv/data/snapshot.cpp @@ -40,13 +40,13 @@ Snapshot::Snapshot(int unit_size, uint64_t total_sample_count, unsigned int chan _ring_sample_count(0), _unit_size(unit_size) { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); assert(_unit_size > 0); } Snapshot::~Snapshot() { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); if (_data != NULL) free(_data); _data = NULL; @@ -73,31 +73,31 @@ bool Snapshot::buf_null() const uint64_t Snapshot::get_sample_count() const { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); return _sample_count / _channel_num; } void* Snapshot::get_data() const { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); return _data; } int Snapshot::get_unit_size() const { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); return _unit_size; } unsigned int Snapshot::get_channel_num() const { - lock_guard lock(_mutex); + boost::lock_guard lock(_mutex); return _channel_num; } void Snapshot::append_data(void *data, uint64_t samples) { -// lock_guard lock(_mutex); +// boost::lock_guard lock(_mutex); // _data = realloc(_data, (_sample_count + samples) * _unit_size + // sizeof(uint64_t)); if (_sample_count + samples < _total_sample_count) diff --git a/DSLogic-gui/pv/decoder/ds1wire.cpp b/DSLogic-gui/pv/decoder/ds1wire.cpp index 1f8d759f..04d3ec38 100644 --- a/DSLogic-gui/pv/decoder/ds1wire.cpp +++ b/DSLogic-gui/pv/decoder/ds1wire.cpp @@ -53,7 +53,7 @@ const QString ds1Wire::StateTable[TableSize] = { "DATA" }; -ds1Wire::ds1Wire(shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : +ds1Wire::ds1Wire(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : Decoder(data, _sel_probes, _options_index) { (void)_options; @@ -91,12 +91,12 @@ void ds1Wire::decode() _max_width = 0; uint8_t cur_state = Unknown; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); uint64_t flag_index1; @@ -336,11 +336,11 @@ void ds1Wire::get_subsampled_states(std::vector &states, { ds_view_state view_state; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); assert(end <= snapshot->get_sample_count()); diff --git a/DSLogic-gui/pv/decoder/dsdmx512.cpp b/DSLogic-gui/pv/decoder/dsdmx512.cpp index 19894ecf..846f2833 100644 --- a/DSLogic-gui/pv/decoder/dsdmx512.cpp +++ b/DSLogic-gui/pv/decoder/dsdmx512.cpp @@ -53,7 +53,7 @@ const QString dsDmx512::StateTable[TableSize] = { "SLOT" }; -dsDmx512::dsDmx512(shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : +dsDmx512::dsDmx512(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : Decoder(data, _sel_probes, _options_index) { (void)_options; @@ -91,12 +91,12 @@ void dsDmx512::decode() _max_width = 0; uint8_t cur_state = Unknown; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); //uint64_t flag_index; @@ -261,11 +261,11 @@ void dsDmx512::get_subsampled_states(std::vector &states, { ds_view_state view_state; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); assert(end <= snapshot->get_sample_count()); diff --git a/DSLogic-gui/pv/decoder/dsi2c.cpp b/DSLogic-gui/pv/decoder/dsi2c.cpp index 9f61b869..b2bc440c 100644 --- a/DSLogic-gui/pv/decoder/dsi2c.cpp +++ b/DSLogic-gui/pv/decoder/dsi2c.cpp @@ -52,7 +52,7 @@ const QString dsI2c::StateTable[TableSize] = { "DATA" }; -dsI2c::dsI2c(shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : +dsI2c::dsI2c(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : Decoder(data, _sel_probes, _options_index) { (void)_options; @@ -91,12 +91,12 @@ void dsI2c::decode() _max_width = 0; uint8_t cur_state = Unknown; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); uint64_t flag_index; @@ -185,7 +185,7 @@ void dsI2c::cmd_decode(const boost::shared_ptr &snapshot) } } -void dsI2c::data_decode(const shared_ptr &snapshot) +void dsI2c::data_decode(const boost::shared_ptr &snapshot) { uint8_t cur_state; const uint8_t *src_ptr; @@ -246,11 +246,11 @@ void dsI2c::get_subsampled_states(std::vector &states, { ds_view_state view_state; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); assert(end <= snapshot->get_sample_count()); diff --git a/DSLogic-gui/pv/decoder/dsserial.cpp b/DSLogic-gui/pv/decoder/dsserial.cpp index 6e963f95..aee9a4ca 100644 --- a/DSLogic-gui/pv/decoder/dsserial.cpp +++ b/DSLogic-gui/pv/decoder/dsserial.cpp @@ -53,7 +53,7 @@ const QString dsSerial::StateTable[TableSize] = { "DATA" }; -dsSerial::dsSerial(shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : +dsSerial::dsSerial(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : Decoder(data, _sel_probes, _options_index) { assert(_sel_probes.size() == 1); @@ -102,12 +102,12 @@ void dsSerial::decode() assert(_data); uint8_t cur_state = Unknown; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); uint64_t flag_index; @@ -174,7 +174,7 @@ void dsSerial::decode() } -void dsSerial::data_decode(const shared_ptr &snapshot, uint64_t start, uint64_t stop, float samplesPerBit) +void dsSerial::data_decode(const boost::shared_ptr &snapshot, uint64_t start, uint64_t stop, float samplesPerBit) { (void)stop; @@ -238,11 +238,11 @@ void dsSerial::get_subsampled_states(std::vector &states, { ds_view_state view_state; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); assert(end <= snapshot->get_sample_count()); diff --git a/DSLogic-gui/pv/decoder/dsspi.cpp b/DSLogic-gui/pv/decoder/dsspi.cpp index 88ff8db0..3b95507d 100644 --- a/DSLogic-gui/pv/decoder/dsspi.cpp +++ b/DSLogic-gui/pv/decoder/dsspi.cpp @@ -45,7 +45,7 @@ const QString dsSpi::StateTable[TableSize] = { "DATA" }; -dsSpi::dsSpi(shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : +dsSpi::dsSpi(boost::shared_ptr data, std::list _sel_probes, QMap &_options, QMap _options_index) : Decoder(data, _sel_probes, _options_index) { _cpol = _options.value("cpol").toBool(); @@ -125,12 +125,12 @@ void dsSpi::decode() _max_width = 0; uint8_t cur_state = Unknown; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); const uint64_t ssn_mask = 1ULL << _ssn_index; @@ -191,7 +191,7 @@ void dsSpi::decode() } } -void dsSpi::data_decode(const shared_ptr &snapshot) +void dsSpi::data_decode(const boost::shared_ptr &snapshot) { uint8_t cur_state; const uint8_t *src_ptr; @@ -256,11 +256,11 @@ void dsSpi::get_subsampled_states(std::vector &states, { ds_view_state view_state; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); assert(end <= snapshot->get_sample_count()); diff --git a/DSLogic-gui/pv/dialogs/deviceoptions.cpp b/DSLogic-gui/pv/dialogs/deviceoptions.cpp index f0cadde2..8dfd14a6 100644 --- a/DSLogic-gui/pv/dialogs/deviceoptions.cpp +++ b/DSLogic-gui/pv/dialogs/deviceoptions.cpp @@ -50,6 +50,7 @@ DeviceOptions::DeviceOptions(QWidget *parent, struct sr_dev_inst *sdi) : setWindowTitle(tr("Configure Device")); setLayout(&_layout); + _last_mode = sdi->mode; _mode_comboBox.addItem(mode_strings[LOGIC]); _mode_comboBox.addItem(mode_strings[DSO]); _mode_comboBox.addItem(mode_strings[ANALOG]); @@ -78,10 +79,11 @@ void DeviceOptions::accept() QDialog::accept(); + _last_mode = _sdi->mode; // Commit the properties - const vector< shared_ptr > &properties = + const vector< boost::shared_ptr > &properties = _device_options_binding.properties(); - BOOST_FOREACH(shared_ptr p, properties) { + BOOST_FOREACH(boost::shared_ptr p, properties) { assert(p); p->commit(); } @@ -97,6 +99,15 @@ void DeviceOptions::accept() } } +void DeviceOptions::reject() +{ + using namespace Qt; + QDialog::reject(); + + // Mode Recovery + sr_config_set(_sdi, SR_CONF_DEVICE_MODE, g_variant_new_string(_mode_comboBox.itemText(_last_mode).toLocal8Bit())); +} + QWidget* DeviceOptions::get_property_form() { QWidget *const form = new QWidget(this); @@ -104,9 +115,9 @@ QWidget* DeviceOptions::get_property_form() form->setLayout(layout); layout->addRow("Device Mode", &_mode_comboBox); - const vector< shared_ptr > &properties = + const vector< boost::shared_ptr > &properties = _device_options_binding.properties(); - BOOST_FOREACH(shared_ptr p, properties) + BOOST_FOREACH(boost::shared_ptr p, properties) { assert(p); const QString label = p->labeled_widget() ? QString() : p->name(); @@ -183,7 +194,8 @@ void DeviceOptions::disable_all_probes() void DeviceOptions::mode_changed(QString mode) { - sr_config_set(_sdi, SR_CONF_DEVICE_MODE, g_variant_new_string(mode.toLocal8Bit())); + // Commit mode + sr_config_set(_sdi, SR_CONF_DEVICE_MODE, g_variant_new_string(_mode_comboBox.currentText().toLocal8Bit())); setup_probes(); } diff --git a/DSLogic-gui/pv/dialogs/deviceoptions.h b/DSLogic-gui/pv/dialogs/deviceoptions.h index 2ee2534a..ad804d22 100644 --- a/DSLogic-gui/pv/dialogs/deviceoptions.h +++ b/DSLogic-gui/pv/dialogs/deviceoptions.h @@ -51,6 +51,7 @@ public: protected: void accept(); + void reject(); private: @@ -67,6 +68,7 @@ private slots: private: struct sr_dev_inst *const _sdi; + int _last_mode; QVBoxLayout _layout; diff --git a/DSLogic-gui/pv/dialogs/search.cpp b/DSLogic-gui/pv/dialogs/search.cpp index 50c15c9d..59454913 100644 --- a/DSLogic-gui/pv/dialogs/search.cpp +++ b/DSLogic-gui/pv/dialogs/search.cpp @@ -22,33 +22,55 @@ #include "search.h" -#include "ui_search.h" #include +#include namespace pv { namespace dialogs { Search::Search(QWidget *parent, struct sr_dev_inst *sdi, QString pattern) : QDialog(parent), - ui(new Ui::Search), _sdi(sdi) { assert(_sdi); - ui->setupUi(this); + + QFont font("Monaco"); + font.setStyleHint(QFont::Monospace); + font.setFixedPitch(true); QRegExp value_rx("[10XRFCxrfc ]+"); QValidator *value_validator = new QRegExpValidator(value_rx, this); - //ui->_value_lineEdit->setText("X X X X X X X X X X X X X X X X"); - ui->_value_lineEdit->setText(pattern); - ui->_value_lineEdit->setValidator(value_validator); - ui->_value_lineEdit->setMaxLength(16 * 2 - 1); - ui->_value_lineEdit->setInputMask("X X X X X X X X X X X X X X X X"); + + search_lineEdit.setText(pattern); + search_lineEdit.setValidator(value_validator); + search_lineEdit.setMaxLength(16 * 2 - 1); + search_lineEdit.setInputMask("X X X X X X X X X X X X X X X X"); + search_lineEdit.setFont(font); + + QLabel *search_label = new QLabel("1 1 1 1 1\n5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0"); + search_label->setFont(font); + + search_buttonBox.addButton(QDialogButtonBox::Ok); + search_buttonBox.addButton(QDialogButtonBox::Cancel); + + QGridLayout *search_layout = new QGridLayout(); + search_layout->addWidget(search_label, 0, 1); + search_layout->addWidget(new QLabel("Search Value: "), 1,0, Qt::AlignRight); + search_layout->addWidget(&search_lineEdit, 1, 1); + search_layout->addWidget(new QLabel(" "), 2,0); + search_layout->addWidget(new QLabel("X: Don't care\n0: Low level\n1: High level\nR: Rising edge\nF: Falling edge\nC: Rising/Falling edge"), 3, 0); + search_layout->addWidget(&search_buttonBox, 4, 2); + //search_layout->addStretch(1); + + setLayout(search_layout); + + connect(&search_buttonBox, SIGNAL(accepted()), this, SLOT(accept())); + connect(&search_buttonBox, SIGNAL(rejected()), this, SLOT(reject())); } Search::~Search() { - delete ui; } void Search::accept() @@ -60,7 +82,7 @@ void Search::accept() QString Search::get_pattern() { - QString pattern = ui->_value_lineEdit->text(); + QString pattern = search_lineEdit.text(); //pattern.remove(QChar('/r'), Qt::CaseInsensitive); return pattern; } diff --git a/DSLogic-gui/pv/dialogs/search.h b/DSLogic-gui/pv/dialogs/search.h index a4dea4cc..07c3312b 100644 --- a/DSLogic-gui/pv/dialogs/search.h +++ b/DSLogic-gui/pv/dialogs/search.h @@ -27,13 +27,12 @@ #include #include #include +#include +#include +#include #include "../sigsession.h" #include -namespace Ui { -class Search; -} - namespace pv { namespace dialogs { @@ -56,7 +55,8 @@ signals: public slots: private: - Ui::Search *ui; + QLineEdit search_lineEdit; + QDialogButtonBox search_buttonBox; sr_dev_inst *_sdi; }; diff --git a/DSLogic-gui/pv/dock/triggerdock.cpp b/DSLogic-gui/pv/dock/triggerdock.cpp index f035bd6b..d5fc8904 100644 --- a/DSLogic-gui/pv/dock/triggerdock.cpp +++ b/DSLogic-gui/pv/dock/triggerdock.cpp @@ -42,6 +42,10 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession &session) : { int i; + QFont font("Monaco"); + font.setStyleHint(QFont::Monospace); + font.setFixedPitch(true); + simple_radioButton = new QRadioButton("Simple Trigger", this); simple_radioButton->setChecked(true); adv_radioButton = new QRadioButton("Advanced Trigger", this); @@ -77,6 +81,7 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession &session) : _logic_comboBox_list.push_back(_logic_comboBox); QLineEdit *_value0_lineEdit = new QLineEdit("X X X X X X X X X X X X X X X X", this); + _value0_lineEdit->setFont(font); _value0_lineEdit->setValidator(value_validator); _value0_lineEdit->setMaxLength(TriggerProbes * 2 - 1); _value0_lineEdit->setInputMask("X X X X X X X X X X X X X X X X"); @@ -91,6 +96,7 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession &session) : _inv0_comboBox_list.push_back(_inv0_comboBox); QLineEdit *_value1_lineEdit = new QLineEdit("X X X X X X X X X X X X X X X X", this); + _value1_lineEdit->setFont(font); _value1_lineEdit->setValidator(value_validator); _value1_lineEdit->setMaxLength(TriggerProbes * 2 - 1); _value1_lineEdit->setInputMask("X X X X X X X X X X X X X X X X"); @@ -104,15 +110,14 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession &session) : _inv1_comboBox->addItem(tr("!=")); _inv1_comboBox_list.push_back(_inv1_comboBox); - QLabel *value_exp0_label = new QLabel("1 1 1 1 1 1", this); - QLabel *value_exp1_label = new QLabel("5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0", this); + QLabel *value_exp_label = new QLabel("1 1 1 1 1 1\n5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0", this); QLabel *inv_exp_label = new QLabel("Inv", this); QLabel *count_exp_label = new QLabel("Counter", this); + value_exp_label->setFont(font); QVBoxLayout *stage_layout = new QVBoxLayout(); QGridLayout *stage_glayout = new QGridLayout(); - stage_glayout->addWidget(value_exp0_label, 0, 0); - stage_glayout->addWidget(value_exp1_label, 1, 0); + stage_glayout->addWidget(value_exp_label, 1, 0); stage_glayout->addWidget(inv_exp_label, 1, 1); stage_glayout->addWidget(count_exp_label, 1, 2); stage_glayout->addWidget(_value0_lineEdit, 2, 0); @@ -123,13 +128,8 @@ TriggerDock::TriggerDock(QWidget *parent, SigSession &session) : stage_glayout->addWidget(_inv1_comboBox, 3, 1); stage_glayout->addWidget(_count1_spinBox, 3, 2); stage_layout->addLayout(stage_glayout); - stage_layout->addSpacing(124); - stage_layout->addWidget(new QLabel("X: Don't care")); - stage_layout->addWidget(new QLabel("0: Low level")); - stage_layout->addWidget(new QLabel("1: High level")); - stage_layout->addWidget(new QLabel("R: Rising edge")); - stage_layout->addWidget(new QLabel("F: Falling edge")); - stage_layout->addWidget(new QLabel("C: Rising/Falling edge")); + stage_layout->addSpacing(160); + stage_layout->addWidget(new QLabel("X: Don't care\n0: Low level\n1: High level\nR: Rising edge\nF: Falling edge\nC: Rising/Falling edge")); stage_layout->addStretch(1); QGroupBox *_stage_groupBox = new QGroupBox("Stage"+QString::number(i), this); diff --git a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp b/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp index 38781a23..d5a75000 100644 --- a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp +++ b/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp @@ -132,13 +132,13 @@ void DeviceOptions::config_setter( void DeviceOptions::bind_bool(const QString &name, int key) { - _properties.push_back(shared_ptr( + _properties.push_back(boost::shared_ptr( new Bool(name, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); } void DeviceOptions::bind_enum(const QString &name, int key, - GVariant *const gvar_list, function printer) + GVariant *const gvar_list, boost::function printer) { GVariant *gvar; GVariantIter iter; @@ -150,7 +150,7 @@ void DeviceOptions::bind_enum(const QString &name, int key, while ((gvar = g_variant_iter_next_value (&iter))) values.push_back(make_pair(gvar, printer(gvar))); - _properties.push_back(shared_ptr( + _properties.push_back(boost::shared_ptr( new Enum(name, values, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); @@ -159,7 +159,7 @@ void DeviceOptions::bind_enum(const QString &name, int key, void DeviceOptions::bind_int(const QString &name, int key, QString suffix, optional< std::pair > range) { - _properties.push_back(shared_ptr( + _properties.push_back(boost::shared_ptr( new Int(name, suffix, range, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); @@ -198,7 +198,7 @@ void DeviceOptions::bind_samplerate(const QString &name, assert(num_elements == 3); - _properties.push_back(shared_ptr( + _properties.push_back(boost::shared_ptr( new Double(name, 0, QObject::tr("Hz"), make_pair((double)elements[0], (double)elements[1]), (double)elements[2], diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSLogic-gui/pv/sigsession.cpp index 0e44a8b1..fb31442a 100644 --- a/DSLogic-gui/pv/sigsession.cpp +++ b/DSLogic-gui/pv/sigsession.cpp @@ -122,15 +122,18 @@ int SigSession::set_device(struct sr_dev_inst *sdi) { int ret = SR_ERR; - if (sdi) + if (_sdi == NULL) { ret = _device_manager.use_device(sdi, this); - if (ret == SR_OK && (sdi != _sdi) && _sdi) { - _device_manager.release_device(_sdi); - } - if (ret == SR_OK) _sdi = sdi; - - set_capture_state(Init); + set_capture_state(Init); + } else if (sdi != _sdi) { + ret = _device_manager.use_device(sdi, this); + _device_manager.release_device(_sdi); + _sdi = sdi; + set_capture_state(Init); + } else { + ret = SR_OK; + } return ret; } @@ -145,12 +148,12 @@ void SigSession::release_device(struct sr_dev_inst *sdi) void SigSession::save_file(const std::string &name){ if (_sdi->mode == LOGIC) { - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _logic_data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); sr_session_save(name.c_str(), _sdi, @@ -158,12 +161,12 @@ void SigSession::save_file(const std::string &name){ snapshot->get_unit_size(), snapshot->get_sample_count()); } else if (_sdi->mode == DSO){ - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _dso_data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); sr_session_save(name.c_str(), _sdi, @@ -171,12 +174,12 @@ void SigSession::save_file(const std::string &name){ snapshot->get_unit_size(), snapshot->get_sample_count()); } else { - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _analog_data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); sr_session_save(name.c_str(), _sdi, @@ -187,7 +190,7 @@ void SigSession::save_file(const std::string &name){ } void SigSession::load_file(const string &name, - function error_handler) + boost::function error_handler) { stop_capture(); _sampling_thread.reset(new boost::thread( @@ -197,12 +200,12 @@ void SigSession::load_file(const string &name, SigSession::capture_state SigSession::get_capture_state() const { - lock_guard lock(_sampling_mutex); + boost::lock_guard lock(_sampling_mutex); return _capture_state; } void SigSession::start_capture(uint64_t record_length, - function error_handler) + boost::function error_handler) { stop_capture(); @@ -244,15 +247,15 @@ void SigSession::stop_capture() _sampling_thread.reset(); } -vector< shared_ptr > SigSession::get_signals() +vector< boost::shared_ptr > SigSession::get_signals() { - lock_guard lock(_signals_mutex); + boost::lock_guard lock(_signals_mutex); return _signals; } -vector< shared_ptr > SigSession::get_pro_signals() +vector< boost::shared_ptr > SigSession::get_pro_signals() { - lock_guard lock(_signals_mutex); + boost::lock_guard lock(_signals_mutex); return _protocol_signals; } @@ -319,36 +322,36 @@ boost::shared_ptr SigSession::get_data() void* SigSession::get_buf(int& unit_size, uint64_t &length) { if (_sdi->mode == LOGIC) { - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _logic_data->get_snapshots(); if (snapshots.empty()) return NULL; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); unit_size = snapshot->get_unit_size(); length = snapshot->get_sample_count(); return snapshot->get_data(); } else if (_sdi->mode == DSO) { - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _dso_data->get_snapshots(); if (snapshots.empty()) return NULL; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); unit_size = snapshot->get_unit_size(); length = snapshot->get_sample_count(); return snapshot->get_data(); } else { - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _analog_data->get_snapshots(); if (snapshots.empty()) return NULL; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); unit_size = snapshot->get_unit_size(); @@ -359,14 +362,14 @@ void* SigSession::get_buf(int& unit_size, uint64_t &length) void SigSession::set_capture_state(capture_state state) { - lock_guard lock(_sampling_mutex); + boost::lock_guard lock(_sampling_mutex); _capture_state = state; data_updated(); capture_state_changed(state); } void SigSession::load_thread_proc(const string name, - function error_handler) + boost::function error_handler) { if (sr_session_load(name.c_str()) != SR_OK) { error_handler(tr("Failed to load file.")); @@ -395,7 +398,7 @@ void SigSession::load_thread_proc(const string name, void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, uint64_t record_length, - function error_handler) + boost::function error_handler) { assert(sdi); assert(error_handler); @@ -403,7 +406,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, if (!_adv_trigger) { /* simple trigger check trigger_enable */ ds_trigger_set_en(false); - BOOST_FOREACH(const shared_ptr s, _signals) + BOOST_FOREACH(const boost::shared_ptr s, _signals) { assert(s); if (s->get_trig() != 0) { @@ -456,7 +459,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, void SigSession::feed_in_header(const sr_dev_inst *sdi) { - shared_ptr signal; + boost::shared_ptr signal; GVariant *gvar; uint64_t sample_rate = 0; unsigned int logic_probe_count = 0; @@ -513,7 +516,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi) // Create data containers for the coming data snapshots { - lock_guard data_lock(_data_mutex); + boost::lock_guard data_lock(_data_mutex); if (logic_probe_count != 0) { _logic_data.reset(new data::Logic( @@ -537,7 +540,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi) // Set Signal data { - BOOST_FOREACH(const shared_ptr s, _signals) + BOOST_FOREACH(const boost::shared_ptr s, _signals) { assert(s); s->set_data(_logic_data, _dso_data, _analog_data, _group_data); @@ -561,7 +564,7 @@ void SigSession::add_group() if (probe_index_list.size() > 1) { //_group_data.reset(new data::Group(_last_sample_rate)); - const shared_ptr signal = shared_ptr( + const boost::shared_ptr signal = boost::shared_ptr( new view::GroupSignal("New Group", _group_data, probe_index_list, _signals.size(), _group_cnt)); _signals.push_back(signal); @@ -571,7 +574,7 @@ void SigSession::add_group() if (!_cur_group_snapshot) { // Create a new data snapshot - _cur_group_snapshot = shared_ptr( + _cur_group_snapshot = boost::shared_ptr( new data::GroupSnapshot(_logic_data->get_snapshots().front(), signal->get_index_list())); //_cur_group_snapshot->append_payload(); _group_data->push_snapshot(_cur_group_snapshot); @@ -630,7 +633,7 @@ void SigSession::add_protocol(std::list probe_index_list, decoder::Decoder if (probe_index_list.size() > 0) { //_group_data.reset(new data::Group(_last_sample_rate)); - const shared_ptr signal = shared_ptr( + const boost::shared_ptr signal = boost::shared_ptr( new view::ProtocolSignal(decoder->get_decode_name(), _logic_data, decoder, probe_index_list, 0, _protocol_cnt)); _signals.push_back(signal); @@ -685,7 +688,7 @@ void SigSession::del_signal(std::vector< boost::shared_ptr >::iter void SigSession::init_signals(const sr_dev_inst *sdi) { - shared_ptr signal; + boost::shared_ptr signal; GVariant *gvar; uint64_t sample_rate = 0; unsigned int logic_probe_count = 0; @@ -767,19 +770,19 @@ void SigSession::init_signals(const sr_dev_inst *sdi) switch(probe->type) { case SR_PROBE_LOGIC: - signal = shared_ptr( + signal = boost::shared_ptr( new view::LogicSignal(probe->name, _logic_data, probe->index, _signals.size())); break; case SR_PROBE_DSO: - signal = shared_ptr( + signal = boost::shared_ptr( new view::DsoSignal(probe->name, _dso_data, probe->index, _signals.size())); break; case SR_PROBE_ANALOG: - signal = shared_ptr( + signal = boost::shared_ptr( new view::AnalogSignal(probe->name, _analog_data, probe->index, _signals.size())); break; @@ -794,7 +797,7 @@ void SigSession::init_signals(const sr_dev_inst *sdi) void SigSession::update_signals(const sr_dev_inst *sdi) { - shared_ptr signal; + boost::shared_ptr signal; QMap probes_en_table; QMap signals_en_table; int index = 0; @@ -823,19 +826,19 @@ void SigSession::update_signals(const sr_dev_inst *sdi) switch(probe->type) { case SR_PROBE_LOGIC: - signal = shared_ptr( + signal = boost::shared_ptr( new view::LogicSignal(probe->name, _logic_data, probe->index, 0)); break; case SR_PROBE_DSO: - signal = shared_ptr( + signal = boost::shared_ptr( new view::DsoSignal(probe->name, _dso_data, probe->index, _signals.size())); break; case SR_PROBE_ANALOG: - signal = shared_ptr( + signal = boost::shared_ptr( new view::AnalogSignal(probe->name, _analog_data, probe->index, 0)); break; @@ -895,7 +898,7 @@ void SigSession::feed_in_trigger(const ds_trigger_pos &trigger_pos) void SigSession::feed_in_logic(const sr_datafeed_logic &logic) { - lock_guard lock(_data_mutex); + boost::lock_guard lock(_data_mutex); if (!_logic_data) { @@ -910,7 +913,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) if (!_cur_logic_snapshot) { // Create a new data snapshot - _cur_logic_snapshot = shared_ptr( + _cur_logic_snapshot = boost::shared_ptr( new data::LogicSnapshot(logic, _total_sample_len, 1)); if (_cur_logic_snapshot->buf_null()) stop_capture(); @@ -929,7 +932,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) void SigSession::feed_in_dso(const sr_datafeed_dso &dso) { - lock_guard lock(_data_mutex); + boost::lock_guard lock(_data_mutex); if(!_dso_data) { @@ -940,7 +943,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso) if (!_cur_dso_snapshot) { // Create a new data snapshot - _cur_dso_snapshot = shared_ptr( + _cur_dso_snapshot = boost::shared_ptr( new data::DsoSnapshot(dso, _total_sample_len, _dso_data->get_num_probes())); if (_cur_dso_snapshot->buf_null()) stop_capture(); @@ -959,7 +962,7 @@ void SigSession::feed_in_dso(const sr_datafeed_dso &dso) void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { - lock_guard lock(_data_mutex); + boost::lock_guard lock(_data_mutex); if(!_analog_data) { @@ -970,7 +973,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) if (!_cur_analog_snapshot) { // Create a new data snapshot - _cur_analog_snapshot = shared_ptr( + _cur_analog_snapshot = boost::shared_ptr( new data::AnalogSnapshot(analog, _total_sample_len, _analog_data->get_num_probes())); if (_cur_analog_snapshot->buf_null()) stop_capture(); @@ -1027,12 +1030,12 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, case SR_DF_END: { { - lock_guard lock(_data_mutex); - BOOST_FOREACH(const shared_ptr s, _signals) + boost::lock_guard lock(_data_mutex); + BOOST_FOREACH(const boost::shared_ptr s, _signals) { assert(s); if (s->get_type() == view::Signal::DS_GROUP) { - _cur_group_snapshot = shared_ptr( + _cur_group_snapshot = boost::shared_ptr( new data::GroupSnapshot(_logic_data->get_snapshots().front(), s->get_index_list())); //_cur_group_snapshot->append_payload(); _group_data->push_snapshot(_cur_group_snapshot); @@ -1093,7 +1096,7 @@ void SigSession::rst_protocol_analyzer(int rst_index, std::list _sel_prob if (_logic_data) _decoders.at(rst_index).first->recode(_sel_probes, _options, _options_index); - BOOST_FOREACH(const shared_ptr s, _signals) + BOOST_FOREACH(const boost::shared_ptr s, _signals) { assert(s); if (s->get_decoder() == _decoders.at(rst_index).first) { diff --git a/DSLogic-gui/pv/toolbars/devicebar.cpp b/DSLogic-gui/pv/toolbars/devicebar.cpp index 1c49f867..5f389bc3 100644 --- a/DSLogic-gui/pv/toolbars/devicebar.cpp +++ b/DSLogic-gui/pv/toolbars/devicebar.cpp @@ -114,16 +114,16 @@ void DeviceBar::on_device_selected() void DeviceBar::on_configure() { - int dev_mode; + int dev_mode, ret; sr_dev_inst *const sdi = get_selected_device(); assert(sdi); dev_mode = sdi->mode; pv::dialogs::DeviceOptions dlg(this, sdi); - //ret = dlg.exec(); - //if (ret == QDialog::Accepted) { - if (dlg.exec()) { + ret = dlg.exec(); + if (ret == QDialog::Accepted) { + //if (dlg.exec()) { if (dev_mode != sdi->mode) device_selected(); else diff --git a/DSLogic-gui/pv/toolbars/samplingbar.cpp b/DSLogic-gui/pv/toolbars/samplingbar.cpp index a6cd04e9..6b6e4307 100644 --- a/DSLogic-gui/pv/toolbars/samplingbar.cpp +++ b/DSLogic-gui/pv/toolbars/samplingbar.cpp @@ -108,7 +108,7 @@ SamplingBar::SamplingBar(QWidget *parent) : // if (l == DefaultRecordLength) // _record_length_selector.setCurrentIndex(i); // } - + _record_length_selector.setSizeAdjustPolicy(QComboBox::AdjustToContents); set_sampling(false); //_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon); diff --git a/DSLogic-gui/pv/view/analogsignal.cpp b/DSLogic-gui/pv/view/analogsignal.cpp index 79e993cb..2e62bfad 100644 --- a/DSLogic-gui/pv/view/analogsignal.cpp +++ b/DSLogic-gui/pv/view/analogsignal.cpp @@ -50,7 +50,7 @@ const QColor AnalogSignal::SignalColours[4] = { const float AnalogSignal::EnvelopeThreshold = 256.0f; -AnalogSignal::AnalogSignal(QString name, shared_ptr data, +AnalogSignal::AnalogSignal(QString name, boost::shared_ptr data, int probe_index, int order) : Signal(name, probe_index, DS_ANALOG, order), _data(data) @@ -91,13 +91,13 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, //paint_axis(p, y, left, right); - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; _scale = _signalHeight * 1.0f / 65536; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); if (get_index() >= (int)snapshot->get_channel_num()) @@ -127,7 +127,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, } void AnalogSignal::paint_trace(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { @@ -159,7 +159,7 @@ void AnalogSignal::paint_trace(QPainter &p, } void AnalogSignal::paint_envelope(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { diff --git a/DSLogic-gui/pv/view/dsosignal.cpp b/DSLogic-gui/pv/view/dsosignal.cpp index f44bfd2b..434997a9 100644 --- a/DSLogic-gui/pv/view/dsosignal.cpp +++ b/DSLogic-gui/pv/view/dsosignal.cpp @@ -43,7 +43,7 @@ const QColor DsoSignal::SignalColours[4] = { const float DsoSignal::EnvelopeThreshold = 256.0f; -DsoSignal::DsoSignal(QString name, shared_ptr data, +DsoSignal::DsoSignal(QString name, boost::shared_ptr data, int probe_index, int order) : Signal(name, probe_index, DS_DSO, order), _data(data) @@ -84,13 +84,13 @@ void DsoSignal::paint(QPainter &p, int y, int left, int right, double scale, //paint_axis(p, y, left, right); - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; _scale = _signalHeight * 1.0f / 256; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); if ((unsigned int)get_index() >= snapshot->get_channel_num()) @@ -120,7 +120,7 @@ void DsoSignal::paint(QPainter &p, int y, int left, int right, double scale, } void DsoSignal::paint_trace(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { @@ -151,7 +151,7 @@ void DsoSignal::paint_trace(QPainter &p, } void DsoSignal::paint_envelope(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { diff --git a/DSLogic-gui/pv/view/groupsignal.cpp b/DSLogic-gui/pv/view/groupsignal.cpp index 9a162afa..d2e708e0 100644 --- a/DSLogic-gui/pv/view/groupsignal.cpp +++ b/DSLogic-gui/pv/view/groupsignal.cpp @@ -50,7 +50,7 @@ GroupSignal::GroupSignal(QString name, boost::shared_ptr data, _data(data) { _colour = SignalColours[probe_index_list.front() % countof(SignalColours)]; - _scale = _signalHeight * 1.0f / pow(2, probe_index_list.size()); + _scale = _signalHeight * 1.0f / std::pow(2.0, static_cast(probe_index_list.size())); } GroupSignal::~GroupSignal() @@ -83,15 +83,15 @@ void GroupSignal::paint(QPainter &p, int y, int left, int right, double scale, assert(_data); assert(right >= left); - _scale = _signalHeight * 1.0f / pow(2, _index_list.size()); + _scale = _signalHeight * 1.0f / std::pow(2.0, static_cast(_index_list.size())); paint_axis(p, y, left, right); - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.at(_sec_index); const double pixels_offset = offset / scale; @@ -118,7 +118,7 @@ void GroupSignal::paint(QPainter &p, int y, int left, int right, double scale, } void GroupSignal::paint_trace(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { @@ -146,7 +146,7 @@ void GroupSignal::paint_trace(QPainter &p, } void GroupSignal::paint_envelope(QPainter &p, - const shared_ptr &snapshot, + const boost::shared_ptr &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { diff --git a/DSLogic-gui/pv/view/header.cpp b/DSLogic-gui/pv/view/header.cpp index 2504953e..c7c132a8 100644 --- a/DSLogic-gui/pv/view/header.cpp +++ b/DSLogic-gui/pv/view/header.cpp @@ -95,11 +95,11 @@ boost::shared_ptr Header::get_mouse_over_signal( const QPoint &pt) { const int w = width(); - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); const int v_offset = _view.v_offset(); - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); @@ -108,7 +108,7 @@ boost::shared_ptr Header::get_mouse_over_signal( return s; } - return shared_ptr(); + return boost::shared_ptr(); } void Header::paintEvent(QPaintEvent*) @@ -122,7 +122,7 @@ void Header::paintEvent(QPaintEvent*) const int w = width(); int action; - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); //QPainter painter(this); @@ -130,7 +130,7 @@ void Header::paintEvent(QPaintEvent*) const int v_offset = _view.v_offset(); const bool dragging = !_drag_sigs.empty(); - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); @@ -171,7 +171,7 @@ void Header::mousePressEvent(QMouseEvent *event) { assert(event); - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); int action; @@ -179,13 +179,13 @@ void Header::mousePressEvent(QMouseEvent *event) _mouse_down_point = event->pos(); // Save the offsets of any signals which will be dragged - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const boost::shared_ptr s, sigs) if (s->selected()) _drag_sigs.push_back( make_pair(s, s->get_v_offset())); // Select the signal if it has been clicked - const shared_ptr mouse_over_signal = + const boost::shared_ptr mouse_over_signal = get_mouse_over_signal(action, event->pos()); if (action == COLOR && mouse_over_signal) { _colorFlag = true; @@ -233,7 +233,7 @@ void Header::mousePressEvent(QMouseEvent *event) if (~QApplication::keyboardModifiers() & Qt::ControlModifier) { // Unselect all other signals because the Ctrl is not // pressed - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const boost::shared_ptr s, sigs) if (s != mouse_over_signal) s->select(false); } @@ -247,7 +247,7 @@ void Header::mouseReleaseEvent(QMouseEvent *event) // judge for color / name / trigger / move int action; - const shared_ptr mouse_over_signal = + const boost::shared_ptr mouse_over_signal = get_mouse_over_signal(action, event->pos()); if (mouse_over_signal){ if (action == COLOR && _colorFlag) { @@ -275,7 +275,7 @@ void Header::move(QMouseEvent *event) bool _moveValid = false; bool _moveUp = false; bool firstCheck = true; - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); boost::shared_ptr minDragSig; boost::shared_ptr maxDragSig; @@ -323,7 +323,7 @@ void Header::move(QMouseEvent *event) } if (!_moveValid && firstCheck){ firstCheck = false; - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { if (_moveUp) { if (s->selected()) { if ((minOffset <= s->get_old_v_offset()) && (minOffset > (s->get_old_v_offset() - _view.get_spanY()))) { @@ -360,7 +360,7 @@ void Header::move(QMouseEvent *event) } } if (_moveValid) { - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { if (_moveUp) { if (s->selected() && s == minDragSig) { s->set_v_offset(targetOffset); @@ -393,7 +393,7 @@ void Header::move(QMouseEvent *event) if (_moveValid) { signals_moved(); } else { - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { if (s->selected()) { s->set_v_offset(s->get_old_v_offset()); s->select(false); @@ -470,7 +470,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event) { int action; - const shared_ptr s = get_mouse_over_signal(action, _mouse_point); + const boost::shared_ptr s = get_mouse_over_signal(action, _mouse_point); //if (!s || action != LABEL) if (!s || !s->selected() || action != LABEL) @@ -489,7 +489,7 @@ void Header::contextMenuEvent(QContextMenuEvent *event) void Header::on_action_set_name_triggered() { - shared_ptr context_signal = _context_signal; + boost::shared_ptr context_signal = _context_signal; if (!context_signal) return; diff --git a/DSLogic-gui/pv/view/logicsignal.cpp b/DSLogic-gui/pv/view/logicsignal.cpp index df43a044..f9fae105 100644 --- a/DSLogic-gui/pv/view/logicsignal.cpp +++ b/DSLogic-gui/pv/view/logicsignal.cpp @@ -65,7 +65,7 @@ const QColor LogicSignal::SignalColours[8] = { const int LogicSignal::StateHeight = 12; const int LogicSignal::StateRound = 5; -LogicSignal::LogicSignal(QString name, shared_ptr data, +LogicSignal::LogicSignal(QString name, boost::shared_ptr data, int probe_index, int order) : Signal(name, probe_index, DS_LOGIC, order), _probe_index(probe_index), @@ -112,12 +112,12 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right, const float high_offset = y - _signalHeight + 0.5f; const float low_offset = y + 0.5f; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); double samplerate = _data->get_samplerate(); diff --git a/DSLogic-gui/pv/view/protocolsignal.cpp b/DSLogic-gui/pv/view/protocolsignal.cpp index b536168f..9ad38309 100644 --- a/DSLogic-gui/pv/view/protocolsignal.cpp +++ b/DSLogic-gui/pv/view/protocolsignal.cpp @@ -41,7 +41,7 @@ namespace view { const int ProtocolSignal::StateHeight = 16; const int ProtocolSignal::StateRound = 3; -ProtocolSignal::ProtocolSignal(QString name, shared_ptr data, +ProtocolSignal::ProtocolSignal(QString name, boost::shared_ptr data, pv::decoder::Decoder *decoder, std::list probe_index_list, int order, int protocol_index) : Signal(name, probe_index_list, DS_PROTOCOL, order, protocol_index), _probe_index_list(probe_index_list), @@ -87,12 +87,12 @@ void ProtocolSignal::paint(QPainter &p, int y, int left, int right, double scale const float middle_offset = y - _signalHeight / 2 + 0.5f; //const float low_offset = y + 0.5f; - const deque< shared_ptr > &snapshots = + const deque< boost::shared_ptr > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr &snapshot = + const boost::shared_ptr &snapshot = snapshots.front(); double samplerate = _data->get_samplerate(); diff --git a/DSLogic-gui/pv/view/ruler.cpp b/DSLogic-gui/pv/view/ruler.cpp index 1441318a..f049beb6 100644 --- a/DSLogic-gui/pv/view/ruler.cpp +++ b/DSLogic-gui/pv/view/ruler.cpp @@ -99,7 +99,7 @@ QString Ruler::format_freq(double period, unsigned precision) assert(order >= FirstSIPrefixPower); const unsigned int prefix = ceil((order - FirstSIPrefixPower) / 3.0f); const double multiplier = pow(10.0, - - prefix * 3 - FirstSIPrefixPower); + static_cast(- prefix * 3 - FirstSIPrefixPower)); QString s; QTextStream ts(&s); @@ -114,7 +114,7 @@ QString Ruler::format_time(double t, unsigned int prefix, unsigned int precision) { const double multiplier = pow(10.0, - - prefix * 3 - FirstSIPrefixPower); + static_cast(- prefix * 3 - FirstSIPrefixPower)); QString s; QTextStream ts(&s); @@ -318,7 +318,7 @@ void Ruler::draw_tick_mark(QPainter &p) //const int order = (int)floorf(log10f(_min_period)); const int order = ceil(log10f(_min_period)); - const double order_decimal = pow(10, order); + const double order_decimal = pow(10.0, static_cast(order)); unsigned int unit = 0; diff --git a/DSLogic-gui/pv/view/view.cpp b/DSLogic-gui/pv/view/view.cpp index 7d9d8bd3..fbd626da 100644 --- a/DSLogic-gui/pv/view/view.cpp +++ b/DSLogic-gui/pv/view/view.cpp @@ -27,6 +27,7 @@ #include +#include #include #include #include @@ -297,14 +298,14 @@ const QPointF& View::hover_point() const void View::normalize_layout() { - const vector< shared_ptr > sigs(_session.get_signals()); + const vector< boost::shared_ptr > sigs(_session.get_signals()); int v_min = INT_MAX; - BOOST_FOREACH(const shared_ptr s, sigs) + BOOST_FOREACH(const boost::shared_ptr s, sigs) v_min = min(s->get_v_offset(), v_min); const int delta = -min(v_min, 0); - BOOST_FOREACH(shared_ptr s, sigs) + BOOST_FOREACH(boost::shared_ptr s, sigs) s->set_v_offset(s->get_v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); @@ -324,7 +325,7 @@ int View::get_signalHeight() void View::get_scroll_layout(double &length, double &offset) const { - const shared_ptr sig_data = _session.get_data(); + const boost::shared_ptr sig_data = _session.get_data(); if (!sig_data) return; @@ -376,8 +377,8 @@ void View::reset_signal_layout() int offset = SignalMargin + SignalHeight; _spanY = SignalHeight + 2 * SignalMargin; - const vector< shared_ptr > sigs(_session.get_signals()); - BOOST_FOREACH(shared_ptr s, sigs) { + const vector< boost::shared_ptr > sigs(_session.get_signals()); + BOOST_FOREACH(boost::shared_ptr s, sigs) { s->set_signalHeight(SignalHeight); //s->set_v_offset(offset); //offset += SignalHeight + 2 * SignalMargin; @@ -438,10 +439,15 @@ int View::headerWidth() int maxNameWidth = 0; int maxLeftWidth = 0; int maxRightWidth = 0; + + QFont font = QApplication::font(); + QFontMetrics fm(font); + int fontWidth=fm.width("A"); + const vector< shared_ptr > sigs(_session.get_signals()); if (!sigs.empty()){ BOOST_FOREACH(const shared_ptr s, sigs) { - maxNameWidth = max(s->get_name().length() * 6, maxNameWidth); + maxNameWidth = max(s->get_name().length() * fontWidth, maxNameWidth); maxLeftWidth = max(s->get_leftWidth(), maxLeftWidth); maxRightWidth = max(s->get_rightWidth(), maxRightWidth); } diff --git a/DSLogic-gui/pv/view/viewport.cpp b/DSLogic-gui/pv/view/viewport.cpp index beacd88a..4e58bec0 100644 --- a/DSLogic-gui/pv/view/viewport.cpp +++ b/DSLogic-gui/pv/view/viewport.cpp @@ -79,9 +79,9 @@ Viewport::Viewport(View &parent) : int Viewport::get_total_height() const { int h = 0; - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); //h = max(s->get_v_offset() + _view.get_signalHeight(), h); h = max(s->get_v_offset(), h); @@ -125,10 +125,10 @@ void Viewport::paintEvent(QPaintEvent *event) p.setRenderHint(QPainter::Antialiasing, false); if (_view.get_signalHeight() != _curSignalHeight) _curSignalHeight = _view.get_signalHeight(); - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); //paint_axis(p, y, left, right); p.setPen(Signal::dsGray); @@ -189,9 +189,9 @@ void Viewport::paintEvent(QPaintEvent *event) void Viewport::paintSignals(QPainter &p) { - const vector< shared_ptr > sigs( + const vector< boost::shared_ptr > sigs( _view.session().get_signals()); -// const vector< shared_ptr > pro_sigs( +// const vector< boost::shared_ptr > pro_sigs( // _view.session().get_pro_signals()); // Plot the signal const int v_offset = _view.v_offset(); @@ -208,13 +208,13 @@ void Viewport::paintSignals(QPainter &p) QPainter dbp(&pixmap); dbp.initFrom(this); p.setRenderHint(QPainter::Antialiasing, false); - BOOST_FOREACH(const shared_ptr s, sigs) { + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); s->paint(dbp, s->get_v_offset() - v_offset, 0, width(), _view.scale(), _view.offset()); } // p.setRenderHint(QPainter::Antialiasing); -// BOOST_FOREACH(const shared_ptr s, pro_sigs) { +// BOOST_FOREACH(const boost::shared_ptr s, pro_sigs) { // assert(s); // s->paint(dbp, s->get_v_offset() - v_offset, 0, width(), // _view.scale(), _view.offset()); @@ -498,8 +498,8 @@ void Viewport::set_receive_len(quint64 length) void Viewport::measure() { - const vector< shared_ptr > sigs(_view.session().get_signals()); - BOOST_FOREACH(const shared_ptr s, sigs) { + const vector< boost::shared_ptr > sigs(_view.session().get_signals()); + BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); const int curY = _view.hover_point().y(); const double curX = _view.hover_point().x(); diff --git a/DSLogic-gui/res/DSLogic.bin b/DSLogic-gui/res/DSLogic.bin index abdc01f7..55265376 100644 Binary files a/DSLogic-gui/res/DSLogic.bin and b/DSLogic-gui/res/DSLogic.bin differ diff --git a/DSLogic-gui/stylesheet.qss b/DSLogic-gui/stylesheet.qss index 58d866dd..9a076bef 100644 --- a/DSLogic-gui/stylesheet.qss +++ b/DSLogic-gui/stylesheet.qss @@ -99,7 +99,7 @@ QComboBox:on { /* shift the text when the popup opens */ QComboBox::drop-down { subcontrol-origin: padding; subcontrol-position: top right; - width: 15px; + width: 20px; border-left-width: 0px; border-top-right-radius: 4px; /* same radius as the QComboBox */ diff --git a/NEWS b/NEWS index e95c8b43..d99df220 100644 --- a/NEWS +++ b/NEWS @@ -8,3 +8,11 @@ ------------------ * Add DSLogic hardware support. +0.2.1 (2014-05-08) +------------------ + + * Add wireless extension hardware support. + * Fix libusb_error_io issue on Linux when sample rate >= 100MHz. + * Fix channel enable/disable bug. + * Fix device options config issue. + * Fix some display issues of UI. \ No newline at end of file diff --git a/libsigrok4DSLogic/Makefile.in b/libsigrok4DSLogic/Makefile.in index 4a3ef9cc..3367111d 100644 --- a/libsigrok4DSLogic/Makefile.in +++ b/libsigrok4DSLogic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,6 +18,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -134,6 +151,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) HEADERS = $(library_include_HEADERS) $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -421,7 +443,6 @@ libsigrok4DSLogic.pc: $(top_builddir)/config.status $(srcdir)/libsigrok4DSLogic. cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -429,6 +450,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -504,8 +527,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -522,8 +548,11 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @list='$(library_include_HEADERS)'; test -n "$(library_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(library_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(library_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -714,13 +743,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -809,7 +835,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/libsigrok4DSLogic/aclocal.m4 b/libsigrok4DSLogic/aclocal.m4 index 45fb2ea7..b0859b53 100644 --- a/libsigrok4DSLogic/aclocal.m4 +++ b/libsigrok4DSLogic/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -1553,7 +1553,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -1917,7 +1924,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2741,17 +2749,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2868,7 +2865,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3484,10 +3481,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3526,7 +3519,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4278,7 +4271,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4577,7 +4570,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6466,9 +6459,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6630,7 +6620,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -9019,7 +9009,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9035,7 +9025,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/libsigrok4DSLogic/configure b/libsigrok4DSLogic/configure index b6517ad2..9f545086 100644 --- a/libsigrok4DSLogic/configure +++ b/libsigrok4DSLogic/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libsigrok4DSLogic 0.2.0. +# Generated by GNU Autoconf 2.69 for libsigrok4DSLogic 0.2.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1257,8 +1277,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1542,9 +1560,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF libsigrok4DSLogic configure 0.2.0 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1657,7 +1675,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1932,7 +1950,8 @@ int main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1948,7 +1967,8 @@ main () { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2005,7 +2025,8 @@ int main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2092,7 +2113,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libsigrok4DSLogic $as_me 0.2.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2512,7 +2533,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2681,7 +2702,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2721,7 +2742,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2772,7 +2793,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2825,7 +2846,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3075,7 +3096,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3115,7 +3136,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3168,7 +3189,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3209,7 +3230,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3267,7 +3288,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3311,7 +3332,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3757,8 +3778,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3991,7 +4011,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4035,7 +4055,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4163,7 +4183,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4203,7 +4223,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4256,7 +4276,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4297,7 +4317,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4355,7 +4375,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4399,7 +4419,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4595,8 +4615,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5275,7 +5294,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5351,7 +5370,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5417,7 +5436,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5484,7 +5503,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5740,7 +5759,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5784,7 +5803,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5962,7 +5981,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -6197,7 +6217,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6237,7 +6257,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6363,10 +6383,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6405,7 +6421,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -6543,7 +6559,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6583,7 +6599,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6686,7 +6702,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6730,7 +6746,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6855,7 +6871,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6895,7 +6911,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6954,7 +6970,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6994,7 +7010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7502,7 +7518,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" @@ -7643,7 +7666,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7683,7 +7706,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7763,7 +7786,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7803,7 +7826,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7855,7 +7878,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7895,7 +7918,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7947,7 +7970,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7987,7 +8010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8039,7 +8062,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8079,7 +8102,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8131,7 +8154,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8171,7 +8194,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9190,7 +9213,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -11360,17 +11383,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11487,7 +11499,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12563,7 +12575,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12606,7 +12618,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12825,7 +12837,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12868,7 +12880,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14406,16 +14418,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -14475,28 +14487,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -14518,7 +14518,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by libsigrok4DSLogic $as_me 0.2.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -14585,10 +14585,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ libsigrok4DSLogic config.status 0.2.0 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -14679,7 +14679,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/libsigrok4DSLogic/hardware/DSLogic/Makefile.in b/libsigrok4DSLogic/hardware/DSLogic/Makefile.in index a67d23ca..54ae4dc9 100644 --- a/libsigrok4DSLogic/hardware/DSLogic/Makefile.in +++ b/libsigrok4DSLogic/hardware/DSLogic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -86,6 +103,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsigrok4DSLogic_hw_dslogic_la_SOURCES) DIST_SOURCES = $(libsigrok4DSLogic_hw_dslogic_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libsigrok4DSLogic/hardware/DSLogic/dslogic.c b/libsigrok4DSLogic/hardware/DSLogic/dslogic.c index f4425527..1c6ffa6f 100644 --- a/libsigrok4DSLogic/hardware/DSLogic/dslogic.c +++ b/libsigrok4DSLogic/hardware/DSLogic/dslogic.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,7 @@ #define min(a,b) ((a)<(b)?(a):(b)) #endif -static const int cons_buffer_size = 128; +static const int cons_buffer_size = 1024 * 16; static const int dso_buffer_size = 1024 * 16; static const int32_t hwopts[] = { @@ -262,7 +263,7 @@ static int fpga_setting(const struct sr_dev_inst *sdi) } if (result == SR_OK) - sr_info("FPGA setting done. trigger_mode = %d; trigger_stages = %d; trigger_mask0 = %d; trigger_value0 = %d; trigger_edge0 = %d", trigger->trigger_mode, trigger->trigger_stages, setting.trig_mask0[0], setting.trig_value0[0], setting.trig_edge0[0]); + sr_info("FPGA setting done"); return result; } @@ -451,7 +452,7 @@ static int configure_probes(const struct sr_dev_inst *sdi) continue; if ((probe->index > 7 && probe->type == SR_PROBE_LOGIC) || - (probe->index > 0 && (probe->type == SR_PROBE_ANALOG || probe->type == SR_PROBE_DSO))) + (probe->type == SR_PROBE_ANALOG || probe->type == SR_PROBE_DSO)) devc->sample_wide = TRUE; else devc->sample_wide = FALSE; @@ -527,6 +528,32 @@ static int set_probes(struct sr_dev_inst *sdi, int num_probes) return SR_OK; } +static int adjust_probes(struct sr_dev_inst *sdi, int num_probes) +{ + int j; + GSList *l; + struct sr_probe *probe; + GSList *p; + + assert(num_probes > 0); + + j = g_slist_length(sdi->probes); + while(j < num_probes) { + if (!(probe = sr_probe_new(j, (sdi->mode == LOGIC) ? SR_PROBE_LOGIC : ((sdi->mode == DSO) ? SR_PROBE_DSO : SR_PROBE_ANALOG), + TRUE, probe_names[j]))) + return SR_ERR; + sdi->probes = g_slist_append(sdi->probes, probe); + j++; + } + + while(j > num_probes) { + g_slist_delete_link(sdi->probes, g_slist_last(sdi->probes)); + j--; + } + + return SR_OK; +} + static GSList *scan(GSList *options) { struct drv_context *drvc; @@ -829,11 +856,9 @@ static int config_set(int id, GVariant *data, struct sr_dev_inst *sdi) devc->cur_samplerate = g_variant_get_uint64(data); if (sdi->mode == LOGIC) { if (devc->cur_samplerate >= SR_MHZ(200)) { - sr_dev_probes_free(sdi); - set_probes(sdi, SR_MHZ(1600)/devc->cur_samplerate); + adjust_probes(sdi, SR_MHZ(1600)/devc->cur_samplerate); } else { - sr_dev_probes_free(sdi); - set_probes(sdi, 16); + adjust_probes(sdi, 16); } } ret = SR_OK; @@ -1245,7 +1270,10 @@ static void receive_transfer(struct libusb_transfer *transfer) static unsigned int to_bytes_per_ms(struct dev_context *devc) { - return devc->cur_samplerate / 1000 * (devc->sample_wide ? 2 : 1); + if (devc->cur_samplerate > SR_MHZ(100)) + return SR_MHZ(100) / 1000 * (devc->sample_wide ? 2 : 1); + else + return devc->cur_samplerate / 1000 * (devc->sample_wide ? 2 : 1); } static size_t get_buffer_size(struct dev_context *devc) @@ -1253,17 +1281,17 @@ static size_t get_buffer_size(struct dev_context *devc) size_t s; /* - * The buffer should be large enough to hold 10ms of data and + * The buffer should be large enough to hold 20ms of data and * a multiple of 512. */ - s = 10 * to_bytes_per_ms(devc); + s = 20 * to_bytes_per_ms(devc); return (s + 511) & ~511; } static unsigned int get_number_of_transfers(struct dev_context *devc) { unsigned int n; - /* Total buffer size should be able to hold about 500ms of data. */ + /* Total buffer size should be able to hold about 100ms of data. */ n = 100 * to_bytes_per_ms(devc) / get_buffer_size(devc); if (n > NUM_SIMUL_TRANSFERS) @@ -1416,7 +1444,7 @@ static void receive_trigger_pos(struct libusb_transfer *transfer) if (devc->status == DSLOGIC_TRIGGERED) { if ((ret = dev_transfer_start(devc->cb_data)) != SR_OK) { sr_err("%s: could not start data transfer" - "(%d)", __func__, ret); + "(%d)%d", __func__, ret, errno); } } } diff --git a/libsigrok4DSLogic/hardware/Makefile.in b/libsigrok4DSLogic/hardware/Makefile.in index 4100aa45..a44634e8 100644 --- a/libsigrok4DSLogic/hardware/Makefile.in +++ b/libsigrok4DSLogic/hardware/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -87,6 +104,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -499,13 +521,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/libsigrok4DSLogic/hardware/common/Makefile.in b/libsigrok4DSLogic/hardware/common/Makefile.in index 0a8f1fad..346cd4f4 100644 --- a/libsigrok4DSLogic/hardware/common/Makefile.in +++ b/libsigrok4DSLogic/hardware/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -86,6 +103,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsigrok4DSLogic_hw_common_la_SOURCES) DIST_SOURCES = $(libsigrok4DSLogic_hw_common_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libsigrok4DSLogic/hardware/demo/Makefile.in b/libsigrok4DSLogic/hardware/demo/Makefile.in index 3e8a139e..c6946b19 100644 --- a/libsigrok4DSLogic/hardware/demo/Makefile.in +++ b/libsigrok4DSLogic/hardware/demo/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -87,6 +104,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsigrok4DSLogic_hw_demo_la_SOURCES) DIST_SOURCES = $(am__libsigrok4DSLogic_hw_demo_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libsigrok4DSLogic/input/Makefile.in b/libsigrok4DSLogic/input/Makefile.in index 7333fed3..fd58fa82 100644 --- a/libsigrok4DSLogic/input/Makefile.in +++ b/libsigrok4DSLogic/input/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -88,6 +105,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsigrok4DSLogicinput_la_SOURCES) DIST_SOURCES = $(libsigrok4DSLogicinput_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libsigrok4DSLogic/output/Makefile.in b/libsigrok4DSLogic/output/Makefile.in index 9221d14e..c7317eef 100644 --- a/libsigrok4DSLogic/output/Makefile.in +++ b/libsigrok4DSLogic/output/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -97,6 +114,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -579,13 +601,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/libsigrok4DSLogic/output/text/Makefile.in b/libsigrok4DSLogic/output/text/Makefile.in index 88bba4b1..1adc6f2c 100644 --- a/libsigrok4DSLogic/output/text/Makefile.in +++ b/libsigrok4DSLogic/output/text/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -88,6 +105,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsigrok4DSLogicoutputtext_la_SOURCES) DIST_SOURCES = $(libsigrok4DSLogicoutputtext_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libsigrok4DSLogic/tests/Makefile.in b/libsigrok4DSLogic/tests/Makefile.in index 7630fa34..416647c0 100644 --- a/libsigrok4DSLogic/tests/Makefile.in +++ b/libsigrok4DSLogic/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -90,6 +107,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(check_main_SOURCES) DIST_SOURCES = $(am__check_main_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags # If stdout is a non-dumb tty, use colors. If test -t is not supported,