0002-Change-the-root-to-opt-path-for-ISP-config-path.patch 6.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150
  1. From c6e5437bd353c8d240ebd33f8c8661b3f91bde33 Mon Sep 17 00:00:00 2001
  2. From: Andy Hu <andy.hu@starfivetech.com>
  3. Date: Fri, 13 Jan 2023 14:30:09 +0800
  4. Subject: [PATCH] Change the /root/ to /opt path for ISP config path
  5. ---
  6. DDKSource/sensorapi/src/sensors/imx219mipi.c | 2 +-
  7. DDKSource/sensorapi/src/sensors/ov4689mipi.c | 2 +-
  8. DDKSource/sensorapi/src/sensors/sc2235dvp.c | 8 ++++----
  9. .../startfive_apps/StarFiveServer/src/tuning_service.c | 10 +++++-----
  10. DDKSource/test_apps/stf_isp_ctrl/src/stf_isp_ctrl.c | 6 +++---
  11. 5 files changed, 14 insertions(+), 14 deletions(-)
  12. diff --git a/DDKSource/sensorapi/src/sensors/imx219mipi.c b/DDKSource/sensorapi/src/sensors/imx219mipi.c
  13. index 7f6c0be..432174a 100644
  14. --- a/DDKSource/sensorapi/src/sensors/imx219mipi.c
  15. +++ b/DDKSource/sensorapi/src/sensors/imx219mipi.c
  16. @@ -68,7 +68,7 @@
  17. #include "stf_common/userlog.h"
  18. #ifdef SIFIVE_ISP
  19. #define DEV_PATH ("/dev/ddk_sensor")
  20. -#define EXTRA_CFG_PATH ("/root/.ispddk/")
  21. +#define EXTRA_CFG_PATH ("/opt/.ispddk/")
  22. #endif //SIFIVE_ISP
  23. #define IMX219_EXPO_GAIN_METHOD (EN_EXPO_GAIN_METHOD_1ST_EXPO_2ND_GAIN)
  24. diff --git a/DDKSource/sensorapi/src/sensors/ov4689mipi.c b/DDKSource/sensorapi/src/sensors/ov4689mipi.c
  25. index dc7922a..bfbfe2b 100644
  26. --- a/DDKSource/sensorapi/src/sensors/ov4689mipi.c
  27. +++ b/DDKSource/sensorapi/src/sensors/ov4689mipi.c
  28. @@ -63,7 +63,7 @@
  29. #include "stf_common/userlog.h"
  30. #ifdef SIFIVE_ISP
  31. #define DEV_PATH ("/dev/ddk_sensor")
  32. -#define EXTRA_CFG_PATH ("/root/.ispddk/")
  33. +#define EXTRA_CFG_PATH ("/opt/.ispddk/")
  34. #endif //SIFIVE_ISP
  35. #define OV4689_EXPO_GAIN_METHOD (EN_EXPO_GAIN_METHOD_SAME_TIME)
  36. diff --git a/DDKSource/sensorapi/src/sensors/sc2235dvp.c b/DDKSource/sensorapi/src/sensors/sc2235dvp.c
  37. index ade6131..b5721ae 100644
  38. --- a/DDKSource/sensorapi/src/sensors/sc2235dvp.c
  39. +++ b/DDKSource/sensorapi/src/sensors/sc2235dvp.c
  40. @@ -58,7 +58,7 @@
  41. #include "stf_common/userlog.h"
  42. #ifdef SIFIVE_ISP
  43. #define DEV_PATH ("/dev/ddk_sensor")
  44. -#define EXTRA_CFG_PATH ("/root/.ispddk/")
  45. +#define EXTRA_CFG_PATH ("/opt/.ispddk/")
  46. #endif //SIFIVE_ISP
  47. #define SC2235_EXPO_GAIN_METHOD (EN_EXPO_GAIN_METHOD_SAME_TIME)
  48. @@ -1550,12 +1550,12 @@ STF_RESULT SC2235DVP_Create(
  49. V_LOG_INFO("<<<<<<<<<<<<\n");
  50. -#ifndef USE_LINUX_SYSTEM_STARTAND_I2C
  51. +#ifndef USE_LINUX_SYSTEM_STARTAND_I2C
  52. LOG_ERROR("Create SC2235 DVP sensor must use linux standart I2C interface!! \n");
  53. return STF_ERROR_DEVICE_UNAVAILABLE;
  54. -#endif //USE_LINUX_SYSTEM_STARTAND_I2C
  55. +#endif //USE_LINUX_SYSTEM_STARTAND_I2C
  56. -#ifndef V4L2_DRIVER
  57. +#ifndef V4L2_DRIVER
  58. LOG_ERROR("Create SC2235 DVP sensor must use linux standart v4l2 drviers!! \n");
  59. return STF_ERROR_DEVICE_UNAVAILABLE;
  60. #endif //V4L2_DRIVER
  61. diff --git a/DDKSource/startfive_apps/StarFiveServer/src/tuning_service.c b/DDKSource/startfive_apps/StarFiveServer/src/tuning_service.c
  62. index 0fbed32..c9acefd 100755
  63. --- a/DDKSource/startfive_apps/StarFiveServer/src/tuning_service.c
  64. +++ b/DDKSource/startfive_apps/StarFiveServer/src/tuning_service.c
  65. @@ -776,7 +776,7 @@ int tuning_serv_set_setting_file(STCOMDDATA* pcomddata)
  66. }
  67. // Check the seting folder is exist or not?
  68. - sprintf(szSetting, "/root/.isp_setting");
  69. + sprintf(szSetting, "/opt/.isp_setting");
  70. bFileExist = (0 == stat(szSetting, &stStat)) ? TRUE : FALSE;
  71. if (FALSE == bFileExist)
  72. {
  73. @@ -792,7 +792,7 @@ int tuning_serv_set_setting_file(STCOMDDATA* pcomddata)
  74. }
  75. // Remove backup file.
  76. - sprintf(szTemp, "/root/.isp_setting/IspSetting_%dx%d.bak",
  77. + sprintf(szTemp, "/opt/.isp_setting/IspSetting_%dx%d.bak",
  78. s32Width, s32Height);
  79. bFileExist = (0 == stat(szTemp, &stStat)) ? TRUE : FALSE;
  80. if (TRUE == bFileExist)
  81. @@ -802,7 +802,7 @@ int tuning_serv_set_setting_file(STCOMDDATA* pcomddata)
  82. }
  83. // Rename setting file as backup file.
  84. - sprintf(szSetting, "/root/.isp_setting/IspSetting_%dx%d.ybn",
  85. + sprintf(szSetting, "/opt/.isp_setting/IspSetting_%dx%d.ybn",
  86. s32Width, s32Height);
  87. bFileExist = (0 == stat(szSetting, &stStat)) ? TRUE : FALSE;
  88. if (TRUE == bFileExist)
  89. @@ -843,7 +843,7 @@ int tuning_serv_set_delete_setting_file(STCOMDDATA* pcomddata)
  90. }
  91. // Remove backup file.
  92. - sprintf(szSetting, "/root/.isp_setting/IspSetting_%dx%d.bak",
  93. + sprintf(szSetting, "/opt/.isp_setting/IspSetting_%dx%d.bak",
  94. s32Width, s32Height);
  95. bFileExist = (0 == stat(szSetting, &stStat)) ? TRUE : FALSE;
  96. if (TRUE == bFileExist)
  97. @@ -853,7 +853,7 @@ int tuning_serv_set_delete_setting_file(STCOMDDATA* pcomddata)
  98. }
  99. // Remove setting file.
  100. - sprintf(szSetting, "/root/.isp_setting/IspSetting_%dx%d.ybn",
  101. + sprintf(szSetting, "/opt/.isp_setting/IspSetting_%dx%d.ybn",
  102. s32Width, s32Height);
  103. bFileExist = (0 == stat(szSetting, &stStat)) ? TRUE : FALSE;
  104. if (TRUE == bFileExist)
  105. diff --git a/DDKSource/test_apps/stf_isp_ctrl/src/stf_isp_ctrl.c b/DDKSource/test_apps/stf_isp_ctrl/src/stf_isp_ctrl.c
  106. index 3522def..0a4d269 100755
  107. --- a/DDKSource/test_apps/stf_isp_ctrl/src/stf_isp_ctrl.c
  108. +++ b/DDKSource/test_apps/stf_isp_ctrl/src/stf_isp_ctrl.c
  109. @@ -1932,14 +1932,14 @@ static STF_INT IspCtrl(
  110. // ISP load binary parameters.
  111. //=========================================================================
  112. bFileExist = STF_FALSE;
  113. - sprintf(szIspBinParamFilename, "/root/.isp_setting/IspSetting_%dx%d.ybn",
  114. + sprintf(szIspBinParamFilename, "/opt/.isp_setting/IspSetting_%dx%d.ybn",
  115. stPipeline.stIspCtx.stImgSize.u16Cx,
  116. stPipeline.stIspCtx.stImgSize.u16Cy
  117. );
  118. bFileExist = (0 == stat(szIspBinParamFilename, &stStat))
  119. ? STF_TRUE : STF_FALSE;
  120. if (STF_FALSE == bFileExist) {
  121. - sprintf(szIspBinParamFilename, "/root/ISP/IspSetting_%s_%dx%d.ybn",
  122. + sprintf(szIspBinParamFilename, "/opt/ISP/IspSetting_%s_%dx%d.ybn",
  123. szSensorName,
  124. stPipeline.stIspCtx.stImgSize.u16Cx,
  125. stPipeline.stIspCtx.stImgSize.u16Cy
  126. @@ -1956,7 +1956,7 @@ static STF_INT IspCtrl(
  127. CAPTURE_HEIGHT
  128. );
  129. - sprintf(szIspBinParamFilename, "/root/ISP/IspSetting_%s_%dx%d.ybn",
  130. + sprintf(szIspBinParamFilename, "/opt/ISP/IspSetting_%s_%dx%d.ybn",
  131. szSensorName,
  132. CAPTURE_WIDTH,
  133. CAPTURE_HEIGHT
  134. --
  135. 2.36.0