Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:48:42 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: intel_tv.c
Log Message:
Constify intel_tv.c.
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/drm/i915/intel_tv.c
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/drm/i915/intel_tv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.1.1.1.2.3 Wed Jul 24 03:48:26 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c Wed Jul 24 03:48:42 2013
@@ -1555,7 +1555,11 @@ intel_tv_init(struct drm_device *dev)
struct intel_encoder *intel_encoder;
struct intel_connector *intel_connector;
u32 tv_dac_on, tv_dac_off, save_tv_dac;
+#ifdef __NetBSD__ /* XXX const */
+ const char *tv_format_names[ARRAY_SIZE(tv_modes)];
+#else
char *tv_format_names[ARRAY_SIZE(tv_modes)];
+#endif
int i, initial_mode = 0;
if ((I915_READ(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED)
@@ -1651,7 +1655,11 @@ intel_tv_init(struct drm_device *dev)
/* Create TV properties then attach current values */
for (i = 0; i < ARRAY_SIZE(tv_modes); i++)
+#ifdef __NetBSD__ /* XXX const */
+ tv_format_names[i] = (const char *)tv_modes[i].name;
+#else
tv_format_names[i] = (char *)tv_modes[i].name;
+#endif
drm_mode_create_tv_properties(dev,
ARRAY_SIZE(tv_modes),
tv_format_names);
