vserver 2.0 rc7
[linux-2.6.git] / drivers / media / common / saa7146_hlp.c
index 7bf6316..ec52dff 100644 (file)
@@ -4,7 +4,7 @@
 static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
 {
        /* clear out the necessary bits */
-       *clip_format &= 0x0000ffff;     
+       *clip_format &= 0x0000ffff;
        /* set these bits new */
        *clip_format |=  (( ((palette&0xf00)>>8) << 30) | ((palette&0x00f) << 24) | (((palette&0x0f0)>>4) << 16));
 }
@@ -21,7 +21,7 @@ static void calculate_hxo_and_hyo(struct saa7146_vv *vv, u32* hps_h_scale, u32*
 
        hyo = vv->standard->v_offset;
        hxo = vv->standard->h_offset;
-                               
+
        *hps_h_scale    &= ~(MASK_B0 | 0xf00);
        *hps_h_scale    |= (hxo <<  0);
 
@@ -40,7 +40,7 @@ static void calculate_hxo_and_hyo(struct saa7146_vv *vv, u32* hps_h_scale, u32*
 static struct {
        u16 hps_coeff;
        u16 weight_sum;
-} hps_h_coeff_tab [] = { 
+} hps_h_coeff_tab [] = {
        {0x00,   2}, {0x02,   4}, {0x00,   4}, {0x06,   8}, {0x02,   8},
        {0x08,   8}, {0x00,   8}, {0x1E,  16}, {0x0E,   8}, {0x26,   8},
        {0x06,   8}, {0x42,   8}, {0x02,   8}, {0x80,   8}, {0x00,   8},
@@ -65,11 +65,11 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
        u32* hps_ctrl, u32* hps_v_gain, u32* hps_h_prescale, u32* hps_h_scale)
 {
        /* horizontal prescaler */
-       u32 dcgx = 0, xpsc = 0, xacm = 0, cxy = 0, cxuv = 0;    
+       u32 dcgx = 0, xpsc = 0, xacm = 0, cxy = 0, cxuv = 0;
        /* horizontal scaler */
-       u32 xim = 0, xp = 0, xsci =0;                           
+       u32 xim = 0, xp = 0, xsci =0;
        /* vertical scale & gain */
-       u32 pfuv = 0;                                           
+       u32 pfuv = 0;
 
        /* helper variables */
        u32 h_atten = 0, i = 0;
@@ -77,29 +77,29 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
        if ( 0 == out_x ) {
                return -EINVAL;
        }
-       
+
        /* mask out vanity-bit */
        *hps_ctrl &= ~MASK_29;
-               
+
        /* calculate prescale-(xspc)-value:     [n   .. 1/2) : 1
-                                               [1/2 .. 1/3) : 2
-                                               [1/3 .. 1/4) : 3
-                                               ...             */
+                                               [1/2 .. 1/3) : 2
+                                               [1/3 .. 1/4) : 3
+                                               ...             */
        if (in_x > out_x) {
                xpsc = in_x / out_x;
        }
        else {
                /* zooming */
-               xpsc = 1;                                               
+               xpsc = 1;
        }
-       
+
        /* if flip_lr-bit is set, number of pixels after
           horizontal prescaling must be < 384 */
        if ( 0 != flip_lr ) {
-       
+
                /* set vanity bit */
                *hps_ctrl |= MASK_29;
-       
+
                while (in_x / xpsc >= 384 )
                        xpsc++;
        }
@@ -109,35 +109,35 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
                while ( in_x / xpsc >= 768 )
                        xpsc++;
        }
-       
+
        /* maximum prescale is 64 (p.69) */
        if ( xpsc > 64 )
                xpsc = 64;
 
        /* keep xacm clear*/
        xacm = 0;
-       
+
        /* set horizontal filter parameters (CXY = CXUV) */
        cxy = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].hps_coeff;
        cxuv = cxy;
-       
+
        /* calculate and set horizontal fine scale (xsci) */
-       
+
        /* bypass the horizontal scaler ? */
        if ( (in_x == out_x) && ( 1 == xpsc ) )
                xsci = 0x400;
-       else    
+       else
                xsci = ( (1024 * in_x) / (out_x * xpsc) ) + xpsc;
 
-       /* set start phase for horizontal fine scale (xp) to 0 */       
+       /* set start phase for horizontal fine scale (xp) to 0 */
        xp = 0;
-       
+
        /* set xim, if we bypass the horizontal scaler */
        if ( 0x400 == xsci )
                xim = 1;
        else
                xim = 0;
-               
+
        /* if the prescaler is bypassed, enable horizontal
           accumulation mode (xacm) and clear dcgx */
        if( 1 == xpsc ) {
@@ -148,12 +148,12 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
                /* get best match in the table of attenuations
                   for horizontal scaling */
                h_atten = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].weight_sum;
-       
+
                for (i = 0; h_attenuation[i] != 0; i++) {
                        if (h_attenuation[i] >= h_atten)
                                break;
                }
-       
+
                dcgx = i;
        }
 
@@ -171,11 +171,11 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
        else
                pfuv = 0x33;
 
-       
+
        *hps_v_gain  &= MASK_W0|MASK_B2;
-       *hps_v_gain  |= (pfuv << 24);   
+       *hps_v_gain  |= (pfuv << 24);
 
-       *hps_h_scale    &= ~(MASK_W1 | 0xf000);
+       *hps_h_scale    &= ~(MASK_W1 | 0xf000);
        *hps_h_scale    |= (xim << 31) | (xp << 24) | (xsci << 12);
 
        *hps_h_prescale |= (dcgx << 27) | ((xpsc-1) << 18) | (xacm << 17) | (cxy << 8) | (cxuv << 0);
@@ -186,7 +186,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
 static struct {
        u16 hps_coeff;
        u16 weight_sum;
-} hps_v_coeff_tab [] = { 
+} hps_v_coeff_tab [] = {
  {0x0100,   2},  {0x0102,   4},  {0x0300,   4},  {0x0106,   8},  {0x0502,   8},
  {0x0708,   8},  {0x0F00,   8},  {0x011E,  16},  {0x110E,  16},  {0x1926,  16},
  {0x3906,  16},  {0x3D42,  16},  {0x7D02,  16},  {0x7F80,  16},  {0xFF00,  16},
@@ -210,14 +210,14 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
        int in_y, int out_y, u32* hps_v_scale, u32* hps_v_gain)
 {
        int lpi = 0;
-       
+
        /* vertical scaling */
        u32 yacm = 0, ysci = 0, yacl = 0, ypo = 0, ype = 0;
        /* vertical scale & gain */
        u32 dcgy = 0, cya_cyb = 0;
-                               
+
        /* helper variables */
-       u32 v_atten = 0, i = 0; 
+       u32 v_atten = 0, i = 0;
 
        /* error, if vertical zooming */
        if ( in_y < out_y ) {
@@ -245,7 +245,7 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
                yacm = 0;
                yacl = 0;
                cya_cyb = 0x00ff;
-               
+
                /* calculate scaling increment */
                if ( in_y > out_y )
                        ysci = ((1024 * in_y) / (out_y + 1)) - 1024;
@@ -257,9 +257,9 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
                /* calculate ype and ypo */
                ype = ysci / 16;
                ypo = ype + (ysci / 64);
-               
+
        } else {
-               yacm = 1;       
+               yacm = 1;
 
                /* calculate scaling increment */
                ysci = (((10 * 1024 * (in_y - out_y - 1)) / in_y) + 9) / 10;
@@ -269,7 +269,7 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
 
                /* the sequence length interval (yacl) has to be set according
                   to the prescale value, e.g.  [n   .. 1/2) : 0
-                                               [1/2 .. 1/3) : 1
+                                               [1/2 .. 1/3) : 1
                                                [1/3 .. 1/4) : 2
                                                ... */
                if ( ysci < 512) {
@@ -278,7 +278,7 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
                        yacl = ( ysci / (1024 - ysci) );
                }
 
-               /* get filter coefficients for cya, cyb from table hps_v_coeff_tab */   
+               /* get filter coefficients for cya, cyb from table hps_v_coeff_tab */
                cya_cyb = hps_v_coeff_tab[ (yacl < 63 ? yacl : 63 ) ].hps_coeff;
 
                /* get best match in the table of attenuations for vertical scaling */
@@ -288,7 +288,7 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
                        if (v_attenuation[i] >= v_atten)
                                break;
                }
-       
+
                dcgy = i;
        }
 
@@ -306,12 +306,12 @@ static int sort_and_eliminate(u32* values, int* count)
 {
        int low = 0, high = 0, top = 0, temp = 0;
        int cur = 0, next = 0;
-       
+
        /* sanity checks */
        if( (0 > *count) || (NULL == values) ) {
                return -EINVAL;
        }
-       
+
        /* bubble sort the first ´count´ items of the array ´values´ */
        for( top = *count; top > 0; top--) {
                for( low = 0, high = 1; high < top; low++, high++) {
@@ -328,9 +328,9 @@ static int sort_and_eliminate(u32* values, int* count)
                if( values[cur] != values[next])
                        values[++cur] = values[next];
        }
-       
+
        *count = cur + 1;
-        
+
        return 0;
 }
 
@@ -343,8 +343,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
        int width = fh->ov.win.w.width;
        int height =  fh->ov.win.w.height;
        int clipcount = fh->ov.nclips;
-       
-       u32 line_list[32];                      
+
+       u32 line_list[32];
        u32 pixel_list[32];
        int numdwords = 0;
 
@@ -361,12 +361,12 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
        /* fill the line and pixel-lists */
        for(i = 0; i < clipcount; i++) {
                int l = 0, r = 0, t = 0, b = 0;
-               
+
                x[i] = fh->ov.clips[i].c.left;
                y[i] = fh->ov.clips[i].c.top;
                w[i] = fh->ov.clips[i].c.width;
                h[i] = fh->ov.clips[i].c.height;
-               
+
                if( w[i] < 0) {
                        x[i] += w[i]; w[i] = -w[i];
                }
@@ -378,7 +378,7 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
                }
                if( y[i] < 0) {
                        h[i] += y[i]; y[i] = 0;
-               }       
+               }
                if( 0 != vv->vflip ) {
                        y[i] = height - y[i] - h[i];
                }
@@ -387,7 +387,7 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
                r = x[i]+w[i];
                t = y[i];
                b = y[i]+h[i];
-               
+
                /* insert left/right coordinates */
                pixel_list[ 2*i   ] = min_t(int, l, width);
                pixel_list[(2*i)+1] = min_t(int, r, width);
@@ -423,7 +423,7 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
                                x[j] = 0;
 
                        if( pixel_list[i] < (x[j] + w[j])) {
-                       
+
                                if ( pixel_list[i] >= x[j] ) {
                                        clipping[2*i] |= cpu_to_le32(1 << j);
                                }
@@ -445,8 +445,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
 
        /* adjust arbitration control register */
        *arbtr_ctrl &= 0xffff00ff;
-       *arbtr_ctrl |= 0x00001c00;      
-       
+       *arbtr_ctrl |= 0x00001c00;
+
        vdma2->base_even        = vv->d_clipping.dma_handle;
        vdma2->base_odd         = vv->d_clipping.dma_handle;
        vdma2->prot_addr        = vv->d_clipping.dma_handle+((sizeof(u32))*(numdwords));
@@ -473,9 +473,9 @@ static void saa7146_disable_clipping(struct saa7146_dev *dev)
 
        /* upload clipping-registers*/
        saa7146_write(dev, CLIP_FORMAT_CTRL,clip_format);
-       saa7146_write(dev, MC2, (MASK_05 | MASK_21));
-       /* disable video dma2 */
+       saa7146_write(dev, MC2, (MASK_05 | MASK_21));
+
+       /* disable video dma2 */
        saa7146_write(dev, MC1, MASK_21);
 }
 
@@ -509,10 +509,10 @@ static void saa7146_set_clipping_rect(struct saa7146_fh *fh)
        saa7146_write(dev, BASE_PAGE2,          vdma2.base_page);
        saa7146_write(dev, PITCH2,              vdma2.pitch);
        saa7146_write(dev, NUM_LINE_BYTE2,      vdma2.num_line_byte);
-       
+
        /* prepare the rest */
        saa7146_write(dev, CLIP_FORMAT_CTRL,clip_format);
-       saa7146_write(dev, PCI_BT_V1, arbtr_ctrl);      
+       saa7146_write(dev, PCI_BT_V1, arbtr_ctrl);
 
        /* upload clip_control-register, clipping-registers, enable video dma2 */
        saa7146_write(dev, MC2, (MASK_05 | MASK_21 | MASK_03 | MASK_19));
@@ -530,11 +530,11 @@ static void saa7146_set_window(struct saa7146_dev *dev, int width, int height, e
 
        /* set vertical scale */
        hps_v_scale = 0; /* all bits get set by the function-call */
-       hps_v_gain  = 0; /* fixme: saa7146_read(dev, HPS_V_GAIN);*/ 
+       hps_v_gain  = 0; /* fixme: saa7146_read(dev, HPS_V_GAIN);*/
        calculate_v_scale_registers(dev, field, vv->standard->v_field*2, height, &hps_v_scale, &hps_v_gain);
 
        /* set horizontal scale */
-       hps_ctrl        = 0;
+       hps_ctrl        = 0;
        hps_h_prescale  = 0; /* all bits get set in the function */
        hps_h_scale     = 0;
        calculate_h_scale_registers(dev, vv->standard->h_pixels, width, vv->hflip, &hps_ctrl, &hps_v_gain, &hps_h_prescale, &hps_h_scale);
@@ -542,43 +542,43 @@ static void saa7146_set_window(struct saa7146_dev *dev, int width, int height, e
        /* set hyo and hxo */
        calculate_hxo_and_hyo(vv, &hps_h_scale, &hps_ctrl);
        calculate_hps_source_and_sync(dev, source, sync, &hps_ctrl);
-       
+
        /* write out new register contents */
        saa7146_write(dev, HPS_V_SCALE, hps_v_scale);
        saa7146_write(dev, HPS_V_GAIN,  hps_v_gain);
        saa7146_write(dev, HPS_CTRL,    hps_ctrl);
        saa7146_write(dev, HPS_H_PRESCALE,hps_h_prescale);
        saa7146_write(dev, HPS_H_SCALE, hps_h_scale);
-       
+
        /* upload shadow-ram registers */
-       saa7146_write(dev, MC2, (MASK_05 | MASK_06 | MASK_21 | MASK_22) );
+       saa7146_write(dev, MC2, (MASK_05 | MASK_06 | MASK_21 | MASK_22) );
 }
 
 /* calculate the new memory offsets for a desired position */
 static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int w_height, enum v4l2_field field, u32 pixelformat)
-{      
+{
        struct saa7146_vv *vv = dev->vv_data;
        struct saa7146_format *sfmt = format_by_fourcc(dev, pixelformat);
 
        int b_depth = vv->ov_fmt->depth;
        int b_bpl = vv->ov_fb.fmt.bytesperline;
        u32 base = (u32)vv->ov_fb.base;
-       
+
        struct  saa7146_video_dma vdma1;
 
        /* calculate memory offsets for picture, look if we shall top-down-flip */
        vdma1.pitch     = 2*b_bpl;
        if ( 0 == vv->vflip ) {
-               vdma1.base_even = (u32)base + (w_y * (vdma1.pitch/2)) + (w_x * (b_depth / 8)); 
+               vdma1.base_even = (u32)base + (w_y * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
                vdma1.base_odd  = vdma1.base_even + (vdma1.pitch / 2);
                vdma1.prot_addr = vdma1.base_even + (w_height * (vdma1.pitch / 2));
        }
        else {
-               vdma1.base_even = (u32)base + ((w_y+w_height) * (vdma1.pitch/2)) + (w_x * (b_depth / 8)); 
+               vdma1.base_even = (u32)base + ((w_y+w_height) * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
                vdma1.base_odd  = vdma1.base_even - (vdma1.pitch / 2);
                vdma1.prot_addr = vdma1.base_odd - (w_height * (vdma1.pitch / 2));
        }
-       
+
        if (V4L2_FIELD_HAS_BOTH(field)) {
        } else if (field == V4L2_FIELD_ALTERNATE) {
                /* fixme */
@@ -596,7 +596,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
        if ( 0 != vv->vflip ) {
                vdma1.pitch *= -1;
        }
-               
+
        vdma1.base_page = sfmt->swap;
        vdma1.num_line_byte = (vv->standard->v_field<<16)+vv->standard->h_pixels;
 
@@ -606,13 +606,13 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
 static void saa7146_set_output_format(struct saa7146_dev *dev, unsigned long palette)
 {
        u32 clip_format = saa7146_read(dev, CLIP_FORMAT_CTRL);
-       
+
        /* call helper function */
        calculate_output_format_register(dev,palette,&clip_format);
 
        /* update the hps registers */
        saa7146_write(dev, CLIP_FORMAT_CTRL, clip_format);
-       saa7146_write(dev, MC2, (MASK_05 | MASK_21));
+       saa7146_write(dev, MC2, (MASK_05 | MASK_21));
 }
 
 /* select input-source */
@@ -630,10 +630,10 @@ void saa7146_set_hps_source_and_sync(struct saa7146_dev *dev, int source, int sy
        /* write back & upload register */
        saa7146_write(dev, HPS_CTRL, hps_ctrl);
        saa7146_write(dev, MC2, (MASK_05 | MASK_21));
-       
+
        vv->current_hps_source = source;
        vv->current_hps_sync = sync;
-} 
+}
 
 int saa7146_enable_overlay(struct saa7146_fh *fh)
 {
@@ -655,31 +655,31 @@ void saa7146_disable_overlay(struct saa7146_fh *fh)
        struct saa7146_dev *dev = fh->dev;
 
        /* disable clipping + video dma1 */
-       saa7146_disable_clipping(dev);
+       saa7146_disable_clipping(dev);
        saa7146_write(dev, MC1, MASK_22);
-}              
+}
 
-void saa7146_write_out_dma(struct saa7146_dev* dev, int which, struct saa7146_video_dma* vdma) 
+void saa7146_write_out_dma(struct saa7146_dev* dev, int which, struct saa7146_video_dma* vdma)
 {
        int where = 0;
-       
+
        if( which < 1 || which > 3) {
                return;
        }
-       
+
        /* calculate starting address */
        where  = (which-1)*0x18;
 
-               saa7146_write(dev, where,       vdma->base_odd);
-               saa7146_write(dev, where+0x04,  vdma->base_even);
-       saa7146_write(dev, where+0x08,  vdma->prot_addr);
-       saa7146_write(dev, where+0x0c,  vdma->pitch);
-       saa7146_write(dev, where+0x10,  vdma->base_page);
+       saa7146_write(dev, where,       vdma->base_odd);
+       saa7146_write(dev, where+0x04,  vdma->base_even);
+       saa7146_write(dev, where+0x08,  vdma->prot_addr);
+       saa7146_write(dev, where+0x0c,  vdma->pitch);
+       saa7146_write(dev, where+0x10,  vdma->base_page);
        saa7146_write(dev, where+0x14,  vdma->num_line_byte);
-       
+
        /* upload */
-       saa7146_write(dev, MC2, (MASK_02<<(which-1))|(MASK_18<<(which-1)));             
-/*             
+       saa7146_write(dev, MC2, (MASK_02<<(which-1))|(MASK_18<<(which-1)));
+/*
        printk("vdma%d.base_even:     0x%08x\n", which,vdma->base_even);
        printk("vdma%d.base_odd:      0x%08x\n", which,vdma->base_odd);
        printk("vdma%d.prot_addr:     0x%08x\n", which,vdma->prot_addr);
@@ -688,6 +688,7 @@ void saa7146_write_out_dma(struct saa7146_dev* dev, int which, struct saa7146_vi
        printk("vdma%d.num_line_byte: 0x%08x\n", which,vdma->num_line_byte);
 */
 }
+
 static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa7146_buf *buf)
 {
        struct saa7146_vv *vv = dev->vv_data;
@@ -708,11 +709,11 @@ static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa71
        if( bytesperline != 0) {
                vdma1.pitch = bytesperline*2;
        } else {
-       vdma1.pitch             = (width*depth*2)/8;
+               vdma1.pitch = (width*depth*2)/8;
        }
        vdma1.num_line_byte     = ((vv->standard->v_field<<16) + vv->standard->h_pixels);
        vdma1.base_page         = buf->pt[0].dma | ME1 | sfmt->swap;
-       
+
        if( 0 != vv->vflip ) {
                vdma1.prot_addr = buf->pt[0].offset;
                vdma1.base_even = buf->pt[0].offset+(vdma1.pitch/2)*height;
@@ -745,7 +746,7 @@ static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa71
 
        if( 0 != vv->vflip ) {
                vdma1.pitch *= -1;
-       }       
+       }
 
        saa7146_write_out_dma(dev, 1, &vdma1);
        return 0;
@@ -769,12 +770,11 @@ static int calc_planar_422(struct saa7146_vv *vv, struct saa7146_buf *buf, struc
                vdma3->prot_addr        = buf->pt[2].offset;
                vdma3->base_even        = ((vdma3->pitch/2)*height)+buf->pt[2].offset;
                vdma3->base_odd         = vdma3->base_even - (vdma3->pitch/2);
-
        } else {
                vdma3->base_even        = buf->pt[2].offset;
                vdma3->base_odd         = vdma3->base_even + (vdma3->pitch/2);
                vdma3->prot_addr        = (vdma3->pitch/2)*height+buf->pt[2].offset;
-               
+
                vdma2->base_even        = buf->pt[1].offset;
                vdma2->base_odd         = vdma2->base_even + (vdma2->pitch/2);
                vdma2->prot_addr        = (vdma2->pitch/2)*height+buf->pt[1].offset;
@@ -812,7 +812,6 @@ static int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struc
        return 0;
 }
 
-
 static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf *buf)
 {
        struct saa7146_vv *vv = dev->vv_data;
@@ -905,7 +904,7 @@ static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa71
                vdma1.pitch *= -1;
                vdma2.pitch *= -1;
                vdma3.pitch *= -1;
-       }       
+       }
 
        saa7146_write_out_dma(dev, 1, &vdma1);
        if( (sfmt->flags & FORMAT_BYTE_SWAP) != 0 ) {
@@ -931,32 +930,32 @@ static void program_capture_engine(struct saa7146_dev *dev, int planar)
        WRITE_RPS0(CMD_PAUSE | CMD_OAN | CMD_SIG0 | e_wait);
 
        /* set rps register 0 */
-       WRITE_RPS0(CMD_WR_REG | (1 << 8) | (MC2/4));    
+       WRITE_RPS0(CMD_WR_REG | (1 << 8) | (MC2/4));
        WRITE_RPS0(MASK_27 | MASK_11);
-       
+
        /* turn on video-dma1 */
-       WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));          
-       WRITE_RPS0(MASK_06 | MASK_22);                  /* => mask */
+       WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
+       WRITE_RPS0(MASK_06 | MASK_22);                  /* => mask */
        WRITE_RPS0(MASK_06 | MASK_22);                  /* => values */
        if( 0 != planar ) {
                /* turn on video-dma2 */
-               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));          
-               WRITE_RPS0(MASK_05 | MASK_21);                  /* => mask */
+               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
+               WRITE_RPS0(MASK_05 | MASK_21);                  /* => mask */
                WRITE_RPS0(MASK_05 | MASK_21);                  /* => values */
 
                /* turn on video-dma3 */
-               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));          
-               WRITE_RPS0(MASK_04 | MASK_20);                  /* => mask */
+               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
+               WRITE_RPS0(MASK_04 | MASK_20);                  /* => mask */
                WRITE_RPS0(MASK_04 | MASK_20);                  /* => values */
        }
-       
+
        /* wait for o_fid_a/b / e_fid_a/b toggle */
        if ( vv->last_field == V4L2_FIELD_INTERLACED ) {
                WRITE_RPS0(CMD_PAUSE | o_wait);
-       WRITE_RPS0(CMD_PAUSE | e_wait);
+               WRITE_RPS0(CMD_PAUSE | e_wait);
        } else if ( vv->last_field == V4L2_FIELD_TOP ) {
                WRITE_RPS0(CMD_PAUSE | (vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? MASK_10 : MASK_09));
-       WRITE_RPS0(CMD_PAUSE | o_wait);
+               WRITE_RPS0(CMD_PAUSE | o_wait);
        } else if ( vv->last_field == V4L2_FIELD_BOTTOM ) {
                WRITE_RPS0(CMD_PAUSE | (vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? MASK_10 : MASK_09));
                WRITE_RPS0(CMD_PAUSE | e_wait);
@@ -964,25 +963,25 @@ static void program_capture_engine(struct saa7146_dev *dev, int planar)
 
        /* turn off video-dma1 */
        WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
-       WRITE_RPS0(MASK_22 | MASK_06);                  /* => mask */
-       WRITE_RPS0(MASK_22);                                    /* => values */
+       WRITE_RPS0(MASK_22 | MASK_06);                  /* => mask */
+       WRITE_RPS0(MASK_22);                            /* => values */
        if( 0 != planar ) {
                /* turn off video-dma2 */
-               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));          
-               WRITE_RPS0(MASK_05 | MASK_21);                  /* => mask */
-               WRITE_RPS0(MASK_21);                                    /* => values */
+               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
+               WRITE_RPS0(MASK_05 | MASK_21);                  /* => mask */
+               WRITE_RPS0(MASK_21);                            /* => values */
 
                /* turn off video-dma3 */
-               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));          
-               WRITE_RPS0(MASK_04 | MASK_20);                  /* => mask */
-               WRITE_RPS0(MASK_20);                                    /* => values */
+               WRITE_RPS0(CMD_WR_REG_MASK | (MC1/4));
+               WRITE_RPS0(MASK_04 | MASK_20);                  /* => mask */
+               WRITE_RPS0(MASK_20);                            /* => values */
        }
 
        /* generate interrupt */
-       WRITE_RPS0(CMD_INTERRUPT);                                      
+       WRITE_RPS0(CMD_INTERRUPT);
 
        /* stop */
-       WRITE_RPS0(CMD_STOP);                                   
+       WRITE_RPS0(CMD_STOP);
 }
 
 void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struct saa7146_buf *next)
@@ -1033,6 +1032,5 @@ void saa7146_set_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, struc
        saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
 
        /* turn on rps */
-       saa7146_write(dev, MC1, (MASK_12 | MASK_28));   
+       saa7146_write(dev, MC1, (MASK_12 | MASK_28));
 }
-