Commit dcae5dac authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] solo6x10: sync to latest code from Bluecherry's git repo 

Synced to commit e9815ac5503ae60cfbf6ff8037035de8f62e2846 from
branch next in git repository https://github.com/bluecherrydvr/solo6x10.git


Only removed some code under #if LINUX_VERSION_CODE < some-kernel-version,
renamed the driver back to solo6x10 from solo6x10-edge, removed the
unnecessary compat.h header and kept the slab.h includes.
Otherwise the code is identical.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarIsmael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c535cc6c

drivers/staging/media/solo6x10/Makefile

+1 −1
Original line number Diff line number Diff line 
solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o

solo6x10-y := core.o i2c.o p2m.o v4l2.o tw28.o gpio.o disp.o enc.o v4l2-enc.o g723.o eeprom.o



obj-$(CONFIG_SOLO6X10) += solo6x10.o

drivers/staging/media/solo6x10/TODO

+12 −21
Original line number Diff line number Diff line 
TODO (staging => main):



	* Motion detection flags need to be moved to v4l2

	* Some private CIDs need to be moved to v4l2



TODO (general):



	* encoder on/off controls

	* mpeg cid bitrate mode (vbr/cbr)

	* mpeg cid bitrate/bitrate-peak

	* mpeg encode of user data

	* mpeg decode of user data

	* switch between 4 frames/irq to 1 when using mjpeg (and then back

	  when not)

	* implement a CID control for motion areas/thresholds

	* implement CID controls for mozaic areas

	* allow for higher level of interval (for < 1 fps)

	* sound:

- batch up desc requests for more efficient use of p2m?

- encoder on/off controls

- mpeg cid bitrate mode (vbr/cbr)

- mpeg cid bitrate/bitrate-peak

- mpeg encode of user data

- mpeg decode of user data

- implement CID controls for mozaic areas



- sound

 - implement playback via external sound jack

 - implement loopback of external sound jack with incoming audio?

	  - implement pause/resume

 - implement pause/resume (make use of in bc-server)



Please send patches to the linux media list <linux-media@vger.kernel.org> and

Cc Ismael Luceno <ismael.luceno@corp.bluecherry.net>.

drivers/staging/media/solo6x10/core.c

+489 −87

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/solo6x10/disp.c

+92 −35

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/media/solo6x10/eeprom.c

0 → 100644
+154 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2013 Bluecherry, LLC <http://www.bluecherrydvr.com>

 *

 * Original author:

 * Ben Collins <bcollins@ubuntu.com>

 *

 * Additional work by:

 * John Brooks <john.brooks@bluecherry.net>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */



#include <linux/kernel.h>

#include <linux/delay.h>



#include "solo6x10.h"



/* Control */

#define EE_SHIFT_CLK	0x04

#define EE_CS		0x08

#define EE_DATA_WRITE	0x02

#define EE_DATA_READ	0x01

#define EE_ENB		(0x80 | EE_CS)



#define eeprom_delay()	udelay(100)

#if 0

#define eeprom_delay()	solo_reg_read(solo_dev, SOLO_EEPROM_CTRL)

#define eeprom_delay()	({				\

	int i, ret;					\

	udelay(100);					\

	for (i = ret = 0; i < 1000 && !ret; i++)	\

		ret = solo_eeprom_reg_read(solo_dev);	\

})

#endif

#define ADDR_LEN	6



/* Commands */

#define EE_EWEN_CMD	4

#define EE_EWDS_CMD	4

#define EE_WRITE_CMD	5

#define EE_READ_CMD	6

#define EE_ERASE_CMD	7



static unsigned int solo_eeprom_reg_read(struct solo_dev *solo_dev)

{

	return solo_reg_read(solo_dev, SOLO_EEPROM_CTRL) & EE_DATA_READ;

}



static void solo_eeprom_reg_write(struct solo_dev *solo_dev, u32 data)

{

	solo_reg_write(solo_dev, SOLO_EEPROM_CTRL, data);

	eeprom_delay();

}



static void solo_eeprom_cmd(struct solo_dev *solo_dev, int cmd)

{

	int i;



	solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ACCESS_EN);

	solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE);



	for (i = 4 + ADDR_LEN; i >= 0; i--) {

		int dataval = (cmd & (1 << i)) ? EE_DATA_WRITE : 0;



		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE | dataval);

		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE |

				      EE_SHIFT_CLK | dataval);

	}



	solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE);

}



unsigned int solo_eeprom_ewen(struct solo_dev *solo_dev, int w_en)

{

	int ewen_cmd = (w_en ? 0x3f : 0) | (EE_EWEN_CMD << ADDR_LEN);

	unsigned int retval = 0;

	int i;



	solo_eeprom_cmd(solo_dev, ewen_cmd);



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

		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE |

				      EE_SHIFT_CLK);

		retval = (retval << 1) | solo_eeprom_reg_read(solo_dev);

		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE);

		retval = (retval << 1) | solo_eeprom_reg_read(solo_dev);

	}



	solo_eeprom_reg_write(solo_dev, ~EE_CS);

	retval = (retval << 1) | solo_eeprom_reg_read(solo_dev);



	return retval;

}



unsigned short solo_eeprom_read(struct solo_dev *solo_dev, int loc)

{

	int read_cmd = loc | (EE_READ_CMD << ADDR_LEN);

	unsigned short retval = 0;

	int i;



	solo_eeprom_cmd(solo_dev, read_cmd);



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

		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE |

				      EE_SHIFT_CLK);

		retval = (retval << 1) | solo_eeprom_reg_read(solo_dev);

		solo_eeprom_reg_write(solo_dev, SOLO_EEPROM_ENABLE);

	}



	solo_eeprom_reg_write(solo_dev, ~EE_CS);



	return retval;

}



int solo_eeprom_write(struct solo_dev *solo_dev, int loc,

		      unsigned short data)

{

	int write_cmd = loc | (EE_WRITE_CMD << ADDR_LEN);

	unsigned int retval;

	int i;



	solo_eeprom_cmd(solo_dev, write_cmd);



	for (i = 15; i >= 0; i--) {

		unsigned int dataval = (data >> i) & 1;



		solo_eeprom_reg_write(solo_dev, EE_ENB);

		solo_eeprom_reg_write(solo_dev,

				      EE_ENB | (dataval << 1) | EE_SHIFT_CLK);

	}



	solo_eeprom_reg_write(solo_dev, EE_ENB);

	solo_eeprom_reg_write(solo_dev, ~EE_CS);

	solo_eeprom_reg_write(solo_dev, EE_ENB);



	for (i = retval = 0; i < 10000 && !retval; i++)

		retval = solo_eeprom_reg_read(solo_dev);



	solo_eeprom_reg_write(solo_dev, ~EE_CS);



	return !retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE