← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/media/video/saa717x.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/saa717x.c
931
931
                break;
932
932
 
933
933
        case V4L2_CID_HUE:
934
 
                if (ctrl->value < -127 || ctrl->value > 127) {
 
934
                if (ctrl->value < -128 || ctrl->value > 127) {
935
935
                        v4l2_err(sd, "invalid hue setting %d\n", ctrl->value);
936
936
                        return -ERANGE;
937
937
                }
1104
1104
        },
1105
1105
};
1106
1106
 
1107
 
static int saa717x_s_video_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
 
1107
static int saa717x_s_video_routing(struct v4l2_subdev *sd,
 
1108
                                   u32 input, u32 output, u32 config)
1108
1109
{
1109
1110
        struct saa717x_state *decoder = to_state(sd);
1110
 
        int inp = route->input;
1111
 
        int is_tuner = inp & 0x80;  /* tuner input flag */
1112
 
 
1113
 
        inp &= 0x7f;
1114
 
 
1115
 
        v4l2_dbg(1, debug, sd, "decoder set input (%d)\n", inp);
 
1111
        int is_tuner = input & 0x80;  /* tuner input flag */
 
1112
 
 
1113
        input &= 0x7f;
 
1114
 
 
1115
        v4l2_dbg(1, debug, sd, "decoder set input (%d)\n", input);
1116
1116
        /* inputs from 0-9 are available*/
1117
1117
        /* saa717x have mode0-mode9 but mode5 is reserved. */
1118
 
        if (inp < 0 || inp > 9 || inp == 5)
 
1118
        if (input < 0 || input > 9 || input == 5)
1119
1119
                return -EINVAL;
1120
1120
 
1121
 
        if (decoder->input != inp) {
1122
 
                int input_line = inp;
 
1121
        if (decoder->input != input) {
 
1122
                int input_line = input;
1123
1123
 
1124
1124
                decoder->input = input_line;
1125
1125
                v4l2_dbg(1, debug, sd,  "now setting %s input %d\n",
1276
1276
        return 0;
1277
1277
}
1278
1278
 
1279
 
static int saa717x_s_audio_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
 
1279
static int saa717x_s_audio_routing(struct v4l2_subdev *sd,
 
1280
                                   u32 input, u32 output, u32 config)
1280
1281
{
1281
1282
        struct saa717x_state *decoder = to_state(sd);
1282
1283
 
1283
 
        if (route->input < 3) { /* FIXME! --tadachi */
1284
 
                decoder->audio_input = route->input;
 
1284
        if (input < 3) { /* FIXME! --tadachi */
 
1285
                decoder->audio_input = input;
1285
1286
                v4l2_dbg(1, debug, sd,
1286
1287
                                "set decoder audio input to %d\n",
1287
1288
                                decoder->audio_input);
1380
1381
        return 0;
1381
1382
}
1382
1383
 
1383
 
static int saa717x_command(struct i2c_client *client, unsigned cmd, void *arg)
1384
 
{
1385
 
        return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
1386
 
}
1387
 
 
1388
1384
/* ----------------------------------------------------------------------- */
1389
1385
 
1390
1386
static const struct v4l2_subdev_core_ops saa717x_core_ops = {
1395
1391
        .queryctrl = saa717x_queryctrl,
1396
1392
        .g_ctrl = saa717x_g_ctrl,
1397
1393
        .s_ctrl = saa717x_s_ctrl,
 
1394
        .s_std = saa717x_s_std,
1398
1395
};
1399
1396
 
1400
1397
static const struct v4l2_subdev_tuner_ops saa717x_tuner_ops = {
1401
1398
        .g_tuner = saa717x_g_tuner,
1402
1399
        .s_tuner = saa717x_s_tuner,
1403
 
        .s_std = saa717x_s_std,
1404
1400
        .s_radio = saa717x_s_radio,
1405
1401
};
1406
1402
 
1528
1524
 
1529
1525
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1530
1526
        .name = "saa717x",
1531
 
        .driverid = I2C_DRIVERID_SAA717X,
1532
 
        .command = saa717x_command,
1533
1527
        .probe = saa717x_probe,
1534
1528
        .remove = saa717x_remove,
1535
 
        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
1536
1529
        .id_table = saa717x_id,
1537
1530
};