--- tmp/buz-1.0/driver/buz.h	Thu Jun 24 13:39:49 1999
+++ buz-1.0/driver/buz.h	Sun Dec 12 01:15:05 1999
@@ -238,7 +238,7 @@
 
    u32 *overlay_mask;
 
-   struct wait_queue * v4l_capq;      /* wait here for grab to finish */
+   wait_queue_head_t v4l_capq;      /* wait here for grab to finish */
 
    int v4l_overlay_active;            /* Overlay grab is activated */
    int v4l_memgrab_active;            /* Memory grab is activated */
@@ -269,7 +269,7 @@
    enum buz_codec_mode codec_mode;      /* status of codec */
    struct buz_params params;            /* structure with a lot of things to play with */
 
-   struct wait_queue * jpg_capq;        /* wait here for grab to finish */
+   wait_queue_head_t jpg_capq;        /* wait here for grab to finish */
 
    /* grab queue counts/indices, mask with BUZ_MASK_STAT_COM before using as index */
    /* (dma_head - dma_tail) is number active in DMA, must be <= BUZ_NUM_STAT_COM */
--- tmp/buz-1.0/driver/buz.c	Thu Jun 24 13:36:39 1999
+++ buz-1.0/driver/buz.c	Sun Dec 12 08:33:34 1999
@@ -49,7 +49,6 @@
 #include <asm/segment.h>
 #include <linux/types.h>
 #include <linux/wrapper.h>
-#include <asm/spinlock.h>
 
 #include <linux/videodev.h>
 
@@ -57,6 +56,7 @@
 #include <asm/uaccess.h>
 
 #include <linux/i2c.h>
+#include <linux/wait.h>
 #include "buz.h"
 #include "video_decoder.h"
 #include "video_encoder.h"
@@ -1380,7 +1380,10 @@
    reg   = btv->params.img_x + tvn->HStart;  /* Hstart */
    zr36060_write_16(btv, 0x046, reg);
 
-   reg  += btv->params.img_width;            /* Hend */
+   if (btv->params.HorDcm> 1)
+      reg  += btv->params.img_width+160;            /* Hend */
+   else
+      reg  += btv->params.img_width;
    zr36060_write_16(btv, 0x048, reg);
 
    /* subimage area */
@@ -2221,9 +2224,9 @@
          params->TmpDcm         = 2;
          params->field_per_buff = 1;
 
-         params->img_x          = 8;
-         params->img_y          = 0;
-         params->img_width      = 704;
+         params->img_x          = 0;
+         params->img_y          = 7;
+         params->img_width      = tvnorms[params->norm].Wa-80;
          params->img_height     = tvnorms[params->norm].Ha/2;
          break;
 
@@ -2293,6 +2296,7 @@
    /* Per default, map the V4L Buffers */
 
    btv->map_mjpeg_buffers= 0;
+   init_waitqueue_head(&btv->jpg_capq);
 
    /* User must explicitly set a window */
 
@@ -2309,7 +2313,7 @@
 
    btv->video_interlace  = 0;
 
-   btv->v4l_capq         = NULL;
+   init_waitqueue_head(&btv->v4l_capq);
 
    btv->v4l_memgrab_active = 0;
    btv->v4l_overlay_active = 0;
@@ -3478,7 +3482,7 @@
 
       spin_lock_init(&btv->lock);
 
-      btv->zr36057_adr = btv->pci_dev->base_address[0] & PCI_BASE_ADDRESS_MEM_MASK;
+      btv->zr36057_adr = btv->pci_dev->resource[0].start & PCI_BASE_ADDRESS_MEM_MASK;
       pci_read_config_byte(btv->pci_dev, PCI_CLASS_REVISION, &btv->revision);
       if (btv->revision < 2) {
          printk(BUZ_INFO "-%u: Zoran ZR36057 (rev %d) irq: %d, memory: 0x%08x.\n",