Clean up most trivial warnings

Do some housekeeping to better catch actual problems.

Change-Id: I1824e0b91c55450006fda1279012117bc9495164

diff --git a/gst-libs/atomisphal/gstv4l2mfldadvci.c b/gst-libs/atomisphal/gstv4l2mfldadvci.c
index e13f312..90e0a90 100644 (file)
--- a/gst-libs/atomisphal/gstv4l2mfldadvci.c
+++ b/gst-libs/atomisphal/gstv4l2mfldadvci.c
@@ -41,7 +41,7 @@ wrapper_default_int (int a)
 static int
 wrapper_default_int_void (void)
 {
-  return;
+  return 0;
 }
 
 static void
@@ -202,8 +202,9 @@ wrapper_default_switch_mode (CI_ISP_MODE binary)
 
 static ci_adv_Err wrapper_AeGetWindowsNum(int *num)
 {
-  return;
+  return ci_adv_Success;
 }
+
 static void wrapper_AwbVersion(int * major, int * minor)
 {
   return;
@@ -221,7 +222,7 @@ static void wrapper_AfVersion(int * major, int * minor)
 
 static ci_adv_Err wrapper_AfGetStillAfStatus(ci_adv_AfStatus *status)
 {
-  return;
+  return ci_adv_Success;
 }
 
 static void wrapper_RerVersion(int * major, int * minor)
@@ -231,7 +232,7 @@ static void wrapper_RerVersion(int * major, int * minor)
 
 static ci_adv_Err wrapper_AeGetManualShutter(int *time)
 {
-  return;
+  return ci_adv_Success;
 }
 
 static void wrapper_Awbdata(unsigned * num_p, unsigned * avg_r, unsigned * avg_gr,
@@ -242,17 +243,17 @@ static void wrapper_Awbdata(unsigned * num_p, unsigned * avg_r, unsigned * avg_g
 
 static ci_adv_Err wrapper_AeGetManualAperture(int *aperture)
 {
-  return;
+  return ci_adv_Success;
 }
 
 static ci_adv_Err wrapper_AeGetFlashMode(ci_adv_AeFlashMode *mode)
 {
-  return;
+  return ci_adv_Success;
 }
 
 static ci_adv_Err wrapper_AwbGetManualColorTemperature(int *ctemp)
 {
-  return;
+  return ci_adv_Success;
 }
 
 static void wrapper_Awbmatrix(int msqWbGain[3], int msqCcMtrx[9], unsigned short * shift)

diff --git a/gst-libs/atomisphal/mfld_cam.c b/gst-libs/atomisphal/mfld_cam.c
index 12f0357..ad4d85d 100644 (file)
--- a/gst-libs/atomisphal/mfld_cam.c
+++ b/gst-libs/atomisphal/mfld_cam.c
@@ -637,6 +637,8 @@ cam_set_capture_fmt (int fd, unsigned int width, unsigned int height,
   mfld_driver.fourcc = fourcc;
 
   mfldadvci->mode_spec_init ();
+
+  return CAM_ERR_NONE;
 }
 
 cam_err_t
@@ -929,7 +931,6 @@ static const char *photo_features [] =
   "capture correction",
 };
 
-
 /* write_settings: Called when some settings in v4l2camerasrc's #GstPhotoSettings
  * structure has changed. Driver needs to forward the settings to device.
  */
@@ -1379,7 +1380,7 @@ mfldcam_3a_process (gpointer data)
       if (mfld_driver.ae_enabled)
         mfldadvci->ae_apply_results ();
     } else
-      return;
+      return NULL;
   }
 }
 
@@ -1693,6 +1694,8 @@ cam_err_t get_af_status(int fd, unsigned * status)
     *status = 1;
   else
     *status = 0;
+
+  return CAM_ERR_NONE;
 }
 
 cam_err_t get_exp_mode(int fd, cam_scene_mode_t *expmode)

diff --git a/gst-libs/atomisphal/mfld_driver.c b/gst-libs/atomisphal/mfld_driver.c
index 72b31a2..9cde68e 100644 (file)
--- a/gst-libs/atomisphal/mfld_driver.c
+++ b/gst-libs/atomisphal/mfld_driver.c
@@ -50,6 +50,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "mfld_driver.h"
+#include "sh_css_types.h"
 #include "atomisp_v4l2.h"
 
 #define CAM_ISP_IS_OPEN(fd)    (fd > 0)
@@ -546,6 +547,7 @@ cam_driver_set_vf (int fd, int factor, int updatek)
   w_ispparm->vf_wind_len_x = w_ispparm->vf_wind_len_x * (factor);
   w_ispparm->vf_wind_len_y = w_ispparm->vf_wind_len_y * (factor);
 #endif
+  return CAM_ERR_NONE;
 }
 
 
@@ -561,6 +563,7 @@ cam_driver_set_si (int fd, int on)
   //Store the Y U V file name to sh_si_config
   //superimpose_file_read((sh_si_config *) arg);
   //Call the kernel to store the pattern to xmem.
+  return CAM_ERR_NONE;
 }
 
 cam_err_t
@@ -715,7 +718,7 @@ led_flash_off (int fd)
 {
        cam_err_t ret;
 
-       cam_driver_set_led_flash (fd, V4L2_CID_FLASH_STROBE, 0);
+       ret = cam_driver_set_led_flash (fd, V4L2_CID_FLASH_STROBE, 0);
        if (ret != CAM_ERR_NONE)
        {
                cam_driver_dbg ("%s: Error flash ioctl %d\n", __func__, 0);

diff --git a/gst-libs/atomisphal/mfld_driver.h b/gst-libs/atomisphal/mfld_driver.h
index e1b285c..f1ba25e 100644 (file)
--- a/gst-libs/atomisphal/mfld_driver.h
+++ b/gst-libs/atomisphal/mfld_driver.h
@@ -25,6 +25,8 @@
 #define ON 1
 #define OFF 0
 
+void cam_err_print (cam_err_t err);
+
 /* Color effect settings */
 cam_err_t cam_driver_set_tone_mode (int fd, enum v4l2_colorfx colorfx);
 cam_err_t cam_driver_get_tone_mode (int fd, int *colorfx);
@@ -103,4 +105,6 @@ cam_err_t cam_driver_set_led_flash (int fd, int id, int value);
 void led_flash_trigger (int fd, int duration, int intensity);
 void led_flash_off (int fd);
 
+cam_err_t cam_driver_get_aperture (int fd, int *aperture);
+
 #endif /* _MFLD_DRIVER_H */

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.c b/gst/mfldv4l2cam/gstv4l2camsrc.c
index 7273ff8..5e82559 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.c
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.c
@@ -999,7 +999,7 @@ gst_v4l2camsrc_mfldadvci_wrapper_load (GstMFLDV4l2CamSrc * v4l2camsrc)
       GST_DEBUG_OBJECT (v4l2camsrc, "Loading %s", module_file);
     }
 
-    printf("Camera Source Interface version is %d\n", LIBMFLDADVCI_VERSION);
+    GST_DEBUG_OBJECT(v4l2camsrc, "Camera Source Interface version is %d\n", LIBMFLDADVCI_VERSION);
 
     if (v4l2camsrc->module) {
       gboolean ret;

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.h b/gst/mfldv4l2cam/gstv4l2camsrc.h
index 300ab6d..7bf516d 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.h
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.h
@@ -27,6 +27,7 @@
 
 #include <gst/gst.h>
 #include <gst/camera/gstmfldcamerasrc.h>
+#include <gst/interfaces/cameracontrol.h>
 #include "mfld_cam.h"
 #include "gstv4l2mfldadvci.h"
 

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index d503a5a..31502ca 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -3228,7 +3228,7 @@ gst_v4l2camsrc_set_autofocus (GstCameraSrc * camsrc, gboolean on)
   g_mutex_lock (v4l2camsrc->device_mutex);
 
   if (v4l2camsrc->running) {
-    cam_err_t err;
+    cam_err_t err = CAM_ERR_NONE;
 
     //err= cam_set_autofocus(v4l2camsrc->video_fd, on);
     v4l2camsrc->af_enabled = on;
@@ -3263,7 +3263,7 @@ gst_v4l2camsrc_set_autoexposure (GstCameraSrc * camsrc, gboolean on)
   g_mutex_lock (v4l2camsrc->device_mutex);
 
   if (v4l2camsrc->running) {
-    cam_err_t err;
+    cam_err_t err = CAM_ERR_NONE;
 
     //err = cam_set_autoexposure(v4l2camsrc->video_fd, on);
     v4l2camsrc->ae_enabled = on;