screen: drm change struct layout

1 files changed, 6 insertions, 20 deletions

diff --git a/src/screen/drm/resources.zig b/src/screen/drm/resources.zig
index fdd5042..9a8566c 100644
--- a/src/screen/drm/resources.zig
+++ b/src/screen/drm/resources.zig
@@ -1,23 +1,9 @@
 const std = @import("std");
 const os = std.os.linux;
 const cerror = @import("../cerror.zig");
-const Card = @import("card.zig").Card;
-const Drm = @import("request.zig").Drm;
 
-const RawResources = extern struct {
-	fb_ids: ?*u32,
-	crtc_ids: ?*u32,
-	connector_ids: ?*u32,
-	encoder_ids: ?*u32,
-	count_fbs: u32,
-	count_crtcs: u32,
-	count_connectors: u32,
-	count_encoders: u32,
-	min_width: u32,
-	max_width: u32,
-	min_height: u32,
-	max_height: u32,
-};
+const drm = @import("root.zig");
+const Card = drm.Card;
 
 pub const Resources = struct {
 	const Self = @This();
@@ -32,9 +18,9 @@ pub const Resources = struct {
 	width: Range,
 	height: Range,
 
-	pub fn raw_without_ids(card: *Card) !RawResources {
-		var result = std.mem.zeroes(RawResources);
-		try Drm.get_resources.request(card.file.handle, RawResources, &result);
+	pub fn raw_without_ids(card: *Card) !drm.request.Resources {
+		var result = std.mem.zeroes(drm.request.Resources);
+		try card.request(.get_resources, &result);
 		return result;
 	}
 
@@ -62,7 +48,7 @@ pub const Resources = struct {
 		raw.crtc_ids = @ptrCast(resources.crtc_ids);
 		raw.connector_ids = @ptrCast(resources.connector_ids);
 		raw.encoder_ids = @ptrCast(resources.encoder_ids);
-		try Drm.get_resources.request(card.file.handle, RawResources, &raw);
+		try card.request(.get_resources, &raw);
 
 		return resources;
 	}