Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 606 → Rev 607

/shark/trunk/drivers/bttv/bttv-driver.c
43,9 → 43,9
unsigned int bttv_num; /* number of Bt848s in use */
struct bttv bttvs[BTTV_MAX];
 
unsigned int bttv_debug = 1;
unsigned int bttv_debug = 0;
unsigned int bttv_verbose = 1;
unsigned int bttv_gpio = 1;
unsigned int bttv_gpio = 0;
 
/* config variables */
#ifdef __BIG_ENDIAN
1264,7 → 1264,7
unsigned long flags;
int retval = 0;
 
dprintk("switch_overlay: enter [new=%p]\n",new);
dprintk("switch_overlay: enter [new=%x]\n",(int)new);
if (new)
new->vb.state = STATE_DONE;
spin_lock_irqsave(&btv->s_lock,flags);
1275,8 → 1275,8
if (NULL == new)
free_btres(btv,fh,RESOURCE_OVERLAY);
if (NULL != old) {
dprintk("switch_overlay: old=%p state is %d\n",old,old->vb.state);
bttv_dma_free(btv, old);
dprintk("switch_overlay: old=%x state is %d\n",(int)old,old->vb.state);
//bttv_dma_free(btv, old);
kfree(old);
}
dprintk("switch_overlay: done\n");
3155,8 → 3155,6
 
memset(set,0,sizeof(*set));
 
set->irqflags = 1;
/*
if (!list_empty(&btv->vcapture)) {
set->irqflags = 1;
set->vbi = list_entry(btv->vcapture.next, struct bttv_buffer, vb.queue);
3205,11 → 3203,11
}
}
}
*/
dprintk("bttv%d: next set: top=%p bottom=%p vbi=%p "
"[screen=%p,irq=%d,%d]\n",
btv->nr,set->top, set->bottom, set->vbi,
btv->screen,set->irqflags,set->topirq);
 
dprintk("bttv%d: next set: top=%x bottom=%x vbi=%x "
"[screen=%x,irq=%d,%d]\n",
btv->nr,(int)set->top, (int)set->bottom, (int)set->vbi,
(int)btv->screen,set->irqflags,set->topirq);
return 0;
}
 
3230,7 → 3228,7
if (wakeup->top == wakeup->bottom) {
if (NULL != wakeup->top && curr->top != wakeup->top) {
if (irq_debug > 1)
printk("bttv%d: wakeup: both=%p\n",btv->nr,wakeup->top);
printk("bttv%d: wakeup: both=%x\n",btv->nr,(int)wakeup->top);
wakeup->top->vb.ts = ts;
wakeup->top->vb.field_count = btv->field_count;
wakeup->top->vb.state = state;
3239,7 → 3237,7
} else {
if (NULL != wakeup->top && curr->top != wakeup->top) {
if (irq_debug > 1)
printk("bttv%d: wakeup: top=%p\n",btv->nr,wakeup->top);
printk("bttv%d: wakeup: top=%x\n",btv->nr,(int)wakeup->top);
wakeup->top->vb.ts = ts;
wakeup->top->vb.field_count = btv->field_count;
wakeup->top->vb.state = state;
3247,7 → 3245,7
}
if (NULL != wakeup->bottom && curr->bottom != wakeup->bottom) {
if (irq_debug > 1)
printk("bttv%d: wakeup: bottom=%p\n",btv->nr,wakeup->bottom);
printk("bttv%d: wakeup: bottom=%x\n",btv->nr,(int)wakeup->bottom);
wakeup->bottom->vb.ts = ts;
wakeup->bottom->vb.field_count = btv->field_count;
wakeup->bottom->vb.state = state;