Add PageNumber field to Exif and use it as sensor port number storage

src/drivers/elphel/exif393.c

@@ -176,12 +176,24 @@ ssize_t minor_file_size(int minor) { //return current file size for different mi
 }
 ssize_t minor_max_size(int minor) { //return max file size for different minors
 	switch (minor) {
-	case X3X3_EXIF_TEMPLATE: return MAX_EXIF_SIZE;
-	case X3X3_EXIF_EXIF:     return MAX_EXIF_SIZE * (MAX_EXIF_FRAMES+1);
-	case X3X3_EXIF_META:     return MAX_EXIF_SIZE;
-	case X3X3_EXIF_METADIR:  return MAX_EXIF_FIELDS * sizeof(struct exif_dir_table_t);
-	case X3X3_EXIF_TIME:     return sizeof(struct exif_time_t);
-	default:return 0;
+	case X3X3_EXIF_TEMPLATE:
+		return MAX_EXIF_SIZE;
+	case X3X3_EXIF_EXIF_CHN_0:
+	case X3X3_EXIF_EXIF_CHN_1:
+	case X3X3_EXIF_EXIF_CHN_2:
+	case X3X3_EXIF_EXIF_CHN_3:
+		return MAX_EXIF_SIZE * (MAX_EXIF_FRAMES+1);
+	case X3X3_EXIF_META_CHN_0:
+	case X3X3_EXIF_META_CHN_1:
+	case X3X3_EXIF_META_CHN_2:
+	case X3X3_EXIF_META_CHN_3:
+		return MAX_EXIF_SIZE;
+	case X3X3_EXIF_METADIR:
+		return MAX_EXIF_FIELDS * sizeof(struct exif_dir_table_t);
+	case X3X3_EXIF_TIME:
+		return sizeof(struct exif_time_t);
+	default:
+		return 0;
 	}
 }
 void exif_invalidate(void) { // 393: OK, only invalidates all ayt once
@@ -231,6 +243,7 @@ int exif_rebuild_chn(int sensor_port, int frames) {
 		return -1;
 	}
 	memset(meta_buffer, 0, aexif_meta_size[sensor_port] * (MAX_EXIF_FRAMES+1));
+	ameta_buffer[sensor_port] = meta_buffer;
 	aexif_valid[sensor_port]  = 1;
 	return 0;
 }
@@ -507,7 +520,6 @@ static loff_t exif_lseek  (struct file * file, loff_t offset, int orig) {
 	int maxsize=minor_max_size(p);
 	//   int sensor_port;
 	int fp;
-
 	switch (orig) {
 	case SEEK_SET:
 		file->f_pos = offset;

src/include/elphel/c313a.h

@@ -4,7 +4,7 @@
  */
 
 #ifndef _ASM_CMOSCAM_H
-#define _ASM_CMOSCAM_HPARS_FRAMES
+#define _ASM_CMOSCAM_H
 #define SAFE_CHECK  1 // perform more verification on the paremeters
 //#define ELPHEL_DEBUG 0 //global debug on/off in multiple files
 //#define ELPHEL_DEBUG_STARTUP 000a4c00 ; 

src/include/elphel/exifa.h

@@ -66,6 +66,8 @@ struct exif_dir_table_t {
 // hack, reusing field to keep it protected
 #define  Exif_Image_IPTCNAA            0x083bb
 #define  Exif_Image_FrameNumber        0x083bb
+// used for sensor number
+#define  Exif_Image_PageNumber         0x00129
 
 #define  Exif_Image_ExifTag            0x08769
 #define  Exif_Image_GPSTag             0x08825
@@ -178,13 +180,32 @@ struct meta_CompassInfo_t {
 #define  Exif_GPSInfo_CompassRoll_Index         0x12
 #define  Exif_Image_FrameNumber_Index           0x13
 #define  Exif_Image_Orientation_Index           0x14
-#define  Exif_Photo_MakerNote_Index             0x15
+#define  Exif_Image_PageNumber_Index            0x15
+#define  Exif_Photo_MakerNote_Index             0x16
 /// update ExifKmlNumber to be total number of *_Index entries
 #define  ExifKmlNumber                          Exif_Photo_MakerNote_Index+1
 
-
-#define EXIF_DEV_NAME "/dev/exif_exif"
+//#define EXIF_DEV_NAME "/dev/exif_exif"
 #define EXIFDIR_DEV_NAME "/dev/exif_metadir"
-#define EXIFMETA_DEV_NAME "/dev/exif_meta"
-
-#endif
+//#define EXIFMETA_DEV_NAME "/dev/exif_meta"
+
+/**
+ * @brief This macro is used to construct file names in user space applications. Example
+ * of usage: <e>const char *exif_file_names[SENSOR_PORTS] = { EXIF_DEV_NAMES };</e>. Then the
+ * sensor port number can be used to access file name.
+ */
+#define EXIF_DEV_NAMES		"/dev/exif_exif0", \
+							"/dev/exif_exif1", \
+							"/dev/exif_exif2", \
+							"/dev/exif_exif3"
+/**
+ * @brief This macro is used to construct file names in user space applications. Example
+ * of usage: <e>const char *exifmeta_file_names[SENSOR_PORTS] = { EXIFMETA_DEV_NAMES };</e>. Then
+ * the sensor port number can be used to access file name.
+ */
+#define EXIFMETA_DEV_NAMES	"/dev/exif_meta0", \
+							"/dev/exif_meta1", \
+							"/dev/exif_meta2", \
+							"/dev/exif_meta3"
+
+#endif /* _ASM_EXIF_H */