Skip to content

E
elphel-apps-imgsrv
Commit 536d4e80 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

modified for framepars branch (use x393_devices.h)

parent 004e80ef
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 19 deletions
.gitignore
View file @ 536d4e80
...@@ -3,4 +3,5 @@ html/* ...@@ -3,4 +3,5 @@ html/*
.cproject .cproject
.externalToolBuilders .externalToolBuilders
.settings .settings
*.directory
Makefile
View file @ 536d4e80
...@@ -5,7 +5,7 @@ CONFFILES = Exif_template.xml ...@@ -5,7 +5,7 @@ CONFFILES = Exif_template.xml
SRCS = imgsrv.c SRCS = imgsrv.c
OBJS = imgsrv.o OBJS = imgsrv.o
CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/elphel CFLAGS += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel
all: $(PROGS) all: $(PROGS)
......
eclipse_project_setup/.cproject
View file @ 536d4e80
...@@ -21,14 +21,20 @@ ...@@ -21,14 +21,20 @@
<builder arguments="apps-imgsrv" command="${workspace_loc:/elphel-apps-imgsrv/run_bitbake.sh}" enableCleanBuild="false" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.build.core.settings.default.builder.580164057" incrementalBuildTarget="-c compile -f" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/> <builder arguments="apps-imgsrv" command="${workspace_loc:/elphel-apps-imgsrv/run_bitbake.sh}" enableCleanBuild="false" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.build.core.settings.default.builder.580164057" incrementalBuildTarget="-c compile -f" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" 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 errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" 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 errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.745731625" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder"> <tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" 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"/> <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">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/uapi/elphel}&quot;"/>
</option>
<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"/> <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>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.1227611439" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder"> <tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.1227611439" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.40980442" 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/uapi/elphel}&quot;"/>
</option>
<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"/> <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>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.176385540" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder"> <tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" 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" name="Include Paths" 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/uapi/elphel}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/elphel}&quot;"/> <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;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include}&quot;"/>
</option> </option>
......
eclipse_project_setup/.externalToolBuilders/bitbake apps-imgsrv -c compile -f.launch deleted 100644 → 0
View file @ 004e80ef
<?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-imgsrv/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-imgsrv -c compile -f"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
imgsrv.c
View file @ 536d4e80
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <c313a.h> #include <c313a.h>
#include <exifa.h> #include <exifa.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <x393_devices.h>
#undef ELPHEL_DEBUG #undef ELPHEL_DEBUG
#if ELPHEL_DEBUG #if ELPHEL_DEBUG
...@@ -93,18 +94,33 @@ static struct file_set files[SENSOR_PORTS]; ...@@ -93,18 +94,33 @@ static struct file_set files[SENSOR_PORTS];
unsigned long * ccam_dma_buf; unsigned long * ccam_dma_buf;
char trailer[TRAILER_SIZE] = { 0xff, 0xd9 }; char trailer[TRAILER_SIZE] = { 0xff, 0xd9 };
#if 0
const char *circbuf_fnames[] = { const char *circbuf_fnames[] = {
"/dev/circbuf0", "/dev/circbuf0",
"/dev/circbuf1", "/dev/circbuf1",
"/dev/circbuf2", "/dev/circbuf2",
"/dev/circbuf3" "/dev/circbuf3"
}; };
const char *jhead_fnames[] = { const char *jhead_fnames[] = {
"/dev/jpeghead0", "/dev/jpeghead0",
"/dev/jpeghead1", "/dev/jpeghead1",
"/dev/jpeghead2", "/dev/jpeghead2",
"/dev/jpeghead3", "/dev/jpeghead3",
}; };
#else
const char *circbuf_fnames[] = {
DEV393_PATH(DEV393_CIRCBUF0),
DEV393_PATH(DEV393_CIRCBUF1),
DEV393_PATH(DEV393_CIRCBUF2),
DEV393_PATH(DEV393_CIRCBUF3)
};
const char *jhead_fnames[] = {
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0),
DEV393_PATH(DEV393_JPEGHEAD0)
};
#endif
static const char *exif_dev_names[SENSOR_PORTS] = { EXIF_DEV_NAMES }; static const char *exif_dev_names[SENSOR_PORTS] = { EXIF_DEV_NAMES };
static const char *exifmeta_dev_names[SENSOR_PORTS] = { EXIFMETA_DEV_NAMES }; static const char *exifmeta_dev_names[SENSOR_PORTS] = { EXIFMETA_DEV_NAMES };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment