summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
Diffstat (limited to 'device.c')
-rw-r--r--device.c71
1 files changed, 41 insertions, 30 deletions
diff --git a/device.c b/device.c
index cfc8783..09a94e3 100644
--- a/device.c
+++ b/device.c
@@ -20,10 +20,7 @@
* Web: http://ni.fr.eu.org/
* Email: <nico at ni.fr.eu.org>
*/
-#include <stdlib.h>
-
#include "device.h"
-#include "utils.h"
#include "moticam.h"
@@ -32,31 +29,38 @@ static const struct device_driver *drivers[] = {
NULL
};
+GQuark
+device_error_quark(void)
+{
+ return g_quark_from_static_string("device-error-quark");
+}
+
struct device *
-device_open(libusb_context *usb)
+device_open(libusb_context *usb, GError **error)
{
+ g_return_val_if_fail(error == NULL || *error == NULL, NULL);
libusb_device **list;
libusb_device *found_usb_device = NULL;
char *found_device_name = NULL;
const struct device_driver *found_device_driver = NULL;
ssize_t cnt = libusb_get_device_list(usb, &list);
- if (cnt < 0)
- utils_fatal("can not list devices: %s", libusb_strerror(cnt));
- for (ssize_t i = 0; i < cnt; i++) {
+ if (cnt < 0) {
+ g_set_error(error, DEVICE_ERROR, DEVICE_ERROR_LIST,
+ "can not list devices: %s", libusb_strerror(cnt));
+ return NULL;
+ }
+ for (ssize_t i = 0; !found_usb_device && i < cnt; i++) {
libusb_device *usb_device = list[i];
struct libusb_device_descriptor desc;
int r = libusb_get_device_descriptor(usb_device, &desc);
- if (r)
- utils_fatal("can not get device descriptor: %s",
+ if (r) {
+ g_warning("can not get device descriptor: %s",
libusb_strerror(r));
- for (const struct device_driver **dd = drivers; *dd; dd++) {
- char *device_name = (*dd)->usb_poll(&desc);
- if (device_name) {
- if (found_device_name)
- utils_fatal("more than one matching device, not"
- " supported");
- else
- {
+ } else {
+ for (const struct device_driver **dd = drivers;
+ !found_usb_device && *dd; dd++) {
+ char *device_name = (*dd)->usb_poll(&desc);
+ if (device_name) {
found_usb_device = usb_device;
found_device_name = device_name;
found_device_driver = *dd;
@@ -66,8 +70,11 @@ device_open(libusb_context *usb)
}
struct device *device = NULL;
if (found_usb_device) {
- free(found_device_name);
- device = found_device_driver->usb_open(usb, found_usb_device);
+ g_free(found_device_name);
+ device = found_device_driver->usb_open(usb, found_usb_device, error);
+ } else {
+ g_set_error(error, DEVICE_ERROR, DEVICE_ERROR_LIST,
+ "no device found");
}
libusb_free_device_list(list, 1);
return device;
@@ -98,26 +105,30 @@ device_set_resolution(struct device *device, int width, int height,
device->set_resolution(device, width, height, stride);
}
-void
-device_start(struct device *device)
+bool
+device_start(struct device *device, GError **error)
{
- device->start(device);
+ g_return_val_if_fail(error == NULL || *error == NULL, false);
+ return device->start(device, error);
}
struct image *
-device_read(struct device *device)
+device_read(struct device *device, GError **error)
{
- return device->read(device);
+ g_return_val_if_fail(error == NULL || *error == NULL, false);
+ return device->read(device, error);
}
-void
-device_stop(struct device *device)
+bool
+device_stop(struct device *device, GError **error)
{
- device->stop(device);
+ g_return_val_if_fail(error == NULL || *error == NULL, false);
+ return device->stop(device, error);
}
-void
-device_close(struct device *device)
+bool
+device_close(struct device *device, GError **error)
{
- device->close(device);
+ g_return_val_if_fail(error == NULL || *error == NULL, false);
+ return device->close(device, error);
}