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

log messages: Use device name, not vendor name. 

There can be multiple devices from the same vendor, obviously.
This commit is contained in:
Uwe Hermann 2011-05-04 19:44:25 +02:00
parent 697785d1ae
commit 340cfac0f0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/asix-sigma/asix-sigma.c
View File

@ -332,13 +332,13 @@ static int bin2bitbang(const char *filename,
fseek(f, 0, SEEK_SET);
if (!(compressed_buf = g_try_malloc(file_size))) {
sr_err("asix: %s: compressed_buf malloc failed", __func__);
sr_err("sigma: %s: compressed_buf malloc failed", __func__);
fclose(f);
return SR_ERR_MALLOC;
}
if (!(firmware = g_try_malloc(buffer_size))) {
sr_err("asix: %s: firmware malloc failed", __func__);
sr_err("sigma: %s: firmware malloc failed", __func__);
fclose(f);
g_free(compressed_buf);
return SR_ERR_MALLOC;
@ -366,7 +366,7 @@ static int bin2bitbang(const char *filename,
*buf = p = (unsigned char *)g_try_malloc(*buf_size);
if (!p) {
sr_err("asix: %s: buf/p malloc failed", __func__);
sr_err("sigma: %s: buf/p malloc failed", __func__);
g_free(compressed_buf);
g_free(firmware);
return SR_ERR_MALLOC;
@ -403,7 +403,7 @@ static int hw_init(const char *deviceinfo)
deviceinfo = deviceinfo;
if (!(sigma = g_try_malloc(sizeof(struct sigma)))) {
sr_err("asix: %s: sigma malloc failed", __func__);
sr_err("sigma: %s: sigma malloc failed", __func__);
return 0; /* FIXME: Should be SR_ERR_MALLOC. */
}
@ -681,12 +681,12 @@ static int hw_closedev(int device_index)
struct sigma *sigma;
if (!(sdi = sr_get_device_instance(device_instances, device_index))) {
sr_err("asix: %s: sdi was NULL", __func__);
sr_err("sigma: %s: sdi was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}
if (!(sigma = sdi->priv)) {
sr_err("asix: %s: sdi->priv was NULL", __func__);
sr_err("sigma: %s: sdi->priv was NULL", __func__);
return SR_ERR; /* TODO: SR_ERR_ARG? */
}

2
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -526,7 +526,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
sr_session_bus(session_device_id, &packet);
if (!(buf = g_try_malloc(PACKET_SIZE))) {
sr_err("zeroplus: %s: buf malloc failed", __func__);
sr_err("lap-c: %s: buf malloc failed", __func__);
return SR_ERR_MALLOC;
}