Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-imgsrv
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-apps-imgsrv
Commits
5d37dde9
Commit
5d37dde9
authored
Nov 02, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added .depend
parent
bcfee1c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
.gitignore
.gitignore
+1
-0
Makefile
src/Makefile
+7
-2
imgsrv.c
src/imgsrv.c
+3
-1
No files found.
.gitignore
View file @
5d37dde9
...
@@ -6,6 +6,7 @@ attic/*
...
@@ -6,6 +6,7 @@ attic/*
/.externalToolBuilders
/.externalToolBuilders
/.settings
/.settings
.directory
.directory
.depend
generated*
generated*
sysroots
sysroots
bitbake-logs
bitbake-logs
...
...
src/Makefile
View file @
5d37dde9
...
@@ -34,6 +34,11 @@ install: $(PROGS) $(PHPCLI) $(CONFIGS)
...
@@ -34,6 +34,11 @@ install: $(PROGS) $(PHPCLI) $(CONFIGS)
clean
:
clean
:
rm
-rf
$(PROGS)
*
.o core
rm
-rf
$(PROGS)
*
.o core
#TODO: implement automatic dependencies!
depend
:
.depend
imgsrv.c
:
$(STAGING_DIR_HOST)/usr/include-uapi/elphel/x393_devices.h
.depend
:
$(SRCS)
rm
-f
./.depend
$(CC)
$(CFLAGS)
-MM
$^
>
./.depend
;
include
.depend
\ No newline at end of file
src/imgsrv.c
View file @
5d37dde9
...
@@ -1349,8 +1349,10 @@ void listener_loop(struct file_set *fset)
...
@@ -1349,8 +1349,10 @@ void listener_loop(struct file_set *fset)
(
lseek
(
fset
->
circbuf_fd
,
LSEEK_CIRC_VALID
,
SEEK_END
)
>=
0
))
// test valid once again, after not ready - it might change
(
lseek
(
fset
->
circbuf_fd
,
LSEEK_CIRC_VALID
,
SEEK_END
)
>=
0
))
// test valid once again, after not ready - it might change
this_p
=
lseek
(
fset
->
circbuf_fd
,
LSEEK_CIRC_WAIT
,
SEEK_END
);
this_p
=
lseek
(
fset
->
circbuf_fd
,
LSEEK_CIRC_WAIT
,
SEEK_END
);
}
else
if
(
strcmp
(
cp1
,
"trig"
)
==
0
)
{
}
else
if
(
strcmp
(
cp1
,
"trig"
)
==
0
)
{
if
(
fset
->
framepars_dev_fd
<
0
)
fset
->
framepars_dev_fd
=
open
(
fset
->
framepars_dev_name
,
O_RDWR
);
lseek
(
fset
->
framepars_dev_fd
,
LSEEK_DMA_INIT
,
SEEK_END
);
// LSEEK_DMA_INIT is currently used as trigger restart in NC393
lseek
(
fset
->
framepars_dev_fd
,
LSEEK_DMA_INIT
,
SEEK_END
);
// LSEEK_DMA_INIT is currently used as trigger restart in NC393
fprintf
(
stderr
,
"Retriggering camera
\n
"
,
cp1
);
fprintf
(
stderr
,
"Retriggering camera
: lseek 0x%x, SEEK_END
\n
"
,
LSEEK_DMA_INIT
);
}
else
if
(
strcmp
(
cp1
,
"favicon.ico"
)
==
0
)
{
}
else
if
(
strcmp
(
cp1
,
"favicon.ico"
)
==
0
)
{
// ignore silently - for now, later make an icon?
// ignore silently - for now, later make an icon?
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment