X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fatten-pps3xxx%2Fprotocol.c;h=34e0af42824ebff7fa13623c79e84bfb8ad93f9d;hb=1f706c21a2977c768692f72d09b35633628d2b0d;hp=98838b65bbe05a2ba00b4018f06ded7a8f5a3019;hpb=945cfd4fdd3d2aa2758e1957c7c4c1440badcf8b;p=libsigrok.git
diff --git a/src/hardware/atten-pps3xxx/protocol.c b/src/hardware/atten-pps3xxx/protocol.c
index 98838b65..34e0af42 100644
--- a/src/hardware/atten-pps3xxx/protocol.c
+++ b/src/hardware/atten-pps3xxx/protocol.c
@@ -17,11 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
-#include
#include "protocol.h"
-static void dump_packet(char *msg, uint8_t *packet)
+static void dump_packet(const char *msg, uint8_t *packet)
{
int i;
char str[128];
@@ -37,13 +37,13 @@ static void handle_packet(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
float value, data[MAX_CHANNELS];
int offset, i;
devc = sdi->priv;
dump_packet("received", devc->packet);
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
analog.channels = sdi->channels;
analog.num_samples = 1;
@@ -88,8 +88,7 @@ SR_PRIV void send_packet(const struct sr_dev_inst *sdi, uint8_t *packet)
devc = sdi->priv;
serial = sdi->conn;
- if (serial_write_blocking(serial, packet, PACKET_SIZE,
- devc->byte_delay_ms * PACKET_SIZE + 1) < PACKET_SIZE)
+ if (serial_write_blocking(serial, packet, PACKET_SIZE, devc->delay_ms) < PACKET_SIZE)
sr_dbg("Failed to send packet.");
dump_packet("sent", packet);
}
@@ -165,4 +164,3 @@ SR_PRIV int atten_pps3xxx_receive_data(int fd, int revents, void *cb_data)
return TRUE;
}
-