Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:19:30 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drm_crtc.h
Log Message:
Use only C99-style initializers in DRM_MODE in drm_crtc.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h:1.1.1.1.2.3 Wed Jul 24 02:13:23 2013
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_crtc.h Wed Jul 24 02:19:30 2013
@@ -114,6 +114,15 @@ enum drm_mode_status {
#define DRM_MODE_TYPE_CLOCK_CRTC_C (DRM_MODE_TYPE_CLOCK_C | \
DRM_MODE_TYPE_CRTC_C)
+#ifdef __NetBSD__
+#define DRM_MODE(nm, t, c, hd, hss, hse, ht, hsk, vd, vss, vse, vt, vs, f) \
+ .name = nm, .status = 0, .type = (t), .clock = (c), \
+ .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
+ .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
+ .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
+ .vscan = (vs), .flags = (f), .vrefresh = 0, \
+ .base = { .type = DRM_MODE_OBJECT_MODE }
+#else
#define DRM_MODE(nm, t, c, hd, hss, hse, ht, hsk, vd, vss, vse, vt, vs, f) \
.name = nm, .status = 0, .type = (t), .clock = (c), \
.hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
@@ -121,6 +130,7 @@ enum drm_mode_status {
.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
.vscan = (vs), .flags = (f), .vrefresh = 0, \
.base.type = DRM_MODE_OBJECT_MODE
+#endif
#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
