minor fixes

blondejamtart · Apr 6, 2020 · 780819e · 780819e
1 parent bdec741
commit 780819e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/raspiraw.cpp b/raspiraw.cpp
@@ -273,7 +273,7 @@ uint32_t order_and_bit_depth_to_encoding(enum bayer_order order, int bit_depth)
     return 0;
 }
 
-int camera_main(RASPIRAW_PARAMS_T cfg, void (*callback)())
+int camera_main(RASPIRAW_PARAMS_T cfg, void (*callback)(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer))
 {
 //    RASPIRAW_PARAMS_T cfg = {
 //            .mode = 0,

diff --git a/raspiraw.h b/raspiraw.h
@@ -52,6 +52,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "interface/vcos/vcos.h"
 #include "bcm_host.h"
 
+extern "C" {
+#include "ov5647_modes.h"
+#include "imx219_modes.h"
+#include "adv7282m_modes.h"
+}
+
 #include "interface/mmal/mmal.h"
 #include "interface/mmal/mmal_buffer.h"
 #include "interface/mmal/mmal_logging.h"
@@ -152,12 +158,6 @@ struct sensor_def
 
 #define NUM_ELEMENTS(a)  (sizeof(a) / sizeof(a[0]))
 
-extern "C" {
-    #include "ov5647_modes.h"
-    #include "imx219_modes.h"
-    #include "adv7282m_modes.h"
-}
-
 const struct sensor_def *sensors[] = {
         &ov5647,
         &imx219,
@@ -273,7 +273,7 @@ uint32_t order_and_bit_depth_to_encoding(enum bayer_order order, int bit_depth);
 
 void modReg(struct mode_def *mode, uint16_t reg, int startBit, int endBit, int value, enum operation op);
 
-int camera_main(RASPIRAW_PARAMS_T cfg, void (*callback)());
+int camera_main(RASPIRAW_PARAMS_T cfg, void (*callback)(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer));
 
 void modRegBit(struct mode_def *mode, uint16_t reg, int bit, int value, enum operation op);