ipdbg-la: return correct samples limit

[libsigrok.git] / src / hardware / ipdbg-logic-analyser / protocol.c

diff --git a/src/hardware/ipdbg-logic-analyser/protocol.c b/src/hardware/ipdbg-logic-analyser/protocol.c
index 2bff81e94462350b109eed4e9f1768316a07ba5e..fa39fb35cc7cb6dc197fff3b22467700cd1a14ce 100644 (file)
--- a/src/hardware/ipdbg-logic-analyser/protocol.c
+++ b/src/hardware/ipdbg-logic-analyser/protocol.c
@@ -119,7 +119,7 @@ SR_PRIV int ipdbg_org_la_tcp_send(struct ipdbg_org_la_tcp *tcp, const uint8_t *b
 {
        int out;
 
-       out = send(tcp->socket, buf, len, 0);
+       out = send(tcp->socket, (char*)buf, len, 0);
 
        if (out < 0) {
                sr_err("Send error: %s", g_strerror(errno));
@@ -142,7 +142,7 @@ SR_PRIV int ipdbg_org_la_tcp_receive(struct ipdbg_org_la_tcp *tcp, uint8_t *buf,
 
         int len;
 
-        len = recv(tcp->socket, buf+received, bufsize-received, 0);
+        len = recv(tcp->socket, (char*)(buf+received), bufsize-received, 0);
 
         if (len < 0) {
             sr_err("Receive error: %s", g_strerror(errno));
@@ -194,7 +194,7 @@ SR_PRIV int ipdbg_org_la_convert_trigger(const struct sr_dev_inst *sdi)
         devc->trigger_mask_last[i] = 0;
         devc->trigger_value_last[i] = 0;
     }
-    sr_err("\nDATA_WITH_BYTES:%i\n",devc->DATA_WIDTH_BYTES);
+    //sr_err("\nDATA_WITH_BYTES:%i\n",devc->DATA_WIDTH_BYTES);
 
 //    devc->trigger_value[0] = 0x00;
 //    devc->trigger_value_last[0] = 0xff;
@@ -336,7 +336,7 @@ SR_PRIV int ipdbg_org_la_receive_data(int fd, int revents, void *cb_data)
 
     if (devc->num_transfers < devc->limit_samples_max*devc->DATA_WIDTH_BYTES)
     {
-        sr_err("1");
+        //sr_err("1");
         unsigned char byte;
 
 
@@ -350,9 +350,9 @@ SR_PRIV int ipdbg_org_la_receive_data(int fd, int revents, void *cb_data)
     }
     else
     {
-        sr_err("Received %d bytes", devc->num_transfers);
+        //sr_err("Received %d bytes", devc->num_transfers);
 
-        sr_dbg("Received %d bytes.", devc->num_transfers);
+        //sr_dbg("Received %d bytes.", devc->num_transfers);
 
         if (devc->delay_value > 0) {
             /* There are pre-trigger samples, send those first. */
@@ -560,8 +560,8 @@ SR_PRIV void ipdbg_org_la_get_addrwidth_and_datawidth(struct ipdbg_org_la_tcp *t
     devc->DATA_WIDTH_BYTES = (devc->DATA_WIDTH+HOST_WORD_SIZE -1)/HOST_WORD_SIZE;
     devc->ADDR_WIDTH_BYTES = (devc->ADDR_WIDTH+HOST_WORD_SIZE -1)/HOST_WORD_SIZE;
     devc->limit_samples_max = (0x01 << devc->ADDR_WIDTH);
-       devc->limit_samples = (0x01 << HOST_WORD_SIZE);
-    //sr_warn("DATA_WIDTH_BYTES: %d  ADDR_WIDTH_BYTES : %d", devc->DATA_WIDTH_BYTES, devc->ADDR_WIDTH_BYTES);
+       devc->limit_samples = devc->limit_samples_max;// (0x01 << HOST_WORD_SIZE);
+    //sr_err("DATA_WIDTH_BYTES: %d  ADDR_WIDTH_BYTES : %d LIMIT_SAMPLES: %d", devc->DATA_WIDTH_BYTES, devc->ADDR_WIDTH_BYTES, devc->limit_samples );