X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fipdbg-la%2Fprotocol.h;h=19a56c31dc8c35dbfa05a983105799c06b53a351;hb=f6129c8f0c92e45de5d70b4101bf2bd759a5fdf7;hp=bcc333155368e13c2e2c3bb8925ca09018028627;hpb=932ef10f1222dc9d693766ab3a64c2b3af2c41eb;p=libsigrok.git

diff --git a/src/hardware/ipdbg-la/protocol.h b/src/hardware/ipdbg-la/protocol.h
index bcc33315..19a56c31 100644
--- a/src/hardware/ipdbg-la/protocol.h
+++ b/src/hardware/ipdbg-la/protocol.h
@@ -34,11 +34,11 @@ struct ipdbg_la_tcp {
 };
 
 /** Private, per-device-instance driver context. */
-struct ipdbg_la_dev_context {
-	uint32_t DATA_WIDTH;
-	uint32_t DATA_WIDTH_BYTES;
-	uint32_t ADDR_WIDTH;
-	uint32_t ADDR_WIDTH_BYTES;
+struct dev_context {
+	uint32_t data_width;
+	uint32_t data_width_bytes;
+	uint32_t addr_width;
+	uint32_t addr_width_bytes;
 
 	uint64_t limit_samples;
 	uint64_t limit_samples_max;
@@ -54,36 +54,26 @@ struct ipdbg_la_dev_context {
 	uint8_t *raw_sample_buf;
 };
 
-int data_available(struct ipdbg_la_tcp *tcp);
-
 SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void);
 SR_PRIV void ipdbg_la_tcp_free(struct ipdbg_la_tcp *tcp);
 SR_PRIV int ipdbg_la_tcp_open(struct ipdbg_la_tcp *tcp);
 SR_PRIV int ipdbg_la_tcp_close(struct ipdbg_la_tcp *tcp);
-SR_PRIV int ipdbg_la_tcp_send(struct ipdbg_la_tcp *tcp,
-	const uint8_t *buf, size_t len);
-SR_PRIV int ipdbg_la_tcp_receive_blocking(struct ipdbg_la_tcp *tcp,
-	uint8_t *buf, int bufsize);
 SR_PRIV int ipdbg_la_tcp_receive(struct ipdbg_la_tcp *tcp,
-	uint8_t *buf);
+	uint8_t *buf, size_t bufsize);
 
 SR_PRIV int ipdbg_la_convert_trigger(const struct sr_dev_inst *sdi);
 
-SR_PRIV struct ipdbg_la_dev_context *ipdbg_la_dev_new(void);
+SR_PRIV struct dev_context *ipdbg_la_dev_new(void);
 SR_PRIV void ipdbg_la_get_addrwidth_and_datawidth(
-	struct ipdbg_la_tcp *tcp, struct ipdbg_la_dev_context *devc);
-SR_PRIV int send_escaping(struct ipdbg_la_tcp *tcp, uint8_t *dataToSend,
-	uint32_t length);
+	struct ipdbg_la_tcp *tcp, struct dev_context *devc);
 SR_PRIV int ipdbg_la_send_reset(struct ipdbg_la_tcp *tcp);
 SR_PRIV int ipdbg_la_request_id(struct ipdbg_la_tcp *tcp);
 SR_PRIV int ipdbg_la_send_start(struct ipdbg_la_tcp *tcp);
-SR_PRIV int ipdbg_la_send_trigger(struct ipdbg_la_dev_context *devc,
+SR_PRIV int ipdbg_la_send_trigger(struct dev_context *devc,
 	struct ipdbg_la_tcp *tcp);
-SR_PRIV int ipdbg_la_send_delay(struct ipdbg_la_dev_context *devc,
+SR_PRIV int ipdbg_la_send_delay(struct dev_context *devc,
 	struct ipdbg_la_tcp *tcp);
 SR_PRIV int ipdbg_la_receive_data(int fd, int revents, void *cb_data);
 SR_PRIV void ipdbg_la_abort_acquisition(const struct sr_dev_inst *sdi);
-SR_PRIV int ipdbg_la_tcp_receive_blocking(struct ipdbg_la_tcp *tcp,
-	uint8_t * buf, int bufsize);
 
 #endif