aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sunplus.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-01-10 14:11:25 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:31 -0400
commit8789d810f104a3e9f4289382968cf5482934b9fd (patch)
treea2b47587a702681c6793b98d9736596879ce8692 /drivers/media/video/gspca/sunplus.c
parentb3f5dbd0e1d4a1f9ed17cb40b9f789c606c44206 (diff)
V4L/DVB (10353): gspca - some subdrivers: Don't get the control values from the webcam.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sunplus.c')
-rw-r--r--drivers/media/video/gspca/sunplus.c59
1 files changed, 0 insertions, 59 deletions
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 2c0b6c3c876..9d08a66fe23 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1194,26 +1194,6 @@ static void setbrightness(struct gspca_dev *gspca_dev)
1194 } 1194 }
1195} 1195}
1196 1196
1197static void getbrightness(struct gspca_dev *gspca_dev)
1198{
1199 struct sd *sd = (struct sd *) gspca_dev;
1200 __u16 brightness = 0;
1201
1202 switch (sd->bridge) {
1203 default:
1204/* case BRIDGE_SPCA533: */
1205/* case BRIDGE_SPCA504B: */
1206/* case BRIDGE_SPCA504: */
1207/* case BRIDGE_SPCA504C: */
1208 brightness = reg_r_12(gspca_dev, 0x00, 0x21a7, 2);
1209 break;
1210 case BRIDGE_SPCA536:
1211 brightness = reg_r_12(gspca_dev, 0x00, 0x20f0, 2);
1212 break;
1213 }
1214 sd->brightness = ((brightness & 0xff) - 128) % 255;
1215}
1216
1217static void setcontrast(struct gspca_dev *gspca_dev) 1197static void setcontrast(struct gspca_dev *gspca_dev)
1218{ 1198{
1219 struct sd *sd = (struct sd *) gspca_dev; 1199 struct sd *sd = (struct sd *) gspca_dev;
@@ -1233,24 +1213,6 @@ static void setcontrast(struct gspca_dev *gspca_dev)
1233 } 1213 }
1234} 1214}
1235 1215
1236static void getcontrast(struct gspca_dev *gspca_dev)
1237{
1238 struct sd *sd = (struct sd *) gspca_dev;
1239
1240 switch (sd->bridge) {
1241 default:
1242/* case BRIDGE_SPCA533: */
1243/* case BRIDGE_SPCA504B: */
1244/* case BRIDGE_SPCA504: */
1245/* case BRIDGE_SPCA504C: */
1246 sd->contrast = reg_r_12(gspca_dev, 0x00, 0x21a8, 2);
1247 break;
1248 case BRIDGE_SPCA536:
1249 sd->contrast = reg_r_12(gspca_dev, 0x00, 0x20f1, 2);
1250 break;
1251 }
1252}
1253
1254static void setcolors(struct gspca_dev *gspca_dev) 1216static void setcolors(struct gspca_dev *gspca_dev)
1255{ 1217{
1256 struct sd *sd = (struct sd *) gspca_dev; 1218 struct sd *sd = (struct sd *) gspca_dev;
@@ -1270,24 +1232,6 @@ static void setcolors(struct gspca_dev *gspca_dev)
1270 } 1232 }
1271} 1233}
1272 1234
1273static void getcolors(struct gspca_dev *gspca_dev)
1274{
1275 struct sd *sd = (struct sd *) gspca_dev;
1276
1277 switch (sd->bridge) {
1278 default:
1279/* case BRIDGE_SPCA533: */
1280/* case BRIDGE_SPCA504B: */
1281/* case BRIDGE_SPCA504: */
1282/* case BRIDGE_SPCA504C: */
1283 sd->colors = reg_r_12(gspca_dev, 0x00, 0x21ae, 2) >> 1;
1284 break;
1285 case BRIDGE_SPCA536:
1286 sd->colors = reg_r_12(gspca_dev, 0x00, 0x20f6, 2) >> 1;
1287 break;
1288 }
1289}
1290
1291static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) 1235static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
1292{ 1236{
1293 struct sd *sd = (struct sd *) gspca_dev; 1237 struct sd *sd = (struct sd *) gspca_dev;
@@ -1302,7 +1246,6 @@ static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
1302{ 1246{
1303 struct sd *sd = (struct sd *) gspca_dev; 1247 struct sd *sd = (struct sd *) gspca_dev;
1304 1248
1305 getbrightness(gspca_dev);
1306 *val = sd->brightness; 1249 *val = sd->brightness;
1307 return 0; 1250 return 0;
1308} 1251}
@@ -1321,7 +1264,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
1321{ 1264{
1322 struct sd *sd = (struct sd *) gspca_dev; 1265 struct sd *sd = (struct sd *) gspca_dev;
1323 1266
1324 getcontrast(gspca_dev);
1325 *val = sd->contrast; 1267 *val = sd->contrast;
1326 return 0; 1268 return 0;
1327} 1269}
@@ -1340,7 +1282,6 @@ static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
1340{ 1282{
1341 struct sd *sd = (struct sd *) gspca_dev; 1283 struct sd *sd = (struct sd *) gspca_dev;
1342 1284
1343 getcolors(gspca_dev);
1344 *val = sd->colors; 1285 *val = sd->colors;
1345 return 0; 1286 return 0;
1346} 1287}