From: Eva Kissling Date: Tue, 16 May 2017 20:13:53 +0000 (+0200) Subject: ipdbg-la: Add changes for IPDBG project X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=a4210e1890bbdae354c64fd903784bdebb1aaa51 ipdbg-la: Add changes for IPDBG project --- diff --git a/Makefile.am b/Makefile.am index ef117ad9..6cb201a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -388,6 +388,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/ikalogic-scanaplus/protocol.c \ src/hardware/ikalogic-scanaplus/api.c endif +if HW_IPDBG_LOGIC_ANALYSER +src_libdrivers_la_SOURCES += \ + src/hardware/ipdbg-logic-analyser/protocol.h \ + src/hardware/ipdbg-logic-analyser/protocol.c \ + src/hardware/ipdbg-logic-analyser/api.c +endif if HW_KECHENG_KC_330B src_libdrivers_la_SOURCES += \ src/hardware/kecheng-kc-330b/protocol.h \ diff --git a/configure.ac b/configure.ac index c76ea6a1..6836e761 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ SR_DRIVER([HP 3478A], [hp-3478a], [libgpib]) SR_DRIVER([Hung-Chang DSO-2100], [hung-chang-dso-2100], [libieee1284]) SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb]) SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) +SR_DRIVER([IPDBG_Logic_Analyser], [ipdbg-logic-analyser]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) SR_DRIVER([KERN scale], [kern-scale], [libserialport]) SR_DRIVER([Korad KAxxxxP], [korad-kaxxxxp], [libserialport]) diff --git a/src/hardware/ipdbg-logic-analyser/api.c b/src/hardware/ipdbg-logic-analyser/api.c new file mode 100644 index 00000000..9bbbfe01 --- /dev/null +++ b/src/hardware/ipdbg-logic-analyser/api.c @@ -0,0 +1,399 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2016 danselmi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include "protocol.h" + +static const uint32_t ipdbg_org_la_drvopts[] = { + SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t ipdbg_org_la_scanopts[] = { + SR_CONF_CONN, + SR_CONF_SERIALCOMM, +}; + +static const uint32_t ipdbg_org_la_devopts[] = { + SR_CONF_TRIGGER_MATCH | SR_CONF_LIST, + SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, +}; + +static const int32_t ipdbg_org_la_trigger_matches[] = { + SR_TRIGGER_ZERO, + SR_TRIGGER_ONE, + SR_TRIGGER_RISING, + SR_TRIGGER_FALLING, + //SR_TRIGGER_EDGE, +}; + +SR_PRIV struct sr_dev_driver ipdbg_la_driver_info; + + + +static void ipdbg_org_la_split_addr_port(const char *conn, char **addr, char **port) +{ + char **strs = g_strsplit(conn, "/", 3); + + *addr = g_strdup(strs[1]); + *port = g_strdup(strs[2]); + + g_strfreev(strs); +} + +static GSList *scan(struct sr_dev_driver *di, GSList *options) +{ + sr_err("scan\n"); + struct drv_context *drvc; + GSList *devices; + + (void)options; + + devices = NULL; + drvc = di->context; + drvc->instances = NULL; + const char *conn; + struct sr_config *src; + GSList *l; + + conn = NULL; + for (l = options; l; l = l->next) { + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); + break; + } + } + + if (!conn) + return NULL; + + struct ipdbg_org_la_tcp *tcp = ipdbg_org_la_new_tcp(); + + ipdbg_org_la_split_addr_port(conn, &tcp->address, &tcp->port); + + if (!tcp->address) + return NULL; + + + if(ipdbg_org_la_tcp_open(tcp) != SR_OK) + return NULL; + + sr_err("set Reset\n"); +////////////////////////////////////////////////////////////////////////////////////////// + ipdbg_org_la_sendReset(tcp); + ipdbg_org_la_sendReset(tcp); + + ipdbg_org_la_requestID(tcp); + + struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst)); + if(!sdi){ + sr_err("no possible to allocate sr_dev_inst"); + return NULL; + } + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup("ipdbg.org"); + sdi->model = g_strdup("Logic Analyzer"); + sdi->version = g_strdup("v1.0"); + sdi->driver = di; + const size_t bufSize = 16; + char buff[bufSize]; + + + struct ipdbg_org_la_dev_context *devc = ipdbg_org_la_dev_new(); + sdi->priv = devc; + + ipdbg_org_la_get_addrwidth_and_datawidth(tcp, devc); + + sr_err("addr_width = %d, data_width = %d\n", devc->ADDR_WIDTH, devc->DATA_WIDTH); + sr_err("limit samples = %d\n", devc->limit_samples); + ///////////////////////////////////////////////////////////////////////////////////////////////////////// + + for (int i = 0; i < devc->DATA_WIDTH; i++) + { + snprintf(buff, bufSize, "ch%d", i); + sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, buff); + } + + sdi->inst_type = SR_INST_USER; + sdi->conn = tcp; + + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); + + ipdbg_org_la_tcp_close(tcp); + + return devices; +} + +static int dev_clear(const struct sr_dev_driver *di) +{ + sr_err("dev_clear\n"); + + struct drv_context *drvc = di->context; + struct sr_dev_inst *sdi; + GSList *l; + + if (drvc) { + for (l = drvc->instances; l; l = l->next) { + sdi = l->data; + struct ipdbg_org_la_tcp *tcp = sdi->conn; + if(tcp) + { + ipdbg_org_la_tcp_close(tcp); + ipdbg_org_la_tcp_free(tcp); + g_free(tcp); + } + sdi->conn = NULL; + } + } + + return std_dev_clear(di); +} + +static int dev_open(struct sr_dev_inst *sdi) +{ + sr_err("dev_open\n"); + (void)sdi; + + /* TODO: get handle from sdi->conn and open it. */ + sdi->status = SR_ST_INACTIVE; + + struct ipdbg_org_la_tcp *tcp = sdi->conn; + + if (!tcp) + { + sr_err("Out of memory\n"); + return SR_ERR; + } + sdi->conn = tcp; + + if(ipdbg_org_la_tcp_open(tcp) != SR_OK) + return SR_ERR; + + sdi->status = SR_ST_ACTIVE; + + return SR_OK; +} + +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"); + /// should be called before a new call to scan() + struct ipdbg_org_la_tcp *tcp = sdi->conn; + ipdbg_org_la_tcp_close(tcp); + + sdi->conn = NULL; + + sdi->status = SR_ST_INACTIVE; + + return SR_OK; +} + +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +{ + int ret; + + (void)sdi; + (void)data; + (void)cg; + + struct ipdbg_org_la_dev_context *devc = sdi->priv; + + ret = SR_OK; + switch (key) { + case SR_CONF_CAPTURE_RATIO: + *data = g_variant_new_uint64(devc->capture_ratio); + break; + case SR_CONF_LIMIT_SAMPLES: + *data = g_variant_new_uint64(devc->limit_samples); + break; + default: + return SR_ERR_NA; + } + + return ret; +} + +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +{ + int ret; + + (void)data; + (void)cg; + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + + sr_err("config_set\n"); + struct ipdbg_org_la_dev_context *devc = sdi->priv; + + ret = SR_OK; + switch (key) { + case SR_CONF_CAPTURE_RATIO: + devc->capture_ratio = g_variant_get_uint64(data); + if (devc->capture_ratio < 0 || devc->capture_ratio > 100) + { + devc->capture_ratio = 50; + ret = SR_ERR; + } + else + ret = SR_OK; + break; + case SR_CONF_LIMIT_SAMPLES: + devc->limit_samples = g_variant_get_uint64(data); + if(devc->limit_samples > devc->limit_samples_max) + { + devc->limit_samples = devc->limit_samples_max; + ret = SR_ERR; + } + else + ret = SR_OK; + break; + default: + ret = SR_ERR_NA; + } + + return ret; +} + +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +{ + (void)cg; + + switch (key) { + case SR_CONF_SCAN_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, ipdbg_org_la_scanopts, ARRAY_SIZE(ipdbg_org_la_scanopts), sizeof(uint32_t)); + break; + case SR_CONF_DEVICE_OPTIONS: + if (!sdi) + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, ipdbg_org_la_drvopts, ARRAY_SIZE(ipdbg_org_la_drvopts), sizeof(uint32_t)); + else + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, ipdbg_org_la_devopts, ARRAY_SIZE(ipdbg_org_la_devopts), sizeof(uint32_t)); + break; + case SR_CONF_TRIGGER_MATCH: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, ipdbg_org_la_trigger_matches, ARRAY_SIZE(ipdbg_org_la_trigger_matches), sizeof(int32_t)); + break; + default: + return SR_ERR_NA; + } + + return SR_OK; +} + + +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) +{ + return std_init(di, sr_ctx); +} + +static int cleanup(const struct sr_dev_driver *di) +{ + sr_err("cleanup\n"); + dev_clear(di); + + //return std_cleanup(di); + return SR_OK; +} + +static GSList *dev_list(const struct sr_dev_driver *di) +{ + //return std_dev_list(di); + return ((struct drv_context *) (di->context))-> instances; +} + +static int dev_acquisition_start(const struct sr_dev_inst *sdi) +{ + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + struct ipdbg_org_la_tcp *tcp = sdi->conn; + + struct ipdbg_org_la_dev_context *devc = sdi->priv; + + ipdbg_org_la_convert_trigger(sdi); + sr_err("dev_acquisition_start\n"); + + /* Send Triggerkonviguration */ + ipdbg_org_la_sendTrigger(devc, tcp); + sr_err("dev_acquisition_start1\n"); + + /* Send Delay */ + ipdbg_org_la_sendDelay(devc, tcp); + 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"); + /* 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"); + + ipdbg_org_la_sendStart(tcp); + sr_err("dev_acquisition_start5\n"); + /* TODO: configure hardware, reset acquisition state, set up + * callbacks and send header packet. */ + + return SR_OK; +} + +static int dev_acquisition_stop(struct sr_dev_inst *sdi) +{ + + sr_err("dev_acquisition_stop\n"); + + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + + ipdbg_org_la_abort_acquisition(sdi); + + return SR_OK; +} + +SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = { + .name = "ipdbg-org-la", + .longname = "ipdbg.org logic analyzer", + .api_version = 1, + .init = init, + .cleanup = cleanup, + .scan = scan, + .dev_list = dev_list, + .dev_clear = dev_clear, + .config_get = config_get, + .config_set = config_set, + .config_list = config_list, + .dev_open = dev_open, + .dev_close = dev_close, + .dev_acquisition_start = dev_acquisition_start, + .dev_acquisition_stop = dev_acquisition_stop, + .context = NULL, +}; + +SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info); diff --git a/src/hardware/ipdbg-logic-analyser/protocol.c b/src/hardware/ipdbg-logic-analyser/protocol.c new file mode 100644 index 00000000..2bff81e9 --- /dev/null +++ b/src/hardware/ipdbg-logic-analyser/protocol.c @@ -0,0 +1,642 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2016 danselmi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#ifdef _WIN32 +#define _WIN32_WINNT 0x0501 +#include +#include +#endif +//#include +#include +#include +#ifndef _WIN32 +#include +#include +#include +#include +#endif +#include +#include "protocol.h" + +#define BUFFER_SIZE 4 + + +#define Start 0xFE +#define reset 0xAB +#define IPDBG_LA_ID 0xBB +#define Escape 0x55 + + +/* Command opcodes */ +#define set_trigger 0x00 +#define Trigger 0xF0 +#define LA 0x0F +#define Masks 0xF1 +#define Mask 0xF3 +#define Value 0xF7 +#define Last_Masks 0xF9 +#define Mask_last 0xFB +#define Value_last 0xFF +#define delay 0x1F +#define K_Mauslesen 0xAA + + +SR_PRIV int sendEscaping(struct ipdbg_org_la_tcp *tcp, char *dataToSend, int length); + +SR_PRIV struct ipdbg_org_la_tcp *ipdbg_org_la_new_tcp(void) +{ + struct ipdbg_org_la_tcp *tcp; + + tcp = g_malloc0(sizeof(struct ipdbg_org_la_tcp)); + + tcp->address = NULL; + tcp->port = NULL; + tcp->socket = -1; + + return tcp; +} + +SR_PRIV int ipdbg_org_la_tcp_open(struct ipdbg_org_la_tcp *tcp) +{ + struct addrinfo hints; + struct addrinfo *results, *res; + int err; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + err = getaddrinfo(tcp->address, tcp->port, &hints, &results); + + if (err) { + sr_err("Address lookup failed: %s:%s: %s", tcp->address, tcp->port, + gai_strerror(err)); + return SR_ERR; + } + + for (res = results; res; res = res->ai_next) { + if ((tcp->socket = socket(res->ai_family, res->ai_socktype, + res->ai_protocol)) < 0) + continue; + if (connect(tcp->socket, res->ai_addr, res->ai_addrlen) != 0) { + close(tcp->socket); + tcp->socket = -1; + continue; + } + break; + } + + freeaddrinfo(results); + + if (tcp->socket < 0) { + sr_err("Failed to connect to %s:%s: %s", tcp->address, tcp->port, + g_strerror(errno)); + return SR_ERR; + } + + return SR_OK; +} + +SR_PRIV int ipdbg_org_la_tcp_send(struct ipdbg_org_la_tcp *tcp, const uint8_t *buf, size_t len) +{ + int out; + + out = send(tcp->socket, buf, len, 0); + + if (out < 0) { + sr_err("Send error: %s", g_strerror(errno)); + return SR_ERR; + } + + if ((unsigned int)out < len) { + sr_dbg("Only sent %d/%d bytes of data.", out, (int)len); + } + + return SR_OK; +} + +SR_PRIV int ipdbg_org_la_tcp_receive(struct ipdbg_org_la_tcp *tcp, uint8_t *buf, int bufsize) +{ + int received = 0; + + while(received < bufsize) + { + + int len; + + len = recv(tcp->socket, buf+received, bufsize-received, 0); + + if (len < 0) { + sr_err("Receive error: %s", g_strerror(errno)); + return SR_ERR; + } + else + { + received += len; + } + } + + return received; +} + +SR_PRIV int ipdbg_org_la_tcp_close(struct ipdbg_org_la_tcp *tcp) +{ + int ret = SR_ERR; + if (close(tcp->socket) >= 0) + ret = SR_OK; + + tcp->socket = -1; + + return ret; +} + +SR_PRIV void ipdbg_org_la_tcp_free(struct ipdbg_org_la_tcp *tcp) +{ + g_free(tcp->address); + g_free(tcp->port); +} + +SR_PRIV int ipdbg_org_la_convert_trigger(const struct sr_dev_inst *sdi) +{ + struct ipdbg_org_la_dev_context *devc; + struct sr_trigger *trigger; + struct sr_trigger_stage *stage; + struct sr_trigger_match *match; + const GSList *l, *m; + + devc = sdi->priv; + + devc->num_stages = 0; + devc->num_transfers = 0; + devc->raw_sample_buf = NULL; /// name convert_trigger to init acquisition... + for (int i = 0; i < devc->DATA_WIDTH_BYTES; i++) // Hier werden die Trigger-Variabeln 0 gesetzt! + { + devc->trigger_mask[i] = 0; + devc->trigger_value[i] = 0; + devc->trigger_mask_last[i] = 0; + devc->trigger_value_last[i] = 0; + } + sr_err("\nDATA_WITH_BYTES:%i\n",devc->DATA_WIDTH_BYTES); + +// devc->trigger_value[0] = 0x00; +// devc->trigger_value_last[0] = 0xff; +// devc->trigger_mask[0] = 0xff; +// devc->trigger_mask_last[0] = 0xff; + + + if (!(trigger = sr_session_trigger_get(sdi->session))) // + { + return SR_OK; + } + + + devc->num_stages = g_slist_length(trigger->stages); + if (devc->num_stages != devc->DATA_WIDTH_BYTES) + { + + sr_err("\nThis device only supports %d trigger stages.", + devc->DATA_WIDTH_BYTES); + + return SR_ERR; + } + + for (l = trigger->stages; l; l = l->next) + { + stage = l->data; + for (m = stage->matches; m; m = m->next) + { + match = m->data; + unsigned int byteIndex = (match->channel->index) /8; + unsigned char matchPattern = 1 << (match->channel->index - 8* byteIndex); + //zeroTrigger |= matchPattern; + //sr_err("\n\nzerotrigger:%x\n\n",zeroTrigger); + //sr_err("\nbyteIndex:%i",byteIndex); + //sr_err("\nmatch Pattern:%i\n",matchPattern); + + if (!match->channel->enabled) + /* Ignore disabled channels with a trigger. */ + continue; + if (match->match == SR_TRIGGER_ONE ) + { + devc->trigger_value[byteIndex] |= matchPattern; + devc->trigger_mask[byteIndex] |= matchPattern; + devc->trigger_mask_last[byteIndex] &= ~matchPattern; + //sr_err("\n========ONE MASK==========="); + + } + else if (match->match == SR_TRIGGER_ZERO) + { + devc->trigger_value[byteIndex] &= ~matchPattern; + devc->trigger_mask[byteIndex] |= matchPattern; + devc->trigger_mask_last[byteIndex] &= ~matchPattern; + //sr_err("\n========ZERO MASK==========="); + } + else if ( match->match == SR_TRIGGER_RISING) + { + devc->trigger_value[byteIndex] |= matchPattern; + devc->trigger_value_last[byteIndex] &= ~matchPattern; + devc->trigger_mask[byteIndex] |= matchPattern; + devc->trigger_mask_last[byteIndex] |= matchPattern; + //sr_err("\n==========RISING==========="); + + } + else if (match->match == SR_TRIGGER_FALLING ) + { + devc->trigger_value[byteIndex] &= ~matchPattern; + devc->trigger_value_last[byteIndex] |= matchPattern; + devc->trigger_mask[byteIndex] |= matchPattern; + devc->trigger_mask_last[byteIndex] |= matchPattern; + //sr_err("\n========FALlING==========="); + } + + } + + } + +// sr_err("\n VAL LAST:%x\n",devc->trigger_value_last[0]); +// sr_err("\n VAL:%x\n",devc->trigger_value[0]); +// sr_err("\n MASK:%x\n",devc->trigger_mask[0]); +// sr_err("\n MASK LAST:%x\n",devc->trigger_mask_last[0]); + + return SR_OK; +} + +SR_PRIV int ipdbg_org_la_receive_data(int fd, int revents, void *cb_data) +{ + //sr_err("receive Data0\n"); + + + const struct sr_dev_inst *sdi; + struct ipdbg_org_la_dev_context *devc; + + + + (void)fd; + (void)revents; + + sdi = (const struct sr_dev_inst *)cb_data; + if (!sdi) + { + return FALSE; + } + //sr_err("receive Data1\n"); + + if (!(devc = sdi->priv)) + { + return FALSE; + + } + //sr_err("receive Data2\n"); + + + struct ipdbg_org_la_tcp *tcp = sdi->conn; + struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; + + + + /*sr_warn("---"); + if (devc->num_transfers == 0 && revents == 0) + { // + sr_warn("warten auf Eingangsdaten"); + // Ignore timeouts as long as we haven't received anything + return TRUE; + }*/ + + if (!devc->raw_sample_buf) + { + //sr_warn("allocating buffer"); + devc->raw_sample_buf = g_try_malloc(devc->limit_samples*devc->DATA_WIDTH_BYTES); + + if (!devc->raw_sample_buf) { + sr_warn("Sample buffer malloc failed."); + return FALSE; + } + + } + + + if (devc->num_transfers < devc->limit_samples_max*devc->DATA_WIDTH_BYTES) + { + sr_err("1"); + unsigned char byte; + + + if (ipdbg_org_la_tcp_receive(tcp, &byte, 1) == 1) + { + if(devc->num_transfers < devc->limit_samples*devc->DATA_WIDTH_BYTES) + devc->raw_sample_buf[devc->num_transfers] = byte; + devc->num_transfers++; + } + + } + else + { + sr_err("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. */ + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + //logic.length = devc->delay_value-1; + logic.length = devc->delay_value*devc->DATA_WIDTH_BYTES; + logic.unitsize = devc->DATA_WIDTH_BYTES; + logic.data = devc->raw_sample_buf; + sr_session_send(cb_data, &packet); + } + + /* Send the trigger. */ + packet.type = SR_DF_TRIGGER; + sr_session_send(cb_data, &packet); + + /* Send post-trigger samples. */ + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + //logic.length = devc->limit_samples - devc->delay_value+1; + logic.length = (devc->limit_samples - devc->delay_value)*devc->DATA_WIDTH_BYTES; + logic.unitsize = devc->DATA_WIDTH_BYTES; + logic.data = devc->raw_sample_buf + devc->delay_value*devc->DATA_WIDTH_BYTES; + //logic.data = devc->raw_sample_buf + devc->delay_value-1; + sr_session_send(cb_data, &packet); + + g_free(devc->raw_sample_buf); + devc->raw_sample_buf = NULL; + + //serial_flush(serial); + ipdbg_org_la_abort_acquisition(sdi);////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + } + + return TRUE; +} + +SR_PRIV int ipdbg_org_la_sendDelay(struct ipdbg_org_la_dev_context *devc, struct ipdbg_org_la_tcp *tcp) +{ + //sr_warn("delay"); + + int maxSample; + + maxSample = //0x1 << (devc->ADDR_WIDTH); + devc->limit_samples; + + devc->delay_value = (maxSample/100.0) * devc->capture_ratio; + uint8_t Befehl[1]; + Befehl[0] = LA; + ipdbg_org_la_tcp_send(tcp, Befehl, 1); + Befehl[0] = delay; + ipdbg_org_la_tcp_send(tcp, Befehl, 1); + + //sr_warn("delay 2"); + + + char buf[4] = { devc->delay_value & 0x000000ff, + (devc->delay_value >> 8) & 0x000000ff, + (devc->delay_value >> 16) & 0x000000ff, + (devc->delay_value >> 24) & 0x000000ff}; + + sendEscaping(tcp, buf, devc->ADDR_WIDTH_BYTES); + + //sr_warn("send delay_value: 0x%.2x", devc->delay_value); + + return SR_OK; +} + +SR_PRIV int ipdbg_org_la_sendTrigger(struct ipdbg_org_la_dev_context *devc, struct ipdbg_org_la_tcp *tcp) +{ + /////////////////////////////////////////////Mask//////////////////////////////////////////////////////////// + uint8_t buf[1]; + buf[0] = Trigger; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Masks; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Mask; + ipdbg_org_la_tcp_send(tcp, buf, 1); + + sendEscaping(tcp, devc->trigger_mask, devc->DATA_WIDTH_BYTES); + + //sr_warn("send trigger_mask: %x", devc->trigger_mask[0]); + + + /////////////////////////////////////////////Value//////////////////////////////////////////////////////////// + buf[0]= Trigger; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Masks; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Value; + ipdbg_org_la_tcp_send(tcp, buf, 1); + + + sendEscaping(tcp, devc->trigger_value, devc->DATA_WIDTH_BYTES); + + //sr_warn("send trigger_value: 0x%.2x", devc->trigger_value[0]); + + + /////////////////////////////////////////////Mask_last//////////////////////////////////////////////////////////// + buf[0] = Trigger; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Last_Masks; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0] = Mask_last; + ipdbg_org_la_tcp_send(tcp, buf, 1); + + + sendEscaping(tcp, devc->trigger_mask_last, devc->DATA_WIDTH_BYTES); + + + //sr_warn("send trigger_mask_last: 0x%.2x", devc->trigger_mask_last[0]); + + + /////////////////////////////////////////////Value_last//////////////////////////////////////////////////////////// + buf[0] = Trigger; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0]= Last_Masks; + ipdbg_org_la_tcp_send(tcp, buf, 1); + buf[0]= Value_last; + ipdbg_org_la_tcp_send(tcp, buf, 1); + + + sendEscaping(tcp, devc->trigger_value_last, devc->DATA_WIDTH_BYTES); + + + //sr_warn("send trigger_value_last: 0x%.2x", devc->trigger_value_last[0]); + + return SR_OK; +} + +SR_PRIV int sendEscaping(struct ipdbg_org_la_tcp *tcp, char *dataToSend, int length) +{ + + while(length--) + { + uint8_t payload = *dataToSend++; + //sr_warn("payload %d", payload); + + //sr_warn("send really"); + + if ( payload == (uint8_t)reset ) + { + uint8_t escapeSymbol = Escape; + sr_warn("Escape"); + + if(ipdbg_org_la_tcp_send(tcp, &escapeSymbol, 1) != SR_OK) + sr_warn("can't send escape"); + + + } + + if ( payload == (char)Escape ) + { + uint8_t escapeSymbol = Escape; + sr_warn("Escape"); + + if(ipdbg_org_la_tcp_send(tcp, &escapeSymbol, 1) != SR_OK) + sr_warn("can't send escape"); + } + + if (ipdbg_org_la_tcp_send(tcp, &payload, 1) != SR_OK) + { + sr_warn("Can't send data"); + } + //sr_warn("length %d", length); + + } + return SR_OK; +} + +SR_PRIV void ipdbg_org_la_get_addrwidth_and_datawidth(struct ipdbg_org_la_tcp *tcp, struct ipdbg_org_la_dev_context *devc) +{ + //sr_err("getAddrAndDataWidth\n"); + uint8_t buf[8]; + uint8_t auslesen[1]; + auslesen[0]= K_Mauslesen; + + if(ipdbg_org_la_tcp_send(tcp, auslesen, 1) != SR_OK) + sr_warn("Can't send K_Mauslesen"); + //g_usleep(RESPONSE_DELAY_US); + + + + /// delay + if(ipdbg_org_la_tcp_receive(tcp, buf, 8) != 8) + sr_warn("getAddrAndDataWidth failed"); + + //sr_warn("getAddrAndDataWidth 0x%x:0x%x:0x%x:0x%x 0x%x:0x%x:0x%x:0x%x", buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7]); + + devc->DATA_WIDTH = buf[0] & 0x000000FF; + devc->DATA_WIDTH |= (buf[1] << 8) & 0x0000FF00; + devc->DATA_WIDTH |= (buf[2] << 16) & 0x00FF0000; + devc->DATA_WIDTH |= (buf[3] << 24) & 0xFF000000; + + devc->ADDR_WIDTH = buf[4] & 0x000000FF; + devc->ADDR_WIDTH |= (buf[5] << 8) & 0x0000FF00; + devc->ADDR_WIDTH |= (buf[6] << 16) & 0x00FF0000; + devc->ADDR_WIDTH |= (buf[7] << 24) & 0xFF000000; + + + + //sr_warn("Datawidth: %d Addrwdth : %d", devc->DATA_WIDTH, devc->ADDR_WIDTH); + + int HOST_WORD_SIZE = 8; // bits/ word + + 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->trigger_mask = g_malloc0(devc->DATA_WIDTH_BYTES); + devc->trigger_value = g_malloc0(devc->DATA_WIDTH_BYTES); + devc->trigger_mask_last = g_malloc0(devc->DATA_WIDTH_BYTES); + devc->trigger_value_last = g_malloc0(devc->DATA_WIDTH_BYTES); + + +} + +SR_PRIV struct ipdbg_org_la_dev_context *ipdbg_org_la_dev_new(void) +{ + struct ipdbg_org_la_dev_context *devc; + + devc = g_malloc0(sizeof(struct ipdbg_org_la_dev_context)); + + + devc->capture_ratio = 50; + ///devc->num_bytes = 0; + + return devc; +} + +SR_PRIV int ipdbg_org_la_sendReset(struct ipdbg_org_la_tcp *tcp) +{ + uint8_t buf[1]; + buf[0]= reset; + if(ipdbg_org_la_tcp_send(tcp, buf, 1) != SR_OK) + sr_warn("Reset can't send"); + return SR_OK; +} + +SR_PRIV int ipdbg_org_la_requestID(struct ipdbg_org_la_tcp *tcp) +{ + uint8_t buf[1]; + buf[0]= IPDBG_LA_ID; + if(ipdbg_org_la_tcp_send(tcp, buf, 1) != SR_OK) + sr_warn("IDBG can't send"); + + char ID[4]; + if(ipdbg_org_la_tcp_receive(tcp, (uint8_t*)ID, 4) != 4) + { + sr_warn("IDBG can't read"); + } + + + if (strncmp(ID, "IDBG", 4)) { + sr_err("Invalid reply (expected 'IDBG' '%c%c%c%c').", ID[0], ID[1], ID[2], ID[3]); + return SR_ERR; + } + + return SR_OK; +} + +SR_PRIV void ipdbg_org_la_abort_acquisition(const struct sr_dev_inst *sdi) +{ + struct sr_datafeed_packet packet; + + struct ipdbg_org_la_tcp *tcp = sdi->conn; + + sr_session_source_remove(sdi->session, tcp->socket); + + /* Terminate session */ + packet.type = SR_DF_END; + sr_session_send(sdi, &packet); +} + +SR_PRIV int ipdbg_org_la_sendStart(struct ipdbg_org_la_tcp *tcp) +{ + uint8_t buf[1]; + buf[0] = Start; + + if(ipdbg_org_la_tcp_send(tcp, buf, 1) != SR_OK) + sr_warn("Reset can't send"); + return SR_OK; +} + diff --git a/src/hardware/ipdbg-logic-analyser/protocol.h b/src/hardware/ipdbg-logic-analyser/protocol.h new file mode 100644 index 00000000..ab92b209 --- /dev/null +++ b/src/hardware/ipdbg-logic-analyser/protocol.h @@ -0,0 +1,80 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2016 danselmi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef LIBSIGROK_HARDWARE_IPDBG_ORG_LA_PROTOCOL_H +#define LIBSIGROK_HARDWARE_IPDBG_ORG_LA_PROTOCOL_H + +#include +#include +#include +#include "libsigrok-internal.h" + +#define LOG_PREFIX "ipdbg-org-la" + + +struct ipdbg_org_la_tcp { + char *address; + char *port; + int socket; + //char length_buf[BUFFER_SIZE]; + //int length_bytes_read; + //int response_length; + //int response_bytes_read; +}; + +/** Private, per-device-instance driver context. */ +struct ipdbg_org_la_dev_context +{ + int DATA_WIDTH; + int DATA_WIDTH_BYTES; + int ADDR_WIDTH; + int ADDR_WIDTH_BYTES ; + + unsigned int limit_samples; + unsigned int limit_samples_max; + char capture_ratio; + char *trigger_mask; + char *trigger_value; + char *trigger_mask_last; + char *trigger_value_last; + unsigned int delay_value; + int num_stages; //always 0 + unsigned int num_transfers; + unsigned char *raw_sample_buf; +}; + +SR_PRIV struct ipdbg_org_la_tcp *ipdbg_org_la_new_tcp(void); +SR_PRIV int ipdbg_org_la_tcp_open(struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_tcp_close(struct ipdbg_org_la_tcp *tcp); +SR_PRIV void ipdbg_org_la_tcp_free(struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_tcp_send(struct ipdbg_org_la_tcp *tcp, const uint8_t *buf, size_t len); +SR_PRIV int ipdbg_org_la_tcp_receive(struct ipdbg_org_la_tcp *tcp, uint8_t *buf, int bufsize); + +SR_PRIV struct ipdbg_org_la_dev_context *ipdbg_org_la_dev_new(void); +SR_PRIV void ipdbg_org_la_get_addrwidth_and_datawidth(struct ipdbg_org_la_tcp *tcp, struct ipdbg_org_la_dev_context *devc); +SR_PRIV int ipdbg_org_la_sendReset(struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_requestID(struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_sendStart(struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_sendTrigger(struct ipdbg_org_la_dev_context *devc, struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_sendDelay(struct ipdbg_org_la_dev_context *devc, struct ipdbg_org_la_tcp *tcp); +SR_PRIV int ipdbg_org_la_convert_trigger(const struct sr_dev_inst *sdi); +SR_PRIV int ipdbg_org_la_receive_data(int fd, int revents, void *cb_data); +SR_PRIV void ipdbg_org_la_abort_acquisition(const struct sr_dev_inst *sdi); + +#endif