Commit 321e5f6b authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

moved circbuf_start_offset to DT

parent 64c2d002

src/arch/arm/boot/dts/elphel393_1_mt9p006.dts

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
		memsize-partitions-circbuf = <16384 16384 16384 16384>; /* line 1 */

		/* memsize-partitions-raw = <16384 16384 16384 16384>; /* line 2 */

		memsize-partitions-raw = <0 0 0 0>; /* line 2 */

		memsize-circbuf-start-offset = <0x100000>;

		h2d_size = <1024>;

		d2h_size = <1024>;

		bidir_size = <1024>;

src/arch/arm/boot/dts/elphel393_4_mt9p006.dts

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
		memsize-partitions-circbuf = <16384 16384 16384 16384>; /* line 1 */

		/* memsize-partitions-raw = <16384 16384 16384 16384>; /* line 2 */

		memsize-partitions-raw = <0 0 0 0>; /* line 2 */

		memsize-circbuf-start-offset = <0x100000>;

		h2d_size = <1024>;

		d2h_size = <1024>;

		bidir_size = <1024>;

src/arch/arm/boot/dts/elphel393_eyesis.dts

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
		memsize-partitions-circbuf = <16384 16384 16384 16384>; /* line 1 */

		/* memsize-partitions-raw = <16384 16384 16384 16384>; /* line 2 */

		memsize-partitions-raw = <0 0 0 0>; /* line 2 */

		memsize-circbuf-start-offset = <0x100000>;

		h2d_size = <1024>;

		d2h_size = <1024>;

		bidir_size = <1024>;

src/arch/arm/boot/dts/elphel393_eyesis_bottom2.dts

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
		memsize-partitions-circbuf = <16384 16384 16384 16384>; /* line 1 */

		/* memsize-partitions-raw = <16384 16384 16384 16384>; /* line 2 */

		memsize-partitions-raw = <0 0 0 0>; /* line 2 */

		memsize-circbuf-start-offset = <0x100000>;

		h2d_size = <1024>;

		d2h_size = <1024>;

		bidir_size = <1024>;

src/drivers/elphel/circbuf.c

+3 −3
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ ssize_t circbuf_get_ptr(int sensor_port, size_t offset, size_t len, struct fvec 
{

	int ret = 1;



	if (offset > CCAM_DMA_SIZE || sensor_port >= SENSOR_PORTS)

	if (offset > circbuf_priv[sensor_port].buf_size || sensor_port >= SENSOR_PORTS)

		return -EINVAL;



	if (offset + len < CCAM_DMA_SIZE) {

	if (offset + len < circbuf_priv[sensor_port].buf_size) {

		// the image is not split

		vect_0->iov_base = &circbuf_priv[sensor_port].buf_ptr[BYTE2DW(offset)];

		vect_0->iov_dma = circbuf_priv[sensor_port].phys_addr + offset;
@@ -193,7 +193,7 @@ ssize_t circbuf_get_ptr(int sensor_port, size_t offset, size_t len, struct fvec 
		// the image is split into two segments

		vect_0->iov_base = &circbuf_priv[sensor_port].buf_ptr[BYTE2DW(offset)];

		vect_0->iov_dma = circbuf_priv[sensor_port].phys_addr + offset;

		vect_0->iov_len = CCAM_DMA_SIZE - offset;

		vect_0->iov_len = circbuf_priv[sensor_port].buf_size - offset;

		vect_1->iov_base = circbuf_priv[sensor_port].buf_ptr;

		vect_1->iov_dma = circbuf_priv[sensor_port].phys_addr;

		vect_1->iov_len = len - vect_0->iov_len;