aboutsummaryrefslogtreecommitdiff
path: root/include/video/mcde_fb.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/video/mcde_fb.h')
-rw-r--r--include/video/mcde_fb.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/include/video/mcde_fb.h b/include/video/mcde_fb.h
index 871b0225c46..6d05f612184 100644
--- a/include/video/mcde_fb.h
+++ b/include/video/mcde_fb.h
@@ -12,9 +12,18 @@
#define __MCDE_FB__H__
#include <linux/fb.h>
-
+#include <linux/ioctl.h>
+#if !defined(__KERNEL__) && !defined(_KERNEL)
+#include <stdint.h>
+#else
+#include <linux/types.h>
+#endif
+
+#ifdef __KERNEL__
#include "mcde_dss.h"
+#endif
+#ifdef __KERNEL__
#define to_mcde_fb(x) ((struct mcde_fb *)(x)->par)
#define MCDE_FB_MAX_NUM_OVERLAYS 3
@@ -28,8 +37,9 @@ struct mcde_fb {
/* MCDE fbdev API */
struct fb_info *mcde_fb_create(struct mcde_display_device *ddev,
- u16 w, u16 h, u16 vw, u16 vh, enum mcde_ovly_pix_fmt pix_fmt,
- u32 rotate, bool display_initialized);
+ uint16_t w, uint16_t h, uint16_t vw, uint16_t vh,
+ enum mcde_ovly_pix_fmt pix_fmt, uint32_t rotate);
+
int mcde_fb_attach_overlay(struct fb_info *fb_info,
struct mcde_overlay *ovl);
void mcde_fb_destroy(struct fb_info *fb_info);
@@ -37,6 +47,7 @@ void mcde_fb_destroy(struct fb_info *fb_info);
/* MCDE fb driver */
int mcde_fb_init(void);
void mcde_fb_exit(void);
+#endif
#endif /* __MCDE_FB__H__ */