Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Remove ifdef for const fix.
details: https://anonhg.NetBSD.org/src/rev/9f9a40f33caf
branches: trunk
changeset: 795171:9f9a40f33caf
user: riastradh <riastradh%NetBSD.org@localhost>
date: Thu Apr 03 15:16:42 2014 +0000
description:
Remove ifdef for const fix.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c | 8 --------
sys/external/bsd/drm2/dist/drm/i915/intel_tv.c | 8 --------
2 files changed, 0 insertions(+), 16 deletions(-)
diffs (54 lines):
diff -r d8bee2562d71 -r 9f9a40f33caf sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Thu Apr 03 15:16:18 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Thu Apr 03 15:16:42 2014 +0000
@@ -419,11 +419,7 @@
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 @@
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;
diff -r d8bee2562d71 -r 9f9a40f33caf sys/external/bsd/drm2/dist/drm/i915/intel_tv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c Thu Apr 03 15:16:18 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c Thu Apr 03 15:16:42 2014 +0000
@@ -1555,11 +1555,7 @@
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 @@
/* 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);
Home |
Main Index |
Thread Index |
Old Index