CVS commit: [riastradh-drm2] src/sys/external/bsd/drm2/dist/drm/i915

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed Jul 24 03:42:05 UTC 2013

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]:
            intel_opregion.c

Log Message:
Avoid void * arithmetic in intel_opregion.c.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.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_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.1.1.1.2.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.1.1.1.2.5
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.1.1.1.2.4	Wed Jul 24 03:41:49 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c	Wed Jul 24 03:42:05 2013
@@ -551,23 +551,43 @@ int intel_opregion_setup(struct drm_devi
 		goto err_out;
 	}
 	opregion->header = base;
+#ifdef __NetBSD__
+	opregion->vbt = (char *)base + OPREGION_VBT_OFFSET;
+#else
 	opregion->vbt = base + OPREGION_VBT_OFFSET;
+#endif
 
+#ifdef __NetBSD__
+	opregion->lid_state = (void *)((char *)base + ACPI_CLID);
+#else
 	opregion->lid_state = base + ACPI_CLID;
+#endif
 
 	mboxes = ioread32(&opregion->header->mboxes);
 	if (mboxes & MBOX_ACPI) {
 		DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
+#ifdef __NetBSD__
+		opregion->acpi = (void *)((char *)base + OPREGION_ACPI_OFFSET);
+#else
 		opregion->acpi = base + OPREGION_ACPI_OFFSET;
+#endif
 	}
 
 	if (mboxes & MBOX_SWSCI) {
 		DRM_DEBUG_DRIVER("SWSCI supported\n");
+#ifdef __NetBSD__
+		opregion->swsci = (void *)((char *)base + OPREGION_SWSCI_OFFSET);
+#else
 		opregion->swsci = base + OPREGION_SWSCI_OFFSET;
+#endif
 	}
 	if (mboxes & MBOX_ASLE) {
 		DRM_DEBUG_DRIVER("ASLE supported\n");
+#ifdef __NetBSD__
+		opregion->asle = (void *)((char *)base + OPREGION_ASLE_OFFSET);
+#else
 		opregion->asle = base + OPREGION_ASLE_OFFSET;
+#endif
 	}
 
 	return 0;