Module Name: src
Committed By: riastradh
Date: Thu Apr 3 15:16:42 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_sdvo.c intel_tv.c
Log Message:
Remove ifdef for const fix.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c \
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_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Thu Apr 3 15:16:42 2014
@@ -419,11 +419,7 @@ static void intel_sdvo_debug_write(struc
DRM_DEBUG_KMS("%s: W: %02X ",
SDVO_NAME(intel_sdvo), cmd);
for (i = 0; i < args_len; i++)
-#ifdef __NetBSD__ /* XXX const */
DRM_LOG_KMS("%02X ", ((const u8 *)args)[i]);
-#else
- DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
-#endif
for (; i < 8; i++)
DRM_LOG_KMS(" ");
for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) {
@@ -473,11 +469,7 @@ static bool intel_sdvo_write_cmd(struct
msgs[i].len = 2;
msgs[i].buf = buf + 2 *i;
buf[2*i + 0] = SDVO_I2C_ARG_0 - i;
-#ifdef __NetBSD__ /* XXX const */
buf[2*i + 1] = ((const u8*)args)[i];
-#else
- buf[2*i + 1] = ((u8*)args)[i];
-#endif
}
msgs[i].addr = intel_sdvo->slave_addr;
msgs[i].flags = 0;
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.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c Thu Apr 3 15:16:42 2014
@@ -1555,11 +1555,7 @@ 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)
@@ -1655,11 +1651,7 @@ 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);
