X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fipdbg-logic-analyser%2Fapi.c;h=98512a1495be06574ed1219c8f8bcf4becd583d6;hb=a66099c6fa4f1b9e8b42bab1f980acc1d5aa452a;hp=84ed294463b14426bf670f8d607d9d521bed52a9;hpb=750303aab837623d2501641ebad026ff78e37f76;p=libsigrok.git diff --git a/src/hardware/ipdbg-logic-analyser/api.c b/src/hardware/ipdbg-logic-analyser/api.c index 84ed2944..98512a14 100644 --- a/src/hardware/ipdbg-logic-analyser/api.c +++ b/src/hardware/ipdbg-logic-analyser/api.c @@ -40,7 +40,7 @@ static const int32_t ipdbg_org_la_trigger_matches[] = { SR_TRIGGER_ONE, SR_TRIGGER_RISING, SR_TRIGGER_FALLING, - //SR_TRIGGER_EDGE, + SR_TRIGGER_EDGE, }; SR_PRIV struct sr_dev_driver ipdbg_la_driver_info; @@ -126,7 +126,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sr_err("limit samples = %d\n", devc->limit_samples_max); ///////////////////////////////////////////////////////////////////////////////////////////////////////// - for (int i = 0; i < devc->DATA_WIDTH; i++) + for (unsigned int i = 0; i < devc->DATA_WIDTH; i++) { snprintf(buff, bufSize, "ch%d", i); sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, buff); @@ -145,7 +145,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static int dev_clear(const struct sr_dev_driver *di) { - sr_err("dev_clear\n"); + //sr_err("dev_clear\n"); struct drv_context *drvc = di->context; struct sr_dev_inst *sdi; @@ -170,7 +170,7 @@ static int dev_clear(const struct sr_dev_driver *di) static int dev_open(struct sr_dev_inst *sdi) { - sr_err("dev_open\n"); + //sr_err("dev_open\n"); (void)sdi; /* TODO: get handle from sdi->conn and open it. */ @@ -196,7 +196,7 @@ static int dev_close(struct sr_dev_inst *sdi) (void)sdi; /* TODO: get handle from sdi->conn and close it. */ - sr_err("dev_close\n"); + //sr_err("dev_close\n"); /// should be called before a new call to scan() struct ipdbg_org_la_tcp *tcp = sdi->conn; if(tcp) @@ -246,7 +246,7 @@ static int config_set(uint32_t key, GVariant *data, if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - sr_err("config_set\n"); + //sr_err("config_set\n"); struct ipdbg_org_la_dev_context *devc = sdi->priv; ret = SR_OK; @@ -324,29 +324,29 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct ipdbg_org_la_dev_context *devc = sdi->priv; ipdbg_org_la_convert_trigger(sdi); - sr_err("dev_acquisition_start\n"); + //sr_err("dev_acquisition_start\n"); /* Send Triggerkonviguration */ ipdbg_org_la_sendTrigger(devc, tcp); - sr_err("dev_acquisition_start1\n"); + //sr_err("dev_acquisition_start1\n"); /* Send Delay */ ipdbg_org_la_sendDelay(devc, tcp); - sr_err("dev_acquisition_start2\n"); + //sr_err("dev_acquisition_start2\n"); //std_session_send_df_header(sdi, LOG_PREFIX); std_session_send_df_header(sdi); - sr_err("dev_acquisition_start3\n"); + //sr_err("dev_acquisition_start3\n"); /* If the device stops sending for longer than it takes to send a byte, * that means it's finished. But wait at least 100 ms to be safe. */ //sr_session_source_add(sdi->session, -1, G_IO_IN, 100, ipdbg_receive_data, (struct sr_dev_inst *)sdi); //sr_session_source_add(sdi->session, -1, G_IO_IN, 100, ipdbg_org_la_receive_data, NULL); sr_session_source_add(sdi->session, tcp->socket, G_IO_IN, 100, ipdbg_org_la_receive_data, (struct sr_dev_inst *)sdi); - sr_err("dev_acquisition_start4\n"); + //sr_err("dev_acquisition_start4\n"); ipdbg_org_la_sendStart(tcp); - sr_err("dev_acquisition_start5\n"); + //sr_err("dev_acquisition_start5\n"); /* TODO: configure hardware, reset acquisition state, set up * callbacks and send header packet. */