X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fdemo%2Fdemo.c;h=1619be24c9e2d927910379c9ccf9948c5b21f6af;hb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;hp=1bd870d849b09e3ddce0d659340ec8fdc9acacda;hpb=2150a69b7633ebd1bcf13f645c026506f3dfe03b;p=libsigrok.git

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 1bd870d8..1619be24 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2011 Olivier Fauchon <olivier@aixmarseille.com>
@@ -172,8 +172,8 @@ static GSList *hw_scan(GSList *options)
 
 	sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, DEMONAME, NULL, NULL);
 	if (!sdi) {
-		sr_err("%s: sr_dev_inst_new failed", __func__);
-		return 0;
+		sr_err("Device instance creation failed.");
+		return NULL;
 	}
 	sdi->driver = di;
 
@@ -188,8 +188,8 @@ static GSList *hw_scan(GSList *options)
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 
 	if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
-		sr_err("%s: devc malloc failed", __func__);
-		return SR_ERR_MALLOC;
+		sr_err("Device context malloc failed.");
+		return NULL;
 	}
 
 	devc->sdi = sdi;
@@ -286,7 +286,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
 		}
 		break;
 	default:
-		return SR_ERR_ARG;
+		return SR_ERR_NA;
 	}
 
 	return SR_OK;
@@ -335,7 +335,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 		sr_dbg("%s: setting pattern to %d",
 			__func__, devc->sample_generator);
 	} else {
-		ret = SR_ERR;
+		ret = SR_ERR_NA;
 	}
 
 	return ret;
@@ -364,7 +364,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 		*data = g_variant_new_strv(pattern_strings, ARRAY_SIZE(pattern_strings));
 		break;
 	default:
-		return SR_ERR_ARG;
+		return SR_ERR_NA;
 	}
 
 	return SR_OK;