From d1187641d64f442968a3b9ea6a19de6cdd45acd4 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 16 Dec 2007 20:16:50 -0800
Subject: Rename inappropriately named 'mask' fields to 'proposed_flags'
 instead.

Flags pending validation were stored in a misleadingly named field, 'mask'.
As 'mask' is already used to indicate pieces of a flags field which are
changing, it seems better to use a name reflecting the actual purpose of
this field. I chose 'proposed_flags' as they may not actually end up in
'flags', and in an case will be modified when they are moved over.

This affects the API, but not ABI of the user-mode interface.
---
 libdrm/xf86drm.c | 6 +++---
 libdrm/xf86mm.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libdrm')

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 4265c320..e3550de7 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2578,7 +2578,7 @@ static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
     buf->size = rep->size;
     buf->offset = rep->offset;
     buf->mapHandle = rep->arg_handle;
-    buf->mask = rep->mask;
+    buf->proposedFlags = rep->proposed_flags;
     buf->start = rep->buffer_start;
     buf->fenceFlags = rep->fence_flags;
     buf->replyFlags = rep->rep_flags;
@@ -2592,7 +2592,7 @@ static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
 
 int drmBOCreate(int fd, unsigned long size,
 		unsigned pageAlignment, void *user_buffer,
-		uint64_t mask,
+		uint64_t flags,
 		unsigned hint, drmBO *buf)
 {
     struct drm_bo_create_arg arg;
@@ -2602,7 +2602,7 @@ int drmBOCreate(int fd, unsigned long size,
 
     memset(buf, 0, sizeof(*buf));
     memset(&arg, 0, sizeof(arg));
-    req->mask = mask;
+    req->flags = flags;
     req->hint = hint;
     req->size = size;
     req->page_alignment = pageAlignment;
diff --git a/libdrm/xf86mm.h b/libdrm/xf86mm.h
index d3df8497..c80288a7 100644
--- a/libdrm/xf86mm.h
+++ b/libdrm/xf86mm.h
@@ -110,7 +110,7 @@ typedef struct _drmBO
     unsigned handle;
     uint64_t mapHandle;
     uint64_t flags;
-    uint64_t mask;
+    uint64_t proposedFlags;
     unsigned mapFlags;
     unsigned long size;
     unsigned long offset;
-- 
cgit v1.2.3