X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=5ab3969ef8e529092331c7226aa3b688396329b9;hb=a00ba012288726678e1a270961c8d4f46f3dbd33;hp=ac7dea9a8977d79092a10b8a6c5bf9da00032ea2;hpb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index ac7dea9a..5ab3969e 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -78,7 +78,7 @@ static uint8_t genmode_default[] = { 0xbe, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* List of struct sigrok_device_instance, maintained by opendev()/closedev(). */ +/* List of struct sr_device_instance, maintained by opendev()/closedev(). */ static GSList *device_instances = NULL; static uint64_t cur_samplerate = KHZ(200); static uint64_t limit_samples = 0; @@ -91,12 +91,12 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id); static int hw_init(char *deviceinfo) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; /* Avoid compiler warnings. */ deviceinfo = deviceinfo; - sdi = sigrok_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL); + sdi = sr_device_instance_new(0, ST_ACTIVE, DEMONAME, NULL, NULL); if (!sdi) return 0; @@ -129,10 +129,10 @@ static void hw_cleanup(void) static void *hw_get_device_info(int device_index, int device_info_id) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; void *info = NULL; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = get_sr_device_instance(device_instances, device_index))) return NULL; switch (device_info_id) {