X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=e53827a4bc9fcdb080dac8e02e6c1da7b227df71;hb=bbef5e326de1669b039413d8753fceda7281e936;hp=086a254aab3c35f2eaf1635a1877e3818f96f103;hpb=79081ec80c79801c439a1a3756cf5426af0739b8;p=libsigrok.git diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c index 086a254a..e53827a4 100644 --- a/hardware/uni-t-dmm/protocol.c +++ b/hardware/uni-t-dmm/protocol.c @@ -1,7 +1,7 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * - * Copyright (C) 2012 Uwe Hermann + * Copyright (C) 2012-2013 Uwe Hermann * * 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 @@ -30,11 +30,12 @@ * Most UNI-T DMMs can be used with two (three) different PC interface cables: * - The UT-D04 USB/HID cable, old version with Hoitek HE2325U chip. * - The UT-D04 USB/HID cable, new version with WCH CH9325 chip. - * - The UT-D01 RS232 cable. + * - The UT-D02 RS232 cable. * - * This driver is meant to support all three cables, and various DMMs that + * This driver is meant to support all USB/HID cables, and various DMMs that * can be attached to a PC via these cables. Currently only the UT-D04 cable - * (new version) is supported. + * (new version) is supported/tested. + * The UT-D02 RS232 cable is handled by the 'serial-dmm' driver. * * The data for one DMM packet (e.g. 14 bytes if the respective DMM uses a * Fortune Semiconductor FS9922-DMM4 chip) is spread across multiple @@ -66,22 +67,31 @@ * - ... */ -static void decode_packet(struct dev_context *devc, const uint8_t *buf) +static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf, + void *info) { + struct dev_context *devc; struct sr_datafeed_packet packet; struct sr_datafeed_analog analog; float floatval; int ret; + devc = sdi->priv; memset(&analog, 0, sizeof(struct sr_datafeed_analog)); /* Parse the protocol packet. */ - if ((ret = sr_dmm_parse_fs9922(buf, &floatval, &analog)) != SR_OK) { - sr_err("Invalid DMM packet, ignoring."); + ret = udmms[dmm].packet_parse(buf, &floatval, &analog, info); + if (ret != SR_OK) { + sr_dbg("Invalid DMM packet, ignoring."); return; } + /* If this DMM needs additional handling, call the resp. function. */ + if (udmms[dmm].dmm_details) + udmms[dmm].dmm_details(&analog, info); + /* Send a sample packet with one analog value. */ + analog.probes = sdi->probes; analog.num_samples = 1; analog.data = &floatval; packet.type = SR_DF_ANALOG; @@ -92,16 +102,20 @@ static void decode_packet(struct dev_context *devc, const uint8_t *buf) devc->num_samples++; } -static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) +static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate) { int ret; uint8_t buf[5]; + struct sr_usb_dev_inst *usb; + usb = sdi->conn; + /* Detach kernel drivers which grabbed this device (if any). */ - if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) { - ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0); + if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) { + ret = libusb_detach_kernel_driver(usb->devhdl, 0); if (ret < 0) { - sr_err("Failed to detach kernel driver: %d.", ret); + sr_err("Failed to detach kernel driver: %s.", + libusb_error_name(ret)); return SR_ERR; } sr_dbg("Successfully detached kernel driver."); @@ -110,13 +124,14 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) } /* Claim interface 0. */ - if ((ret = libusb_claim_interface(devc->usb->devhdl, 0)) < 0) { - sr_err("Failed to claim interface 0: %d.", ret); + if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) { + sr_err("Failed to claim interface 0: %s.", + libusb_error_name(ret)); return SR_ERR; } sr_dbg("Successfully claimed interface 0."); - /* Baudrate example: 19230 baud -> HEX(19230) == 0x4b1e */ + /* Set data for the HID feature report (e.g. baudrate). */ buf[0] = baudrate & 0xff; /* Baudrate, LSB */ buf[1] = (baudrate >> 8) & 0xff; /* Baudrate, MSB */ buf[2] = 0x00; /* Unknown/unused (?) */ @@ -128,7 +143,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) sr_spew("HID init = 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x (%d baud)", buf[0], buf[1], buf[2], buf[3], buf[4], baudrate); ret = libusb_control_transfer( - devc->usb->devhdl, /* libusb device handle */ + usb->devhdl, /* libusb device handle */ LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_OUT, @@ -140,7 +155,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) 1000 /* timeout (ms) */); if (ret < 0) { - sr_err("HID feature report error: %d.", ret); + sr_err("HID feature report error: %s.", libusb_error_name(ret)); return SR_ERR; } @@ -170,40 +185,32 @@ static void log_dmm_packet(const uint8_t *buf) buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]); } -SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data) +static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info) { - struct sr_dev_inst *sdi; struct dev_context *devc; + uint8_t buf[CHUNK_SIZE], *pbuf; int i, ret, len, num_databytes_in_chunk; - uint8_t buf[CHUNK_SIZE]; - uint8_t *pbuf; - static gboolean first_run = TRUE, synced_on_first_packet = FALSE; - static uint64_t data_byte_counter = 0; + struct sr_usb_dev_inst *usb; - (void)fd; - (void)revents; - - sdi = cb_data; devc = sdi->priv; - + usb = sdi->conn; pbuf = devc->protocol_buf; /* On the first run, we need to init the HID chip. */ - if (first_run) { - /* TODO: The baudrate is DMM-specific (UT61D: 19230). */ - if ((ret = hid_chip_init(devc, 19230)) != SR_OK) { + if (devc->first_run) { + if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) { sr_err("HID chip init failed: %d.", ret); - return FALSE; + return SR_ERR; } - memset(pbuf, 0x00, NUM_DATA_BYTES); - first_run = FALSE; + memset(pbuf, 0x00, DMM_BUFSIZE); + devc->first_run = FALSE; } memset(&buf, 0x00, CHUNK_SIZE); /* Get data from EP2 using an interrupt transfer. */ ret = libusb_interrupt_transfer( - devc->usb->devhdl, /* libusb device handle */ + usb->devhdl, /* libusb device handle */ LIBUSB_ENDPOINT_IN | 2, /* EP2, IN */ (unsigned char *)&buf, /* receive buffer */ CHUNK_SIZE, /* wLength */ @@ -211,46 +218,78 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data) 1000 /* timeout (ms) */); if (ret < 0) { - sr_err("USB receive error: %d.", ret); - return FALSE; + sr_err("USB receive error: %s.", libusb_error_name(ret)); + return SR_ERR; } if (len != CHUNK_SIZE) { sr_err("Short packet: received %d/%d bytes.", len, CHUNK_SIZE); /* TODO: Print the bytes? */ - return FALSE; + return SR_ERR; } log_8byte_chunk((const uint8_t *)&buf); - if (buf[0] != 0xf0) { - /* First time: Synchronize to the start of a packet. */ - if (!synced_on_first_packet) { - /* Valid packets start with '+' or '-'. */ - if ((buf[1] != '+') && buf[1] != '-') - return TRUE; - synced_on_first_packet = TRUE; - sr_spew("Successfully synchronized on first packet."); + /* If there are no data bytes just return (without error). */ + if (buf[0] == 0xf0) + return SR_OK; + + devc->bufoffset = 0; + + /* Append the 1-7 data bytes of this chunk to pbuf. */ + num_databytes_in_chunk = buf[0] & 0x0f; + for (i = 0; i < num_databytes_in_chunk; i++) + pbuf[devc->buflen++] = buf[1 + i]; + + /* Now look for packets in that data. */ + while ((devc->buflen - devc->bufoffset) >= udmms[dmm].packet_size) { + if (udmms[dmm].packet_valid(pbuf + devc->bufoffset)) { + log_dmm_packet(pbuf + devc->bufoffset); + decode_packet(sdi, dmm, pbuf + devc->bufoffset, info); + devc->bufoffset += udmms[dmm].packet_size; + } else { + devc->bufoffset++; } + } - num_databytes_in_chunk = buf[0] & 0x0f; - for (i = 0; i < num_databytes_in_chunk; i++) - pbuf[data_byte_counter++] = buf[1 + i]; + /* Move remaining bytes to beginning of buffer. */ + for (i = 0; i < devc->buflen - devc->bufoffset; i++) + pbuf[i] = pbuf[devc->bufoffset + i]; + devc->buflen -= devc->bufoffset; - /* TODO: Handle > 14 bytes in pbuf? Can this happen? */ - if (data_byte_counter == NUM_DATA_BYTES) { - log_dmm_packet(pbuf); - data_byte_counter = 0; - decode_packet(devc, pbuf); - memset(pbuf, 0x00, NUM_DATA_BYTES); - } - } + return SR_OK; +} + +static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data) +{ + int ret; + struct sr_dev_inst *sdi; + struct dev_context *devc; + + (void)fd; + (void)revents; + + sdi = cb_data; + devc = sdi->priv; + + if ((ret = get_and_handle_data(sdi, dmm, info)) != SR_OK) + return FALSE; /* Abort acquisition if we acquired enough samples. */ - if (devc->num_samples >= devc->limit_samples && devc->limit_samples > 0) { + if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { sr_info("Requested number of samples reached."); sdi->driver->dev_acquisition_stop(sdi, cb_data); } return TRUE; } + +#define RECEIVE_DATA(ID_UPPER, DMM_DRIVER) \ +SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \ + struct DMM_DRIVER##_info info; \ + return receive_data(fd, revents, ID_UPPER, &info, cb_data); } + +/* Driver-specific receive_data() wrappers */ +RECEIVE_DATA(UNI_T_UT61D, fs9922) +RECEIVE_DATA(UNI_T_UT61E, es51922) +RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)