From f193623ca11c245e9209a8df40115dbe420bbc22 Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Mon, 2 Oct 2017 21:44:33 +1300
Subject: [PATCH] Change iface prefix to suffix

---
 backend/drm/{iface_atomic.c => atomic.c} | 2 +-
 backend/drm/drm.c                        | 6 +++---
 backend/drm/{iface_legacy.c => legacy.c} | 2 +-
 backend/meson.build                      | 4 ++--
 include/backend/drm/iface.h              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename backend/drm/{iface_atomic.c => atomic.c} (99%)
 rename backend/drm/{iface_legacy.c => legacy.c} (97%)

diff --git a/backend/drm/iface_atomic.c b/backend/drm/atomic.c
similarity index 99%
rename from backend/drm/iface_atomic.c
rename to backend/drm/atomic.c
index 1aef05d1..e7374a00 100644
--- a/backend/drm/iface_atomic.c
+++ b/backend/drm/atomic.c
@@ -181,7 +181,7 @@ static bool atomic_crtc_move_cursor(struct wlr_drm_backend *drm,
 	return atomic_end(drm->fd, &atom);
 }
 
-const struct wlr_drm_interface iface_atomic = {
+const struct wlr_drm_interface atomic_iface = {
 	.conn_enable = atomic_conn_enable,
 	.crtc_pageflip = atomic_crtc_pageflip,
 	.crtc_set_cursor = atomic_crtc_set_cursor,
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index ccdc92d9..1a5fea9f 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -32,13 +32,13 @@ bool wlr_drm_check_features(struct wlr_drm_backend *drm) {
 
 	if (getenv("WLR_DRM_NO_ATOMIC")) {
 		wlr_log(L_DEBUG, "WLR_DRM_NO_ATOMIC set, forcing legacy DRM interface");
-		drm->iface = &iface_legacy;
+		drm->iface = &legacy_iface;
 	} else if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
 		wlr_log(L_DEBUG, "Atomic modesetting unsupported, using legacy DRM interface");
-		drm->iface = &iface_legacy;
+		drm->iface = &legacy_iface;
 	} else {
 		wlr_log(L_DEBUG, "Using atomic DRM interface");
-		drm->iface = &iface_atomic;
+		drm->iface = &atomic_iface;
 	}
 
 	return true;
diff --git a/backend/drm/iface_legacy.c b/backend/drm/legacy.c
similarity index 97%
rename from backend/drm/iface_legacy.c
rename to backend/drm/legacy.c
index cf73bb87..d75eb2cb 100644
--- a/backend/drm/iface_legacy.c
+++ b/backend/drm/legacy.c
@@ -58,7 +58,7 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *drm,
 	return !drmModeMoveCursor(drm->fd, crtc->id, x, y);
 }
 
-const struct wlr_drm_interface iface_legacy = {
+const struct wlr_drm_interface legacy_iface = {
 	.conn_enable = legacy_conn_enable,
 	.crtc_pageflip = legacy_crtc_pageflip,
 	.crtc_set_cursor = legacy_crtc_set_cursor,
diff --git a/backend/meson.build b/backend/meson.build
index caf2c8b0..c5c73288 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -3,10 +3,10 @@ backend_files = files(
 	'session/direct-ipc.c',
 	'session/direct.c',
 	'session/session.c',
+	'drm/atomic.c',
 	'drm/backend.c',
 	'drm/drm.c',
-	'drm/iface_atomic.c',
-	'drm/iface_legacy.c',
+	'drm/legacy.c',
 	'drm/properties.c',
 	'drm/renderer.c',
 	'drm/util.c',
diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h
index db1d7ee1..bc61eb51 100644
--- a/include/backend/drm/iface.h
+++ b/include/backend/drm/iface.h
@@ -29,7 +29,7 @@ struct wlr_drm_interface {
 		struct wlr_drm_crtc *crtc, int x, int y);
 };
 
-extern const struct wlr_drm_interface iface_atomic;
-extern const struct wlr_drm_interface iface_legacy;
+extern const struct wlr_drm_interface atomic_iface;
+extern const struct wlr_drm_interface legacy_iface;
 
 #endif