X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fsaa7134%2Fsaa6752hs.c;h=5fdff4829229584e73fdb000be4eeb97c315b2f4;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=d52cecb58416961abce5882a95cc2ff4707a723a;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index d52cecb58..5fdff4829 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c @@ -36,7 +36,7 @@ enum saa6752hs_command { SAA6752HS_COMMAND_RECONFIGURE = 4, SAA6752HS_COMMAND_SLEEP = 5, SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6, - + SAA6752HS_COMMAND_MAX }; @@ -46,24 +46,24 @@ enum saa6752hs_command { static u8 PAT[] = { 0xc2, // i2c register 0x00, // table number for encoder - + 0x47, // sync 0x40, 0x00, // transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid(0) 0x10, // transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) - + 0x00, // PSI pointer to start of table - + 0x00, // tid(0) 0xb0, 0x0d, // section_syntax_indicator(1), section_length(13) - + 0x00, 0x01, // transport_stream_id(1) - + 0xc1, // version_number(0), current_next_indicator(1) - + 0x00, 0x00, // section_number(0), last_section_number(0) 0x00, 0x01, // program_number(1) - + 0xe0, 0x10, // PMT PID(0x10) 0x76, 0xf1, 0x44, 0xd1 // CRC32 @@ -72,29 +72,29 @@ static u8 PAT[] = { static u8 PMT[] = { 0xc2, // i2c register 0x01, // table number for encoder - + 0x47, // sync 0x40, 0x10, // transport_error_indicator(0), payload_unit_start(1), transport_priority(0), pid(0x10) 0x10, // transport_scrambling_control(00), adaptation_field_control(01), continuity_counter(0) - + 0x00, // PSI pointer to start of table - + 0x02, // tid(2) 0xb0, 0x17, // section_syntax_indicator(1), section_length(23) 0x00, 0x01, // program_number(1) - + 0xc1, // version_number(0), current_next_indicator(1) - + 0x00, 0x00, // section_number(0), last_section_number(0) - + 0xe1, 0x04, // PCR_PID (0x104) - + 0xf0, 0x00, // program_info_length(0) - + 0x02, 0xe1, 0x00, 0xf0, 0x00, // video stream type(2), pid(0x100) 0x04, 0xe1, 0x03, 0xf0, 0x00, // audio stream type(4), pid(0x103) - + 0xa1, 0xca, 0x0f, 0x82 // CRC32 }; @@ -106,7 +106,7 @@ static struct mpeg_params mpeg_params_template = .total_bitrate = 6000, }; - + /* ---------------------------------------------------------------------- */ @@ -122,11 +122,11 @@ static int saa6752hs_chip_command(struct i2c_client* client, case SAA6752HS_COMMAND_RESET: buf[0] = 0x00; break; - + case SAA6752HS_COMMAND_STOP: buf[0] = 0x03; break; - + case SAA6752HS_COMMAND_START: buf[0] = 0x02; break; @@ -134,11 +134,11 @@ static int saa6752hs_chip_command(struct i2c_client* client, case SAA6752HS_COMMAND_PAUSE: buf[0] = 0x04; break; - + case SAA6752HS_COMMAND_RECONFIGURE: buf[0] = 0x05; break; - + case SAA6752HS_COMMAND_SLEEP: buf[0] = 0x06; break; @@ -146,11 +146,11 @@ static int saa6752hs_chip_command(struct i2c_client* client, case SAA6752HS_COMMAND_RECONFIGURE_FORCE: buf[0] = 0x07; break; - + default: - return -EINVAL; + return -EINVAL; } - + // set it and wait for it to be so i2c_master_send(client, buf, 1); timeout = jiffies + HZ * 3; @@ -166,16 +166,14 @@ static int saa6752hs_chip_command(struct i2c_client* client, status = -ETIMEDOUT; break; } - + // wait a bit - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ/100); + msleep(10); } // delay a bit to let encoder settle - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ/20); - + msleep(50); + // done return status; } @@ -185,12 +183,12 @@ static int saa6752hs_set_bitrate(struct i2c_client* client, struct mpeg_params* params) { u8 buf[3]; - + // set the bitrate mode buf[0] = 0x71; buf[1] = params->bitrate_mode; i2c_master_send(client, buf, 2); - + // set the video bitrate if (params->bitrate_mode == MPEG_BITRATE_MODE_VBR) { // set the target bitrate @@ -211,24 +209,24 @@ static int saa6752hs_set_bitrate(struct i2c_client* client, buf[2] = params->video_target_bitrate & 0xff; i2c_master_send(client, buf, 3); } - + // set the audio bitrate buf[0] = 0x94; buf[1] = params->audio_bitrate; i2c_master_send(client, buf, 2); - + // set the total bitrate buf[0] = 0xb1; buf[1] = params->total_bitrate >> 8; buf[2] = params->total_bitrate & 0xff; i2c_master_send(client, buf, 3); - + return 0; } static int saa6752hs_init(struct i2c_client* client, struct mpeg_params* params) -{ +{ unsigned char buf[3]; void *data; @@ -246,41 +244,41 @@ static int saa6752hs_init(struct i2c_client* client, struct mpeg_params* params) return -EINVAL; if (params->bitrate_mode == MPEG_BITRATE_MODE_MAX && params->video_target_bitrate <= params->video_max_bitrate) - return -EINVAL; + return -EINVAL; } - + // Set GOP structure {3, 13} buf[0] = 0x72; buf[1] = 0x03; buf[2] = 0x0D; i2c_master_send(client,buf,3); - + // Set minimum Q-scale {4} buf[0] = 0x82; buf[1] = 0x04; i2c_master_send(client,buf,2); - + // Set maximum Q-scale {12} buf[0] = 0x83; buf[1] = 0x0C; i2c_master_send(client,buf,2); - + // Set Output Protocol buf[0] = 0xD0; buf[1] = 0x01; i2c_master_send(client,buf,2); - + // Set video output stream format {TS} buf[0] = 0xB0; buf[1] = 0x05; i2c_master_send(client,buf,2); - + // Set Audio PID {0x103} buf[0] = 0xC1; buf[1] = 0x01; buf[2] = 0x03; i2c_master_send(client,buf,3); - + // setup bitrate settings data = i2c_get_clientdata(client); if (params) { @@ -290,18 +288,18 @@ static int saa6752hs_init(struct i2c_client* client, struct mpeg_params* params) // parameters were not supplied. use the previous set saa6752hs_set_bitrate(client, (struct mpeg_params*) data); } - + // Send SI tables i2c_master_send(client,PAT,sizeof(PAT)); i2c_master_send(client,PMT,sizeof(PMT)); - + // mute then unmute audio. This removes buzzing artefacts buf[0] = 0xa4; buf[1] = 1; i2c_master_send(client, buf, 2); buf[1] = 0; i2c_master_send(client, buf, 2); - + // start it going saa6752hs_chip_command(client, SAA6752HS_COMMAND_START); @@ -322,22 +320,21 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind) return -ENOMEM; memcpy(client,&client_template,sizeof(struct i2c_client)); strlcpy(client->name, "saa6752hs", sizeof(client->name)); - + if (NULL == (params = kmalloc(sizeof(struct mpeg_params), GFP_KERNEL))) return -ENOMEM; memcpy(params,&mpeg_params_template,sizeof(struct mpeg_params)); i2c_set_clientdata(client, params); i2c_attach_client(client); - + return 0; } static int saa6752hs_probe(struct i2c_adapter *adap) { - if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) + if (adap->class & I2C_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, saa6752hs_attach); - return 0; } @@ -365,7 +362,7 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg) /* nothing */ break; } - + return 0; } @@ -388,13 +385,12 @@ static struct i2c_client client_template = .driver = &driver, }; -static int saa6752hs_init_module(void) +static int __init saa6752hs_init_module(void) { - i2c_add_driver(&driver); - return 0; + return i2c_add_driver(&driver); } -static void saa6752hs_cleanup_module(void) +static void __exit saa6752hs_cleanup_module(void) { i2c_del_driver(&driver); }