Merge d427981 on remote branch

Change-Id: I7c01119a4a4eb14977e76813139bf5da539cd007
HyperTeam · Dec 10, 2018 · 2519d63 · 2519d63
2 parents d9cde72 + d427981
commit 2519d63
Show file tree

Hide file tree

Showing 14 changed files with 1,514 additions and 81 deletions.
diff --git a/configure.ac b/configure.ac
@@ -31,6 +31,11 @@ AC_ARG_ENABLE([target-msm8953],
                 [Enable conditional compile for target msm8953 [default=no]]),
         [target_msm8953="${enableval}"])
 
+AC_ARG_ENABLE([target-qcs605],
+        AC_HELP_STRING([--enable-target-qcs605],
+                [Enable conditional compile for target qcs605 [default=no]]),
+        [target_qcs605="${enableval}"])
+
 AC_ARG_ENABLE([target-msm8909],
         AC_HELP_STRING([--enable-target-msm8909],
                 [Enable conditional compile for target msm8909 [default=no]]),
@@ -157,6 +162,7 @@ AC_ARG_WITH([glib-lib-dir],
         [CPPFLAGS="$CPPFLAGS -I$withval"])
 
 AM_CONDITIONAL(TARGET_MSM8953, [test "x$target_msm8953" = "xyes"])
+AM_CONDITIONAL(TARGET_QCS605, [test "x$target_qcs605" = "xyes"])
 AM_CONDITIONAL(TARGET_MSM8909, [test "x$target_msm8909" = "xyes"])
 AM_CONDITIONAL(TARGET_MSM8996, [test "x$target_msm8996" = "xyes"])
 AM_CONDITIONAL(TARGET_MSM8610, [test "x$target_msm8610" = "xyes"])

diff --git a/mm-core/Android.mk b/mm-core/Android.mk
@@ -18,6 +18,8 @@ else ifeq ($(filter $(TARGET_BOARD_PLATFORM), msmpeafowl),$(TARGET_BOARD_PLATFOR
 MM_CORE_TARGET = msmpeafowl
 else ifeq ($(filter $(TARGET_BOARD_PLATFORM), sdm710),$(TARGET_BOARD_PLATFORM))
 MM_CORE_TARGET = sdm710
+else ifeq ($(filter $(TARGET_BOARD_PLATFORM), qcs605),$(TARGET_BOARD_PLATFORM))
+MM_CORE_TARGET = qcs605
 else
 MM_CORE_TARGET = default
 endif
@@ -77,7 +79,8 @@ LOCAL_CFLAGS            := $(OMXCORE_CFLAGS)
 
 LOCAL_SRC_FILES         := src/common/omx_core_cmp.cpp
 LOCAL_SRC_FILES         += src/common/qc_omx_core.c
-ifneq (,$(filter sdm845 msmpeafowl sdm710,$(TARGET_BOARD_PLATFORM)))
+$(info srik $(MM_CORE_TARGET))
+ifneq (,$(filter qcs605 sdm845 msmpeafowl sdm710,$(TARGET_BOARD_PLATFORM)))
 LOCAL_SRC_FILES         += src/$(MM_CORE_TARGET)/registry_table_android.c
 else
 LOCAL_SRC_FILES         += src/$(MM_CORE_TARGET)/qc_registry_table_android.c
@@ -109,7 +112,7 @@ LOCAL_CFLAGS            := $(OMXCORE_CFLAGS)
 
 LOCAL_SRC_FILES         := src/common/omx_core_cmp.cpp
 LOCAL_SRC_FILES         += src/common/qc_omx_core.c
-ifneq (,$(filter sdm845 msmpeafowl sdm710,$(TARGET_BOARD_PLATFORM)))
+ifneq (,$(filter qcs605 sdm845 msmpeafowl sdm710,$(TARGET_BOARD_PLATFORM)))
 LOCAL_SRC_FILES         += src/$(MM_CORE_TARGET)/registry_table.c
 else
 LOCAL_SRC_FILES         += src/$(MM_CORE_TARGET)/qc_registry_table.c

diff --git a/mm-core/Makefile.am b/mm-core/Makefile.am
@@ -58,6 +58,10 @@ if TARGET_MSM8909
 TARGET_REGISTRY = 8909
 endif
 
+if TARGET_QCS605
+TARGET_REGISTRY = qcs605
+endif
+
 c_sources +=src/${TARGET_REGISTRY}/registry_table_android.c
 
 lib_LTLIBRARIES = libOmxCore.la

diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h
@@ -1,5 +1,5 @@
 /*--------------------------------------------------------------------------
-Copyright (c) 2009-2017, The Linux Foundation. All rights reserved.
+Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -139,6 +139,15 @@ struct OMX_QCOM_PARAM_MEMMAPENTRYTYPE
 #define OMX_QCOM_PORTDEFN_EXTN   "OMX.QCOM.index.param.portdefn"
 /* Allowed APIs on the above Index: OMX_GetParameter() and OMX_SetParameter() */
 
+/*
+ * VT Driver Version Number definition
+ * Hexa Decimal: 0xPPPPYYMM
+ *               PPPP [2 Bytes] - Product ID
+ *               YY   [1 Byte ] - Year (last two digits of year {00..99})
+ *               MM   [1 Byte ] - Month (01..12)
+ */
+#define VT_DRIVER_VERSION 0x034D120B
+
 typedef enum OMX_QCOMMemoryRegion
 {
     OMX_QCOM_MemRegionInvalid,