commit 120d6ef511215d85f3a630c21b31cc741c62b416 Author: Daniel Ribeiro <[email protected]> Date: Mon Jan 10 15:12:38 2011 -0200
update plugins and cli to use new DF_HEADER
diff --git a/cli/sigrok-cli.c b/cli/sigrok-cli.c
index 012dcf1..c6368e8 100644
--- a/cli/sigrok-cli.c
+++ b/cli/sigrok-cli.c
@@ -272,7 +272,7 @@ void datafeed_in(struct device *device, struct
datafeed_packet *packet)
header = (struct datafeed_header *)packet->payload;
num_enabled_probes = 0;
- for (i = 0; i < header->num_probes; i++) {
+ for (i = 0; i < header->num_logic_probes; i++) {
probe = g_slist_nth_data(device->probes, i);
if (probe->enabled)
probelist[num_enabled_probes++] = probe->index;
diff --git a/libsigrok/hardware/asix-sigma/asix-sigma.c
b/libsigrok/hardware/asix-sigma/asix-sigma.c
index 09c8799..d4d9fdd 100644
--- a/libsigrok/hardware/asix-sigma/asix-sigma.c
+++ b/libsigrok/hardware/asix-sigma/asix-sigma.c
@@ -1219,7 +1219,8 @@ static int hw_start_acquisition(int device_index,
gpointer session_device_id)
gettimeofday(&header.starttime, NULL);
header.samplerate = cur_samplerate;
header.protocol_id = PROTO_RAW;
- header.num_probes = num_probes;
+ header.num_logic_probes = num_probes;
+ header.num_analog_probes = 0;
session_bus(session_device_id, &packet);
/* Add capture source. */
diff --git a/libsigrok/hardware/demo/demo.c
b/libsigrok/hardware/demo/demo.c
index cb627ef..f3f71fa 100644
--- a/libsigrok/hardware/demo/demo.c
+++ b/libsigrok/hardware/demo/demo.c
@@ -318,7 +318,8 @@ static int hw_start_acquisition(int device_index,
gpointer session_device_id)
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
header->protocol_id = PROTO_RAW;
- header->num_probes = NUM_PROBES;
+ header->num_logic_probes = NUM_PROBES;
+ header->num_analog_probes = 0;
session_bus(session_device_id, packet);
free(header);
free(packet);
diff --git a/libsigrok/hardware/openbench-logic-sniffer/ols.c
b/libsigrok/hardware/openbench-logic-sniffer/ols.c
index 0e79145..7f44788 100644
--- a/libsigrok/hardware/openbench-logic-sniffer/ols.c
+++ b/libsigrok/hardware/openbench-logic-sniffer/ols.c
@@ -760,7 +760,8 @@ static int hw_start_acquisition(int device_index,
gpointer session_device_id)
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
header->protocol_id = PROTO_RAW;
- header->num_probes = NUM_PROBES;
+ header->num_logic_probes = NUM_PROBES;
+ header->num_analog_probes = 0;
session_bus(session_device_id, packet);
g_free(header);
g_free(packet);
diff --git a/libsigrok/hardware/saleae-logic/saleae-logic.c
b/libsigrok/hardware/saleae-logic/saleae-logic.c
index b80808d..f89d3ee 100644
--- a/libsigrok/hardware/saleae-logic/saleae-logic.c
+++ b/libsigrok/hardware/saleae-logic/saleae-logic.c
@@ -713,7 +713,8 @@ static int hw_start_acquisition(int device_index,
gpointer session_device_id)
gettimeofday(&header->starttime, NULL);
header->samplerate = cur_samplerate;
header->protocol_id = PROTO_RAW;
- header->num_probes = NUM_PROBES;
+ header->num_logic_probes = NUM_PROBES;
+ header->num_analog_probes = 0;
session_bus(session_device_id, packet);
g_free(header);
g_free(packet);
diff --git a/libsigrok/hardware/zeroplus-logic-cube/zeroplus.c
b/libsigrok/hardware/zeroplus-logic-cube/zeroplus.c
index eef93cb..e034dfc 100644
--- a/libsigrok/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/libsigrok/hardware/zeroplus-logic-cube/zeroplus.c
@@ -512,7 +512,8 @@ static int hw_start_acquisition(int device_index,
gpointer session_device_id)
gettimeofday(&header.starttime, NULL);
header.samplerate = cur_samplerate;
header.protocol_id = PROTO_RAW;
- header.num_probes = num_channels;
+ header.num_logic_probes = num_channels;
+ header.num_analog_probes = 0;
session_bus(session_device_id, &packet);
buf = g_malloc(PACKET_SIZE);
diff --git a/libsigrok/input/input_binary.c
b/libsigrok/input/input_binary.c
index 7c9f96b..2f1462d 100644
--- a/libsigrok/input/input_binary.c
+++ b/libsigrok/input/input_binary.c
@@ -48,7 +48,8 @@ static int in_loadfile(const char *filename)
device = device_new(NULL, 0, num_probes);
header.feed_version = 1;
- header.num_probes = num_probes;
+ header.num_logic_probes = num_probes;
+ header.num_analog_probes = 0; /* FIXME */
header.protocol_id = PROTO_RAW;
header.samplerate = 0;
gettimeofday(&header.starttime, NULL);
--
Daniel Ribeiro
signature.asc
Description: Esta é uma parte de mensagem assinada digitalmente
------------------------------------------------------------------------------ Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________ sigrok-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/sigrok-devel
