From 335182556c2a5f7097d5fdedc1365716a9e56a03 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 3 May 2012 19:24:39 +0200 Subject: [PATCH] uterm_video: add udev device parameter to video_new() When triggered by seat monitor we need to be able to create uterm_video objects on a concrete device so enable passing it in. Signed-off-by: David Herrmann --- src/uterm_internal.h | 2 +- src/uterm_video.c | 2 +- src/uterm_video_drm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uterm_internal.h b/src/uterm_internal.h index a65f6c0..affa158 100644 --- a/src/uterm_internal.h +++ b/src/uterm_internal.h @@ -57,7 +57,7 @@ struct display_ops { }; struct video_ops { - int (*init) (struct uterm_video *video); + int (*init) (struct uterm_video *video, struct udev_device *dev); void (*destroy) (struct uterm_video *video); void (*segfault) (struct uterm_video *video); int (*use) (struct uterm_video *video); diff --git a/src/uterm_video.c b/src/uterm_video.c index 913af9d..7c8ac0a 100644 --- a/src/uterm_video.c +++ b/src/uterm_video.c @@ -454,7 +454,7 @@ int uterm_video_new(struct uterm_video **out, if (ret) goto err_umon; - ret = VIDEO_CALL(video->ops->init, 0, video); + ret = VIDEO_CALL(video->ops->init, 0, video, NULL); if (ret) goto err_umon_add; diff --git a/src/uterm_video_drm.c b/src/uterm_video_drm.c index 7ae8201..601e8df 100644 --- a/src/uterm_video_drm.c +++ b/src/uterm_video_drm.c @@ -659,7 +659,7 @@ err_close: return ret; } -static int video_init(struct uterm_video *video) +static int video_init(struct uterm_video *video, struct udev_device *dev_ign) { struct udev_enumerate *e; struct udev_list_entry *name;