BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uni-t-dmm: Use sr_dev_inst to store connection handle.

This commit is contained in:
Uwe Hermann 2013-04-28 08:13:15 +02:00
parent d9a7c349ed
commit 3ece1dff6c
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/uni-t-dmm/api.c
View File

@ -125,7 +125,8 @@ static GSList *hw_scan(GSList *options, int dmm)
return NULL; return NULL;
sdi->probes = g_slist_append(sdi->probes, probe); sdi->probes = g_slist_append(sdi->probes, probe);
devc->usb = usb; sdi->inst_type = SR_INST_USB;
sdi->conn = usb;
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
@ -142,13 +143,13 @@ static GSList *hw_dev_list(int dmm)
static int hw_dev_open(struct sr_dev_inst *sdi, int dmm) static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
{ {
struct drv_context *drvc; struct drv_context *drvc;
struct dev_context *devc; struct sr_usb_dev_inst *usb;
int ret; int ret;
drvc = udmms[dmm].di->priv; drvc = udmms[dmm].di->priv;
devc = sdi->priv; usb = sdi->conn;
if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb)) == SR_OK) if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
sdi->status = SR_ST_ACTIVE; sdi->status = SR_ST_ACTIVE;
return ret; return ret;

19
hardware/uni-t-dmm/protocol.c
View File

@ -102,14 +102,17 @@ static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf,
devc->num_samples++; 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; int ret;
uint8_t buf[5]; uint8_t buf[5];
struct sr_usb_dev_inst *usb;
usb = sdi->conn;
/* Detach kernel drivers which grabbed this device (if any). */ /* Detach kernel drivers which grabbed this device (if any). */
if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) { if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0); ret = libusb_detach_kernel_driver(usb->devhdl, 0);
if (ret < 0) { if (ret < 0) {
sr_err("Failed to detach kernel driver: %s.", sr_err("Failed to detach kernel driver: %s.",
libusb_error_name(ret)); libusb_error_name(ret));
@ -121,7 +124,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
} }
/* Claim interface 0. */ /* Claim interface 0. */
if ((ret = libusb_claim_interface(devc->usb->devhdl, 0)) < 0) { if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
sr_err("Failed to claim interface 0: %s.", sr_err("Failed to claim interface 0: %s.",
libusb_error_name(ret)); libusb_error_name(ret));
return SR_ERR; return SR_ERR;
@ -140,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)", 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); buf[0], buf[1], buf[2], buf[3], buf[4], baudrate);
ret = libusb_control_transfer( ret = libusb_control_transfer(
devc->usb->devhdl, /* libusb device handle */ usb->devhdl, /* libusb device handle */
LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_REQUEST_TYPE_CLASS |
LIBUSB_RECIPIENT_INTERFACE | LIBUSB_RECIPIENT_INTERFACE |
LIBUSB_ENDPOINT_OUT, LIBUSB_ENDPOINT_OUT,
@ -187,13 +190,15 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
struct dev_context *devc; struct dev_context *devc;
uint8_t buf[CHUNK_SIZE], *pbuf; uint8_t buf[CHUNK_SIZE], *pbuf;
int i, ret, len, num_databytes_in_chunk; int i, ret, len, num_databytes_in_chunk;
struct sr_usb_dev_inst *usb;
devc = sdi->priv; devc = sdi->priv;
usb = sdi->conn;
pbuf = devc->protocol_buf; pbuf = devc->protocol_buf;
/* On the first run, we need to init the HID chip. */ /* On the first run, we need to init the HID chip. */
if (devc->first_run) { if (devc->first_run) {
if ((ret = hid_chip_init(devc, udmms[dmm].baudrate)) != SR_OK) { if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) {
sr_err("HID chip init failed: %d.", ret); sr_err("HID chip init failed: %d.", ret);
return SR_ERR; return SR_ERR;
} }
@ -205,7 +210,7 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
/* Get data from EP2 using an interrupt transfer. */ /* Get data from EP2 using an interrupt transfer. */
ret = libusb_interrupt_transfer( ret = libusb_interrupt_transfer(
devc->usb->devhdl, /* libusb device handle */ usb->devhdl, /* libusb device handle */
LIBUSB_ENDPOINT_IN | 2, /* EP2, IN */ LIBUSB_ENDPOINT_IN | 2, /* EP2, IN */
(unsigned char *)&buf, /* receive buffer */ (unsigned char *)&buf, /* receive buffer */
CHUNK_SIZE, /* wLength */ CHUNK_SIZE, /* wLength */

2
hardware/uni-t-dmm/protocol.h
View File

@ -78,8 +78,6 @@ struct dev_context {
/** The current number of already received samples. */ /** The current number of already received samples. */
uint64_t num_samples; uint64_t num_samples;
struct sr_usb_dev_inst *usb;
gboolean first_run; gboolean first_run;
uint8_t protocol_buf[DMM_BUFSIZE]; uint8_t protocol_buf[DMM_BUFSIZE];