fakedevice: return an error on read/write_memory

Author: EmmanuelP

src/arvdebugprivate.h

@@ -73,6 +73,7 @@ extern ArvDebugCategoryInfos arv_debug_category_infos[];
 #define arv_warning_device(...)		arv_warning (ARV_DEBUG_CATEGORY_DEVICE, __VA_ARGS__)
 #define arv_info_device(...) 		arv_info (ARV_DEBUG_CATEGORY_DEVICE, __VA_ARGS__)
 #define arv_debug_device(...)		arv_debug (ARV_DEBUG_CATEGORY_DEVICE, __VA_ARGS__)
+#define arv_trace_device(...)           arv_trace (ARV_DEBUG_CATEGORY_DEVICE, __VA_ARGS__)
 
 #define arv_warning_chunk(...)		arv_warning (ARV_DEBUG_CATEGORY_CHUNK, __VA_ARGS__)
 #define arv_info_chunk(...) 		arv_info (ARV_DEBUG_CATEGORY_CHUNK, __VA_ARGS__)

src/arvfakedevice.c

@@ -31,7 +31,7 @@
 #include <arvfakestreamprivate.h>
 #include <arvfakecamera.h>
 #include <arvgc.h>
-#include <arvdebug.h>
+#include <arvdebugprivate.h>
 
 enum
 {
@@ -85,16 +85,34 @@ static gboolean
 arv_fake_device_read_memory (ArvDevice *device, guint64 address, guint32 size, void *buffer, GError **error)
 {
 	ArvFakeDevicePrivate *priv = arv_fake_device_get_instance_private (ARV_FAKE_DEVICE (device));
+        gboolean success;
 
-	return arv_fake_camera_read_memory (priv->camera, address, size, buffer);
+	success = arv_fake_camera_read_memory (priv->camera, address, size, buffer);
+
+        arv_trace_device ("[FakeDevice::read_memory] address 0x%" G_GINT64_MODIFIER "x, size = %d", address, size);
+
+        if (!success)
+                g_set_error (error, ARV_DEVICE_ERROR, ARV_DEVICE_ERROR_INVALID_PARAMETER,
+                            "Invalid read at 0x%" G_GINT64_MODIFIER "x, size %d", address, size);
+
+        return success;
 }
 
 static gboolean
 arv_fake_device_write_memory (ArvDevice *device, guint64 address, guint32 size, const void *buffer, GError **error)
 {
 	ArvFakeDevicePrivate *priv = arv_fake_device_get_instance_private (ARV_FAKE_DEVICE (device));
+        gboolean success;
+
+        arv_trace_device ("[FakeDevice::write_memory] address 0x%" G_GINT64_MODIFIER "x, size = %d", address, size);
+
+	success = arv_fake_camera_write_memory (priv->camera, address, size, buffer);
+
+        if (!success)
+                g_set_error (error, ARV_DEVICE_ERROR, ARV_DEVICE_ERROR_INVALID_PARAMETER,
+                             "Invalid write at 0x%" G_GINT64_MODIFIER "x, size %d", address, size);
 
-	return arv_fake_camera_write_memory (priv->camera, address, size, buffer);
+        return success;
 }
 
 static gboolean

tests/device.py

@@ -19,6 +19,12 @@
 
 assert bytes == b'0123\x00'
 
+try:
+    bytes = device.write_memory (0x10000, b'test')
+
+except GLib.Error as err:
+    assert err.matches (Aravis.device_error_quark(), Aravis.DeviceError.INVALID_PARAMETER)
+
 device.write_register (0x48, 123)
 value = device.read_register (0x48)