Commit 90486df4 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

fixed .gitignore, minor edits

parent 817de061

.gitignore

+10 −6
Original line number Diff line number Diff line 
html/*

.project

.cproject

.externalToolBuilders

.settings

*.directory

attic/*

/.project

/.cproject

/.pydevproject

/.externalToolBuilders

/.settings

.directory

generated*

sysroots

bitbake-logs

Makefile

+16 −10
Original line number Diff line number Diff line
@@ -5,11 +5,17 @@ CONFIGS = Exif_template.xml 
SRCS = imgsrv.c

OBJS = imgsrv.o



INSTALL    = install

INSTMODE   = 0755

INSTDOCS   = 0644



OWN = -o root -g root



#CFLAGS   += -Wall -I$(ELPHEL_KERNEL_DIR)/include/uapi/elphel

CFLAGS   += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi/elphel

CFLAGS   += -Wall -I$(STAGING_DIR_HOST)/usr/include-uapi



SYSCONFDIR = /etc/

BINDIR     = /usr/bin/

SYSCONFDIR = /etc

BINDIR     = /usr/bin

WWW_PAGES  = /www/pages



all: $(PROGS)
@@ -17,13 +23,13 @@ all: $(PROGS) 
$(PROGS): $(OBJS)

	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@



install: 

	install -d $(DESTDIR)$(BINDIR)

	install -m 0755 -t $(DESTDIR)$(BINDIR) $(PROGS)

	install -d $(DESTDIR)$(SYSCONFDIR)

	install -m 0644 -t $(DESTDIR)$(SYSCONFDIR) $(CONFIGS)

	install -d $(DESTDIR)$(WWW_PAGES)

	install -m 0755 -t $(DESTDIR)$(WWW_PAGES) $(PHPCLI) 

install: $(PROGS) $(PHPCLI) $(CONFIGS)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(BINDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(SYSCONFDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(WWW_PAGES)

	$(INSTALL) $(OWN) -m $(INSTMODE) $(PROGS)   $(DESTDIR)$(BINDIR)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(CONFIGS) $(DESTDIR)$(SYSCONFDIR) 

	$(INSTALL) $(OWN) -m $(INSTMODE) $(PHPCLI)  $(DESTDIR)$(WWW_PAGES) 



clean:

	rm -rf $(PROGS) *.o core

imgsrv.c

+9 −7
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
#include <netinet/in.h>

#include <sys/mman.h>

#include <sys/ioctl.h>

#include <c313a.h>

#include <exifa.h>

#include <asm/byteorder.h>

#include <x393_devices.h>

#include <elphel/c313a.h>

#include <elphel/exifa.h>

#include <elphel/x393_devices.h>



#undef ELPHEL_DEBUG

#if ELPHEL_DEBUG
@@ -122,8 +122,10 @@ const char *jhead_fnames[] = { 
};

#endif



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 *exif_dev_names[SENSOR_PORTS] = { DEV393_PATH(DEV393_EXIF0), DEV393_PATH(DEV393_EXIF1),

                                                    DEV393_PATH(DEV393_EXIF2), DEV393_PATH(DEV393_EXIF3)};

static const char *exifmeta_dev_names[SENSOR_PORTS] = { DEV393_PATH(DEV393_EXIF_META0),  DEV393_PATH(DEV393_EXIF_META1),

                                                        DEV393_PATH(DEV393_EXIF_META2), DEV393_PATH(DEV393_EXIF_META3)};



const char app_args[] = "Usage:\n%s -p <port_number_1> [<port_number_2> <port_number_3> <port_number_4>]\n" \

		"Start image server, bind it to ports <port_number_1> <port_number_2> <port_number_3> <port_number_4>\n" \
@@ -192,9 +194,9 @@ int printExifXML(int exif_page, struct file_set *fset) 


	// Create Exif directory

	// Read the size  of the Exif data

	fd_exifdir = open(EXIFDIR_DEV_NAME, O_RDONLY);

	fd_exifdir = open(DEV393_PATH(DEV393_EXIF_METADIR), O_RDONLY);

	if (fd_exifdir < 0) {

		printf("<error>\"Opening %s\"</error>\n", EXIFDIR_DEV_NAME);

		printf("<error>\"Opening %s\"</error>\n", DEV393_PATH(DEV393_EXIF_METADIR));

		return -2; // Error opening Exif directory

	}

	for (indx = 0; indx < ExifKmlNumber; indx++) exif_dir[indx].ltag = 0;

imu_setup.php

+1 −1
Original line number Diff line number Diff line 
#!/usr/local/sbin/php -q

#!/usr/bin/env php -q

<?php

/*

*! FILE NAME  : imu_setup.php

start_gps_compass.php

+1 −1
Original line number Diff line number Diff line 
#!/usr/local/sbin/php -q

#!/usr/bin/env php -q

<?php

/*

*! FILE NAME  : start_gps_compass.php