#define LOG_PREFIX "input/raw_analog"
/* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE 4096
-#define DEFAULT_NUM_CHANNELS 1
-#define DEFAULT_SAMPLERATE 0
+#define CHUNK_SIZE 4096
+#define DEFAULT_NUM_CHANNELS 1
+#define DEFAULT_SAMPLERATE 0
struct context {
gboolean started;
};
struct sample_format {
- const char const *fmt_name;
+ const char *fmt_name;
struct sr_analog_encoding encoding;
};
-static const struct sample_format const sample_formats[] =
+static const struct sample_format sample_formats[] =
{
{ "S8", { 1, TRUE, FALSE, FALSE, 0, TRUE, { 1, 128}, { 0, 1}}},
{ "U8", { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1, 255}, {-1, 2}}},
{
struct context *inc;
int num_channels;
- char channelname[8];
+ char channelname[16];
const char *format;
int fmt_index;
in->priv = inc = g_malloc0(sizeof(struct context));
for (int i = 0; i < num_channels; i++) {
- snprintf(channelname, 8, "CH%d", i + 1);
+ snprintf(channelname, sizeof(channelname) - 1, "CH%d", i + 1);
sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
}
inc = in->priv;
if (!inc->started) {
- std_session_send_df_header(in->sdi, LOG_PREFIX);
+ std_session_send_df_header(in->sdi);
if (inc->samplerate) {
packet.type = SR_DF_META;
static int end(struct sr_input *in)
{
- struct sr_datafeed_packet packet;
struct context *inc;
int ret;
ret = SR_OK;
inc = in->priv;
- if (inc->started) {
- packet.type = SR_DF_END;
- sr_session_send(in->sdi, &packet);
- }
+ if (inc->started)
+ std_session_send_df_end(in->sdi);
return ret;
}
in->priv = NULL;
}
+static int reset(struct sr_input *in)
+{
+ struct context *inc = in->priv;
+
+ inc->started = FALSE;
+ cleanup(in);
+ g_string_truncate(in->buf, 0);
+
+ return SR_OK;
+}
+
SR_PRIV struct sr_input_module input_raw_analog = {
.id = "raw_analog",
.name = "RAW analog",
.receive = receive,
.end = end,
.cleanup = cleanup,
+ .reset = reset,
};