porting Elphel PHP extension to nc393

src/ext/elphel/elphel_php.h

@@ -8,45 +8,50 @@
 #warning Not using TSRM.h
 #endif
 
-#include <c313a.h>
-#include <exifa.h>
+#include "elphel/c313a.h"
+#include "elphel/exifa.h"
 #include <autoexp.h>
 #include <elphel/x393_devices.h>
 
 ZEND_BEGIN_MODULE_GLOBALS(elphel)
-int fd_exif;
+int fd_exif[SENSOR_PORTS];
 int fd_exifdir;
-int fd_exifmeta;
+int fd_exifmeta[SENSOR_PORTS];
 int exif_size; // to see if verify exif directory has changed
 struct exif_dir_table_t exif_dir[ExifKmlNumber] ;  //! store locations of the fields needed for KML generations in the Exif block
 
 
 /// (circbuf.c) access to /dev/circbuf (mmap, lseek)
-int             fd_circ;
-unsigned long * ccam_dma_buf;
-unsigned long   ccam_dma_buf_len; // in bytes
+int             fd_circ[SENSOR_PORTS];
+unsigned long * ccam_dma_buf[SENSOR_PORTS];
+unsigned long   ccam_dma_buf_len[SENSOR_PORTS]; // in bytes
 //struct framepars_t *framePars;
 
 /// (framepars.c) access to /dev/frameparsall (write, lseek, mmap)
 
-int fd_fparmsall;
-struct framepars_all_t   *frameParsAll;
-struct framepars_t       *framePars;
-struct framepars_past_t  *pastPars;
-unsigned long            *funcs2call; ///   each parameter has a 32-bit mask of what pgm_function to call - other fields not used
-unsigned long            *globalPars; /// parameters that are not frame-related, their changes do not initiate any actions so they can be mmaped for both 
-unsigned long            *multiSensIndex; /// indexes of individual sensor register shadows (first of 3)
-unsigned long            *multiSensRvrsIndex; /// reverse index (to parent) for the multiSensIndex
+int                       fd_fparmsall[SENSOR_PORTS];
+struct framepars_all_t   *frameParsAll[SENSOR_PORTS];
+struct framepars_t       *framePars[SENSOR_PORTS];
+struct framepars_past_t  *pastPars[SENSOR_PORTS];
+unsigned long            *funcs2call[SENSOR_PORTS];        ///< each parameter has a 32-bit mask of what pgm_function to call - other fields not used
+unsigned long            *globalPars[SENSOR_PORTS];        ///< parameters that are not frame-related, their changes do not initiate any actions so they can be mmaped for both
+unsigned long            *multiSensIndex[SENSOR_PORTS];    ///< indexes of individual sensor register shadows (first of 3)
+unsigned long            *multiSensRvrsIndex[SENSOR_PORTS];///< reverse index (to parent) for the multiSensIndex
+/*
+struct framepars_all_t  *aframeparsall = NULL;              // - will be mmap-ed, in 393 points to an array of structures
+struct framepars_t      *aframepars[SENSOR_PORTS];          ///< getting rid of static to be able to use extern
+struct framepars_past_t *apastpars[SENSOR_PORTS];            ///< getting rid of static to be able to use extern
+unsigned long           *afuncs2call[SENSOR_PORTS];          //  sFrameParsAll.func2call.pars; - each parameter has a 32-bit mask of what pgm_function to call - other fields not used
+unsigned long           *aglobalPars[SENSOR_PORTS];          // parameters that are not frame-related, their changes do not initiate any actions so they can be mmaped for both
+unsigned long           *amultiSensIndex[SENSOR_PORTS];      // index for per-sensor alternatives
+unsigned long           *amultiSensRvrsIndex[SENSOR_PORTS];  // reverse index (to parent) for the multiSensIndex
+wait_queue_head_t       aframepars_wait_queue[SENSOR_PORTS];// used to wait for the frame to be acquired
+
+ */
 
-
-/// (gamma_tables.c) access to gammas
-//static struct gamma_stuct_t gammas[GAMMA_CACHE_NUMBER] __attribute__ ((aligned (PAGE_SIZE)));
-//       struct gamma_stuct_t * gammas_p; /// to use with mmap
 int fd_gamma_cache;
 struct gamma_stuct_t  * gamma_cache; /// array of gamma structures
 
-//static struct histogram_stuct_t histograms[HISTOGRAM_CACHE_NUMBER] __attribute__ ((aligned (PAGE_SIZE)));
-
 int fd_histogram_cache;
 struct histogram_stuct_t  * histogram_cache; /// array of histogram
 
@@ -58,10 +63,13 @@ ZEND_END_MODULE_GLOBALS(elphel)
 #define ELPHEL_G(v) (elphel_globals.v)
 #endif
 
-#define PHP_ELPHEL_VERSION "1.0"
+#define PHP_ELPHEL_VERSION "2.0"
 #define PHP_ELPHEL_EXTNAME "elphel"
+#ifdef NC353
 #define ELPHEL_GLOBALPARS(x) (((unsigned long *) ELPHEL_G(globalPars))[x-FRAMEPAR_GLOBALS])
-
+#else
+#define ELPHEL_GLOBALPARS(p, x) (((unsigned long *) ELPHEL_G(globalPars[p]))[x-FRAMEPAR_GLOBALS])
+#endif
 PHP_FUNCTION(elphel_get_frame);      /// current absolute frame number (includes those that are not compressed)
 PHP_FUNCTION(elphel_skip_frames);    /// skip some frames (includes those that are not compressed) - will work even if no frames are compressed
 PHP_FUNCTION(elphel_wait_frame_abs); /// wait for absolute frame number (includes those that are not compressed)
@@ -92,7 +100,7 @@ PHP_FUNCTION(elphel_compressor_frame);
 PHP_FUNCTION(elphel_reset_sensor);
 PHP_FUNCTION(elphel_set_fpga_time);
 PHP_FUNCTION(elphel_get_fpga_time);
-PHP_FUNCTION(elphel_wait_frame);          /// wait for compressed frame in a circular frame buffer - will wait forever if comressor is off
+PHP_FUNCTION(elphel_wait_frame);          /// wait for compressed frame in a circular frame buffer - will wait forever if compressor is off
 PHP_FUNCTION(elphel_fpga_read);
 PHP_FUNCTION(elphel_fpga_write);
 PHP_FUNCTION(elphel_gamma);
@@ -114,8 +122,8 @@ PHP_MINFO_FUNCTION(elphel);
 extern zend_module_entry elphel_module_entry;
 #define phpext_elphel_ptr &elphel_module_entry
 //static void init_sens();
-int splitConstantName(char * name);
-int get_histogram_index (long color,long frame, long needreverse); /// histogram is availble for previous frame, not for the current one
-unsigned long get_imageParamsThat     (int indx, unsigned long frame);
+int splitConstantName             (char * name);
+int get_histogram_index           (long port, long sub_chn, long color,long frame, long needreverse); /// histogram is availble for previous frame, not for the current one
+unsigned long get_imageParamsThat (int port, int indx, unsigned long frame);
 
 #endif

src/ext/elphel/include/exifa.h

-/*
- exifa.h
-*/
-#ifndef _ASM_EXIF_H
-#define _ASM_EXIF_H
-
-//Major
-#define X3X3_EXIF 125
-//Minors
-#define X3X3_EXIF_EXIF    0 // read encoded Exif data (SEEK_END,
-#define X3X3_EXIF_META    1 // write metadata, concurently opened files. All writes atomic
-// control/setup devices
-#define X3X3_EXIF_TEMPLATE 2 // write Exif template
-#define X3X3_EXIF_METADIR  3 // write metadata to Exif header translation (dir_table[MAX_EXIF_FIELDS])
-// those 2 files will disable exif_enable and exif_valid, truncate file size to file pointer on release.
-#define X3X3_EXIF_TIME     4 // write today/tomorrow date (YYYY:MM:DD) and number of seconds at today/tomorrow
-                             // midnight (00:00:00) in seconds from epoch (long, startting from LSB)
-
-// commands for the overloaded lseek:
-
-//X3X3_EXIF_TIME
-#define EXIF_LSEEK_DISABLE       1 // disable Exif (storing of frame meta, generating Exif)
-#define EXIF_LSEEK_ENABLE        2 // enable Exif (build buffer if needed)
-#define EXIF_LSEEK_INVALIDATE    3 // invalidate (and disable)
-#define EXIF_LSEEK_REBUILD       4 // rebuild buffer
-
-#define EXIF_LSEEK_TOMORROW_DATE 5 // file pointer to YYYY:MM:DD (tomorrow) string
-#define EXIF_LSEEK_TOMORROW_SEC  6 // file pointer to unsigned long (little endian) tomorrow seconds from epoch
-#define EXIF_LSEEK_TODAY_DATE    7 // file pointer to YYYY:MM:DD (today) string
-#define EXIF_LSEEK_TODAY_SEC     8  // file pointer to unsigned long (little endian) today seconds from epoch
-
-
-/*
-Exif data in the images is combined from the "static" structure (template), calculated once at startup, and
-variable data stored in the buffer for individual frames in the "Exif" form - converted to ASCII strings
-or Rational or else. The generated Exif header copies that variable fileds on top of the Exif template.
-
-The compressed data buffer is stored in "meta pages", one per frame 
-*/
-struct exif_dir_table_t {
-        union {
-          unsigned long ltag;// tag group and tag combined
-          struct {
-            unsigned short tag_group; // tag group: 0 - IFD0, 1 - Exif, 2 - GPS
-            unsigned short tag;       // Exif tag as defined in the standard
-          };
-        };
-        unsigned long len; // Number of bytes to be copied from metadata to Exif
-        unsigned long src; // offset in meta data page
-        unsigned long dst; // offset in output Exif page
-};
-#define MAX_EXIF_FIELDS  256 // number of Exif tags in the header
-#define MAX_EXIF_SIZE   4096 // Exif data size 
-//#define MAX_EXIF_FRAMES  512 // number of frames in the buffer
-#define MAX_EXIF_FRAMES  2048 // number of frames in the buffer
-
-//Exif Tags - unsigned long, combining actual Exif tags with tag groups (0 - IFD0, 1 - Exif, 2 - GPS)
-#define  Exif_Image_ImageDescription   0x0010e
-#define  Exif_Image_Make               0x0010f
-#define  Exif_Image_Model              0x00110
-#define  Exif_Image_Software           0x00131
-#define  Exif_Image_DateTime           0x00132
-#define  Exif_Image_Artist             0x0013b
-#define  Exif_Image_HostComputer       0x0013c
-#define  Exif_Image_Orientation        0x00112
-// hack, reusing field to keep it protected
-#define  Exif_Image_IPTCNAA            0x083bb
-#define  Exif_Image_FrameNumber        0x083bb
-
-#define  Exif_Image_ExifTag            0x08769
-#define  Exif_Image_GPSTag             0x08825
-
-//Sub IFD
-#define  Exif_Photo_ExposureTime       0x1829a
-#define  Exif_Photo_DateTimeOriginal   0x19003
-#define  Exif_Photo_MakerNote          0x1927c
-#define  Exif_Photo_SubSecTime         0x19290
-#define  Exif_Photo_SubSecTimeOriginal 0x19291
-//GPSInfo
-#define  Exif_GPSInfo_GPSLatitudeRef   0x20001
-#define  Exif_GPSInfo_GPSLatitude      0x20002
-#define  Exif_GPSInfo_GPSLongitudeRef  0x20003
-#define  Exif_GPSInfo_GPSLongitude     0x20004
-#define  Exif_GPSInfo_GPSAltitudeRef   0x20005
-#define  Exif_GPSInfo_GPSAltitude      0x20006
-#define  Exif_GPSInfo_GPSTimeStamp     0x20007
-#define  Exif_GPSInfo_GPSMeasureMode   0x2000a
-#define  Exif_GPSInfo_GPSDateStamp     0x2001D
-
-/// used for compass module
-#define  Exif_GPSInfo_GPSImgDirectionRef  0x20010
-#define  Exif_GPSInfo_GPSImgDirection     0x20011
-#define  Exif_GPSInfo_GPSDestLatitudeRef  0x20013
-#define  Exif_GPSInfo_GPSDestLatitude     0x20014
-#define  Exif_GPSInfo_GPSDestLongitudeRef 0x20015
-#define  Exif_GPSInfo_GPSDestLongitude    0x20016
-
-#define  Exif_GPSInfo_CompassDirectionRef 0x20010
-#define  Exif_GPSInfo_CompassDirection    0x20011
-#define  Exif_GPSInfo_CompassPitchRef     0x20013
-#define  Exif_GPSInfo_CompassPitch        0x20014
-#define  Exif_GPSInfo_CompassRollRef      0x20015
-#define  Exif_GPSInfo_CompassRoll         0x20016
-
-//  array(0x9003,2,"2001:06:21 12:00:00","len"=> 20), //date/time original time created, always use 20 bytes (19 ."\0")
-//  array(0x9291,2,"0        ") //original time sub-second length=10  9 ."\0"
-///move back to interframe_params_t?
-struct frame_exif_t {
-          unsigned short meta_index;     //! index of the linked meta page
-          unsigned short signffff;       //! should be 0xffff - it will be a signature that JPEG data was not overwritten
-          unsigned long  frame_length;   //! frame length
-};
-
-struct meta_GPSInfo_t {
-   unsigned char GPSLatitudeRef; //"N"/"S"
-   unsigned long GPSLatitude_deg_nom;
-   unsigned long GPSLatitude_deg_denom;
-   unsigned long GPSLatitude_min_nom;
-   unsigned long GPSLatitude_min_denom;
-   unsigned char GPSLongitudeRef; //"E"/"W"
-   unsigned long GPSLongitude_deg_nom;
-   unsigned long GPSLongitude_deg_denom;
-   unsigned long GPSLongitude_min_nom;
-   unsigned long GPSLongitude_min_denom;
-   unsigned char GPSAltitudeRef; //byte, not ascii 0 - above sea level, 1 - below
-   unsigned long GPSAltitude_nom;   //in meters
-   unsigned long GPSAltitude_denom;
-   unsigned long GPSTimeStamp_hrs_nom;
-   unsigned long GPSTimeStamp_hrs_denom;
-   unsigned long GPSTimeStamp_min_nom;
-   unsigned long GPSTimeStamp_min_denom;
-   unsigned long GPSTimeStamp_sec_nom;
-   unsigned long GPSTimeStamp_sec_denom;
-   unsigned char GPSDateStamp[11]; //includes '\0'
-   unsigned char GPSMeasureMode;
-};
-//hack - use
-struct meta_CompassInfo_t {
-//   unsigned char GPSImgDirectionRef; //"M"/"T" //0x10
-   unsigned long CompassDirection_nom; //0x11
-   unsigned long CompassDirection_denom;
-   unsigned char CompassPitchRef; //"N"/"S"
-   unsigned long CompassPitch_nom;
-   unsigned long CompassPitch_denom;
-   unsigned char CompassRollRef; //"E"/"W"
-   unsigned long CompassRoll_nom;
-   unsigned long CompassRoll_denom;
-};
-
-
-#define EXIF_GPS_MIN_DENOM     10000
-#define EXIF_GPS_METERS_DENOM     10
-#define EXIF_GPS_TIMESEC_DENOM  1000
-#define EXIF_GPS_COMPASS_DENOM    10
-///hack!
-#define EXIF_COMPASS_PITCH_ASCII  "NS" // use for pitch +/-
-#define EXIF_COMPASS_ROLL_ASCII   "EW" // use for roll +/-
-
-/// Exif data (variable, stored with each frame) used for KML (not only)
-#define  Exif_Image_ImageDescription_Index      0x00
-#define  Exif_Photo_DateTimeOriginal_Index      0x01
-#define  Exif_Photo_SubSecTimeOriginal_Index    0x02
-#define  Exif_Photo_ExposureTime_Index          0x03
-#define  Exif_GPSInfo_GPSLatitudeRef_Index      0x04
-#define  Exif_GPSInfo_GPSLatitude_Index         0x05
-#define  Exif_GPSInfo_GPSLongitudeRef_Index     0x06
-#define  Exif_GPSInfo_GPSLongitude_Index        0x07
-#define  Exif_GPSInfo_GPSAltitudeRef_Index      0x08
-#define  Exif_GPSInfo_GPSAltitude_Index         0x09
-#define  Exif_GPSInfo_GPSTimeStamp_Index        0x0a
-#define  Exif_GPSInfo_GPSDateStamp_Index        0x0b
-#define  Exif_GPSInfo_GPSMeasureMode_Index      0x0c
-#define  Exif_GPSInfo_CompassDirectionRef_Index 0x0d
-#define  Exif_GPSInfo_CompassDirection_Index    0x0e
-#define  Exif_GPSInfo_CompassPitchRef_Index     0x0f
-#define  Exif_GPSInfo_CompassPitch_Index        0x10
-#define  Exif_GPSInfo_CompassRollRef_Index      0x11
-#define  Exif_GPSInfo_CompassRoll_Index         0x12
-#define  Exif_Image_FrameNumber_Index           0x13
-#define  Exif_Image_Orientation_Index           0x14
-#define  Exif_Photo_MakerNote_Index             0x15
-/// update ExifKmlNumber to be total number of *_Index entries
-#define  ExifKmlNumber                          Exif_Photo_MakerNote_Index+1
-
-
-#define EXIF_DEV_NAME "/dev/exif_exif"
-#define EXIFDIR_DEV_NAME "/dev/exif_metadir"
-#define EXIFMETA_DEV_NAME "/dev/exif_meta"
-
-#endif