diff --git a/libsigrok4DSL/backend.c b/libsigrok4DSL/backend.c index 8c4c9400..c4ff7086 100644 --- a/libsigrok4DSL/backend.c +++ b/libsigrok4DSL/backend.c @@ -325,9 +325,13 @@ SR_PRIV int sr_init(struct sr_context **ctx) } memset(context, 0, sizeof(struct sr_context)); + sr_info("bbb:%s:%d", __func__, __LINE__); + ret = libusb_init(&context->libusb_ctx); + if (LIBUSB_SUCCESS != ret) { - sr_err("libusb_init() returned %s.\n", libusb_error_name(ret)); + sr_err("%s:%d, Failed to init lib. Error name:%s", + __func__, __LINE__, libusb_error_name(ret)); ret = SR_ERR; goto done; } diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c index 14effc32..8023b930 100644 --- a/libsigrok4DSL/hardware/DSL/dsl.c +++ b/libsigrok4DSL/hardware/DSL/dsl.c @@ -368,7 +368,8 @@ static int hw_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi) rd_cmd.data = rd_cmd_data; if ((ret = command_ctl_rd(usb->devhdl, rd_cmd)) != SR_OK) { - sr_err("Failed to get firmware version."); + sr_err("%s:%d, Failed to get firmware version.", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); return ret; } @@ -1894,7 +1895,8 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo rd_cmd.data = &hw_info; if ((ret = command_ctl_rd(usb->devhdl, rd_cmd)) != SR_OK) { - sr_err("Failed to get hardware infos."); + sr_err("%s:%d, Failed to get hardware information.", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); return SR_ERR; } @@ -1927,7 +1929,8 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo g_free(fpga_bit); if (ret != SR_OK) { - sr_err("%s: Configure FPGA failed!", __func__); + sr_err("%s:%d, Configure FPGA failed!", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); return SR_ERR; } @@ -1938,7 +1941,8 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo ret = dsl_hdl_version(sdi, &hw_info); if ((ret != SR_OK)) { - sr_err("%s: Failed to get FPGA bin version!", __func__); + sr_err("%s:%d, Failed to get FPGA bin version!", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); sdi->status = SR_ST_INACTIVE; return SR_ERR; @@ -1958,7 +1962,8 @@ SR_PRIV int dsl_dev_open(struct sr_dev_driver *di, struct sr_dev_inst *sdi, gboo uint16_t encryption[SECU_STEPS]; ret = dsl_wr_reg(sdi, CTR0_ADDR, bmNONE); // dessert clear if (dsl_rd_nvm(sdi, (unsigned char *)encryption, SECU_EEP_ADDR, SECU_STEPS*2) != SR_OK) { - sr_err("Read EEPROM content failed!"); + sr_err("%s:%d, Read EEPROM content failed!", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); return SR_ERR; } diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c index b6e138aa..166737b8 100644 --- a/libsigrok4DSL/hardware/DSL/dslogic.c +++ b/libsigrok4DSL/hardware/DSL/dslogic.c @@ -1282,6 +1282,8 @@ static int dev_open(struct sr_dev_inst *sdi) ret = dsl_wr_reg(sdi, VTH_ADDR, (uint8_t)(devc->vth/5.0*255)); if (ret != SR_OK){ + sr_err("%s:%d, Failed to call dsl_wr_reg()!", + __func__, __LINE__); ds_set_last_error(SR_ERR_DEVICE_USB_IO_ERROR); return ret; }