modified for framepars branch (use x393_devices.h)

.gitignore

@@ -3,3 +3,5 @@ html/*
 .cproject
 .externalToolBuilders
 .settings
+*.directory
+

Makefile

@@ -4,7 +4,7 @@ PHPFILES   = camogmstate.php
 SRCS = camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c
 OBJS = camogm.o camogm_ogm.o camogm_jpeg.o camogm_mov.o camogm_kml.o camogm_read.o index_list.o
 
-CFLAGS   += -Wall -I$(ELPHEL_KERNEL_DIR)/include/elphel
+CFLAGS   += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
 LDLIBS   += -logg -pthread -lm
 
 all: $(PROGS)

camogm.c

@@ -36,7 +36,7 @@
 
 /** @brief Default debug level */
 #define DEFAULT_DEBUG_LVL         6
-/** @brief JPEG trailer syze in bytes */
+/** @brief JPEG trailer size in bytes */
 #define TRAILER_SIZE              0x02
 /** @brief Default segment duration in seconds */
 #define DEFAULT_DURATION          600
@@ -62,19 +62,35 @@
 
 char trailer[TRAILER_SIZE] = { 0xff, 0xd9 };
 
-const char *exifFileNames[] = {	"/dev/exif_exif0", "/dev/exif_exif1",
-								"/dev/exif_exif2", "/dev/exif_exif3"
+#if 0
+const char *exifFileNames[] = { "/dev/exif_exif0", "/dev/exif_exif1",
+                                "/dev/exif_exif2", "/dev/exif_exif3"
 };
 
-const char *headFileNames[] = {	"/dev/jpeghead0", "/dev/jpeghead1",
-								"/dev/jpeghead2", "/dev/jpeghead3"
+const char *headFileNames[] = { "/dev/jpeghead0", "/dev/jpeghead1",
+                                "/dev/jpeghead2", "/dev/jpeghead3"
 };
 const char *ctlFileNames[] = {   "/dev/frameparsall0", "/dev/frameparsall1",
-								"/dev/frameparsall2", "/de/framepars3"
+                                "/dev/frameparsall2", "/de/framepars3"
 };
 const char *circbufFileNames[] = {"/dev/circbuf0", "/dev/circbuf1",
-								"/dev/circbuf2", "/dev/circbuf3"
+                                "/dev/circbuf2", "/dev/circbuf3"
 };
+#else
+const char *exifFileNames[] = { DEV393_PATH(DEV393_EXIF0), DEV393_PATH(DEV393_EXIF1),
+                                DEV393_PATH(DEV393_EXIF2), DEV393_PATH(DEV393_EXIF3)
+};
+
+const char *headFileNames[] = { DEV393_PATH(DEV393_JPEGHEAD0), DEV393_PATH(DEV393_JPEGHEAD1),
+                                DEV393_PATH(DEV393_JPEGHEAD2), DEV393_PATH(DEV393_JPEGHEAD3)
+};
+const char *ctlFileNames[] = {  DEV393_PATH(DEV393_FRAMEPARS0), DEV393_PATH(DEV393_FRAMEPARS1),
+                                DEV393_PATH(DEV393_FRAMEPARS2), DEV393_PATH(DEV393_FRAMEPARS3)
+};
+const char *circbufFileNames[] = {DEV393_PATH(DEV393_CIRCBUF0), DEV393_PATH(DEV393_CIRCBUF1),
+                                  DEV393_PATH(DEV393_CIRCBUF2), DEV393_PATH(DEV393_CIRCBUF3)
+};
+
 
 int lastDaemonBit[SENSOR_PORTS] = {DAEMON_BIT_CAMOGM};
 struct framepars_all_t   *frameParsAll[SENSOR_PORTS];

camogm.h

@@ -25,6 +25,8 @@
 #include <c313a.h>
 #include <ogg/ogg.h>
 #include "ogmstreams.h"
+#include <x393_devices.h>
+
 
 #define CAMOGM_FRAME_NOT_READY    1        ///< frame pointer valid, but not yet acquired
 #define CAMOGM_FRAME_INVALID      2        ///< invalid frame pointer

eclipse_project_setup/.externalToolBuilders/bitbake apps-camogm -c compile -f.launch

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/elphel-apps-camogm/run_bitbake.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="apps-camogm -c compile -f"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

eclipse_project_setup/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

eclipse_project_setup/.project

@@ -7,32 +7,8 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder (1).launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<triggers>full,incremental,</triggers>
 			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/bitbake apps-camogm -c compile -f.launch</value>
-				</dictionary>
-				<dictionary>
-					<key>incclean</key>
-					<value>true</value>
-				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>

eclipse_project_setup/.settings/language.settings.xml

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<configuration id="0.531211255" name="Default">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-		</extension>
-	</configuration>
-</project>