projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
camsys_drv: v0.0x16.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
nt99252_3way.c
diff --git
a/drivers/media/video/nt99252_3way.c
b/drivers/media/video/nt99252_3way.c
index 9984824f9ebfeb48517de6d436c452a6c242ca65..4b77492af356fbfd6521e47091e9d54273fc85c1 100755
(executable)
--- a/
drivers/media/video/nt99252_3way.c
+++ b/
drivers/media/video/nt99252_3way.c
@@
-1,14
+1,12
@@
\r
#include "generic_sensor.h"
\r
\r
#include "generic_sensor.h"
\r
-/*
\r
+/*
* Driver Version Note
\r
*v0.0.1: this driver is compatible with generic_sensor
\r
*v0.1.1:
\r
* add sensor_focus_af_const_pause_usr_cb;
\r
* Driver Version Note
\r
*v0.0.1: this driver is compatible with generic_sensor
\r
*v0.1.1:
\r
* add sensor_focus_af_const_pause_usr_cb;
\r
-*v0.1.2:
\r
- crop for rk3188m
\r
*/
\r
*/
\r
-static int version = KERNEL_VERSION(0,1,
2
);
\r
+static int version = KERNEL_VERSION(0,1,
1
);
\r
module_param(version, int, S_IRUGO);
\r
\r
static int debug =1;
\r
module_param(version, int, S_IRUGO);
\r
\r
static int debug =1;
\r
@@
-25,13
+23,8
@@
module_param(debug, int, S_IRUGO|S_IWUSR);
#define SENSOR_BUS_PARAM (SOCAM_MASTER |\
\r
SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_HIGH|\
\r
SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8 |SOCAM_MCLK_24MHZ)
\r
#define SENSOR_BUS_PARAM (SOCAM_MASTER |\
\r
SOCAM_PCLK_SAMPLE_RISING|SOCAM_HSYNC_ACTIVE_HIGH| SOCAM_VSYNC_ACTIVE_HIGH|\
\r
SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8 |SOCAM_MCLK_24MHZ)
\r
-#if defined(CONFIG_SOC_RK3188M)
\r
-#define SENSOR_PREVIEW_W (800 - 20)
\r
-#define SENSOR_PREVIEW_H (600 - 20)
\r
-#else
\r
-#define SENSOR_PREVIEW_W (800)
\r
-#define SENSOR_PREVIEW_H (600)
\r
-#endif
\r
+#define SENSOR_PREVIEW_W 800
\r
+#define SENSOR_PREVIEW_H 600
\r
#define SENSOR_PREVIEW_FPS 15000 // 15fps
\r
#define SENSOR_FULLRES_L_FPS 5000 // 7.5fps
\r
#define SENSOR_FULLRES_H_FPS 10000 // 7.5fps
\r
#define SENSOR_PREVIEW_FPS 15000 // 15fps
\r
#define SENSOR_FULLRES_L_FPS 5000 // 7.5fps
\r
#define SENSOR_FULLRES_H_FPS 10000 // 7.5fps
\r
@@
-959,11
+952,6
@@
static int sensor_s_fmt_cb_bh (struct i2c_client *client,struct v4l2_mbus_framef
if (capture) {
\r
//sensor_ae_transfer(client);
\r
}
\r
if (capture) {
\r
//sensor_ae_transfer(client);
\r
}
\r
-#if defined(CONFIG_SOC_RK3188M)
\r
- mf->width-=20;
\r
- mf->height-=20;
\r
- msleep(300);
\r
-#endif
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-1100,9
+1088,9
@@
static int sensor_focus_af_specialpos_usr_cb(struct i2c_client *client,int pos){
static int sensor_focus_af_const_usr_cb(struct i2c_client *client){
\r
return 0;
\r
}
\r
static int sensor_focus_af_const_usr_cb(struct i2c_client *client){
\r
return 0;
\r
}
\r
-static int sensor_focus_af_const_pause_usr_cb(struct i2c_client *client)
\r
-{
\r
- return 0;
\r
+static int sensor_focus_af_const_pause_usr_cb(struct i2c_client *client)
+{
+ return 0;
}
\r
static int sensor_focus_af_close_usr_cb(struct i2c_client *client){
\r
return 0;
\r
}
\r
static int sensor_focus_af_close_usr_cb(struct i2c_client *client){
\r
return 0;
\r