* 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 <http://www.gnu.org/licenses/>.
*/
#include <config.h>
};
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;
/* 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;
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(sdi, &packet);
} 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;
}
if (sr_sw_limits_check(&devc->limits))
- sdi->driver->dev_acquisition_stop(sdi);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}