[media] saa7164: add various encoder message functions
authorSteven Toth <stoth@kernellabs.com>
Sat, 31 Jul 2010 17:44:53 +0000 (14:44 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 09:54:34 +0000 (07:54 -0200)
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7164/saa7164-api.c
drivers/media/video/saa7164/saa7164-buffer.c
drivers/media/video/saa7164/saa7164-cards.c
drivers/media/video/saa7164/saa7164-core.c
drivers/media/video/saa7164/saa7164-encoder.c
drivers/media/video/saa7164/saa7164.h

index a810e6d..5e05723 100644 (file)
 
 #include "saa7164.h"
 
+int saa7164_api_set_encoder(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       tmComResEncVideoBitRate_t vb;
+       tmComResEncAudioBitRate_t ab;
+       int ret;
+
+       dprintk(DBGLVL_ENC, "%s() unitid=0x%x\n", __func__, port->hwcfg.sourceid);
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
+               EU_PROFILE_CONTROL, sizeof(u8), &port->encoder_profile);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Establish video bitrates */
+       vb.ucVideoBitRateMode = 0;
+       vb.dwVideoBitRate = port->encoder_params.bitrate;
+       vb.dwVideoBitRatePeak = vb.dwVideoBitRate;
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
+               EU_VIDEO_BIT_RATE_CONTROL, sizeof(tmComResEncVideoBitRate_t), &vb);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Establish audio bitrates */
+       ab.ucAudioBitRateMode = 0;
+       ab.dwAudioBitRate = 384000;
+       ab.dwAudioBitRatePeak = ab.dwAudioBitRate;
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
+               EU_AUDIO_BIT_RATE_CONTROL, sizeof(tmComResEncAudioBitRate_t), &ab);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       saa7164_api_set_aspect_ratio(port);
+
+       return ret;
+}
+
+int saa7164_api_get_encoder(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       tmComResEncVideoBitRate_t v;
+       tmComResEncAudioBitRate_t a;
+       tmComResEncVideoInputAspectRatio_t ar;
+       int ret;
+
+       dprintk(DBGLVL_ENC, "%s() unitid=0x%x\n", __func__, port->hwcfg.sourceid);
+
+       port->encoder_profile = 0;
+       port->video_format = 0;
+       port->video_resolution = 0;
+       port->audio_format = 0;
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_PROFILE_CONTROL, sizeof(u8), &port->encoder_profile);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_VIDEO_FORMAT_CONTROL, sizeof(u8), &port->video_format);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_VIDEO_BIT_RATE_CONTROL, sizeof(v), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_AUDIO_FORMAT_CONTROL, sizeof(u8), &port->audio_format);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_AUDIO_BIT_RATE_CONTROL, sizeof(a), &a);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Aspect Ratio */
+       ar.width = 0;
+       ar.height = 0;
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
+               EU_VIDEO_INPUT_ASPECT_CONTROL,
+               sizeof(tmComResEncVideoInputAspectRatio_t), &ar);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       dprintk(DBGLVL_ENC, "encoder_profile = %d\n", port->encoder_profile);
+       dprintk(DBGLVL_ENC, "video_format    = %d\n", port->video_format);
+       dprintk(DBGLVL_ENC, "audio_format    = %d\n", port->audio_format);
+       dprintk(DBGLVL_ENC, "video_resolution= %d\n", port->video_resolution);
+       dprintk(DBGLVL_ENC, "v.ucVideoBitRateMode = %d\n", v.ucVideoBitRateMode);
+       dprintk(DBGLVL_ENC, "v.dwVideoBitRate     = %d\n", v.dwVideoBitRate);
+       dprintk(DBGLVL_ENC, "v.dwVideoBitRatePeak = %d\n", v.dwVideoBitRatePeak);
+       dprintk(DBGLVL_ENC, "a.ucVideoBitRateMode = %d\n", a.ucAudioBitRateMode);
+       dprintk(DBGLVL_ENC, "a.dwVideoBitRate     = %d\n", a.dwAudioBitRate);
+       dprintk(DBGLVL_ENC, "a.dwVideoBitRatePeak = %d\n", a.dwAudioBitRatePeak);
+       dprintk(DBGLVL_ENC, "aspect.width / height = %d:%d\n", ar.width, ar.height);
+
+       return ret;
+}
+
+int saa7164_api_set_aspect_ratio(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       tmComResEncVideoInputAspectRatio_t ar;
+       int ret;
+
+       dprintk(DBGLVL_ENC, "%s(%d)\n", __func__,
+               port->encoder_params.ctl_aspect);
+
+       switch (port->encoder_params.ctl_aspect) {
+       case V4L2_MPEG_VIDEO_ASPECT_1x1:
+               ar.width = 1;
+               ar.height = 1;
+               break;
+       case V4L2_MPEG_VIDEO_ASPECT_4x3:
+               ar.width = 4;
+               ar.height = 3;
+               break;
+       case V4L2_MPEG_VIDEO_ASPECT_16x9:
+               ar.width = 16;
+               ar.height = 9;
+               break;
+       case V4L2_MPEG_VIDEO_ASPECT_221x100:
+               ar.width = 221;
+               ar.height = 100;
+               break;
+       default:
+               BUG();
+       }
+
+       dprintk(DBGLVL_ENC, "%s(%d) now %d:%d\n", __func__,
+               port->encoder_params.ctl_aspect,
+               ar.width, ar.height);
+
+       /* Aspect Ratio */
+       ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
+               EU_VIDEO_INPUT_ASPECT_CONTROL,
+               sizeof(tmComResEncVideoInputAspectRatio_t), &ar);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_set_usercontrol(struct saa7164_port *port, u8 ctl)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+       u16 val;
+
+       if (ctl == PU_BRIGHTNESS_CONTROL)
+               val = port->ctl_brightness;
+       else
+       if (ctl == PU_CONTRAST_CONTROL)
+               val = port->ctl_contrast;
+       else
+       if (ctl == PU_HUE_CONTROL)
+               val = port->ctl_hue;
+       else
+       if (ctl == PU_SATURATION_CONTROL)
+               val = port->ctl_saturation;
+       else
+       if (ctl == PU_SHARPNESS_CONTROL)
+               val = port->ctl_sharpness;
+       else
+               return -EINVAL;
+
+       dprintk(DBGLVL_ENC, "%s() unitid=0x%x ctl=%d, val=%d\n",
+               __func__, port->encunit.vsourceid, ctl, val);
+
+       ret = saa7164_cmd_send(port->dev, port->encunit.vsourceid, SET_CUR,
+               ctl, sizeof(u16), &val);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_get_usercontrol(struct saa7164_port *port, u8 ctl)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+       u16 val;
+
+       ret = saa7164_cmd_send(port->dev, port->encunit.vsourceid, GET_CUR,
+               ctl, sizeof(u16), &val);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+               return ret;
+       }
+
+       dprintk(DBGLVL_ENC, "%s() ctl=%d, val=%d\n",
+               __func__, ctl, val);
+
+       if (ctl == PU_BRIGHTNESS_CONTROL)
+               port->ctl_brightness = val;
+       else
+       if (ctl == PU_CONTRAST_CONTROL)
+               port->ctl_contrast = val;
+       else
+       if (ctl == PU_HUE_CONTROL)
+               port->ctl_hue = val;
+       else
+       if (ctl == PU_SATURATION_CONTROL)
+               port->ctl_saturation = val;
+       else
+       if (ctl == PU_SHARPNESS_CONTROL)
+               port->ctl_sharpness = val;
+
+       return ret;
+}
+
+int saa7164_api_set_videomux(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       u8 inputs[] = { 1, 2, 2, 2, 5, 5, 5 };
+       int ret;
+
+       dprintk(DBGLVL_ENC, "%s() v_mux=%d a_mux=%d\n",
+               __func__, port->mux_input, inputs[ port->mux_input - 1 ]);
+
+       /* Audio Mute */
+       ret = saa7164_api_audio_mute(port, 1);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Video Mux */
+       ret = saa7164_cmd_send(port->dev, port->vidproc.sourceid, SET_CUR,
+               SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+       /* Audio Mux */
+       ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR,
+               SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+       /* Audio UnMute */
+       ret = saa7164_api_audio_mute(port, 0);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_audio_mute(struct saa7164_port *port, int mute)
+{
+       struct saa7164_dev *dev = port->dev;
+       u8 v = mute;
+       int ret;
+
+       dprintk(DBGLVL_API, "%s(%d)\n", __func__, mute);
+
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, SET_CUR,
+               MUTE_CONTROL, sizeof(u8), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+/* 0 = silence, 0xff = full */
+int saa7164_api_set_audio_volume(struct saa7164_port *port, s8 level)
+{
+       struct saa7164_dev *dev = port->dev;
+       s16 v, min, max;
+       int ret;
+
+       dprintk(DBGLVL_API, "%s(%d)\n", __func__, level);
+
+       /* Obtain the min/max ranges */
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, GET_MIN,
+               VOLUME_CONTROL, sizeof(u16), &min);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, GET_MAX,
+               VOLUME_CONTROL, sizeof(u16), &max);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, GET_CUR,
+               ( 0x01 << 8) | VOLUME_CONTROL, sizeof(u16), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       dprintk(DBGLVL_API, "%s(%d) min=%d max=%d cur=%d\n", __func__, level, min, max, v);
+
+       v = level;
+       if (v < min)
+               v = min;
+       if (v > max)
+               v = max;
+
+       /* Left */
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, SET_CUR,
+               ( 0x01 << 8 ) | VOLUME_CONTROL, sizeof(s16), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Right */
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, SET_CUR,
+               ( 0x02 << 8 ) | VOLUME_CONTROL, sizeof(s16), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, GET_CUR,
+               ( 0x01 << 8) | VOLUME_CONTROL, sizeof(u16), &v);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       dprintk(DBGLVL_API, "%s(%d) min=%d max=%d cur=%d\n", __func__, level, min, max, v);
+
+       return ret;
+}
+
+int saa7164_api_set_audio_std(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       tmComResAudioDefaults_t lvl;
+       tmComResTunerStandard_t tvaudio;
+       int ret;
+
+       dprintk(DBGLVL_API, "%s()\n", __func__);
+
+       /* Establish default levels */
+       lvl.ucDecoderLevel = TMHW_LEV_ADJ_DECLEV_DEFAULT;
+       lvl.ucDecoderFM_Level = TMHW_LEV_ADJ_DECLEV_DEFAULT;
+       lvl.ucMonoLevel = TMHW_LEV_ADJ_MONOLEV_DEFAULT;
+       lvl.ucNICAM_Level = TMHW_LEV_ADJ_NICLEV_DEFAULT;
+       lvl.ucSAP_Level = TMHW_LEV_ADJ_SAPLEV_DEFAULT;
+       lvl.ucADC_Level = TMHW_LEV_ADJ_ADCLEV_DEFAULT;
+       ret = saa7164_cmd_send(port->dev, port->audfeat.unitid, SET_CUR,
+               AUDIO_DEFAULT_CONTROL, sizeof(tmComResAudioDefaults_t), &lvl);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       /* Manually select the appropriate TV audio standard */
+       if (port->encodernorm.id & V4L2_STD_NTSC) {
+               tvaudio.std = TU_STANDARD_NTSC_M;
+               tvaudio.country = 1;
+       } else {
+               tvaudio.std = TU_STANDARD_PAL_I;
+               tvaudio.country = 44;
+       }
+
+       ret = saa7164_cmd_send(port->dev, port->tunerunit.unitid, SET_CUR,
+               TU_STANDARD_CONTROL, sizeof(tvaudio), &tvaudio);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() TU_STANDARD_CONTROL error, ret = 0x%x\n", __func__, ret);
+       return ret;
+}
+
+int saa7164_api_set_audio_detection(struct saa7164_port *port, int autodetect)
+{
+       struct saa7164_dev *dev = port->dev;
+       tmComResTunerStandardAuto_t p;
+       int ret;
+
+       dprintk(DBGLVL_API, "%s(%d)\n", __func__, autodetect);
+
+       /* Disable TV Audio autodetect if not already set (buggy) */
+       if (autodetect)
+               p.mode = TU_STANDARD_AUTO;
+       else
+               p.mode = TU_STANDARD_MANUAL;
+       ret = saa7164_cmd_send(port->dev, port->tunerunit.unitid, SET_CUR,
+               TU_STANDARD_AUTO_CONTROL, sizeof(p), &p);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() TU_STANDARD_AUTO_CONTROL error, ret = 0x%x\n", __func__, ret);
+
+       return ret;
+}
+
+int saa7164_api_get_videomux(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_cmd_send(port->dev, port->vidproc.sourceid, GET_CUR,
+               SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
+
+       dprintk(DBGLVL_ENC, "%s() v_mux=%d\n",
+               __func__, port->mux_input);
+
+       return ret;
+}
+
+int saa7164_api_set_dif(struct saa7164_port *port, u8 reg, u8 val)
+{
+       struct saa7164_dev *dev = port->dev;
+
+       u16 len = 0;
+       u8 buf[256];
+       int ret;
+       u8 mas;
+
+       dprintk(DBGLVL_API, "%s()\n", __func__);
+
+       if (port->nr == 0)
+               mas = 0xd0;
+       else
+               mas = 0xe0;
+
+       memset(buf, 0, sizeof(buf));
+
+       buf[0x00] = 0x04;
+       buf[0x01] = 0x00;
+       buf[0x02] = 0x00;
+       buf[0x03] = 0x00;
+
+       buf[0x04] = 0x04;
+       buf[0x05] = 0x00;
+       buf[0x06] = 0x00;
+       buf[0x07] = 0x00;
+
+       buf[0x08] = reg;
+       buf[0x09] = 0x26;
+       buf[0x0a] = mas;
+       buf[0x0b] = 0xb0;
+
+       buf[0x0c] = val;
+       buf[0x0d] = 0x00;
+       buf[0x0e] = 0x00;
+       buf[0x0f] = 0x00;
+
+       ret = saa7164_cmd_send(dev, port->ifunit.unitid, GET_LEN,
+               EXU_REGISTER_ACCESS_CONTROL, sizeof(len), &len);
+       if (ret != SAA_OK) {
+               printk(KERN_ERR "%s() error, ret(1) = 0x%x\n", __func__, ret);
+               return -EIO;
+       }
+
+       ret = saa7164_cmd_send(dev, port->ifunit.unitid, SET_CUR,
+               EXU_REGISTER_ACCESS_CONTROL, len, &buf);
+       if (ret != SAA_OK)
+               printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret);
+
+       //saa7164_dumphex16(dev, buf, 16);
+
+       return ret == SAA_OK ? 0 : -EIO;
+}
+
+/* Disable the IF block AGC controls */
+int saa7164_api_configure_dif(struct saa7164_port *port, u32 std)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret = 0;
+       u8 agc_disable;
+
+       dprintk(DBGLVL_API, "%s(%p, 0x%x)\n", __func__, port, std);
+
+       if (std & V4L2_STD_NTSC) {
+               dprintk(DBGLVL_API, " NTSC\n");
+               saa7164_api_set_dif(port, 0x00, 0x01); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_I) {
+               dprintk(DBGLVL_API, " PAL-I\n");
+               saa7164_api_set_dif(port, 0x00, 0x08); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_M) {
+               dprintk(DBGLVL_API, " PAL-M\n");
+               saa7164_api_set_dif(port, 0x00, 0x01); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_N) {
+               dprintk(DBGLVL_API, " PAL-N\n");
+               saa7164_api_set_dif(port, 0x00, 0x01); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_Nc) {
+               dprintk(DBGLVL_API, " PAL-Nc\n");
+               saa7164_api_set_dif(port, 0x00, 0x01); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_B) {
+               dprintk(DBGLVL_API, " PAL-B\n");
+               saa7164_api_set_dif(port, 0x00, 0x02); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_PAL_DK) {
+               dprintk(DBGLVL_API, " PAL-DK\n");
+               saa7164_api_set_dif(port, 0x00, 0x10); /* Video Standard */
+               agc_disable = 0;
+       } else if (std & V4L2_STD_SECAM_L) {
+               dprintk(DBGLVL_API, " SECAM-L\n");
+               saa7164_api_set_dif(port, 0x00, 0x20); /* Video Standard */
+               agc_disable = 0;
+       } else {
+               /* Unknown standard, assume DTV */
+               dprintk(DBGLVL_API, " Unknown (assuming DTV)\n");
+               saa7164_api_set_dif(port, 0x00, 0x80); /* Undefined Video Standard */
+               agc_disable = 1;
+       }
+
+       saa7164_api_set_dif(port, 0x48, 0xa0); /* AGC Functions 1 */
+       saa7164_api_set_dif(port, 0xc0, agc_disable); /* AGC Output Disable */
+       saa7164_api_set_dif(port, 0x7c, 0x04); /* CVBS EQ */
+       saa7164_api_set_dif(port, 0x04, 0x01); /* Active */
+       msleep(100);
+       saa7164_api_set_dif(port, 0x04, 0x00); /* Active (again) */
+       msleep(100);
+
+       return ret;
+}
+
+/* Ensure the dif is in the correct state for the operating mode
+ * (analog / dtv). We only configure the diff through the analog encoder
+ * so when we're in digital mode we need to find the appropriate encoder
+ * and use it to configure the DIF.
+ */
+int saa7164_api_initialize_dif(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_port *p = 0;
+       int ret = -EINVAL;
+       u32 std = 0;
+
+       if (port->type == SAA7164_MPEG_ENCODER) {
+               /* Pick any analog standard to init the diff.
+                * we'll come back during encoder_init'
+                * and set the correct standard if requried.
+                */
+               std = V4L2_STD_NTSC;
+       } else
+       if (port->type == SAA7164_MPEG_DVB) {
+               if (port->nr == SAA7164_PORT_TS1)
+                       p = &dev->ports[ SAA7164_PORT_ENC1 ];
+               else
+                       p = &dev->ports[ SAA7164_PORT_ENC2 ];
+       } else
+               BUG();
+
+       if (p)
+               ret = saa7164_api_configure_dif(p, std);
+
+       return ret;
+}
+
 int saa7164_api_transition_port(struct saa7164_port *port, u8 mode)
 {
        int ret;
@@ -96,9 +633,43 @@ int saa7164_api_configure_port_mpeg2ts(struct saa7164_dev *dev,
        return 0;
 }
 
+int saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev,
+       struct saa7164_port *port,
+       tmComResPSFormatDescrHeader_t *fmt)
+{
+       dprintk(DBGLVL_API, "    bFormatIndex = 0x%x\n", fmt->bFormatIndex);
+       dprintk(DBGLVL_API, "    wPacketLength= 0x%x\n", fmt->wPacketLength);
+       dprintk(DBGLVL_API, "    wPackLength=   0x%x\n", fmt->wPackLength);
+       dprintk(DBGLVL_API, "    bPackDataType= 0x%x\n", fmt->bPackDataType);
+
+       /* Cache the hardware configuration in the port */
+       /* TODO: CHECK THIS in the port config */
+       port->bufcounter = port->hwcfg.BARLocation;
+       port->pitch = port->hwcfg.BARLocation + (2 * sizeof(u32));
+       port->bufsize = port->hwcfg.BARLocation + (3 * sizeof(u32));
+       port->bufoffset = port->hwcfg.BARLocation + (4 * sizeof(u32));
+       port->bufptr32l = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount) + sizeof(u32);
+       port->bufptr32h = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount);
+       port->bufptr64 = port->hwcfg.BARLocation +
+               (4 * sizeof(u32)) +
+               (sizeof(u32) * port->hwcfg.buffercount);
+       dprintk(DBGLVL_API, "   = port->hwcfg.BARLocation = 0x%x\n",
+               port->hwcfg.BARLocation);
+
+       dprintk(DBGLVL_API, "   = VS_FORMAT_MPEGPS (becomes dev->enc[%d])\n",
+               port->nr);
+
+       return 0;
+}
+
 int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
 {
-       struct saa7164_port *port = 0;
+       struct saa7164_port *tsport = 0;
+       struct saa7164_port *encport = 0;
        u32 idx, next_offset;
        int i;
        tmComResDescrHeader_t *hdr, *t;
@@ -108,6 +679,11 @@ int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
        tmComResTunerDescrHeader_t *tunerunithdr;
        tmComResDMATermDescrHeader_t *vcoutputtermhdr;
        tmComResTSFormatDescrHeader_t *tsfmt;
+       tmComResPSFormatDescrHeader_t *psfmt;
+       tmComResSelDescrHeader_t *psel;
+       tmComResProcDescrHeader_t *pdh;
+       tmComResAFeatureDescrHeader_t *afd;
+       tmComResEncoderDescrHeader_t *edh;
        u32 currpath = 0;
 
        dprintk(DBGLVL_API,
@@ -244,17 +820,25 @@ int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
                                        tsfmt =
                                        (tmComResTSFormatDescrHeader_t *)t;
                                        if (currpath == 1)
-                                               port = &dev->ts1;
+                                               tsport = &dev->ports[ SAA7164_PORT_TS1 ];
                                        else
-                                               port = &dev->ts2;
-                                       memcpy(&port->hwcfg, vcoutputtermhdr,
+                                               tsport = &dev->ports[ SAA7164_PORT_TS2 ];
+                                       memcpy(&tsport->hwcfg, vcoutputtermhdr,
                                                sizeof(*vcoutputtermhdr));
                                        saa7164_api_configure_port_mpeg2ts(dev,
-                                               port, tsfmt);
+                                               tsport, tsfmt);
                                        break;
                                case VS_FORMAT_MPEG2PS:
-                                       dprintk(DBGLVL_API,
-                                               "   = VS_FORMAT_MPEG2PS\n");
+                                       psfmt =
+                                       (tmComResPSFormatDescrHeader_t *)t;
+                                       if (currpath == 1)
+                                               encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                                       else
+                                               encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                                       memcpy(&encport->hwcfg, vcoutputtermhdr,
+                                               sizeof(*vcoutputtermhdr));
+                                       saa7164_api_configure_port_mpeg2ps(dev,
+                                               encport, psfmt);
                                        break;
                                case VS_FORMAT_VBI:
                                        dprintk(DBGLVL_API,
@@ -297,18 +881,80 @@ int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
                                tunerunithdr->controlsize);
                        dprintk(DBGLVL_API, "  controls = 0x%x\n",
                                tunerunithdr->controls);
+
+                       if (tunerunithdr->unitid == tunerunithdr->iunit) {
+                               if (currpath == 1)
+                                       encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                               else
+                                       encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                               memcpy(&encport->tunerunit, tunerunithdr,
+                                       sizeof(tmComResTunerDescrHeader_t));
+                               dprintk(DBGLVL_API, "  (becomes dev->enc[%d] tuner)\n", encport->nr);
+                       }
                        break;
                case VC_SELECTOR_UNIT:
+                       psel = (tmComResSelDescrHeader_t *)(buf + idx);
                        dprintk(DBGLVL_API, " VC_SELECTOR_UNIT\n");
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               psel->unitid);
+                       dprintk(DBGLVL_API, "  nrinpins = 0x%x\n",
+                               psel->nrinpins);
+                       dprintk(DBGLVL_API, "  sourceid = 0x%x\n",
+                               psel->sourceid);
                        break;
                case VC_PROCESSING_UNIT:
+                       pdh = (tmComResProcDescrHeader_t *)(buf + idx);
                        dprintk(DBGLVL_API, " VC_PROCESSING_UNIT\n");
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               pdh->unitid);
+                       dprintk(DBGLVL_API, "  sourceid = 0x%x\n",
+                               pdh->sourceid);
+                       dprintk(DBGLVL_API, "  controlsize = 0x%x\n",
+                               pdh->controlsize);
+                       if (pdh->controlsize == 0x04) {
+                               if (currpath == 1)
+                                       encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                               else
+                                       encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                               memcpy(&encport->vidproc, pdh,
+                                       sizeof(tmComResProcDescrHeader_t));
+                               dprintk(DBGLVL_API, "  (becomes dev->enc[%d])\n", encport->nr);
+                       }
                        break;
                case FEATURE_UNIT:
+                       afd = (tmComResAFeatureDescrHeader_t *)(buf + idx);
                        dprintk(DBGLVL_API, " FEATURE_UNIT\n");
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n",
+                               afd->unitid);
+                       dprintk(DBGLVL_API, "  sourceid = 0x%x\n",
+                               afd->sourceid);
+                       dprintk(DBGLVL_API, "  controlsize = 0x%x\n",
+                               afd->controlsize);
+                       if (currpath == 1)
+                               encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                       else
+                               encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                       memcpy(&encport->audfeat, afd,
+                               sizeof(tmComResAFeatureDescrHeader_t));
+                       dprintk(DBGLVL_API, "  (becomes dev->enc[%d])\n", encport->nr);
                        break;
                case ENCODER_UNIT:
+                       edh = (tmComResEncoderDescrHeader_t *)(buf + idx);
                        dprintk(DBGLVL_API, " ENCODER_UNIT\n");
+                       dprintk(DBGLVL_API, "  subtype = 0x%x\n", edh->subtype);
+                       dprintk(DBGLVL_API, "  unitid = 0x%x\n", edh->unitid);
+                       dprintk(DBGLVL_API, "  vsourceid = 0x%x\n", edh->vsourceid);
+                       dprintk(DBGLVL_API, "  asourceid = 0x%x\n", edh->asourceid);
+                       dprintk(DBGLVL_API, "  iunit = 0x%x\n", edh->iunit);
+                       if (edh->iunit == edh->unitid) {
+                               if (currpath == 1)
+                                       encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                               else
+                                       encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                               memcpy(&encport->encunit, edh,
+                                       sizeof(tmComResEncoderDescrHeader_t));
+                               dprintk(DBGLVL_API, "  (becomes dev->enc[%d])\n", encport->nr);
+                       }
                        break;
                case EXTENSION_UNIT:
                        dprintk(DBGLVL_API, " EXTENSION_UNIT\n");
@@ -364,6 +1010,15 @@ int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
                                exthdr->numgpiogroups);
                        dprintk(DBGLVL_API, "  controlsize = 0x%x\n",
                                exthdr->controlsize);
+                       if (exthdr->devicetype & 0x80) {
+                               if (currpath == 1)
+                                       encport = &dev->ports[ SAA7164_PORT_ENC1 ];
+                               else
+                                       encport = &dev->ports[ SAA7164_PORT_ENC2 ];
+                               memcpy(&encport->ifunit, exthdr,
+                                       sizeof(tmComResExtDevDescrHeader_t));
+                               dprintk(DBGLVL_API, "  (becomes dev->enc[%d])\n", encport->nr);
+                       }
                        break;
                case PVC_INFRARED_UNIT:
                        dprintk(DBGLVL_API, " PVC_INFRARED_UNIT\n");
index 6f58af4..5fccecd 100644 (file)
@@ -265,3 +265,41 @@ int saa7164_buffer_cfg_port(struct saa7164_port *port)
        return 0;
 }
 
+struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev, u32 len)
+{
+       struct saa7164_user_buffer *buf;
+
+       buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL);
+       if (buf == 0)
+               return 0;
+
+       buf->data = kzalloc(len, GFP_KERNEL);
+
+       if (buf->data == 0) {
+               kfree(buf);
+               return 0;
+       }
+
+       buf->actual_size = len;
+       buf->pos = 0;
+
+       dprintk(DBGLVL_BUF, "%s()   allocated user buffer @ 0x%p\n",
+               __func__, buf);
+
+       return buf;
+}
+
+void saa7164_buffer_dealloc_user(struct saa7164_user_buffer *buf)
+{
+       if (!buf)
+               return;
+
+       if (buf->data) {
+               kfree(buf->data);
+               buf->data = 0;
+       }
+
+       if (buf)
+               kfree(buf);
+}
+
index bd04ae0..81baa36 100644 (file)
@@ -55,6 +55,8 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2200",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV3,
                .unit           = {{
                        .id             = 0x1d,
@@ -97,6 +99,8 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2200",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV2,
                .unit           = {{
                        .id             = 0x06,
@@ -139,6 +143,8 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2200",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV2,
                .unit           = {{
                        .id             = 0x1d,
@@ -195,6 +201,10 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2250",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV3,
                .unit           = {{
                        .id             = 0x22,
@@ -251,6 +261,8 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2250",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV3,
                .unit           = {{
                        .id             = 0x28,
@@ -307,6 +319,8 @@ struct saa7164_board saa7164_boards[] = {
                .name           = "Hauppauge WinTV-HVR2250",
                .porta          = SAA7164_MPEG_DVB,
                .portb          = SAA7164_MPEG_DVB,
+               .portc          = SAA7164_MPEG_ENCODER,
+               .portd          = SAA7164_MPEG_ENCODER,
                .chiprev        = SAA7164_CHIP_REV3,
                .unit           = {{
                        .id             = 0x26,
index 88c36bd..b8e56d8 100644 (file)
@@ -82,6 +82,69 @@ static void saa7164_buffer_deliver(struct saa7164_buffer *buf)
 
 }
 
+static irqreturn_t saa7164_irq_encoder(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct saa7164_user_buffer *ubuf;
+       struct list_head *c, *n;
+       int wp, i = 0, rp;
+
+       /* Find the current write point from the hardware */
+       wp = saa7164_readl(port->bufcounter);
+       if (wp > (port->hwcfg.buffercount - 1))
+               BUG();
+
+       /* Find the previous buffer to the current write point */
+       if (wp == 0)
+               rp = 7;
+       else
+               rp = wp - 1;
+
+       /* Lookup the WP in the buffer list */
+       /* TODO: turn this into a worker thread */
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               buf = list_entry(c, struct saa7164_buffer, list);
+               if (i++ > port->hwcfg.buffercount)
+                       BUG();
+
+               if (buf->idx == rp) {
+                       /* Found the buffer, deal with it */
+                       dprintk(DBGLVL_IRQ, "%s() wp: %d processing: %d\n",
+                               __func__, wp, rp);
+
+                       /* */
+                       /* find a free user buffer and clone to it */
+                       if (!list_empty(&port->list_buf_free.list)) {
+
+                               /* Pull the first buffer from the used list */
+                               ubuf = list_first_entry(&port->list_buf_free.list,
+                                       struct saa7164_user_buffer, list);
+
+                               if (ubuf->actual_size == buf->actual_size)
+                                       memcpy(ubuf->data, buf->cpu, ubuf->actual_size);
+
+                               /* Requeue the buffer on the free list */
+                               ubuf->pos = 0;
+
+
+//                             mutex_lock(&port->dmaqueue_lock);
+                               list_move_tail(&ubuf->list, &port->list_buf_used.list);
+//                             mutex_unlock(&port->dmaqueue_lock);
+
+                               /* Flag any userland waiters */
+                               wake_up_interruptible(&port->wait_read);
+
+                       } else
+                               printk(KERN_ERR "encirq no free buffers\n");
+
+                       break;
+               }
+
+       }
+       return 0;
+}
+
 static irqreturn_t saa7164_irq_ts(struct saa7164_port *port)
 {
        struct saa7164_dev *dev = port->dev;
@@ -123,6 +186,11 @@ static irqreturn_t saa7164_irq_ts(struct saa7164_port *port)
 static irqreturn_t saa7164_irq(int irq, void *dev_id)
 {
        struct saa7164_dev *dev = dev_id;
+       struct saa7164_port *porta = &dev->ports[ SAA7164_PORT_TS1 ];
+       struct saa7164_port *portb = &dev->ports[ SAA7164_PORT_TS2 ];
+       struct saa7164_port *portc = &dev->ports[ SAA7164_PORT_ENC1 ];
+       struct saa7164_port *portd = &dev->ports[ SAA7164_PORT_ENC2 ];
+
        u32 intid, intstat[INT_SIZE/4];
        int i, handled = 0, bit;
 
@@ -168,17 +236,25 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
                                if (intid == dev->intfdesc.bInterruptId) {
                                        /* A response to an cmd/api call */
                                        schedule_work(&dev->workcmd);
-                               } else if (intid ==
-                                       dev->ts1.hwcfg.interruptid) {
+                               } else if (intid == porta->hwcfg.interruptid) {
 
                                        /* Transport path 1 */
-                                       saa7164_irq_ts(&dev->ts1);
+                                       saa7164_irq_ts(porta);
 
-                               } else if (intid ==
-                                       dev->ts2.hwcfg.interruptid) {
+                               } else if (intid == portb->hwcfg.interruptid) {
 
                                        /* Transport path 2 */
-                                       saa7164_irq_ts(&dev->ts2);
+                                       saa7164_irq_ts(portb);
+
+                               } else if (intid == portc->hwcfg.interruptid) {
+
+                                       /* Encoder path 1 */
+                                       saa7164_irq_encoder(portc);
+
+                               } else if (intid == portd->hwcfg.interruptid) {
+
+                                       /* Encoder path 1 */
+                                       saa7164_irq_encoder(portd);
 
                                } else {
                                        /* Find the function */
@@ -402,6 +478,37 @@ static int get_resources(struct saa7164_dev *dev)
        return -EBUSY;
 }
 
+static int saa7164_port_init(struct saa7164_dev *dev, int portnr)
+{
+       struct saa7164_port *port = 0;
+
+       if ((portnr < 0) || (portnr >= SAA7164_MAX_PORTS))
+               BUG();
+
+       port = &dev->ports[ portnr ];
+
+       port->dev = dev;
+       port->nr = portnr;
+
+       if ((portnr == SAA7164_PORT_TS1) || (portnr == SAA7164_PORT_TS2))
+               port->type = SAA7164_MPEG_DVB;
+       else
+       if ((portnr == SAA7164_PORT_ENC1) || (portnr == SAA7164_PORT_ENC2))
+               port->type = SAA7164_MPEG_ENCODER;
+       else
+               BUG();
+
+       /* Init all the critical resources */
+       mutex_init(&port->dvb.lock);
+       INIT_LIST_HEAD(&port->dmaqueue.list);
+       mutex_init(&port->dmaqueue_lock);
+
+       INIT_LIST_HEAD(&port->list_buf_used.list);
+       INIT_LIST_HEAD(&port->list_buf_free.list);
+       init_waitqueue_head(&port->wait_read);
+       return 0;
+}
+
 static int saa7164_dev_setup(struct saa7164_dev *dev)
 {
        int i;
@@ -443,21 +550,11 @@ static int saa7164_dev_setup(struct saa7164_dev *dev)
        dev->i2c_bus[2].dev = dev;
        dev->i2c_bus[2].nr = 2;
 
-       /* Transport port A Defaults / setup */
-       dev->ts1.dev = dev;
-       dev->ts1.nr = 0;
-       dev->ts1.type = SAA7164_MPEG_UNDEFINED;
-       mutex_init(&dev->ts1.dvb.lock);
-       INIT_LIST_HEAD(&dev->ts1.dmaqueue.list);
-       mutex_init(&dev->ts1.dmaqueue_lock);
-
-       /* Transport port B Defaults / setup */
-       dev->ts2.dev = dev;
-       dev->ts2.nr = 1;
-       dev->ts2.type = SAA7164_MPEG_UNDEFINED;
-       mutex_init(&dev->ts2.dvb.lock);
-       INIT_LIST_HEAD(&dev->ts2.dmaqueue.list);
-       mutex_init(&dev->ts2.dmaqueue_lock);
+       /* Transport + Encoder ports 1, 2, 3, 4 - Defaults / setup */
+       saa7164_port_init(dev, SAA7164_PORT_TS1);
+       saa7164_port_init(dev, SAA7164_PORT_TS2);
+       saa7164_port_init(dev, SAA7164_PORT_ENC1);
+       saa7164_port_init(dev, SAA7164_PORT_ENC2);
 
        if (get_resources(dev) < 0) {
                printk(KERN_ERR "CORE %s No more PCIe resources for "
@@ -631,7 +728,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
 
                /* Begin to create the video sub-systems and register funcs */
                if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) {
-                       if (saa7164_dvb_register(&dev->ts1) < 0) {
+                       if (saa7164_dvb_register(&dev->ports[ SAA7164_PORT_TS1 ]) < 0) {
                                printk(KERN_ERR "%s() Failed to register "
                                        "dvb adapters on porta\n",
                                        __func__);
@@ -639,13 +736,27 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
                }
 
                if (saa7164_boards[dev->board].portb == SAA7164_MPEG_DVB) {
-                       if (saa7164_dvb_register(&dev->ts2) < 0) {
+                       if (saa7164_dvb_register(&dev->ports[ SAA7164_PORT_TS2 ]) < 0) {
                                printk(KERN_ERR"%s() Failed to register "
                                        "dvb adapters on portb\n",
                                        __func__);
                        }
                }
 
+               if (saa7164_boards[dev->board].portc == SAA7164_MPEG_ENCODER) {
+                       if (saa7164_encoder_register(&dev->ports[ SAA7164_PORT_ENC1 ]) < 0) {
+                               printk(KERN_ERR"%s() Failed to register "
+                                       "mpeg encoder\n", __func__);
+                       }
+               }
+
+               if (saa7164_boards[dev->board].portd == SAA7164_MPEG_ENCODER) {
+                       if (saa7164_encoder_register(&dev->ports[ SAA7164_PORT_ENC2 ]) < 0) {
+                               printk(KERN_ERR"%s() Failed to register "
+                                       "mpeg encoder\n", __func__);
+                       }
+               }
+
        } /* != BOARD_UNKNOWN */
        else
                printk(KERN_ERR "%s() Unsupported board detected, "
@@ -676,10 +787,16 @@ static void __devexit saa7164_finidev(struct pci_dev *pci_dev)
        saa7164_shutdown(dev);
 
        if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB)
-               saa7164_dvb_unregister(&dev->ts1);
+               saa7164_dvb_unregister(&dev->ports[ SAA7164_PORT_TS1 ]);
 
        if (saa7164_boards[dev->board].portb == SAA7164_MPEG_DVB)
-               saa7164_dvb_unregister(&dev->ts2);
+               saa7164_dvb_unregister(&dev->ports[ SAA7164_PORT_TS2 ]);
+
+       if (saa7164_boards[dev->board].portc == SAA7164_MPEG_ENCODER)
+               saa7164_encoder_unregister(&dev->ports[ SAA7164_PORT_ENC1 ]);
+
+       if (saa7164_boards[dev->board].portd == SAA7164_MPEG_ENCODER)
+               saa7164_encoder_unregister(&dev->ports[ SAA7164_PORT_ENC2 ]);
 
        saa7164_i2c_unregister(&dev->i2c_bus[0]);
        saa7164_i2c_unregister(&dev->i2c_bus[1]);
index eae0e1b..74aec26 100644 (file)
 
 #include "saa7164.h"
 
+#define ENCODER_MAX_BITRATE 6500000
+#define ENCODER_MIN_BITRATE 1000000
+#define ENCODER_DEF_BITRATE 5000000
+
+static struct saa7164_tvnorm saa7164_tvnorms[] = {
+       {
+               .name      = "NTSC-M",
+               .id        = V4L2_STD_NTSC_M,
+       }, {
+               .name      = "NTSC-JP",
+               .id        = V4L2_STD_NTSC_M_JP,
+       }
+};
+
+static const u32 saa7164_v4l2_ctrls[] = {
+       V4L2_CID_BRIGHTNESS,
+       V4L2_CID_CONTRAST,
+       V4L2_CID_SATURATION,
+       V4L2_CID_HUE,
+       V4L2_CID_AUDIO_VOLUME,
+       V4L2_CID_SHARPNESS,
+       V4L2_CID_MPEG_VIDEO_ASPECT,
+       V4L2_CID_MPEG_STREAM_TYPE,
+       V4L2_CID_MPEG_AUDIO_MUTE,
+       V4L2_CID_MPEG_VIDEO_BITRATE,
+       0
+};
+
+/* Take the encoder configuration form the port struct and
+ * flush it to the hardware.
+ */
+static void saa7164_encoder_configure(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       port->encoder_params.width = port->width;
+       port->encoder_params.height = port->height;
+       port->encoder_params.is_50hz =
+               (port->encodernorm.id & V4L2_STD_625_50) != 0;
+
+       /* Set up the DIF (enable it) for analog mode by default */
+       saa7164_api_initialize_dif(port);
+
+       /* Configure the correct video standard */
+       saa7164_api_configure_dif(port, port->encodernorm.id);
+
+       /* Ensure the audio decoder is correct configured */
+       saa7164_api_set_audio_std(port);
+}
+
+/* One time configuration at registration time */
+static int saa7164_encoder_initialize(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       saa7164_encoder_configure(port);
+
+       return 0;
+}
+
+/* -- V4L2 --------------------------------------------------------- */
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *id)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+       unsigned int i;
+
+       dprintk(DBGLVL_ENC, "%s(id=0x%x)\n", __func__, (u32)*id);
+
+       for (i = 0; i < ARRAY_SIZE(saa7164_tvnorms); i++) {
+               if (*id & saa7164_tvnorms[i].id)
+                       break;
+       }
+       if (i == ARRAY_SIZE(saa7164_tvnorms))
+               return -EINVAL;
+
+       port->encodernorm = saa7164_tvnorms[i];
+
+       /* Update the audio decoder while is not running in
+        * auto detect mode.
+        */
+       saa7164_api_set_audio_std(port);
+
+       dprintk(DBGLVL_ENC, "%s(id=0x%x) OK\n", __func__, (u32)*id);
+
+       return 0;
+}
+
+static int vidioc_enum_input(struct file *file, void *priv,
+       struct v4l2_input *i)
+{
+       int n;
+
+       char *inputs[] = { "tuner", "composite", "svideo", "aux",
+               "composite", "svideo", "aux" };
+
+       if (i->index >= 7)
+               return -EINVAL;
+
+       strcpy(i->name, inputs[ i->index ]);
+
+       if (i->index == 0)
+               i->type = V4L2_INPUT_TYPE_TUNER;
+       else
+               i->type  = V4L2_INPUT_TYPE_CAMERA;
+
+       for (n = 0; n < ARRAY_SIZE(saa7164_tvnorms); n++)
+               i->std |= saa7164_tvnorms[n].id;
+
+       return 0;
+}
+
+static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       if (saa7164_api_get_videomux(port) != SAA_OK)
+               return -EIO;
+
+       *i = (port->mux_input - 1);
+
+       dprintk(DBGLVL_ENC, "%s() input=%d\n", __func__, *i);
+
+       return 0;
+}
+
+static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       dprintk(DBGLVL_ENC, "%s() input=%d\n", __func__, i);
+
+       if (i >= 7)
+               return -EINVAL;
+
+       port->mux_input = i + 1;
+
+       if (saa7164_api_set_videomux(port) != SAA_OK)
+               return -EIO;
+
+       return 0;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv,
+       struct v4l2_tuner *t)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       if (0 != t->index)
+               return -EINVAL;
+
+       strcpy(t->name, "tuner");
+       t->type = V4L2_TUNER_ANALOG_TV;
+       t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO;
+
+       dprintk(DBGLVL_ENC, "VIDIOC_G_TUNER: tuner type %d\n", t->type);
+
+       return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv,
+       struct v4l2_tuner *t)
+{
+
+       /* Update the A/V core */
+
+       return 0;
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+       struct v4l2_frequency *f)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+
+       f->type = V4L2_TUNER_ANALOG_TV;
+       f->frequency = port->freq;
+
+       return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+       struct v4l2_frequency *f)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_port *tsport;
+       struct dvb_frontend *fe;
+
+       /* TODO: Pull this for the std */
+       struct analog_parameters params = {
+               .mode      = V4L2_TUNER_ANALOG_TV,
+               .audmode   = V4L2_TUNER_MODE_STEREO,
+               .std       = port->encodernorm.id,
+               .frequency = f->frequency
+       };
+
+       /* Stop the encoder */
+       dprintk(DBGLVL_ENC, "%s() frequency=%d tuner=%d\n", __func__,
+               f->frequency, f->tuner);
+
+       if (f->tuner != 0)
+               return -EINVAL;
+
+       if (f->type != V4L2_TUNER_ANALOG_TV)
+               return -EINVAL;
+
+       port->freq = f->frequency;
+
+       /* Update the hardware */
+       if (port->nr == SAA7164_PORT_ENC1)
+               tsport = &dev->ports[ SAA7164_PORT_TS1 ];
+       else
+       if (port->nr == SAA7164_PORT_ENC2)
+               tsport = &dev->ports[ SAA7164_PORT_TS2 ];
+       else
+               BUG();
+
+       fe = tsport->dvb.frontend;
+
+       if (fe && fe->ops.tuner_ops.set_analog_params)
+               fe->ops.tuner_ops.set_analog_params(fe, &params);
+       else
+               printk(KERN_ERR "%s() No analog tuner, aborting\n", __func__);
+
+       saa7164_encoder_initialize(port);
+
+       return 0;
+}
+
+static int vidioc_g_ctrl(struct file *file, void *priv,
+       struct v4l2_control *ctl)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       dprintk(DBGLVL_ENC, "%s(id=%d, value=%d)\n", __func__,
+               ctl->id, ctl->value);
+
+       switch (ctl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               ctl->value = port->ctl_brightness;
+               break;
+       case V4L2_CID_CONTRAST:
+               ctl->value = port->ctl_contrast;
+               break;
+       case V4L2_CID_SATURATION:
+               ctl->value = port->ctl_saturation;
+               break;
+       case V4L2_CID_HUE:
+               ctl->value = port->ctl_hue;
+               break;
+       case V4L2_CID_SHARPNESS:
+               ctl->value = port->ctl_sharpness;
+               break;
+       case V4L2_CID_AUDIO_VOLUME:
+               ctl->value = port->ctl_volume;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int vidioc_s_ctrl(struct file *file, void *priv,
+       struct v4l2_control *ctl)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+       int ret = 0;
+
+       dprintk(DBGLVL_ENC, "%s(id=%d, value=%d)\n", __func__,
+               ctl->id, ctl->value);
+
+       switch (ctl->id) {
+       case V4L2_CID_BRIGHTNESS:
+               if ((ctl->value >= 0) && (ctl->value <= 255)) {
+                       port->ctl_brightness = ctl->value;
+                       saa7164_api_set_usercontrol(port,
+                               PU_BRIGHTNESS_CONTROL);
+               } else
+                       ret = -EINVAL;
+               break;
+       case V4L2_CID_CONTRAST:
+               if ((ctl->value >= 0) && (ctl->value <= 255)) {
+                       port->ctl_contrast = ctl->value;
+                       saa7164_api_set_usercontrol(port, PU_CONTRAST_CONTROL);
+               } else
+                       ret = -EINVAL;
+               break;
+       case V4L2_CID_SATURATION:
+               if ((ctl->value >= 0) && (ctl->value <= 255)) {
+                       port->ctl_saturation = ctl->value;
+                       saa7164_api_set_usercontrol(port,
+                               PU_SATURATION_CONTROL);
+               } else
+                       ret = -EINVAL;
+               break;
+       case V4L2_CID_HUE:
+               if ((ctl->value >= 0) && (ctl->value <= 255)) {
+                       port->ctl_hue = ctl->value;
+                       saa7164_api_set_usercontrol(port, PU_HUE_CONTROL);
+               } else
+                       ret = -EINVAL;
+               break;
+       case V4L2_CID_SHARPNESS:
+               if ((ctl->value >= 0) && (ctl->value <= 255)) {
+                       port->ctl_sharpness = ctl->value;
+                       saa7164_api_set_usercontrol(port, PU_SHARPNESS_CONTROL);
+               } else
+                       ret = -EINVAL;
+               break;
+       case V4L2_CID_AUDIO_VOLUME:
+               if ((ctl->value >= -83) && (ctl->value <= 24)) {
+                       port->ctl_volume = ctl->value;
+                       saa7164_api_set_audio_volume(port, port->ctl_volume);
+               } else
+                       ret = -EINVAL;
+               break;
+       default:
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static int saa7164_get_ctrl(struct saa7164_port *port,
+       struct v4l2_ext_control *ctrl)
+{
+       struct saa7164_encoder_params *params = &port->encoder_params;
+
+       switch (ctrl->id) {
+       case V4L2_CID_MPEG_VIDEO_BITRATE:
+               ctrl->value = params->bitrate;
+               break;
+       case V4L2_CID_MPEG_STREAM_TYPE:
+               ctrl->value = params->stream_type;
+               break;
+       case V4L2_CID_MPEG_AUDIO_MUTE:
+               ctrl->value = params->ctl_mute;
+               break;
+       case V4L2_CID_MPEG_VIDEO_ASPECT:
+               ctrl->value = params->ctl_aspect;
+               break;
+       default:
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int vidioc_g_ext_ctrls(struct file *file, void *priv,
+       struct v4l2_ext_controls *ctrls)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       int i, err = 0;
+
+       if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
+               for (i = 0; i < ctrls->count; i++) {
+                       struct v4l2_ext_control *ctrl = ctrls->controls + i;
+
+                       err = saa7164_get_ctrl(port, ctrl);
+                       if (err) {
+                               ctrls->error_idx = i;
+                               break;
+                       }
+               }
+               return err;
+
+       }
+
+       return -EINVAL;
+}
+
+static int saa7164_try_ctrl(struct v4l2_ext_control *ctrl, int ac3)
+{
+       int ret = -EINVAL;
+
+       switch (ctrl->id) {
+       case V4L2_CID_MPEG_VIDEO_BITRATE:
+               if ((ctrl->value >= ENCODER_MIN_BITRATE) &&
+                       (ctrl->value <= ENCODER_MAX_BITRATE))
+                       ret = 0;
+               break;
+       case V4L2_CID_MPEG_STREAM_TYPE:
+               if (ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_PS)
+                       ret = 0;
+               break;
+       case V4L2_CID_MPEG_AUDIO_MUTE:
+               if ((ctrl->value >= 0) &&
+                       (ctrl->value <= 1))
+                       ret = 0;
+               break;
+       case V4L2_CID_MPEG_VIDEO_ASPECT:
+               if ((ctrl->value >= V4L2_MPEG_VIDEO_ASPECT_1x1) &&
+                       (ctrl->value <= V4L2_MPEG_VIDEO_ASPECT_221x100))
+                       ret = 0;
+               break;
+       case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
+               if ((ctrl->value >= 0) &&
+                       (ctrl->value <= 255))
+                       ret = 0;
+               break;
+       default:
+               ret = -EINVAL;
+       }
+
+       return ret;
+}
+
+static int vidioc_try_ext_ctrls(struct file *file, void *priv,
+       struct v4l2_ext_controls *ctrls)
+{
+       int i, err = 0;
+
+       if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
+               for (i = 0; i < ctrls->count; i++) {
+                       struct v4l2_ext_control *ctrl = ctrls->controls + i;
+
+                       err = saa7164_try_ctrl(ctrl, 0);
+                       if (err) {
+                               ctrls->error_idx = i;
+                               break;
+                       }
+               }
+               return err;
+       }
+
+       return -EINVAL;
+}
+
+static int saa7164_set_ctrl(struct saa7164_port *port,
+       struct v4l2_ext_control *ctrl)
+{
+       struct saa7164_encoder_params *params = &port->encoder_params;
+       int ret = 0;
+
+       switch (ctrl->id) {
+       case V4L2_CID_MPEG_VIDEO_BITRATE:
+               params->bitrate = ctrl->value;
+               break;
+       case V4L2_CID_MPEG_STREAM_TYPE:
+               params->stream_type = ctrl->value;
+               break;
+       case V4L2_CID_MPEG_AUDIO_MUTE:
+               params->ctl_mute = ctrl->value;
+               ret = saa7164_api_audio_mute(port, params->ctl_mute);
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
+                               ret);
+                       ret = -EIO;
+               }
+               break;
+       case V4L2_CID_MPEG_VIDEO_ASPECT:
+               params->ctl_aspect = ctrl->value;
+               ret = saa7164_api_set_aspect_ratio(port);
+               if (ret != SAA_OK) {
+                       printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__,
+                               ret);
+                       ret = -EIO;
+               }
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* TODO: Update the hardware */
+
+       return ret;
+}
+
+static int vidioc_s_ext_ctrls(struct file *file, void *priv,
+       struct v4l2_ext_controls *ctrls)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       int i, err = 0;
+
+       if (ctrls->ctrl_class == V4L2_CTRL_CLASS_MPEG) {
+               for (i = 0; i < ctrls->count; i++) {
+                       struct v4l2_ext_control *ctrl = ctrls->controls + i;
+
+                       err = saa7164_try_ctrl(ctrl, 0);
+                       if (err) {
+                               ctrls->error_idx = i;
+                               break;
+                       }
+                       err = saa7164_set_ctrl(port, ctrl);
+                       if (err) {
+                               ctrls->error_idx = i;
+                               break;
+                       }
+               }
+               return err;
+
+       }
+
+       return -EINVAL;
+}
+
+static int vidioc_querycap(struct file *file, void  *priv,
+       struct v4l2_capability *cap)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       strcpy(cap->driver, dev->name);
+       strlcpy(cap->card, saa7164_boards[dev->board].name,
+               sizeof(cap->card));
+       sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
+
+       cap->capabilities =
+               V4L2_CAP_VIDEO_CAPTURE |
+               V4L2_CAP_READWRITE     |
+               V4L2_CAP_STREAMING     |
+               0;
+
+       cap->capabilities |= V4L2_CAP_TUNER;
+       cap->version = 0;
+
+       return 0;
+}
+
+static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
+       struct v4l2_fmtdesc *f)
+{
+       if (f->index != 0)
+               return -EINVAL;
+
+       strlcpy(f->description, "MPEG", sizeof(f->description));
+       f->pixelformat = V4L2_PIX_FMT_MPEG;
+
+       return 0;
+}
+
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+       f->fmt.pix.bytesperline = 0;
+       f->fmt.pix.sizeimage    =
+               port->ts_packet_size * port->ts_packet_count;
+       f->fmt.pix.colorspace   = 0;
+       f->fmt.pix.width        = port->width;
+       f->fmt.pix.height       = port->height;
+
+       dprintk(DBGLVL_ENC, "VIDIOC_G_FMT: w: %d, h: %d\n",
+               port->width, port->height);
+
+       return 0;
+}
+
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+       f->fmt.pix.bytesperline = 0;
+       f->fmt.pix.sizeimage    =
+               port->ts_packet_size * port->ts_packet_count;
+       f->fmt.pix.colorspace   = 0;
+       dprintk(DBGLVL_ENC, "VIDIOC_TRY_FMT: w: %d, h: %d\n",
+               port->width, port->height);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                               struct v4l2_format *f)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+       f->fmt.pix.bytesperline = 0;
+       f->fmt.pix.sizeimage    =
+               port->ts_packet_size * port->ts_packet_count;
+       f->fmt.pix.colorspace   = 0;
+
+       dprintk(DBGLVL_ENC, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
+               f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
+
+       return 0;
+}
+
+static int vidioc_log_status(struct file *file, void *priv)
+{
+       return 0;
+}
+
+static int fill_queryctrl(struct saa7164_encoder_params *params,
+       struct v4l2_queryctrl *c)
+{
+       switch (c->id) {
+       case V4L2_CID_BRIGHTNESS:
+               return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 127);
+       case V4L2_CID_CONTRAST:
+               return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 66);
+       case V4L2_CID_SATURATION:
+               return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 62);
+       case V4L2_CID_HUE:
+               return v4l2_ctrl_query_fill(c, 0x0, 0xff, 1, 128);
+       case V4L2_CID_SHARPNESS:
+               return v4l2_ctrl_query_fill(c, 0x0, 0x0f, 1, 8);
+       case V4L2_CID_MPEG_AUDIO_MUTE:
+               return v4l2_ctrl_query_fill(c, 0x0, 0x01, 1, 0);
+       case V4L2_CID_AUDIO_VOLUME:
+               return v4l2_ctrl_query_fill(c, -83, 24, 1, 20);
+       case V4L2_CID_MPEG_VIDEO_BITRATE:
+               return v4l2_ctrl_query_fill(c,
+                       ENCODER_MIN_BITRATE, ENCODER_MAX_BITRATE,
+                       100000, ENCODER_DEF_BITRATE);
+       case V4L2_CID_MPEG_STREAM_TYPE:
+               return v4l2_ctrl_query_fill(c,
+                       V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
+                       V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
+                       0, V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
+       case V4L2_CID_MPEG_VIDEO_ASPECT:
+               return v4l2_ctrl_query_fill(c,
+                       V4L2_MPEG_VIDEO_ASPECT_1x1,
+                       V4L2_MPEG_VIDEO_ASPECT_221x100,
+                       1, V4L2_MPEG_VIDEO_ASPECT_4x3);
+       case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
+               return v4l2_ctrl_query_fill(c, 1, 255, 1, 15);
+       default:
+               return -EINVAL;
+       }
+}
+
+static int vidioc_queryctrl(struct file *file, void *priv,
+       struct v4l2_queryctrl *c)
+{
+       struct saa7164_fh *fh = priv;
+       struct saa7164_port *port = fh->port;
+       int i, next;
+       u32 id = c->id;
+
+       memset(c, 0, sizeof(*c));
+
+       next = !!(id & V4L2_CTRL_FLAG_NEXT_CTRL);
+       c->id = id & ~V4L2_CTRL_FLAG_NEXT_CTRL;
+
+       for (i = 0; i < ARRAY_SIZE(saa7164_v4l2_ctrls); i++) {
+               if (next) {
+                       if (c->id < saa7164_v4l2_ctrls[i])
+                               c->id = saa7164_v4l2_ctrls[i];
+                       else
+                               continue;
+               }
+
+               if (c->id == saa7164_v4l2_ctrls[i])
+                       return fill_queryctrl(&port->encoder_params, c);
+
+               if (c->id < saa7164_v4l2_ctrls[i])
+                       break;
+       }
+
+       return -EINVAL;
+}
+
+static int saa7164_encoder_stop_port(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() stop transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_ENC, "%s()    Stopped\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+static int saa7164_encoder_acquire_port(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() acquire transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_ENC, "%s() Acquired\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+static int saa7164_encoder_pause_port(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int ret;
+
+       ret = saa7164_api_transition_port(port, SAA_DMASTATE_PAUSE);
+       if ((ret != SAA_OK) && (ret != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() pause transition failed, ret = 0x%x\n",
+                       __func__, ret);
+               ret = -EIO;
+       } else {
+               dprintk(DBGLVL_ENC, "%s()   Paused\n", __func__);
+               ret = 0;
+       }
+
+       return ret;
+}
+
+/* Firmware is very windows centric, meaning you have to transition
+ * the part through AVStream / KS Windows stages, forwards or backwards.
+ * States are: stopped, acquired (h/w), paused, started.
+ * We have to leave here will all of the soft buffers on the free list,
+ * else the cfg_post() func won't have soft buffers to correctly configure.
+ */
+static int saa7164_encoder_stop_streaming(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct saa7164_user_buffer *ubuf;
+       struct list_head *c, *n;
+       int ret;
+
+       dprintk(DBGLVL_ENC, "%s(port=%d)\n", __func__, port->nr);
+
+       ret = saa7164_encoder_pause_port(port);
+       ret = saa7164_encoder_acquire_port(port);
+       ret = saa7164_encoder_stop_port(port);
+
+       dprintk(DBGLVL_ENC, "%s(port=%d) Hardware stopped\n", __func__,
+               port->nr);
+
+       mutex_lock(&port->dmaqueue_lock);
+
+       /* Reset the hard and soft buffer state */
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               buf = list_entry(c, struct saa7164_buffer, list);
+               buf->flags = SAA7164_BUFFER_FREE;
+               buf->pos = 0;
+       }
+
+       list_for_each_safe(c, n, &port->list_buf_used.list) {
+               ubuf = list_entry(c, struct saa7164_user_buffer, list);
+               ubuf->pos = 0;
+               list_move_tail(&ubuf->list, &port->list_buf_free.list);
+       }
+
+       mutex_unlock(&port->dmaqueue_lock);
+       dprintk(DBGLVL_ENC, "%s(port=%d) Released\n", __func__, port->nr);
+
+       return ret;
+}
+
+static int saa7164_encoder_start_streaming(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       int result, ret = 0;
+
+       dprintk(DBGLVL_ENC, "%s(port=%d)\n", __func__, port->nr);
+
+       /* Configure the encoder with any cache values */
+       saa7164_api_set_encoder(port);
+
+       saa7164_buffer_cfg_port(port);
+
+       /* Acquire the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_ACQUIRE);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() acquire transition failed, res = 0x%x\n",
+                       __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() acquire/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+               ret = -EIO;
+               goto out;
+       } else
+               dprintk(DBGLVL_ENC, "%s()   Acquired\n", __func__);
+
+       /* Pause the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_PAUSE);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() pause transition failed, res = 0x%x\n",
+                               __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() pause/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+
+               ret = -EIO;
+               goto out;
+       } else
+               dprintk(DBGLVL_ENC, "%s()   Paused\n", __func__);
+
+       /* Start the hardware */
+       result = saa7164_api_transition_port(port, SAA_DMASTATE_RUN);
+       if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+               printk(KERN_ERR "%s() run transition failed, result = 0x%x\n",
+                               __func__, result);
+
+               /* Stop the hardware, regardless */
+               result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
+               if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
+                       printk(KERN_ERR "%s() run/forced stop transition "
+                               "failed, res = 0x%x\n", __func__, result);
+               }
+
+               ret = -EIO;
+       } else
+               dprintk(DBGLVL_ENC, "%s()   Running\n", __func__);
+
+out:
+       return ret;
+}
+
+static int fops_open(struct file *file)
+{
+       struct saa7164_dev *h, *dev = NULL;
+       struct saa7164_port *port = NULL;
+       struct saa7164_port *portc = NULL;
+       struct saa7164_port *portd = NULL;
+       struct saa7164_fh *fh;
+       struct list_head *list;
+       int minor = video_devdata(file)->minor;
+
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       /* TODO: Really, the BKL? - remove this */
+       lock_kernel();
+       list_for_each(list, &saa7164_devlist) {
+               h = list_entry(list, struct saa7164_dev, devlist);
+
+               portc = &h->ports[ SAA7164_PORT_ENC1 ];
+               portd = &h->ports[ SAA7164_PORT_ENC2 ];
+
+               if (portc->v4l_device &&
+                   portc->v4l_device->minor == minor) {
+                       dev = h;
+                       port = portc;
+                       break;
+               }
+
+               if (portd->v4l_device &&
+                   portd->v4l_device->minor == minor) {
+                       dev = h;
+                       port = portd;
+                       break;
+               }
+
+       }
+
+       if (port == NULL) {
+               unlock_kernel();
+               return -ENODEV;
+       }
+
+       /* allocate + initialize per filehandle data */
+       fh = kzalloc(sizeof(*fh), GFP_KERNEL);
+       if (NULL == fh) {
+               unlock_kernel();
+               return -ENOMEM;
+       }
+
+       file->private_data = fh;
+       fh->port = port;
+
+       unlock_kernel();
+
+       return 0;
+}
+
+static int fops_release(struct file *file)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_dev *dev = port->dev;
+
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       /* Shut device down on last close */
+       if (atomic_cmpxchg(&fh->v4l_reading, 1, 0) == 1) {
+               if (atomic_dec_return(&port->v4l_reader_count) == 0) {
+                       /* stop mpeg capture then cancel buffers */
+                       saa7164_encoder_stop_streaming(port);
+               }
+       }
+
+       file->private_data = NULL;
+       kfree(fh);
+
+       return 0;
+}
+
+struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
+{
+       struct saa7164_user_buffer *buf = 0;
+       struct saa7164_dev *dev = port->dev;
+
+       mutex_lock(&port->dmaqueue_lock);
+       if (!list_empty(&port->list_buf_used.list)) {
+               buf = list_first_entry(&port->list_buf_used.list,
+                       struct saa7164_user_buffer, list);
+       }
+       mutex_unlock(&port->dmaqueue_lock);
+
+       dprintk(DBGLVL_ENC, "%s() returns %p\n", __func__, buf);
+
+       return buf;
+}
+
+static ssize_t fops_read(struct file *file, char __user *buffer,
+       size_t count, loff_t *pos)
+{
+       struct saa7164_fh *fh = file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_user_buffer *ubuf = NULL;
+       struct saa7164_dev *dev = port->dev;
+       unsigned int ret = 0;
+       int rem, cnt;
+       u8 *p;
+
+       if (*pos)
+               return -ESPIPE;
+
+       if (atomic_cmpxchg(&fh->v4l_reading, 0, 1) == 0) {
+               if (atomic_inc_return(&port->v4l_reader_count) == 1) {
+
+                       if (saa7164_encoder_initialize(port) < 0)
+                               return -EINVAL;
+
+                       saa7164_encoder_start_streaming(port);
+                       msleep(200);
+               }
+       }
+
+       /* blocking wait for buffer */
+       if ((file->f_flags & O_NONBLOCK) == 0) {
+               if (wait_event_interruptible(port->wait_read,
+                       saa7164_enc_next_buf(port))) {
+                               return -ERESTARTSYS;
+               }
+       }
+
+       /* Pull the first buffer from the used list */
+       ubuf = saa7164_enc_next_buf(port);
+
+       while ((count > 0) && ubuf) {
+
+               /* set remaining bytes to copy */
+               rem = ubuf->actual_size - ubuf->pos;
+               cnt = rem > count ? count : rem;
+
+               p = ubuf->data + ubuf->pos;
+
+               dprintk(DBGLVL_ENC,
+                       "%s() count=%d cnt=%d rem=%d buf=%p buf->pos=%d\n",
+                       __func__, (int)count, cnt, rem, ubuf, ubuf->pos);
+
+               if (copy_to_user(buffer, p, cnt)) {
+                       printk(KERN_ERR "%s() copy_to_user failed\n", __func__);
+                       if (!ret)
+                               ret = -EFAULT;
+                       goto err;
+               }
+
+               ubuf->pos += cnt;
+               count -= cnt;
+               buffer += cnt;
+               ret += cnt;
+
+               if (ubuf->pos == ubuf->actual_size) {
+
+                       /* finished with current buffer, take next buffer */
+
+                       /* Requeue the buffer on the free list */
+                       ubuf->pos = 0;
+
+                       mutex_lock(&port->dmaqueue_lock);
+                       list_move_tail(&ubuf->list, &port->list_buf_free.list);
+                       mutex_unlock(&port->dmaqueue_lock);
+
+                       /* Dequeue next */
+                       if ((file->f_flags & O_NONBLOCK) == 0) {
+                               if (wait_event_interruptible(port->wait_read,
+                                       saa7164_enc_next_buf(port))) {
+                                               break;
+                               }
+                       }
+                       ubuf = saa7164_enc_next_buf(port);
+               }
+       }
+err:
+       if (!ret && !ubuf)
+               ret = -EAGAIN;
+
+       return ret;
+}
+
+static unsigned int fops_poll(struct file *file, poll_table *wait)
+{
+       struct saa7164_fh *fh = (struct saa7164_fh *)file->private_data;
+       struct saa7164_port *port = fh->port;
+       struct saa7164_user_buffer *ubuf;
+       unsigned int mask = 0;
+
+       if (!video_is_registered(port->v4l_device)) {
+               return -EIO;
+       }
+
+       if (atomic_cmpxchg(&fh->v4l_reading, 0, 1) == 0) {
+               if (atomic_inc_return(&port->v4l_reader_count) == 1) {
+                       if (saa7164_encoder_initialize(port) < 0)
+                               return -EINVAL;
+                       saa7164_encoder_start_streaming(port);
+                       msleep(200);
+               }
+       }
+
+       /* blocking wait for buffer */
+       if ((file->f_flags & O_NONBLOCK) == 0) {
+               if (wait_event_interruptible(port->wait_read,
+                       saa7164_enc_next_buf(port))) {
+                               return -ERESTARTSYS;
+               }
+       }
+
+       /* Pull the first buffer from the used list */
+       ubuf = list_first_entry(&port->list_buf_used.list,
+               struct saa7164_user_buffer, list);
+
+       if (ubuf)
+               mask |= POLLIN | POLLRDNORM;
+
+       return mask;
+}
+
+static const struct v4l2_file_operations mpeg_fops = {
+       .owner          = THIS_MODULE,
+       .open           = fops_open,
+       .release        = fops_release,
+       .read           = fops_read,
+       .poll           = fops_poll,
+       .unlocked_ioctl = video_ioctl2,
+};
+
+int saa7164_g_chip_ident(struct file *file, void *fh,
+       struct v4l2_dbg_chip_ident *chip)
+{
+       struct saa7164_port *port = ((struct saa7164_fh *)fh)->port;
+       struct saa7164_dev *dev = port->dev;
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       return 0;
+}
+
+int saa7164_g_register(struct file *file, void *fh,
+       struct v4l2_dbg_register *reg)
+{
+       struct saa7164_port *port = ((struct saa7164_fh *)fh)->port;
+       struct saa7164_dev *dev = port->dev;
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       return 0;
+}
+
+int saa7164_s_register(struct file *file, void *fh,
+       struct v4l2_dbg_register *reg)
+{
+       struct saa7164_port *port = ((struct saa7164_fh *)fh)->port;
+       struct saa7164_dev *dev = port->dev;
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       if (!capable(CAP_SYS_ADMIN))
+               return -EPERM;
+
+       return 0;
+}
+
+static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
+       .vidioc_s_std            = vidioc_s_std,
+       .vidioc_enum_input       = vidioc_enum_input,
+       .vidioc_g_input          = vidioc_g_input,
+       .vidioc_s_input          = vidioc_s_input,
+       .vidioc_g_tuner          = vidioc_g_tuner,
+       .vidioc_s_tuner          = vidioc_s_tuner,
+       .vidioc_g_frequency      = vidioc_g_frequency,
+       .vidioc_s_frequency      = vidioc_s_frequency,
+       .vidioc_s_ctrl           = vidioc_s_ctrl,
+       .vidioc_g_ctrl           = vidioc_g_ctrl,
+       .vidioc_querycap         = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap    = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap  = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap    = vidioc_s_fmt_vid_cap,
+       .vidioc_g_ext_ctrls      = vidioc_g_ext_ctrls,
+       .vidioc_s_ext_ctrls      = vidioc_s_ext_ctrls,
+       .vidioc_try_ext_ctrls    = vidioc_try_ext_ctrls,
+       .vidioc_log_status       = vidioc_log_status,
+       .vidioc_queryctrl        = vidioc_queryctrl,
+       .vidioc_g_chip_ident     = saa7164_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register       = saa7164_g_register,
+       .vidioc_s_register       = saa7164_s_register,
+#endif
+};
+
+static struct video_device saa7164_mpeg_template = {
+       .name          = "saa7164",
+       .fops          = &mpeg_fops,
+       .ioctl_ops     = &mpeg_ioctl_ops,
+       .minor         = -1,
+       .tvnorms       = SAA7164_NORMS,
+       .current_norm  = V4L2_STD_NTSC_M,
+};
+
+static struct video_device *saa7164_encoder_alloc(
+       struct saa7164_port *port,
+       struct pci_dev *pci,
+       struct video_device *template,
+       char *type)
+{
+       struct video_device *vfd;
+       struct saa7164_dev *dev = port->dev;
+
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       vfd = video_device_alloc();
+       if (NULL == vfd)
+               return NULL;
+
+       *vfd = *template;
+       snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name,
+               type, saa7164_boards[dev->board].name);
+
+       vfd->parent  = &pci->dev;
+       vfd->release = video_device_release;
+       return vfd;
+}
+
+int saa7164_encoder_register(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct saa7164_user_buffer *ubuf;
+       int result = -ENODEV, i;
+       int len = 0;
+
+       dprintk(DBGLVL_ENC, "%s()\n", __func__);
+
+       if (port->type != SAA7164_MPEG_ENCODER)
+               BUG();
+
+       /* Sanity check that the PCI configuration space is active */
+       if (port->hwcfg.BARLocation == 0) {
+               printk(KERN_ERR "%s() failed "
+                      "(errno = %d), NO PCI configuration\n",
+                       __func__, result);
+               result = -ENOMEM;
+               goto failed;
+       }
+
+       /* Init and establish defaults */
+       /* TODO: Check the umber of lines for PS */
+       port->hw_streamingparams.bitspersample = 8;
+       port->hw_streamingparams.samplesperline = 188;
+       port->hw_streamingparams.numberoflines =
+               (SAA7164_TS_NUMBER_OF_LINES * 188) / 188;
+
+       port->hw_streamingparams.pitch = 188;
+       port->hw_streamingparams.linethreshold = 0;
+       port->hw_streamingparams.pagetablelistvirt = 0;
+       port->hw_streamingparams.pagetablelistphys = 0;
+       port->hw_streamingparams.numpagetables = 2 +
+               ((SAA7164_TS_NUMBER_OF_LINES * 188) / PAGE_SIZE);
+
+       port->hw_streamingparams.numpagetableentries = port->hwcfg.buffercount;
+
+       /* Allocate the PCI resources, buffers (hard) */
+       for (i = 0; i < port->hwcfg.buffercount; i++) {
+               buf = saa7164_buffer_alloc(port,
+                       port->hw_streamingparams.numberoflines *
+                       port->hw_streamingparams.pitch);
+
+               if (!buf) {
+                       printk(KERN_ERR "%s() failed "
+                              "(errno = %d), unable to allocate buffer\n",
+                               __func__, result);
+                       result = -ENOMEM;
+                       goto failed;
+               } else {
+
+                       mutex_lock(&port->dmaqueue_lock);
+                       list_add_tail(&buf->list, &port->dmaqueue.list);
+                       mutex_unlock(&port->dmaqueue_lock);
+
+               }
+       }
+
+       /* Allocate some kenrel kernel buffers for copying
+        * to userpsace.
+        */
+       len = port->hw_streamingparams.numberoflines *
+               port->hw_streamingparams.pitch;
+
+       for (i = 0; i < SAA7164_MAX_ENCODER_BUFFERS; i++) {
+
+               ubuf = saa7164_buffer_alloc_user(dev, len);
+               if (ubuf) {
+                       mutex_lock(&port->dmaqueue_lock);
+                       list_add_tail(&ubuf->list, &port->list_buf_free.list);
+                       mutex_unlock(&port->dmaqueue_lock);
+               }
+
+       }
+
+       /* Establish encoder defaults here */
+       /* Set default TV standard */
+       port->encodernorm = saa7164_tvnorms[0];
+       port->width = 720;
+       port->mux_input = 1; /* Composite */
+       port->encoder_profile = EU_PROFILE_PS_DVD;
+       port->video_format = EU_VIDEO_FORMAT_MPEG_2;
+       port->audio_format = 0;
+       port->video_resolution = 0;
+       port->ctl_brightness = 127;
+       port->ctl_contrast = 66;
+       port->ctl_hue = 128;
+       port->ctl_saturation = 62;
+       port->ctl_sharpness = 8;
+       port->encoder_params.bitrate = ENCODER_DEF_BITRATE;
+       port->encoder_params.stream_type = V4L2_MPEG_STREAM_TYPE_MPEG2_PS;
+       port->encoder_params.ctl_mute = 0;
+       port->encoder_params.ctl_aspect = V4L2_MPEG_VIDEO_ASPECT_4x3;
+
+       if (port->encodernorm.id & V4L2_STD_525_60)
+               port->height = 480;
+       else
+               port->height = 576;
+
+       /* Allocate and register the video device node */
+       port->v4l_device = saa7164_encoder_alloc(port,
+               dev->pci, &saa7164_mpeg_template, "mpeg");
+
+       if (port->v4l_device == NULL) {
+               printk(KERN_INFO "%s: can't allocate mpeg device\n",
+                       dev->name);
+               result = -ENOMEM;
+               goto failed;
+       }
+
+       result = video_register_device(port->v4l_device,
+               VFL_TYPE_GRABBER, -1);
+       if (result < 0) {
+               printk(KERN_INFO "%s: can't register mpeg device\n",
+                       dev->name);
+               /* TODO: We're going to leak here if we don't dealloc
+                The buffers above. The unreg function can't deal wit it.
+               */
+               goto failed;
+       }
+
+       printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
+               dev->name, port->v4l_device->num);
+
+       /* Configure the hardware defaults */
+       saa7164_api_set_videomux(port);
+       saa7164_api_set_usercontrol(port, PU_BRIGHTNESS_CONTROL);
+       saa7164_api_set_usercontrol(port, PU_CONTRAST_CONTROL);
+       saa7164_api_set_usercontrol(port, PU_HUE_CONTROL);
+       saa7164_api_set_usercontrol(port, PU_SATURATION_CONTROL);
+       saa7164_api_set_usercontrol(port, PU_SHARPNESS_CONTROL);
+       saa7164_api_audio_mute(port, 0);
+       saa7164_api_set_audio_volume(port, 20);
+       saa7164_api_set_aspect_ratio(port);
+
+       /* Disable audio standard detection, it's buggy */
+       saa7164_api_set_audio_detection(port, 0);
+
+       saa7164_api_set_encoder(port);
+       saa7164_api_get_encoder(port);
+
+       result = 0;
+failed:
+       return result;
+}
+
+void saa7164_encoder_unregister(struct saa7164_port *port)
+{
+       struct saa7164_dev *dev = port->dev;
+       struct saa7164_buffer *buf;
+       struct saa7164_user_buffer *ubuf;
+       struct list_head *c, *n, *p, *q, *l, *v;
+
+       dprintk(DBGLVL_ENC, "%s(port=%d)\n", __func__, port->nr);
+
+       if (port->type != SAA7164_MPEG_ENCODER)
+               BUG();
+
+       if (port->v4l_device) {
+               if (port->v4l_device->minor != -1)
+                       video_unregister_device(port->v4l_device);
+               else
+                       video_device_release(port->v4l_device);
+
+               port->v4l_device = NULL;
+       }
+
+       /* Remove any allocated buffers */
+       mutex_lock(&port->dmaqueue_lock);
+
+       dprintk(DBGLVL_ENC, "%s(port=%d) dmaqueue\n", __func__, port->nr);
+       list_for_each_safe(c, n, &port->dmaqueue.list) {
+               buf = list_entry(c, struct saa7164_buffer, list);
+               list_del(c);
+               saa7164_buffer_dealloc(buf);
+       }
+
+       dprintk(DBGLVL_ENC, "%s(port=%d) used\n", __func__, port->nr);
+       list_for_each_safe(p, q, &port->list_buf_used.list) {
+               ubuf = list_entry(p, struct saa7164_user_buffer, list);
+               list_del(p);
+               saa7164_buffer_dealloc_user(ubuf);
+       }
+
+       dprintk(DBGLVL_ENC, "%s(port=%d) free\n", __func__, port->nr);
+       list_for_each_safe(l, v, &port->list_buf_free.list) {
+               ubuf = list_entry(l, struct saa7164_user_buffer, list);
+               list_del(l);
+               saa7164_buffer_dealloc_user(ubuf);
+       }
+
+       mutex_unlock(&port->dmaqueue_lock);
+       dprintk(DBGLVL_ENC, "%s(port=%d) done\n", __func__, port->nr);
+}
+
index 1ca9bf2..ad39072 100644 (file)
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/kdev_t.h>
+#include <linux/version.h>
+#include <linux/mutex.h>
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/videobuf-dvb.h>
+#include <linux/smp_lock.h>
+#include <dvb_demux.h>
+#include <dvb_frontend.h>
+#include <dvb_net.h>
+#include <dvbdev.h>
+#include <dmxdev.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
 
 #include "saa7164-reg.h"
 #include "saa7164-types.h"
 
-#include <linux/version.h>
-#include <linux/mutex.h>
-
 #define SAA7164_MAXBOARDS 8
 
 #define UNSET (-1U)
 #define SAA7164_MAX_UNITS              8
 #define SAA7164_TS_NUMBER_OF_LINES     312
 #define SAA7164_PT_ENTRIES             16 /* (312 * 188) / 4096 */
+#define SAA7164_MAX_ENCODER_BUFFERS    16
+
+/* Port related defines */
+#define SAA7164_PORT_TS1       (0)
+#define SAA7164_PORT_TS2       (SAA7164_PORT_TS1 + 1)
+#define SAA7164_PORT_ENC1      (SAA7164_PORT_TS2 + 1)
+#define SAA7164_PORT_ENC2      (SAA7164_PORT_ENC1 + 1)
+#define SAA7164_MAX_PORTS      (SAA7164_PORT_ENC2 + 1)
 
 #define DBGLVL_FW    4
 #define DBGLVL_DVB   8
 #define DBGLVL_BUF 512
 #define DBGLVL_ENC 1024
 
+#define SAA7164_NORMS ( V4L2_STD_NTSC_M |  V4L2_STD_NTSC_M_JP |  V4L2_STD_NTSC_443 )
+
 enum port_t {
        SAA7164_MPEG_UNDEFINED = 0,
        SAA7164_MPEG_DVB,
@@ -136,7 +154,7 @@ struct saa7164_unit {
 
 struct saa7164_board {
        char    *name;
-       enum port_t porta, portb;
+       enum port_t porta, portb, portc, portd;
        enum {
                SAA7164_CHIP_UNDEFINED = 0,
                SAA7164_CHIP_REV2,
@@ -151,6 +169,22 @@ struct saa7164_subid {
        u32     card;
 };
 
+struct saa7164_fh {
+       struct saa7164_port *port;
+       u32 freq;
+       u32 tuner_type;
+       atomic_t v4l_reading;
+};
+
+struct saa7164_user_buffer {
+       struct list_head list;
+
+       /* Attributes */
+       u8  *data;
+       u32 pos;
+       u32 actual_size;
+};
+
 struct saa7164_fw_status {
 
        /* RISC Core details */
@@ -193,6 +227,30 @@ struct saa7164_i2c {
        u32                             i2c_rc;
 };
 
+struct saa7164_ctrl {
+       struct v4l2_queryctrl v;
+};
+
+struct saa7164_tvnorm {
+       char            *name;
+       v4l2_std_id     id;
+//     u32             cxiformat;
+//     u32             cxoformat;
+};
+
+struct saa7164_encoder_params {
+       struct saa7164_tvnorm encodernorm;
+       u32 height;
+       u32 width;
+       u32 is_50hz;
+       u32 bitrate; /* bps */
+       u32 stream_type; /* V4L2_MPEG_STREAM_TYPE_MPEG2_TS */
+
+       u32 audio_sampling_freq;
+       u32 ctl_mute;
+       u32 ctl_aspect;
+};
+
 struct saa7164_port;
 
 struct saa7164_buffer {
@@ -254,7 +312,42 @@ struct saa7164_port {
        struct saa7164_dvb dvb;
 
        /* --- Encoder/V4L related attributes --- */
-
+       /* Encoder */
+       /* Defaults established in saa7164-encoder.c */
+       struct saa7164_tvnorm encodernorm;
+       u32 height;
+       u32 width;
+       u32 freq;
+       u32 ts_packet_size;
+       u32 ts_packet_count;
+       u8 mux_input;
+       u8 encoder_profile;
+       u8 video_format;
+       u8 audio_format;
+       u8 video_resolution;
+       u16 ctl_brightness;
+       u16 ctl_contrast;
+       u16 ctl_hue;
+       u16 ctl_saturation;
+       u16 ctl_sharpness;
+       s8 ctl_volume;
+
+       tmComResAFeatureDescrHeader_t audfeat;
+       tmComResEncoderDescrHeader_t encunit;
+       tmComResProcDescrHeader_t vidproc;
+       tmComResExtDevDescrHeader_t ifunit;
+       tmComResTunerDescrHeader_t tunerunit;
+
+       /* V4L */
+       struct saa7164_encoder_params encoder_params;
+       struct video_device *v4l_device;
+       atomic_t v4l_reader_count;
+//     spinlock_t slock;
+//     struct mutex fops_lock;
+
+       struct saa7164_buffer list_buf_used;
+       struct saa7164_buffer list_buf_free;
+       wait_queue_head_t wait_read;
 };
 
 struct saa7164_dev {
@@ -297,7 +390,7 @@ struct saa7164_dev {
        struct saa7164_i2c i2c_bus[3];
 
        /* Transport related */
-       struct saa7164_port ts1, ts2;
+       struct saa7164_port ports[ SAA7164_MAX_PORTS ];
 
        /* Deferred command/api interrupts handling */
        struct work_struct workcmd;
@@ -355,6 +448,19 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen);
 int saa7164_api_set_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
 int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, u8 pin);
 int saa7164_api_transition_port(struct saa7164_port *port, u8 mode);
+int saa7164_api_initialize_dif(struct saa7164_port *port);
+int saa7164_api_configure_dif(struct saa7164_port *port, u32 std);
+int saa7164_api_set_encoder(struct saa7164_port *port);
+int saa7164_api_get_encoder(struct saa7164_port *port);
+int saa7164_api_set_aspect_ratio(struct saa7164_port *port);
+int saa7164_api_set_usercontrol(struct saa7164_port *port, u8 ctl);
+int saa7164_api_get_usercontrol(struct saa7164_port *port, u8 ctl);
+int saa7164_api_set_videomux(struct saa7164_port *port);
+int saa7164_api_audio_mute(struct saa7164_port *port, int mute);
+int saa7164_api_set_audio_volume(struct saa7164_port *port, s8 level);
+int saa7164_api_set_audio_std(struct saa7164_port *port);
+int saa7164_api_set_audio_detection(struct saa7164_port *port, int autodetect);
+int saa7164_api_get_videomux(struct saa7164_port *port);
 
 /* ----------------------------------------------------------- */
 /* saa7164-cards.c                                             */
@@ -385,6 +491,15 @@ extern int saa7164_buffer_dealloc(struct saa7164_buffer *buf);
 extern void saa7164_buffer_display(struct saa7164_buffer *buf);
 extern int saa7164_buffer_activate(struct saa7164_buffer *buf, int i);
 extern int saa7164_buffer_cfg_port(struct saa7164_port *port);
+extern struct saa7164_user_buffer *saa7164_buffer_alloc_user(
+       struct saa7164_dev *dev, u32 len);
+extern void saa7164_buffer_dealloc_user(struct saa7164_user_buffer *buf);
+
+
+/* ----------------------------------------------------------- */
+/* saa7164-encoder.c                                            */
+int saa7164_encoder_register(struct saa7164_port *port);
+void saa7164_encoder_unregister(struct saa7164_port *port);
 
 /* ----------------------------------------------------------- */