diff options
Diffstat (limited to 'include/backend')
-rw-r--r-- | include/backend/drm.h | 3 | ||||
-rw-r--r-- | include/backend/libinput.h | 2 | ||||
-rw-r--r-- | include/backend/multi.h | 2 | ||||
-rw-r--r-- | include/backend/session/direct-ipc.h | 2 | ||||
-rw-r--r-- | include/backend/udev.h | 29 |
5 files changed, 1 insertions, 37 deletions
diff --git a/include/backend/drm.h b/include/backend/drm.h index 25bbd1f7..342a980c 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -7,7 +7,6 @@ #include <wayland-server.h> #include <xf86drmMode.h> #include <EGL/egl.h> -#include <libudev.h> #include <gbm.h> #include <wlr/backend/session.h> @@ -16,7 +15,6 @@ #include <wlr/egl.h> #include <wlr/util/list.h> -#include <backend/udev.h> #include "drm-properties.h" struct wlr_drm_plane { @@ -124,7 +122,6 @@ struct wlr_drm_backend { struct wlr_drm_renderer renderer; struct wlr_session *session; - struct wlr_udev *udev; }; enum wlr_drm_output_state { diff --git a/include/backend/libinput.h b/include/backend/libinput.h index e0f762a7..f484ea8d 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -6,13 +6,11 @@ #include <wlr/backend/interface.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/util/list.h> -#include "backend/udev.h" struct wlr_libinput_backend { struct wlr_backend backend; struct wlr_session *session; - struct wlr_udev *udev; struct wl_display *display; struct libinput *libinput_context; diff --git a/include/backend/multi.h b/include/backend/multi.h index af747332..c7a2198e 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -3,7 +3,6 @@ #include <wlr/backend/interface.h> #include <wlr/backend/multi.h> -#include <wlr/backend/udev.h> #include <wlr/util/list.h> #include <wlr/backend/session.h> @@ -11,7 +10,6 @@ struct wlr_multi_backend { struct wlr_backend backend; struct wlr_session *session; - struct wlr_udev *udev; list_t *backends; }; diff --git a/include/backend/session/direct-ipc.h b/include/backend/session/direct-ipc.h index 96504f04..2189d6fa 100644 --- a/include/backend/session/direct-ipc.h +++ b/include/backend/session/direct-ipc.h @@ -7,6 +7,6 @@ int direct_ipc_open(int sock, const char *path); void direct_ipc_setmaster(int sock, int fd); void direct_ipc_dropmaster(int sock, int fd); void direct_ipc_finish(int sock, pid_t pid); -int direct_ipc_start(pid_t *pid_out); +int direct_ipc_init(pid_t *pid_out); #endif diff --git a/include/backend/udev.h b/include/backend/udev.h deleted file mode 100644 index 080422c0..00000000 --- a/include/backend/udev.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _WLR_INTERNAL_UDEV_H -#define _WLR_INTERNAL_UDEV_H - -#include <sys/types.h> -#include <libudev.h> -#include <wlr/backend/session.h> -#include <wayland-server.h> -#include <wlr/backend/udev.h> - -struct wlr_udev_dev { - dev_t dev; - struct wl_signal invalidate; - - struct wl_list link; -}; - -struct wlr_udev { - struct udev *udev; - struct udev_monitor *mon; - struct wl_event_source *event; - - struct wl_list devices; -}; - -int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session); -bool wlr_udev_signal_add(struct wlr_udev *udev, dev_t dev, struct wl_listener *listener); -void wlr_udev_signal_remove(struct wlr_udev *udev, struct wl_listener *listener); - -#endif |