diff for duplicates of <4BF924E3.5020702@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 67384a4..fddea18 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -291,12 +291,12 @@ cycle, and I had some travels that delayed my tasks even further, causing > + > + fmt.fmt.pix = cam->sensor_format; > + ret = sensor_call(cam, core, init, 0); -> + if (ret = 0) +> + if (ret == 0) > + ret = sensor_call(cam, video, s_fmt, &fmt); > + /* > + * OV7670 does weird things if flip is set *before* format... > + */ -> + if (ret = 0) +> + if (ret == 0) > + ret = viacam_set_flip(cam); > + return ret; > +} @@ -396,7 +396,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + * with anything else. > + */ > + vb = viacam_next_buffer(cam); -> + if (vb = NULL) +> + if (vb == NULL) > + goto done; > + /* > + * Figure out which buffer we just completed. @@ -459,7 +459,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + cam->n_cap_bufs = 3; > + viacam_write_reg_mask(cam, VCR_CAPINTC, VCR_CI_3BUFS, > + VCR_CI_3BUFS); -> + } else if (nbuf = 2) { +> + } else if (nbuf == 2) { > + cam->n_cap_bufs = 2; > + viacam_write_reg_mask(cam, VCR_CAPINTC, 0, VCR_CI_3BUFS); > + } else { @@ -501,7 +501,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + unsigned int avscale; > + int sf; > + -> + if (cam->user_format.width = VGA_WIDTH) +> + if (cam->user_format.width == VGA_WIDTH) > + avscale = 0; > + else { > + sf = (cam->user_format.width*2048)/VGA_WIDTH; @@ -556,12 +556,12 @@ cycle, and I had some travels that delayed my tasks even further, causing > + VCR_CI_VREFINV | /* OLPC-specific? */ > + VCR_CI_DIBOTH | /* Capture both fields */ > + VCR_CI_CCIR601_8; -> + if (cam->n_cap_bufs = 3) +> + if (cam->n_cap_bufs == 3) > + cicreg |= VCR_CI_3BUFS; > + /* > + * YUV formats need different byte swapping than RGB. > + */ -> + if (cam->user_format.pixelformat = V4L2_PIX_FMT_YUYV) +> + if (cam->user_format.pixelformat == V4L2_PIX_FMT_YUYV) > + cicreg |= VCR_CI_YUYV; > + else > + cicreg |= VCR_CI_UYVY; @@ -623,7 +623,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + struct via_camera *cam = q->priv_data; > + > + *size = cam->user_format.sizeimage; -> + if (*count = 0 || *count > 6) /* Arbitrary number */ +> + if (*count == 0 || *count > 6) /* Arbitrary number */ > + *count = 6; > + return 0; > +} @@ -640,7 +640,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + vb->width = cam->user_format.width; /* bytesperline???? */ > + vb->height = cam->user_format.height; > + vb->field = field; -> + if (vb->state = VIDEOBUF_NEEDS_INIT) { +> + if (vb->state == VIDEOBUF_NEEDS_INIT) { > + int ret = videobuf_iolock(q, vb, NULL); > + if (ret) > + return ret; @@ -698,7 +698,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + * need to power up the sensor. > + */ > + mutex_lock(&cam->lock); -> + if (cam->users = 0) { +> + if (cam->users == 0) { > + int ret = viafb_request_dma(); > + > + if (ret) { @@ -730,7 +730,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + * If the "owner" is closing, shut down any ongoing > + * operations. > + */ -> + if (filp = cam->owner) { +> + if (filp == cam->owner) { > + videobuf_stop(&cam->vb_queue); > + if (cam->opstate != S_IDLE) > + viacam_stop_engine(cam); @@ -739,7 +739,7 @@ cycle, and I had some travels that delayed my tasks even further, causing > + /* > + * Last one out needs to turn out the lights. > + */ -> + if (cam->users = 0) { +> + if (cam->users == 0) { > + videobuf_mmap_free(&cam->vb_queue); > + via_sensor_power_down(cam); > + viafb_release_dma(); @@ -1289,7 +1289,7 @@ only one stream can be produced. > + printk(KERN_ERR "viacam: insufficient FB memory reserved\n"); > + return -ENOMEM; > + } -> + if (viadev->engine_mmio = NULL) { +> + if (viadev->engine_mmio == NULL) { > + printk(KERN_ERR "viacam: No I/O memory, so no pictures\n"); > + return -ENOMEM; > + } @@ -1342,7 +1342,7 @@ only one stream can be produced. > + sensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31); > + cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter, > + "ov7670", "ov7670", 0x42 >> 1, NULL); -> + if (cam->sensor = NULL) { +> + if (cam->sensor == NULL) { > + dev_err(&pdev->dev, "Unable to find the sensor!\n"); > + ret = -ENODEV; > + goto out_power_down; @@ -1418,9 +1418,9 @@ only one stream can be produced. > + > + pci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN, > + VIACAM_SERIAL_CREG, &cbyte); -> + if ((cbyte & VIACAM_SERIAL_BIT) = 0) +> + if ((cbyte & VIACAM_SERIAL_BIT) == 0) > + return 0; /* Not enabled */ -> + if (override_serial = 0) { +> + if (override_serial == 0) { > + printk(KERN_NOTICE "Via camera: serial port is enabled, " \ > + "refusing to load.\n"); > + printk(KERN_NOTICE "Specify override_serial=1 to force " \ @@ -1492,7 +1492,7 @@ only one stream can be produced. > +#define VCR_CI_CCIR656_8 0x00000010 /* ... CCIR656, 8 bit */ > +#define VCR_CI_CCIR601_16 0x00000020 /* ... CCIR601, 16 bit */ > +#define VCR_CI_CCIR656_16 0x00000030 /* ... CCIR656, 16 bit */ -> +#define VCR_CI_HDMODE 0x00000040 /* CCIR656-16 hdr decode mode; 1\x16b */ +> +#define VCR_CI_HDMODE 0x00000040 /* CCIR656-16 hdr decode mode; 1=16b */ > +#define VCR_CI_BSWAP 0x00000080 /* Swap bytes (16-bit) */ > +#define VCR_CI_YUYV 0 /* Byte order 0123 */ > +#define VCR_CI_UYVY 0x00000100 /* Byte order 1032 */ diff --git a/a/content_digest b/N1/content_digest index f56cbd1..b81265f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01273098884-21848-6-git-send-email-corbet@lwn.net\0" "From\0Mauro Carvalho Chehab <mchehab@redhat.com>\0" "Subject\0Re: [PATCH 5/5] Add the viafb video capture driver\0" - "Date\0Sun, 23 May 2010 12:51:47 +0000\0" + "Date\0Sun, 23 May 2010 09:51:47 -0300\0" "To\0Jonathan Corbet <corbet@lwn.net>\0" "Cc\0linux-kernel@vger.kernel.org" Harald Welte <laforge@gnumonks.org> @@ -307,12 +307,12 @@ "> +\n" "> +\tfmt.fmt.pix = cam->sensor_format;\n" "> +\tret = sensor_call(cam, core, init, 0);\n" - "> +\tif (ret = 0)\n" + "> +\tif (ret == 0)\n" "> +\t\tret = sensor_call(cam, video, s_fmt, &fmt);\n" "> +\t/*\n" "> +\t * OV7670 does weird things if flip is set *before* format...\n" "> +\t */\n" - "> +\tif (ret = 0)\n" + "> +\tif (ret == 0)\n" "> +\t\tret = viacam_set_flip(cam);\n" "> +\treturn ret;\n" "> +}\n" @@ -412,7 +412,7 @@ "> +\t * with anything else.\n" "> +\t */\n" "> +\tvb = viacam_next_buffer(cam);\n" - "> +\tif (vb = NULL)\n" + "> +\tif (vb == NULL)\n" "> +\t\tgoto done;\n" "> +\t/*\n" "> +\t * Figure out which buffer we just completed.\n" @@ -475,7 +475,7 @@ "> +\t\tcam->n_cap_bufs = 3;\n" "> +\t\tviacam_write_reg_mask(cam, VCR_CAPINTC, VCR_CI_3BUFS,\n" "> +\t\t\t\tVCR_CI_3BUFS);\n" - "> +\t} else if (nbuf = 2) {\n" + "> +\t} else if (nbuf == 2) {\n" "> +\t\tcam->n_cap_bufs = 2;\n" "> +\t\tviacam_write_reg_mask(cam, VCR_CAPINTC, 0, VCR_CI_3BUFS);\n" "> +\t} else {\n" @@ -517,7 +517,7 @@ "> +\tunsigned int avscale;\n" "> +\tint sf;\n" "> +\n" - "> +\tif (cam->user_format.width = VGA_WIDTH)\n" + "> +\tif (cam->user_format.width == VGA_WIDTH)\n" "> +\t\tavscale = 0;\n" "> +\telse {\n" "> +\t\tsf = (cam->user_format.width*2048)/VGA_WIDTH;\n" @@ -572,12 +572,12 @@ "> +\t\tVCR_CI_VREFINV |\t/* OLPC-specific? */\n" "> +\t\tVCR_CI_DIBOTH |\t\t/* Capture both fields */\n" "> +\t\tVCR_CI_CCIR601_8;\n" - "> +\tif (cam->n_cap_bufs = 3)\n" + "> +\tif (cam->n_cap_bufs == 3)\n" "> +\t\tcicreg |= VCR_CI_3BUFS;\n" "> +\t/*\n" "> +\t * YUV formats need different byte swapping than RGB.\n" "> +\t */\n" - "> +\tif (cam->user_format.pixelformat = V4L2_PIX_FMT_YUYV)\n" + "> +\tif (cam->user_format.pixelformat == V4L2_PIX_FMT_YUYV)\n" "> +\t\tcicreg |= VCR_CI_YUYV;\n" "> +\telse\n" "> +\t\tcicreg |= VCR_CI_UYVY;\n" @@ -639,7 +639,7 @@ "> +\tstruct via_camera *cam = q->priv_data;\n" "> +\n" "> +\t*size = cam->user_format.sizeimage;\n" - "> +\tif (*count = 0 || *count > 6)\t/* Arbitrary number */\n" + "> +\tif (*count == 0 || *count > 6)\t/* Arbitrary number */\n" "> +\t\t*count = 6;\n" "> +\treturn 0;\n" "> +}\n" @@ -656,7 +656,7 @@ "> +\tvb->width = cam->user_format.width; /* bytesperline???? */\n" "> +\tvb->height = cam->user_format.height;\n" "> +\tvb->field = field;\n" - "> +\tif (vb->state = VIDEOBUF_NEEDS_INIT) {\n" + "> +\tif (vb->state == VIDEOBUF_NEEDS_INIT) {\n" "> +\t\tint ret = videobuf_iolock(q, vb, NULL);\n" "> +\t\tif (ret)\n" "> +\t\t\treturn ret;\n" @@ -714,7 +714,7 @@ "> +\t * need to power up the sensor.\n" "> +\t */\n" "> +\tmutex_lock(&cam->lock);\n" - "> +\tif (cam->users = 0) {\n" + "> +\tif (cam->users == 0) {\n" "> +\t\tint ret = viafb_request_dma();\n" "> +\n" "> +\t\tif (ret) {\n" @@ -746,7 +746,7 @@ "> +\t * If the \"owner\" is closing, shut down any ongoing\n" "> +\t * operations.\n" "> +\t */\n" - "> +\tif (filp = cam->owner) {\n" + "> +\tif (filp == cam->owner) {\n" "> +\t\tvideobuf_stop(&cam->vb_queue);\n" "> +\t\tif (cam->opstate != S_IDLE)\n" "> +\t\t\tviacam_stop_engine(cam);\n" @@ -755,7 +755,7 @@ "> +\t/*\n" "> +\t * Last one out needs to turn out the lights.\n" "> +\t */\n" - "> +\tif (cam->users = 0) {\n" + "> +\tif (cam->users == 0) {\n" "> +\t\tvideobuf_mmap_free(&cam->vb_queue);\n" "> +\t\tvia_sensor_power_down(cam);\n" "> +\t\tviafb_release_dma();\n" @@ -1305,7 +1305,7 @@ "> +\t\tprintk(KERN_ERR \"viacam: insufficient FB memory reserved\\n\");\n" "> +\t\treturn -ENOMEM;\n" "> +\t}\n" - "> +\tif (viadev->engine_mmio = NULL) {\n" + "> +\tif (viadev->engine_mmio == NULL) {\n" "> +\t\tprintk(KERN_ERR \"viacam: No I/O memory, so no pictures\\n\");\n" "> +\t\treturn -ENOMEM;\n" "> +\t}\n" @@ -1358,7 +1358,7 @@ "> +\tsensor_adapter = viafb_find_i2c_adapter(VIA_PORT_31);\n" "> +\tcam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, sensor_adapter,\n" "> +\t\t\t\"ov7670\", \"ov7670\", 0x42 >> 1, NULL);\n" - "> +\tif (cam->sensor = NULL) {\n" + "> +\tif (cam->sensor == NULL) {\n" "> +\t\tdev_err(&pdev->dev, \"Unable to find the sensor!\\n\");\n" "> +\t\tret = -ENODEV;\n" "> +\t\tgoto out_power_down;\n" @@ -1434,9 +1434,9 @@ "> +\n" "> +\tpci_bus_read_config_byte(pbus, VIACAM_SERIAL_DEVFN,\n" "> +\t\t\tVIACAM_SERIAL_CREG, &cbyte);\n" - "> +\tif ((cbyte & VIACAM_SERIAL_BIT) = 0)\n" + "> +\tif ((cbyte & VIACAM_SERIAL_BIT) == 0)\n" "> +\t\treturn 0; /* Not enabled */\n" - "> +\tif (override_serial = 0) {\n" + "> +\tif (override_serial == 0) {\n" "> +\t\tprintk(KERN_NOTICE \"Via camera: serial port is enabled, \" \\\n" "> +\t\t\t\t\"refusing to load.\\n\");\n" "> +\t\tprintk(KERN_NOTICE \"Specify override_serial=1 to force \" \\\n" @@ -1508,7 +1508,7 @@ "> +#define VCR_CI_CCIR656_8 0x00000010 /* ... CCIR656, 8 bit */\n" "> +#define VCR_CI_CCIR601_16 0x00000020 /* ... CCIR601, 16 bit */\n" "> +#define VCR_CI_CCIR656_16 0x00000030 /* ... CCIR656, 16 bit */\n" - "> +#define VCR_CI_HDMODE 0x00000040 /* CCIR656-16 hdr decode mode; 1\026b */\n" + "> +#define VCR_CI_HDMODE 0x00000040 /* CCIR656-16 hdr decode mode; 1=16b */\n" "> +#define VCR_CI_BSWAP 0x00000080 /* Swap bytes (16-bit) */\n" "> +#define VCR_CI_YUYV\t 0\t /* Byte order 0123 */\n" "> +#define VCR_CI_UYVY\t 0x00000100 /* Byte order 1032 */\n" @@ -1672,4 +1672,4 @@ "Cheers,\n" Mauro -b93f742120e3c14d552249012cd5ea87d09f6f2b2dd0e860c9cc2bc28ccb8d15 +9ade2b2d334c3f67dfa490a6b1580422623fcdcd49ff517d02af2bd4cbec6839
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.