backend/session: share is_drm_card implementation

backend/session/dev.c

@@ -0,0 +1,21 @@
+#define _POSIX_C_SOURCE 200809L
+#include <stdbool.h>
+#include <string.h>
+#include <xf86drm.h>
+#include "backend/session/dev.h"
+
+// TODO move to util?
+bool is_drm_card(const char *devname) {
+	const char prefix[] = DRM_PRIMARY_MINOR_NAME;
+	const char *name = strrchr(devname, '/');
+	name = name ? name + 1 : devname;
+	if (strncmp(name, prefix, strlen(prefix)) != 0) {
+		return false;
+	}
+	for (size_t i = strlen(prefix); name[i] != '\0'; i++) {
+		if (name[i] < '0' || name[i] > '9') {
+			return false;
+		}
+	}
+	return true;
+}

backend/session/dev_demi.c

@@ -18,21 +18,6 @@
 #include "backend/session/dev_demi.h"
 #include "util/signal.h"
 
-static bool is_drm_card(const char *devname) {
-	const char prefix[] = DRM_PRIMARY_MINOR_NAME;
-	const char *name = strrchr(devname);
-	name = name ? name + 1 : devname;
-	if (strncmp(name, prefix, strlen(prefix)) != 0) {
-		return false;
-	}
-	for (size_t i = strlen(prefix); name[i] != '\0'; i++) {
-		if (name[i] < '0' || name[i] > '9') {
-			return false;
-		}
-	}
-	return true;
-}
-
 static int handle_event(int fd, uint32_t mask, void *data) {
 	struct wlr_session *session = data;
 

backend/session/dev_udev.c

@@ -20,19 +20,6 @@
 
 #define WAIT_GPU_TIMEOUT 10000 // ms
 
-static bool is_drm_card(const char *sysname) {
-	const char prefix[] = DRM_PRIMARY_MINOR_NAME;
-	if (strncmp(sysname, prefix, strlen(prefix)) != 0) {
-		return false;
-	}
-	for (size_t i = strlen(prefix); sysname[i] != '\0'; i++) {
-		if (sysname[i] < '0' || sysname[i] > '9') {
-			return false;
-		}
-	}
-	return true;
-}
-
 static void read_udev_change_event(struct wlr_device_change_event *event,
 		struct udev_device *udev_dev) {
 	const char *hotplug = udev_device_get_property_value(udev_dev, "HOTPLUG");

backend/session/meson.build

@@ -3,7 +3,7 @@ libseat = dependency('libseat',
 	fallback: 'seatd',
 	default_options: ['server=disabled', 'man-pages=disabled'],
 )
-wlr_files += files('session.c')
+wlr_files += files('session.c', 'dev.c')
 wlr_deps += libseat
 
 # libudev & libdemi

include/backend/session/dev.h

@@ -1,3 +1,4 @@
+#include <stdbool.h>
 #include <sys/types.h>
 #include <wlr/backend/session.h>
 #include <wayland-server-core.h>
@@ -10,4 +11,6 @@ void dev_finish(struct wlr_session *session);
 
 ssize_t dev_find_gpus(struct wlr_session *session, size_t ret_len,
 		struct wlr_device **ret);
+
+bool is_drm_card(const char *devname);
 #endif