From patchwork Sun Nov 1 21:59:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 1939 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sun, 01 Nov 2009 21:59:47 +0000 Received: from bombadil.infradead.org [18.85.46.34] by caramujo.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Sun, 01 Nov 2009 20:02:24 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N4iSh-0006Pw-7y; Sun, 01 Nov 2009 21:59:47 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbZKAV7k (ORCPT + 1 other); Sun, 1 Nov 2009 16:59:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753599AbZKAV7k (ORCPT ); Sun, 1 Nov 2009 16:59:40 -0500 Received: from mail02a.mail.t-online.hu ([84.2.40.7]:51686 "EHLO mail02a.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533AbZKAV7j (ORCPT ); Sun, 1 Nov 2009 16:59:39 -0500 Received: from [192.168.1.64] (dsl5402C4D0.pool.t-online.hu [84.2.196.208]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail02a.mail.t-online.hu (Postfix) with ESMTPSA id 796C02560ED; Sun, 1 Nov 2009 22:59:33 +0100 (CET) Message-ID: <4AEE04CB.5060802@freemail.hu> Date: Sun, 01 Nov 2009 22:59:39 +0100 From: =?ISO-8859-2?Q?N=E9meth_M=E1rton?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Jean-Francois Moine , Hans de Goede , V4L Mailing List CC: Thomas Kaiser , Theodore Kilgore , Kyle Guinn Subject: [PATCH 1/3] gspca pac7302/pac7311: simplify pac_find_sof X-DCC-mail.t-online.hu-Metrics: mail02a.mail.t-online.hu 32721; Body=6 Fuz1=6 Fuz2=6 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh Remove struct sd dependency from pac_find_sof() function implementation. This step prepares separation of pac7302 and pac7311 specific parts of struct sd. Signed-off-by: Márton Németh Cc: Thomas Kaiser Cc: Theodore Kilgore Cc: Kyle Guinn --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uprN a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c --- a/drivers/media/video/gspca/mr97310a.c 2009-11-01 06:49:29.000000000 +0100 +++ b/drivers/media/video/gspca/mr97310a.c 2009-11-01 18:11:22.000000000 +0100 @@ -1034,9 +1034,10 @@ static void sd_pkt_scan(struct gspca_dev __u8 *data, /* isoc packet */ int len) /* iso packet length */ { + struct sd *sd = (struct sd *) gspca_dev; unsigned char *sof; - sof = pac_find_sof(gspca_dev, data, len); + sof = pac_find_sof(&sd->sof_read, data, len); if (sof) { int n; diff -uprN a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c --- a/drivers/media/video/gspca/pac207.c 2009-10-30 16:12:05.000000000 +0100 +++ b/drivers/media/video/gspca/pac207.c 2009-11-01 18:11:22.000000000 +0100 @@ -344,7 +344,7 @@ static void sd_pkt_scan(struct gspca_dev struct sd *sd = (struct sd *) gspca_dev; unsigned char *sof; - sof = pac_find_sof(gspca_dev, data, len); + sof = pac_find_sof(&sd->sof_read, data, len); if (sof) { int n; diff -uprN a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c --- a/drivers/media/video/gspca/pac7311.c 2009-11-01 06:51:38.000000000 +0100 +++ b/drivers/media/video/gspca/pac7311.c 2009-11-01 18:11:22.000000000 +0100 @@ -852,7 +852,7 @@ static void sd_pkt_scan(struct gspca_dev struct sd *sd = (struct sd *) gspca_dev; unsigned char *sof; - sof = pac_find_sof(gspca_dev, data, len); + sof = pac_find_sof(&sd->sof_read, data, len); if (sof) { unsigned char tmpbuf[4]; int n, lum_offset, footer_length; diff -uprN a/drivers/media/video/gspca/pac_common.h b/drivers/media/video/gspca/pac_common.h --- a/drivers/media/video/gspca/pac_common.h 2009-10-30 16:12:05.000000000 +0100 +++ b/drivers/media/video/gspca/pac_common.h 2009-11-01 18:11:22.000000000 +0100 @@ -72,42 +72,41 @@ static const unsigned char pac_sof_marke +----------+ */ -static unsigned char *pac_find_sof(struct gspca_dev *gspca_dev, +static unsigned char *pac_find_sof(u8 *sof_read, unsigned char *m, int len) { - struct sd *sd = (struct sd *) gspca_dev; int i; /* Search for the SOF marker (fixed part) in the header */ for (i = 0; i < len; i++) { - switch (sd->sof_read) { + switch (*sof_read) { case 0: if (m[i] == 0xff) - sd->sof_read = 1; + *sof_read = 1; break; case 1: if (m[i] == 0xff) - sd->sof_read = 2; + *sof_read = 2; else - sd->sof_read = 0; + *sof_read = 0; break; case 2: switch (m[i]) { case 0x00: - sd->sof_read = 3; + *sof_read = 3; break; case 0xff: /* stay in this state */ break; default: - sd->sof_read = 0; + *sof_read = 0; } break; case 3: if (m[i] == 0xff) - sd->sof_read = 4; + *sof_read = 4; else - sd->sof_read = 0; + *sof_read = 0; break; case 4: switch (m[i]) { @@ -117,18 +116,18 @@ static unsigned char *pac_find_sof(struc "SOF found, bytes to analyze: %u." " Frame starts at byte #%u", len, i + 1); - sd->sof_read = 0; + *sof_read = 0; return m + i + 1; break; case 0xff: - sd->sof_read = 2; + *sof_read = 2; break; default: - sd->sof_read = 0; + *sof_read = 0; } break; default: - sd->sof_read = 0; + *sof_read = 0; } }