Merge "drm: add extern C guard for the UAPI headers" (bdd32e7a) · Commits · e / devices / android_kernel_sony_msm8998

include/uapi/drm/drm.h

+21 −1

Original line number	Diff line number	Diff line
		@@ -58,6 +58,10 @@ typedef unsigned long drm_handle_t;

		#endif

		#if defined(__cplusplus)
		extern "C" {
		#endif

		#define DRM_NAME "drm" /*< Name in kernel, /dev, and /proc /
		#define DRM_MIN_ORDER 5 /*< At least 2^5 bytes = 32 bytes /
		#define DRM_MAX_ORDER 22 /*< Up to 2^22 bytes = 4MB /
		@@ -372,7 +376,11 @@ struct drm_buf_pub {
		*/
		struct drm_buf_map {
		int count; /*< Length of the buffer list /
		#ifdef __cplusplus
		void __user *virt;
		#else
		void __user virtual; /< Mmap'd area in user-virtual /
		#endif
		struct drm_buf_pub __user list; /< Buffer information /
		};

		@@ -679,7 +687,15 @@ struct drm_prime_handle {
		__s32 fd;
		};

		#include <drm/drm_mode.h>
		#if defined(__cplusplus)
		}
		#endif

		#include "drm_mode.h"

		#if defined(__cplusplus)
		extern "C" {
		#endif

		#define DRM_IOCTL_BASE 'd'
		#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
		@@ -874,4 +890,8 @@ typedef struct drm_scatter_gather drm_scatter_gather_t;
		typedef struct drm_set_version drm_set_version_t;
		#endif

		#if defined(__cplusplus)
		}
		#endif

		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@

		#include <linux/types.h>

		#if defined(__cplusplus)
		extern "C" {
		#endif

		#define fourcc_code(a, b, c, d) ((__u32)(a) \| ((__u32)(b) << 8) \| \
		((__u32)(c) << 16) \| ((__u32)(d) << 24))

		@@ -237,4 +241,8 @@
		*/
		#define DRM_FORMAT_MOD_QCOM_COMPRESSED fourcc_mod_code(QCOM, 1)

		#if defined(__cplusplus)
		}
		#endif

		#endif /* DRM_FOURCC_H */

+8 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,10 @@

		#include <linux/types.h>

		#if defined(__cplusplus)
		extern "C" {
		#endif

		#define DRM_DISPLAY_INFO_LEN 32
		#define DRM_CONNECTOR_NAME_LEN 32
		#define DRM_DISPLAY_MODE_LEN 32
		@@ -599,4 +603,8 @@ struct drm_mode_destroy_blob {
		__u32 blob_id;
		};

		#if defined(__cplusplus)
		}
		#endif

		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,10 @@

		#include <drm/drm.h>

		#if defined(__cplusplus)
		extern "C" {
		#endif

		/* SAREA area needs to be at least a page */
		#if defined(__alpha__)
		#define SAREA_MAX 0x2000U
		@@ -83,4 +87,8 @@ typedef struct drm_sarea_frame drm_sarea_frame_t;
		typedef struct drm_sarea drm_sarea_t;
		#endif

		#if defined(__cplusplus)
		}
		#endif

		#endif /* _DRM_SAREA_H_ */