Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ebbb0e5c
Commit
ebbb0e5c
authored
Apr 07, 2016
by
Emil Velikov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm: add extern C guard for the UAPI headers
Signed-off-by:
Emil Velikov
<
emil.l.velikov@gmail.com
>
parent
1224649a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
0 deletions
+40
-0
include/uapi/drm/drm.h
include/uapi/drm/drm.h
+16
-0
include/uapi/drm/drm_fourcc.h
include/uapi/drm/drm_fourcc.h
+8
-0
include/uapi/drm/drm_mode.h
include/uapi/drm/drm_mode.h
+8
-0
include/uapi/drm/drm_sarea.h
include/uapi/drm/drm_sarea.h
+8
-0
No files found.
include/uapi/drm/drm.h
View file @
ebbb0e5c
...
@@ -65,6 +65,10 @@ typedef unsigned long drm_handle_t;
...
@@ -65,6 +65,10 @@ typedef unsigned long drm_handle_t;
#endif
#endif
#if defined(__cplusplus)
extern
"C"
{
#endif
#define DRM_NAME "drm"
/**< Name in kernel, /dev, and /proc */
#define DRM_NAME "drm"
/**< Name in kernel, /dev, and /proc */
#define DRM_MIN_ORDER 5
/**< At least 2^5 bytes = 32 bytes */
#define DRM_MIN_ORDER 5
/**< At least 2^5 bytes = 32 bytes */
#define DRM_MAX_ORDER 22
/**< Up to 2^22 bytes = 4MB */
#define DRM_MAX_ORDER 22
/**< Up to 2^22 bytes = 4MB */
...
@@ -691,8 +695,16 @@ struct drm_prime_handle {
...
@@ -691,8 +695,16 @@ struct drm_prime_handle {
__s32
fd
;
__s32
fd
;
};
};
#if defined(__cplusplus)
}
#endif
#include "drm_mode.h"
#include "drm_mode.h"
#if defined(__cplusplus)
extern
"C"
{
#endif
#define DRM_IOCTL_BASE 'd'
#define DRM_IOCTL_BASE 'd'
#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
#define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type)
#define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type)
...
@@ -886,4 +898,8 @@ typedef struct drm_scatter_gather drm_scatter_gather_t;
...
@@ -886,4 +898,8 @@ typedef struct drm_scatter_gather drm_scatter_gather_t;
typedef
struct
drm_set_version
drm_set_version_t
;
typedef
struct
drm_set_version
drm_set_version_t
;
#endif
#endif
#if defined(__cplusplus)
}
#endif
#endif
#endif
include/uapi/drm/drm_fourcc.h
View file @
ebbb0e5c
...
@@ -26,6 +26,10 @@
...
@@ -26,6 +26,10 @@
#include "drm.h"
#include "drm.h"
#if defined(__cplusplus)
extern
"C"
{
#endif
#define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \
#define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \
((__u32)(c) << 16) | ((__u32)(d) << 24))
((__u32)(c) << 16) | ((__u32)(d) << 24))
...
@@ -229,4 +233,8 @@
...
@@ -229,4 +233,8 @@
*/
*/
#define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1)
#define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1)
#if defined(__cplusplus)
}
#endif
#endif
/* DRM_FOURCC_H */
#endif
/* DRM_FOURCC_H */
include/uapi/drm/drm_mode.h
View file @
ebbb0e5c
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
#include "drm.h"
#include "drm.h"
#if defined(__cplusplus)
extern
"C"
{
#endif
#define DRM_DISPLAY_INFO_LEN 32
#define DRM_DISPLAY_INFO_LEN 32
#define DRM_CONNECTOR_NAME_LEN 32
#define DRM_CONNECTOR_NAME_LEN 32
#define DRM_DISPLAY_MODE_LEN 32
#define DRM_DISPLAY_MODE_LEN 32
...
@@ -623,4 +627,8 @@ struct drm_mode_destroy_blob {
...
@@ -623,4 +627,8 @@ struct drm_mode_destroy_blob {
__u32
blob_id
;
__u32
blob_id
;
};
};
#if defined(__cplusplus)
}
#endif
#endif
#endif
include/uapi/drm/drm_sarea.h
View file @
ebbb0e5c
...
@@ -34,6 +34,10 @@
...
@@ -34,6 +34,10 @@
#include "drm.h"
#include "drm.h"
#if defined(__cplusplus)
extern
"C"
{
#endif
/* SAREA area needs to be at least a page */
/* SAREA area needs to be at least a page */
#if defined(__alpha__)
#if defined(__alpha__)
#define SAREA_MAX 0x2000U
#define SAREA_MAX 0x2000U
...
@@ -83,4 +87,8 @@ typedef struct drm_sarea_frame drm_sarea_frame_t;
...
@@ -83,4 +87,8 @@ typedef struct drm_sarea_frame drm_sarea_frame_t;
typedef
struct
drm_sarea
drm_sarea_t
;
typedef
struct
drm_sarea
drm_sarea_t
;
#endif
#endif
#if defined(__cplusplus)
}
#endif
#endif
/* _DRM_SAREA_H_ */
#endif
/* _DRM_SAREA_H_ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment