diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2014-07-20 13:52:03 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2014-11-22 23:17:48 +0000 |
| commit | e66155b9d20bf5f778c10a6e00b2d79da4a9e938 (patch) | |
| tree | 033547ce244d0db22a329dce9c4c3b7868239f22 | |
| parent | a358377db2c4dbcb12d662ccae334c89f14f8a6e (diff) | |
common: move shared headers to common/
Move various header files to common/ since they will be shared by the
KMS and acceleration code.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | common/Makefile.am | 21 | ||||
| -rw-r--r-- | common/compat-api.h (renamed from src/compat-api.h) | 0 | ||||
| -rw-r--r-- | common/gal_extension.h (renamed from src/gal_extension.h) | 10 | ||||
| -rw-r--r-- | common/utils.h (renamed from src/utils.h) | 0 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
7 files changed, 32 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 933c55a..011d0e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,4 +19,4 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src man +SUBDIRS = common man src diff --git a/common/Makefile.am b/common/Makefile.am new file mode 100644 index 0000000..d47a0dd --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,21 @@ +# +# Marvell Armada DRM-based driver +# +# Written by Russell King, 2012, derived in part from the +# Intel xorg X server driver. +# + +# Turn off -Wnested-externs - these are a good thing because it allows +# information hiding and helps prevent misuse of private externs. +# Turn off -Wcast-qual - this makes stuff like string assignment +# too noisy. +# Turn off -Wredundant-decls - Xorg headers seem to contain a lot +# of this, so why it's in xorg-macros.m4... maybe more of a wish? +# Turn off -Wshadow - Xorg headers seem to declare a lot of globals +# which can conflict - index, range, etc. +AM_CFLAGS = $(filter-out -Wnested-externs -Wcast-qual -Wredundant-decls \ + -Werror=write-strings -Wshadow,$(CWARNFLAGS)) \ + $(XORG_CFLAGS) + +noinst_LTLIBRARIES = libcommon.la +libcommon_la_SOURCES = diff --git a/src/compat-api.h b/common/compat-api.h index 993daa0..993daa0 100644 --- a/src/compat-api.h +++ b/common/compat-api.h diff --git a/src/gal_extension.h b/common/gal_extension.h index 96ac7f4..0c8d66b 100644 --- a/src/gal_extension.h +++ b/common/gal_extension.h @@ -4,16 +4,16 @@ #ifndef GAL_EXTENSION_H #define GAL_EXTENSION_H +#include <stdint.h> #include <sys/ioctl.h> -#include <gc_hal.h> /* Map a DMABUF fd into galcore */ struct dmabuf_map_old { - unsigned zero; - unsigned status; + uint32_t zero; + uint32_t status; int fd; - gctPOINTER Info; - gctUINT32 Address; + void *Info; + uint32_t Address; }; #define IOC_GDMABUF_MAP_OLD _IOWR('_', 0, struct dmabuf_map_old) diff --git a/src/utils.h b/common/utils.h index a7f8353..a7f8353 100644 --- a/src/utils.h +++ b/common/utils.h diff --git a/configure.ac b/configure.ac index 545ed84..154a93c 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,7 @@ AC_SUBST([moduledir]) AC_OUTPUT([ Makefile - src/Makefile + common/Makefile man/Makefile + src/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index deded85..c719bd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,9 @@ # which can conflict - index, range, etc. AM_CFLAGS = $(filter-out -Wnested-externs -Wcast-qual -Wredundant-decls \ -Werror=write-strings -Wshadow,$(CWARNFLAGS)) \ - $(XORG_CFLAGS) $(LIBGAL_CFLAGS) $(DRMARMADA_CFLAGS) $(UDEV_CFLAGS) + $(XORG_CFLAGS) $(LIBGAL_CFLAGS) $(DRMARMADA_CFLAGS) $(UDEV_CFLAGS) \ + -I$(top_srcdir)/common + armada_drv_la_LTLIBRARIES = armada_drv.la armada_drv_la_LDFLAGS = -module -avoid-version armada_drv_la_LIBADD = $(LIBGAL_LIBS) $(DRMARMADA_LIBS) $(UDEV_LIBS) |