X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=447a2b318ad1da39d10231db25d24ac6d8dbdecb;hb=5097b0d0912165429aceddb5febbf68467b623f5;hp=5e0d44cffea379f5590104d3b51e6d06338e12ce;hpb=3010f21c9170e9f235d49bc7b333d17677c70e5c;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 5e0d44cf..447a2b31 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -71,14 +71,14 @@ struct databag { uint8_t sample_generator; uint8_t thread_running; uint64_t samples_counter; - int device_index; + int dev_index; gpointer session_data; GTimer *timer; }; -static int capabilities[] = { +static int hwcaps[] = { SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_DEMO_DEVICE, + SR_HWCAP_DEMO_DEV, SR_HWCAP_SAMPLERATE, SR_HWCAP_PATTERN_MODE, SR_HWCAP_LIMIT_SAMPLES, @@ -125,8 +125,8 @@ static uint8_t pattern_sigrok[] = { 0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ -static GSList *device_instances = NULL; +/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */ +static GSList *dev_insts = NULL; static uint64_t cur_samplerate = SR_KHZ(200); static uint64_t limit_samples = 0; static uint64_t limit_msec = 0; @@ -134,63 +134,64 @@ static int default_pattern = PATTERN_SIGROK; static GThread *my_thread; static int thread_running; -static int hw_stop_acquisition(int device_index, gpointer session_data); +static int hw_stop_acquisition(int dev_index, gpointer session_data); -static int hw_init(const char *deviceinfo) +static int hw_init(const char *devinfo) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; /* Avoid compiler warnings. */ - (void)deviceinfo; + (void)devinfo; - sdi = sr_device_instance_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); + sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL); if (!sdi) { - sr_err("demo: %s: sr_device_instance_new failed", __func__); + sr_err("demo: %s: sr_dev_inst_new failed", __func__); return 0; } - device_instances = g_slist_append(device_instances, sdi); + dev_insts = g_slist_append(dev_insts, sdi); return 1; } -static int hw_opendev(int device_index) +static int hw_opendev(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; /* Nothing needed so far. */ return SR_OK; } -static int hw_closedev(int device_index) +static int hw_closedev(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; /* Nothing needed so far. */ return SR_OK; } -static void hw_cleanup(void) +static int hw_cleanup(void) { /* Nothing needed so far. */ + return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static void *hw_dev_info_get(int dev_index, int dev_info_id) { - struct sr_device_instance *sdi; + struct sr_dev_inst *sdi; void *info = NULL; - if (!(sdi = sr_get_device_instance(device_instances, device_index))) { + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { sr_err("demo: %s: sdi was NULL", __func__); return NULL; } - switch (device_info_id) { - case SR_DI_INSTANCE: + switch (dev_info_id) { + case SR_DI_INST: info = sdi; break; case SR_DI_NUM_PROBES: @@ -213,46 +214,46 @@ static void *hw_get_device_info(int device_index, int device_info_id) return info; } -static int hw_get_status(int device_index) +static int hw_get_status(int dev_index) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; return SR_ST_ACTIVE; } -static int *hw_get_capabilities(void) +static int *hw_hwcap_get_all(void) { - return capabilities; + return hwcaps; } -static int hw_set_configuration(int device_index, int capability, void *value) +static int hw_config_set(int dev_index, int hwcap, void *value) { int ret; char *stropt; /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; - if (capability == SR_HWCAP_PROBECONFIG) { + if (hwcap == SR_HWCAP_PROBECONFIG) { /* Nothing to do, but must be supported */ ret = SR_OK; - } else if (capability == SR_HWCAP_SAMPLERATE) { + } else if (hwcap == SR_HWCAP_SAMPLERATE) { cur_samplerate = *(uint64_t *)value; sr_dbg("demo: %s: setting samplerate to %" PRIu64, __func__, cur_samplerate); ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_SAMPLES) { + } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { limit_samples = *(uint64_t *)value; sr_dbg("demo: %s: setting limit_samples to %" PRIu64, __func__, limit_samples); ret = SR_OK; - } else if (capability == SR_HWCAP_LIMIT_MSEC) { + } else if (hwcap == SR_HWCAP_LIMIT_MSEC) { limit_msec = *(uint64_t *)value; sr_dbg("demo: %s: setting limit_msec to %" PRIu64, __func__, limit_msec); ret = SR_OK; - } else if (capability == SR_HWCAP_PATTERN_MODE) { + } else if (hwcap == SR_HWCAP_PATTERN_MODE) { stropt = value; ret = SR_OK; if (!strcmp(stropt, "sigrok")) { @@ -404,7 +405,7 @@ static int receive_data(int fd, int revents, void *session_data) return TRUE; } -static int hw_start_acquisition(int device_index, gpointer session_data) +static int hw_start_acquisition(int dev_index, gpointer session_data) { struct sr_datafeed_packet *packet; struct sr_datafeed_header *header; @@ -418,7 +419,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data) mydata->sample_generator = default_pattern; mydata->session_data = session_data; - mydata->device_index = device_index; + mydata->dev_index = dev_index; mydata->samples_counter = 0; if (pipe(mydata->pipe_fds)) { @@ -476,10 +477,10 @@ static int hw_start_acquisition(int device_index, gpointer session_data) return SR_OK; } -static int hw_stop_acquisition(int device_index, gpointer session_data) +static int hw_stop_acquisition(int dev_index, gpointer session_data) { /* Avoid compiler warnings. */ - (void)device_index; + (void)dev_index; (void)session_data; /* Stop generate thread. */ @@ -488,7 +489,7 @@ static int hw_stop_acquisition(int device_index, gpointer session_data) return SR_OK; } -SR_PRIV struct sr_device_plugin demo_plugin_info = { +SR_PRIV struct sr_dev_plugin demo_plugin_info = { .name = "demo", .longname = "Demo driver and pattern generator", .api_version = 1, @@ -496,10 +497,10 @@ SR_PRIV struct sr_device_plugin demo_plugin_info = { .cleanup = hw_cleanup, .opendev = hw_opendev, .closedev = hw_closedev, - .get_device_info = hw_get_device_info, + .dev_info_get = hw_dev_info_get, .get_status = hw_get_status, - .get_capabilities = hw_get_capabilities, - .set_configuration = hw_set_configuration, + .hwcap_get_all = hw_hwcap_get_all, + .config_set = hw_config_set, .start_acquisition = hw_start_acquisition, .stop_acquisition = hw_stop_acquisition, };