Commit 97a0469d authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

Merge framepars

parent f497cdab

src/drivers/elphel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_ELPHEL393) += clock10359.o 
#fpgajtag-y := fpgajtag353.o x393.o 

#obj-$(CONFIG_ELPHEL393_EXTERNAL)  += fpgajtag.o



obj-$(CONFIG_ELPHEL393)           += exif393.o

obj-$(CONFIG_ELPHEL393)           += x393_helpers.o

obj-$(CONFIG_ELPHEL393)           += framepars.o

obj-$(CONFIG_ELPHEL393)           += sensor_common.o x393.o

src/drivers/elphel/circbuf.c

+11 −9
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static struct device *g_dev_ptr; 


static const struct of_device_id elphel393_circbuf_of_match[];



unsigned long *ccam_dma_buf_ptr[SENSOR_PORTS] = {NULL};



/* debug code */

//extern long long zero_counter[IMAGE_CHN_NUM];

/* end of debug code*/
@@ -94,16 +96,16 @@ int init_ccam_dma_buf_ptr(struct platform_device *pdev) 
	dma_addr_t dma_handle;

	const size_t dma_size = (CCAM_DMA_SIZE + (PAGE_SIZE >> 2)) * sizeof(int);

	struct device *dev = &pdev->dev;

	unsigned long *ccam_dma_buf_ptr = NULL;

	unsigned long *dma_buf_ptr = NULL;



	// use Elphel_buf if it was allocated

	if (pElphel_buf != NULL) {

		ccam_dma_buf_ptr = pElphel_buf->vaddr;

		dma_buf_ptr = pElphel_buf->vaddr;

		dma_handle = pElphel_buf->paddr;

		dev_info(dev, "using %lu bytes of DMA memory from pElphel_buf at address 0x%08x", pElphel_buf->size * PAGE_SIZE, dma_handle);

	} else {

		ccam_dma_buf_ptr = dmam_alloc_coherent(dev, dma_size, &dma_handle, GFP_KERNEL);

		if (!ccam_dma_buf_ptr) {

		dma_buf_ptr = dmam_alloc_coherent(dev, dma_size, &dma_handle, GFP_KERNEL);

		if (!dma_buf_ptr) {

			dev_err(dev, "unable to allocate DMA buffer\n");

			return -ENOMEM;

		} else {
@@ -111,12 +113,12 @@ int init_ccam_dma_buf_ptr(struct platform_device *pdev) 
		}

	}



	// set circular buffer size in bytes

//	set_globalParam(G_CIRCBUFSIZE, CCAM_DMA_SIZE);



	for (i = 0; i < IMAGE_CHN_NUM; i++) {

		circbuf_priv[i].buf_ptr = ccam_dma_buf_ptr + BYTE2DW(CIRCBUF_START_OFFSET + i * CCAM_DMA_SIZE);

		circbuf_priv[i].buf_ptr = dma_buf_ptr + BYTE2DW(CIRCBUF_START_OFFSET + i * CCAM_DMA_SIZE);

		circbuf_priv[i].phys_addr = dma_handle + CIRCBUF_START_OFFSET + i * CCAM_DMA_SIZE;

		ccam_dma_buf_ptr[i] = circbuf_priv[i].buf_ptr;

		// set circular buffer size in bytes

		set_globalParam(i, G_CIRCBUFSIZE, CCAM_DMA_SIZE);

	}



	return 0;
@@ -664,7 +666,7 @@ loff_t circbuf_lseek(struct file *file, loff_t offset, int orig) 
				break;

			default:

				if ((offset & ~0x1f)==LSEEK_DAEMON_CIRCBUF) {

					wait_event_interruptible(circbuf_wait_queue, get_imageParamsThis(P_DAEMON_EN) & (1<<(offset & 0x1f)));

					wait_event_interruptible(circbuf_wait_queue, get_imageParamsThis(chn, P_DAEMON_EN) & (1<<(offset & 0x1f)));

				}

			}

			dev_dbg(g_dev_ptr, "[chn %u] finish SEEK_END processing; return file->f_pos = %lld\n", chn, file->f_pos);

src/drivers/elphel/circbuf.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ unsigned int circbuf_poll (struct file *file, poll_table *wait); 
 *!======================================================================================*/

extern wait_queue_head_t circbuf_wait_queue;



extern unsigned long  *ccam_dma_buf_ptr;

//unsigned long *circbuf_get_ccam_ptr(void);



// private data

struct circbuf_priv_t {

	int                 minor;

src/drivers/elphel/exif393.h

+5 −5
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ int exif_enable_chn(int sensor_port, int en); // enable/disable Exif process 
int exif_enable(int en);                          // For all sensor ports

int dir_find_tag (unsigned long tag); //!find location of the tag field in meta page using long tag (Exif tag and tag group)



inline void write_meta_raw_irq(int sensor_port, char * data, int offset, int len); //write data to meta, called from IRQ

inline int write_meta_irq(int sensor_port, char * data, int * indx,  unsigned long ltag, int len); //write data to meta, called from IRQ(len==0 => use field length)

inline void putlong_meta_raw_irq(int sensor_port, unsigned long data, int offset); //write data to meta (4 bytes, big endian), called from IRQ

inline int putlong_meta_irq(int sensor_port, unsigned long data, int * indx,  unsigned long ltag); //write data to meta (4 bytes, big endian), from IRQ

void write_meta_raw_irq(int sensor_port, char * data, int offset, int len); //write data to meta, called from IRQ

int write_meta_irq(int sensor_port, char * data, int * indx,  unsigned long ltag, int len); //write data to meta, called from IRQ(len==0 => use field length)

void putlong_meta_raw_irq(int sensor_port, unsigned long data, int offset); //write data to meta (4 bytes, big endian), called from IRQ

int putlong_meta_irq(int sensor_port, unsigned long data, int * indx,  unsigned long ltag); //write data to meta (4 bytes, big endian), from IRQ

//void write_meta_raw_irq(char * data, int offset, int len); //write data to meta, called from IRQ

//int write_meta_irq(char * data, int * indx,  unsigned long ltag, int len); //write data to meta, called from IRQ(len==0 => use field length). Returns index of the written data, -1 if not written
@@ -37,7 +37,7 @@ int write_meta(int sensor_port, char * data, int * indx, unsigned long ltag, in 
void putlong_meta_raw(int sensor_port, unsigned long data, int offset); //write data to meta (4 bytes, big endian), called from outside IRQ (atomic)

int putlong_meta(int sensor_port, unsigned long data, int * indx,  unsigned long ltag); //write data to meta (4 bytes, big endian), from outside IRQ (atomic). Returns index of the written data, -1 if not written



char * encode_time(unsigned long sec, unsigned long usec);

char * encode_time(char buf[27], unsigned long sec, unsigned long usec);

int store_meta(int sensor_port); //called from IRQ service - put current metadata to meta_buffer, return page index

src/drivers/elphel/framepars.c

+275 −167

File changed.

Preview size limit exceeded, changes collapsed.