Merge branch 'test'

 Conflicts resolved:
	imgsrv.c

.cproject

@@ -21,14 +21,14 @@
 							<builder id="org.eclipse.cdt.build.core.settings.default.builder.580164057" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.2129855326" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.745731625" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1859993711" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath"/>
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1859993711" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.58661368" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.1227611439" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1739426241" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.build.core.settings.holder.176385540" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1931881995" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1931881995" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/elphel}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include}&quot;"/>
 								</option>

Exif_template.xml

@@ -9,6 +9,9 @@
       dlen: length of a variable data field, stored in frame buffer
       ltag: Exif_tag+(group<<16). If specified, is used by the software, while the Exif output will still have tag
       SubSecTimeOriginal should go immediately after DateTimeOriginal (in the sequence numbers, not in the Exif templete)
+      
+      Update, June 2016: PageNumber field is used as sensor port number, HostComputer field is replaced with CameraSerialNumber and
+            FrameNumber field (which actually was IPTCNAA field) is replaced with standart ImageNumber field.
     -->
 <Exif>
  <Image>
@@ -22,9 +25,10 @@
    <DateTime tag="0x0132" format="ASCII" count="20"  seq="1" dlen="20">
      <value>2001:06:21 12:00:00</value>
    </DateTime>
-   <HostComputer tag="0x013c" format="ASCII" function="SERIAL"/>
-   <FrameNumber  tag="0x83bb" format="LONG" count="1"  seq="25" dlen="4"/>
+   <CameraSerialNumber tag="0xc62f" format="ASCII" function="SERIAL"/>
+   <ImageNumber  tag="0x9211" format="LONG" count="1"  seq="25" dlen="4"/>
    <Orientation  tag="0x112"  format="SHORT" count="1"  seq="27" dlen="2"/>
+   <PageNumber   tag="0x129"  format="SHORT" count="1"  seq="28" dlen="2"/>
    <ExifTag tag="0x8769" format="LONG" function="EXIFTAG"/>
    <GPSTag tag="0x08825" format="LONG" function="GPSTAG"/>
  </Image>

circbuf_start.sh

@@ -2,9 +2,30 @@
 
 PORT=2323
 
-echo file circbuf.c +pfl > /sys/kernel/debug/dynamic_debug/control
-echo file sensor_common.c +pfl > /sys/kernel/debug/dynamic_debug/control
-echo file jpeghead.c +pfl > /sys/kernel/debug/dynamic_debug/control
+if [ $1 == "nodebug" ]; then
+    echo file circbuf.c -pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file sensor_common.c -pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file jpeghead.c -pfl > /sys/kernel/debug/dynamic_debug/control
+	exit 0
+elif [ $1 == "dump_state" ]; then
+    echo "func circbuf_valid_ptr +p" > /sys/kernel/debug/dynamic_debug/control 
+    echo "func get_image_length +p" > /sys/kernel/debug/dynamic_debug/control
+    echo "func dump_interframe_params +p" > /sys/kernel/debug/dynamic_debug/control 
+    echo "func dump_state +p" > /sys/kernel/debug/dynamic_debug/control 
+	exit 0
+elif [ $1 == "full_debug" ]; then
+    echo file circbuf.c +pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file sensor_common.c +pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file jpeghead.c +pfl > /sys/kernel/debug/dynamic_debug/control
+	exit 0
+else
+	# default, turn  off all
+    echo file circbuf.c -pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file sensor_common.c -pfl > /sys/kernel/debug/dynamic_debug/control
+    echo file jpeghead.c -pfl > /sys/kernel/debug/dynamic_debug/control
+fi
+
+
  
 if [ ! -e /dev/circbuf0 ]; then
 	mknod /dev/circbuf0 c 135 32