X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftondaj-sl-814%2Fprotocol.c;h=13f043056255b7d42fcbae3f1370e2486a615dd9;hb=81ceb6a51dd666987fb5c67b83c5ba14d105b301;hp=d09d19bf2c9a5ddf550a245123e9c44847477a0d;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git
diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index d09d19bf..13f04305 100644
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -34,7 +33,7 @@ enum {
};
static void parse_packet(const uint8_t *buf, float *floatval,
- struct sr_datafeed_analog_old *analog)
+ struct sr_datafeed_analog *analog)
{
gboolean is_a, is_fast;
uint16_t intval;
@@ -69,18 +68,18 @@ static void parse_packet(const uint8_t *buf, float *floatval,
/* The value on the display always has one digit after the comma. */
*floatval /= 10;
- analog->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
- analog->unit = SR_UNIT_DECIBEL_SPL;
+ analog->meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
+ analog->meaning->unit = SR_UNIT_DECIBEL_SPL;
if (is_a)
- analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A;
+ analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A;
else
- analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C;
+ analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C;
if (is_fast)
- analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
+ analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
else
- analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S;
+ analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S;
/* TODO: How to handle level? */
(void)level;
@@ -89,24 +88,28 @@ static void parse_packet(const uint8_t *buf, float *floatval,
static void decode_packet(struct sr_dev_inst *sdi)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog_old analog;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc;
float floatval;
devc = sdi->priv;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
+
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
parse_packet(devc->buf, &floatval, &analog);
/* Send a sample packet with one analog value. */
- analog.channels = sdi->channels;
+ analog.meaning->channels = sdi->channels;
analog.num_samples = 1;
analog.data = &floatval;
- packet.type = SR_DF_ANALOG_OLD;
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
@@ -171,7 +174,7 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
} else if (devc->state == GET_PACKET) {
/* Read a packet from the device. */
ret = serial_read_nonblocking(serial, devc->buf + devc->buflen,
- 4 - devc->buflen);
+ 4 - devc->buflen);
if (ret < 0) {
sr_err("Error reading packet: %d.", ret);
return TRUE;
@@ -201,11 +204,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
return FALSE;
}
- /* Stop acquisition if we acquired enough samples. */
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}