X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=709e36779a8b2dfa93418fdba9eabf51cbdc85bb;hb=8de8551b8809b0818c20690c3014df6e6c4ee7fc;hp=801f83b024ad714f5e7a358d9ffcf929812e6199;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git
diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index 801f83b0..709e3677 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -17,17 +17,18 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
extern struct sr_dev_driver lascar_el_usb_driver_info;
-static struct sr_dev_driver *di = &lascar_el_usb_driver_info;
+struct sr_dev_driver *di = &lascar_el_usb_driver_info;
static const struct elusb_profile profiles[] = {
{ 1, "EL-USB-1", LOG_UNSUPPORTED },
@@ -54,7 +55,6 @@ static const struct elusb_profile profiles[] = {
{ 0, NULL, 0 }
};
-
static libusb_device_handle *lascar_open(struct libusb_device *dev)
{
libusb_device_handle *dev_hdl;
@@ -67,7 +67,7 @@ static libusb_device_handle *lascar_open(struct libusb_device *dev)
}
/* Some of these fail, but it needs doing -- some sort of mode
- * setup for the SILabs F32x. */
+ * setup for the SiLabs F32x. */
libusb_control_transfer(dev_hdl, LIBUSB_REQUEST_TYPE_VENDOR,
0x00, 0xffff, 0x00, NULL, 0, 50);
libusb_control_transfer(dev_hdl, LIBUSB_REQUEST_TYPE_VENDOR,
@@ -78,7 +78,7 @@ static libusb_device_handle *lascar_open(struct libusb_device *dev)
return dev_hdl;
}
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
{
xfer->user_data = GINT_TO_POINTER(1);
@@ -97,7 +97,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
sr_spew("Reading config block.");
- drvc = di->priv;
+ drvc = di->context;
*configlen = 0;
if (!(xfer_in = libusb_alloc_transfer(0)) ||
@@ -112,7 +112,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
/* Keep a read request waiting in the wings, ready to pounce
* the moment the device sends something. */
libusb_fill_bulk_transfer(xfer_in, dev_hdl, LASCAR_EP_IN,
- buf, 256, mark_xfer, 0, 10000);
+ buf, 256, mark_xfer, 0, BULK_XFER_TIMEOUT);
if (libusb_submit_transfer(xfer_in) != 0)
goto cleanup;
@@ -133,7 +133,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
start = 0;
break;
}
- g_usleep(5000);
+ g_usleep(SLEEP_US_LONG);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
if (!start) {
@@ -166,7 +166,7 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
start = 0;
break;
}
- g_usleep(5000);
+ g_usleep(SLEEP_US_LONG);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
if (!start) {
@@ -183,16 +183,16 @@ SR_PRIV int lascar_get_config(libusb_device_handle *dev_hdl,
*configlen = buflen;
cleanup:
- if (!xfer_in->user_data || !xfer_in->user_data) {
+ if (!xfer_in->user_data || !xfer_out->user_data) {
if (!xfer_in->user_data)
libusb_cancel_transfer(xfer_in);
if (!xfer_out->user_data)
libusb_cancel_transfer(xfer_out);
start = g_get_monotonic_time();
while (!xfer_in->user_data || !xfer_out->user_data) {
- if (g_get_monotonic_time() - start > 10000)
+ if (g_get_monotonic_time() - start > EVENTS_TIMEOUT)
break;
- g_usleep(1000);
+ g_usleep(SLEEP_US_SHORT);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
}
@@ -214,7 +214,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
sr_spew("Writing config block.");
- drvc = di->priv;
+ drvc = di->context;
if (!(xfer_in = libusb_alloc_transfer(0)) ||
!(xfer_out = libusb_alloc_transfer(0)))
@@ -229,7 +229,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
/* Keep a read request waiting in the wings, ready to pounce
* the moment the device sends something. */
libusb_fill_bulk_transfer(xfer_in, dev_hdl, LASCAR_EP_IN,
- buf, 256, mark_xfer, 0, 10000);
+ buf, 256, mark_xfer, 0, BULK_XFER_TIMEOUT);
if (libusb_submit_transfer(xfer_in) != 0) {
ret = SR_ERR;
goto cleanup;
@@ -248,7 +248,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
tv.tv_sec = 0;
tv.tv_usec = 0;
while (!xfer_out->user_data) {
- g_usleep(5000);
+ g_usleep(SLEEP_US_LONG);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
@@ -259,7 +259,7 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
goto cleanup;
}
while (!xfer_in->user_data || !xfer_out->user_data) {
- g_usleep(5000);
+ g_usleep(SLEEP_US_LONG);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
@@ -269,16 +269,16 @@ static int lascar_save_config(libusb_device_handle *dev_hdl,
}
cleanup:
- if (!xfer_in->user_data || !xfer_in->user_data) {
+ if (!xfer_in->user_data || !xfer_out->user_data) {
if (!xfer_in->user_data)
libusb_cancel_transfer(xfer_in);
if (!xfer_out->user_data)
libusb_cancel_transfer(xfer_out);
start = g_get_monotonic_time();
while (!xfer_in->user_data || !xfer_out->user_data) {
- if (g_get_monotonic_time() - start > 10000)
+ if (g_get_monotonic_time() - start > EVENTS_TIMEOUT)
break;
- g_usleep(1000);
+ g_usleep(SLEEP_US_SHORT);
libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
}
}
@@ -293,7 +293,6 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
struct dev_context *devc;
const struct elusb_profile *profile;
struct sr_dev_inst *sdi;
- struct sr_channel *ch;
int modelid, i;
char firmware[5];
@@ -332,16 +331,12 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
if (profile->logformat == LOG_TEMP_RH) {
/* Model this as two channels: temperature and humidity. */
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Temp");
- sdi->channels = g_slist_append(NULL, ch);
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "Hum");
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temp");
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Hum");
} else if (profile->logformat == LOG_CO) {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "CO");
- sdi->channels = g_slist_append(NULL, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CO");
} else {
- ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
- sdi->channels = g_slist_append(NULL, ch);
+ sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
}
devc = g_malloc0(sizeof(struct dev_context));
@@ -357,21 +352,15 @@ SR_PRIV struct sr_dev_inst *lascar_scan(int bus, int address)
struct drv_context *drvc;
struct sr_dev_inst *sdi;
struct libusb_device **devlist;
- struct libusb_device_descriptor des;
libusb_device_handle *dev_hdl;
- int dummy, ret, i;
+ int dummy, i;
unsigned char config[MAX_CONFIGBLOCK_SIZE];
- drvc = di->priv;
+ drvc = di->context;
sdi = NULL;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
- if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
- sr_err("Failed to get device descriptor: %d.", ret);
- continue;
- }
-
if (libusb_get_bus_number(devlist[i]) != bus ||
libusb_get_device_address(devlist[i]) != address)
continue;
@@ -416,9 +405,9 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
if (!(rh = g_try_malloc(sizeof(float) * samples)))
break;
for (i = 0, j = 0; i < samples; i++) {
- /* Both Celcius and Fahrenheit stored at base -40. */
+ /* Both Celsius and Fahrenheit stored at base -40. */
if (devc->temp_unit == 0)
- /* Celcius is stored in half-degree increments. */
+ /* Celsius is stored in half-degree increments. */
temp[j] = buf[i * 2] / 2 - 40;
else
temp[j] = buf[i * 2] - 40;
@@ -442,6 +431,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
analog.unit = SR_UNIT_CELSIUS;
analog.data = temp;
sr_session_send(devc->cb_data, &packet);
+ g_slist_free(analog.channels);
}
ch = sdi->channels->next->data;
@@ -451,6 +441,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
analog.unit = SR_UNIT_PERCENTAGE;
analog.data = rh;
sr_session_send(devc->cb_data, &packet);
+ g_slist_free(analog.channels);
}
g_free(temp);
@@ -468,7 +459,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
break;
for (i = 0; i < samples; i++) {
s = (buf[i * 2] << 8) | buf[i * 2 + 1];
- analog.data[i] = (s * devc->co_high + devc->co_low) / 1000000;
+ analog.data[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
if (analog.data[i] < 0.0)
analog.data[i] = 0.0;
}
@@ -485,7 +476,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
{
- struct drv_context *drvc = di->priv;
+ struct drv_context *drvc = di->context;
struct sr_datafeed_packet packet;
struct sr_dev_inst *sdi;
struct timeval tv;
@@ -509,7 +500,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
return TRUE;
}
-SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
{
struct dev_context *devc;
struct sr_dev_inst *sdi;