X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fchronovu_la8.c;h=53e1477321510583c7529d60c8411ccc4c5b4b01;hb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;hp=c28f0e0a811b8afa43006ef86095ab231bbdedf0;hpb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;p=libsigrok.git diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c index c28f0e0a..53e14773 100644 --- a/src/input/chronovu_la8.c +++ b/src/input/chronovu_la8.c @@ -18,19 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #define LOG_PREFIX "input/chronovu-la8" #define DEFAULT_NUM_CHANNELS 8 -#define DEFAULT_SAMPLERATE 100000000L -#define MAX_CHUNK_SIZE 4096 -#define CHRONOVU_LA8_FILESIZE 8 * 1024 * 1024 + 5 +#define DEFAULT_SAMPLERATE SR_MHZ(100) +#define MAX_CHUNK_SIZE (4 * 1024) +#define CHRONOVU_LA8_FILESIZE ((8 * 1024 * 1024) + 5) struct context { gboolean started; @@ -51,7 +52,6 @@ static int format_match(GHashTable *metadata) static int init(struct sr_input *in, GHashTable *options) { - struct sr_channel *ch; struct context *inc; int num_channels, i; char name[16]; @@ -69,8 +69,7 @@ static int init(struct sr_input *in, GHashTable *options) for (i = 0; i < num_channels; i++) { snprintf(name, 16, "%d", i); - ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name); - in->sdi->channels = g_slist_append(in->sdi->channels, ch); + sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name); } return SR_OK;