Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/include/drm Add some exp...



details:   https://anonhg.NetBSD.org/src/rev/2d06c590bf2c
branches:  riastradh-drm2
changeset: 788094:2d06c590bf2c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 02:12:46 2013 +0000

description:
Add some expedient __UNCONST workarounds to drm_crtc_helper.h.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_crtc_helper.h |  18 ++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r 5a200b9476c7 -r 2d06c590bf2c sys/external/bsd/drm2/dist/include/drm/drm_crtc_helper.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_crtc_helper.h  Wed Jul 24 02:12:29 2013 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_crtc_helper.h  Wed Jul 24 02:12:46 2013 +0000
@@ -145,19 +145,37 @@
 static inline void drm_crtc_helper_add(struct drm_crtc *crtc,
                                       const struct drm_crtc_helper_funcs *funcs)
 {
+#ifdef __NetBSD__
+       /*
+        * XXX This is wrong, but more expedient than going through all
+        * the uses of helper_private and constifying them.  Whoever
+        * comes through this code with a few spare moments should
+        * consider donating them to the cause of doing that.
+        */
+       crtc->helper_private = (void *)__UNCONST(funcs);
+#else
        crtc->helper_private = (void *)funcs;
+#endif
 }
 
 static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
                                          const struct drm_encoder_helper_funcs *funcs)
 {
+#ifdef __NetBSD__
+       encoder->helper_private = (void *)__UNCONST(funcs);
+#else
        encoder->helper_private = (void *)funcs;
+#endif
 }
 
 static inline void drm_connector_helper_add(struct drm_connector *connector,
                                            const struct drm_connector_helper_funcs *funcs)
 {
+#ifdef __NetBSD__
+       connector->helper_private = (void *)__UNCONST(funcs);
+#else
        connector->helper_private = (void *)funcs;
+#endif
 }
 
 extern int drm_helper_resume_force_mode(struct drm_device *dev);



Home | Main Index | Thread Index | Old Index