| Message ID | 20181219170803.23452-1-eric.engestrom@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [libdrm,1/3] xf86drm: dedupe `#define`s | expand |
On Wednesday, 2018-12-19 17:08:01 +0000, Eric Engestrom wrote: > Adapted from a local patch carried by DragonFlyBSD: > https://github.com/DragonFlyBSD/DPorts/blob/bc056f88f7e4d468d8c9751f831a47b5ae1326e3/graphics/libdrm/files/patch-xf86drm.h > > Patch is sadly uncredited (a bot authored the commit), so I can't credit > the author here either. > > Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Ping? :) > --- > xf86drm.c | 10 ---------- > xf86drm.h | 16 ++++++++++------ > 2 files changed, 10 insertions(+), 16 deletions(-) > > diff --git a/xf86drm.c b/xf86drm.c > index 377ddf917d2cb902899a..07425b19897d00a19e8a 100644 > --- a/xf86drm.c > +++ b/xf86drm.c > @@ -71,16 +71,6 @@ > > #include "util_math.h" > > -#ifdef __OpenBSD__ > -#define DRM_PRIMARY_MINOR_NAME "drm" > -#define DRM_CONTROL_MINOR_NAME "drmC" > -#define DRM_RENDER_MINOR_NAME "drmR" > -#else > -#define DRM_PRIMARY_MINOR_NAME "card" > -#define DRM_CONTROL_MINOR_NAME "controlD" > -#define DRM_RENDER_MINOR_NAME "renderD" > -#endif > - > #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) > #define DRM_MAJOR 145 > #endif > diff --git a/xf86drm.h b/xf86drm.h > index 7773d71a803084e86920..18668ff3d40d7db55c95 100644 > --- a/xf86drm.h > +++ b/xf86drm.h > @@ -78,17 +78,21 @@ extern "C" { > > #ifdef __OpenBSD__ > #define DRM_DIR_NAME "/dev" > -#define DRM_DEV_NAME "%s/drm%d" > -#define DRM_CONTROL_DEV_NAME "%s/drmC%d" > -#define DRM_RENDER_DEV_NAME "%s/drmR%d" > +#define DRM_PRIMARY_MINOR_NAME "drm" > +#define DRM_CONTROL_MINOR_NAME "drmC" > +#define DRM_RENDER_MINOR_NAME "drmR" > #else > #define DRM_DIR_NAME "/dev/dri" > -#define DRM_DEV_NAME "%s/card%d" > -#define DRM_CONTROL_DEV_NAME "%s/controlD%d" > -#define DRM_RENDER_DEV_NAME "%s/renderD%d" > +#define DRM_PRIMARY_MINOR_NAME "card" > +#define DRM_CONTROL_MINOR_NAME "controlD" > +#define DRM_RENDER_MINOR_NAME "renderD" > #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ > #endif > > +#define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d" > +#define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d" > +#define DRM_RENDER_DEV_NAME "%s/" DRM_RENDER_MINOR_NAME "%d" > + > #define DRM_ERR_NO_DEVICE (-1001) > #define DRM_ERR_NO_ACCESS (-1002) > #define DRM_ERR_NOT_ROOT (-1003) > -- > Cheers, > Eric >
On Mon, 18 Feb 2019 at 17:10, Eric Engestrom <eric.engestrom@intel.com> wrote: > > On Wednesday, 2018-12-19 17:08:01 +0000, Eric Engestrom wrote: > > Adapted from a local patch carried by DragonFlyBSD: > > https://github.com/DragonFlyBSD/DPorts/blob/bc056f88f7e4d468d8c9751f831a47b5ae1326e3/graphics/libdrm/files/patch-xf86drm.h > > > > Patch is sadly uncredited (a bot authored the commit), so I can't credit > > the author here either. > > > > Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> > > Ping? :) > Thanks - saw this before but if fell through the cracks. > > --- > > xf86drm.c | 10 ---------- > > xf86drm.h | 16 ++++++++++------ > > 2 files changed, 10 insertions(+), 16 deletions(-) > > This adds more API for not so obvious reasons. I've got a series that resolves this by folding the duplicated code into a few trivial helpers. Let me see if I can pull then out from the larger series and send them out. Emil
diff --git a/xf86drm.c b/xf86drm.c index 377ddf917d2cb902899a..07425b19897d00a19e8a 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -71,16 +71,6 @@ #include "util_math.h" -#ifdef __OpenBSD__ -#define DRM_PRIMARY_MINOR_NAME "drm" -#define DRM_CONTROL_MINOR_NAME "drmC" -#define DRM_RENDER_MINOR_NAME "drmR" -#else -#define DRM_PRIMARY_MINOR_NAME "card" -#define DRM_CONTROL_MINOR_NAME "controlD" -#define DRM_RENDER_MINOR_NAME "renderD" -#endif - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #define DRM_MAJOR 145 #endif diff --git a/xf86drm.h b/xf86drm.h index 7773d71a803084e86920..18668ff3d40d7db55c95 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -78,17 +78,21 @@ extern "C" { #ifdef __OpenBSD__ #define DRM_DIR_NAME "/dev" -#define DRM_DEV_NAME "%s/drm%d" -#define DRM_CONTROL_DEV_NAME "%s/drmC%d" -#define DRM_RENDER_DEV_NAME "%s/drmR%d" +#define DRM_PRIMARY_MINOR_NAME "drm" +#define DRM_CONTROL_MINOR_NAME "drmC" +#define DRM_RENDER_MINOR_NAME "drmR" #else #define DRM_DIR_NAME "/dev/dri" -#define DRM_DEV_NAME "%s/card%d" -#define DRM_CONTROL_DEV_NAME "%s/controlD%d" -#define DRM_RENDER_DEV_NAME "%s/renderD%d" +#define DRM_PRIMARY_MINOR_NAME "card" +#define DRM_CONTROL_MINOR_NAME "controlD" +#define DRM_RENDER_MINOR_NAME "renderD" #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ #endif +#define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d" +#define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d" +#define DRM_RENDER_DEV_NAME "%s/" DRM_RENDER_MINOR_NAME "%d" + #define DRM_ERR_NO_DEVICE (-1001) #define DRM_ERR_NO_ACCESS (-1002) #define DRM_ERR_NOT_ROOT (-1003)
Adapted from a local patch carried by DragonFlyBSD: https://github.com/DragonFlyBSD/DPorts/blob/bc056f88f7e4d468d8c9751f831a47b5ae1326e3/graphics/libdrm/files/patch-xf86drm.h Patch is sadly uncredited (a bot authored the commit), so I can't credit the author here either. Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> --- xf86drm.c | 10 ---------- xf86drm.h | 16 ++++++++++------ 2 files changed, 10 insertions(+), 16 deletions(-)