From fe670b2a79b8f676f3a01771e8a79a7e37fa51a5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 23 Apr 2020 09:47:26 +0200 Subject: [PATCH] media: atomisp: print css_version in runtime The CSS version returned by ISP2400 is different than the one returned by ISP2401. While we could return just one version for both, as this sounds like just an informative string, for now, let's keep returning different versions, as we don't know if this would affect userspace. Signed-off-by: Mauro Carvalho Chehab --- .../pci/atomisp2/css2400/ia_css_version_data.h | 7 ++----- .../atomisp/pci/atomisp2/css2400/sh_css_version.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h index 8fb8c045f2927..f630fa5d55cc9 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h @@ -21,10 +21,7 @@ #ifndef __IA_CSS_VERSION_DATA_H #define __IA_CSS_VERSION_DATA_H -#ifndef ISP2401 -#define CSS_VERSION_STRING "REL:20150521_21.4_0539; API:2.1.15.3; GIT:irci_candrpv_0415_20150504_35b345#35b345be52ac575f8934abb3a88fea26a94e7343; SDK:/nfs/iir/disks/iir_hivepackages_003/iir_hivepkgs_disk017/Css_Mizuchi/packages/Css_Mizuchi/int_css_mizuchi_20140829_1053; USER:viedifw; " -#else -#define CSS_VERSION_STRING "REL:20150911_37.5_1652; API:2.1.20.9; GIT:irci___#ebf437d53a8951bb7ff6d13fdb7270dab393a92a; SDK:; USER:viedifw; " -#endif +#define ISP2400_CSS_VERSION_STRING "REL:20150521_21.4_0539; API:2.1.15.3; GIT:irci_candrpv_0415_20150504_35b345#35b345be52ac575f8934abb3a88fea26a94e7343; SDK:/nfs/iir/disks/iir_hivepackages_003/iir_hivepkgs_disk017/Css_Mizuchi/packages/Css_Mizuchi/int_css_mizuchi_20140829_1053; USER:viedifw; " +#define ISP2401_CSS_VERSION_STRING "REL:20150911_37.5_1652; API:2.1.20.9; GIT:irci___#ebf437d53a8951bb7ff6d13fdb7270dab393a92a; SDK:; USER:viedifw; " #endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c index 3c7cadd837da8..eb986e15c7fa9 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c @@ -12,6 +12,7 @@ * more details. */ +#include "../../include/linux/atomisp.h" #include "ia_css_version.h" #include "ia_css_version_data.h" #include "ia_css_err.h" @@ -19,9 +20,16 @@ enum ia_css_err ia_css_get_version(char *version, int max_size) { - if (max_size <= (int)strlen(CSS_VERSION_STRING) + (int)strlen(sh_css_get_fw_version()) + 5) + char *css_version; + + if (!atomisp_hw_is_isp2401) + css_version = ISP2400_CSS_VERSION_STRING; + else + css_version = ISP2401_CSS_VERSION_STRING; + + if (max_size <= (int)strlen(css_version) + (int)strlen(sh_css_get_fw_version()) + 5) return IA_CSS_ERR_INVALID_ARGUMENTS; - strcpy(version, CSS_VERSION_STRING); + strcpy(version, css_version); strcat(version, "FW:"); strcat(version, sh_css_get_fw_version()); strcat(version, "; "); -- 2.30.2