log messages: Use device name, not vendor name.

There can be multiple devices from the same vendor, obviously.

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index b85db6095e87eecaa641b77ec4b0901a5e9c2cdc..e33b5b7959242376ed2c7573867303cd488d4e29 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -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? */
        }
 

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index f5b2d9e4443268956df325ccec771397dd993957..875291ee9a63de5574fee21165e3a56cb11c0409 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -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;
        }