From patchwork Wed Feb 3 20:16:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 2583 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 03 Feb 2010 20:17:20 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 03 Feb 2010 18:21:47 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Nclf6-0006UI-FJ; Wed, 03 Feb 2010 20:17:20 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757850Ab0BCURT (ORCPT + 1 other); Wed, 3 Feb 2010 15:17:19 -0500 Received: from mail-in-16.arcor-online.net ([151.189.21.56]:55966 "EHLO mail-in-16.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757855Ab0BCURT (ORCPT ); Wed, 3 Feb 2010 15:17:19 -0500 Received: from mail-in-11-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mx.arcor.de (Postfix) with ESMTP id 7EA842571A6; Wed, 3 Feb 2010 21:17:17 +0100 (CET) Received: from mail-in-06.arcor-online.net (mail-in-06.arcor-online.net [151.189.21.46]) by mail-in-11-z2.arcor-online.net (Postfix) with ESMTP id 5C8083470C2; Wed, 3 Feb 2010 21:17:17 +0100 (CET) Received: from [192.168.2.102] (dslb-188-103-200-201.pools.arcor-ip.net [188.103.200.201]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-06.arcor-online.net (Postfix) with ESMTPA id F333F39A636; Wed, 3 Feb 2010 21:17:16 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-06.arcor-online.net F333F39A636 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265228237; bh=pWcjRGF1WfWi+7AqLY4CXDNSG+N3w7nynnzVAlumJhY=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=Y3uHeppKiAfAAIBoiFdr36HRQd347Fg+FQN5ehzm46Jw6+/GYDctUeTh9l0ZHvHgy ZqXxGjnryBGwS6MDoJhbehnkd8hAez1S8ffeegGyPXmTFLEIXgFd6R9DzTqJkS6Bi1 MC2pM62rq4mUVO2rwRkM6bvsdtDa+KVbuyWXyO34= Message-ID: <4B69D9AF.4020309@arcor.de> Date: Wed, 03 Feb 2010 21:16:47 +0100 From: Stefan Ringel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: linux-media@vger.kernel.org, Devin Heitmueller Subject: [PATCH 4/15] - tm6000.h References: <4B673790.3030706@arcor.de> <4B673B2D.6040507@arcor.de> <4B675B19.3080705@redhat.com> <4B685FB9.1010805@arcor.de> <4B688507.606@redhat.com> <4B688E41.2050806@arcor.de> <4B689094.2070204@redhat.com> <4B6894FE.6010202@arcor.de> <4B69D83D.5050809@arcor.de> <4B69D8CC.2030008@arcor.de> In-Reply-To: <4B69D8CC.2030008@arcor.de> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org signed-off-by: Stefan Ringel int tm6000_init_digital_mode (struct tm6000_core *dev); @@ -231,7 +242,12 @@ int tm6000_set_standard (struct tm6000_core *dev, v4l2_std_id *norm); int tm6000_i2c_register(struct tm6000_core *dev); int tm6000_i2c_unregister(struct tm6000_core *dev); +#if 1 /* In tm6000-queue.c */ +#if 0 +int tm6000_init_isoc(struct tm6000_core *dev, int max_packets); +void tm6000_uninit_isoc(struct tm6000_core *dev); +#endif int tm6000_v4l2_mmap(struct file *filp, struct vm_area_struct *vma); @@ -276,3 +292,4 @@ extern int tm6000_debug; __FUNCTION__ , ##arg); } while (0) +#endif --- a/drivers/staging/tm6000/tm6000.h +++ b/drivers/staging/tm6000/tm6000.h @@ -90,12 +97,14 @@ enum tm6000_core_state { DEV_MISCONFIGURED = 0x04, }; +#if 1 /* io methods */ enum tm6000_io_method { IO_NONE, IO_READ, IO_MMAP, }; +#endif enum tm6000_mode { TM6000_MODE_UNKNOWN=0, @@ -202,6 +211,9 @@ struct tm6000_fh { V4L2_STD_PAL_M|V4L2_STD_PAL_60|V4L2_STD_NTSC_M| \ V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM +/* In tm6000-cards.c */ + +int tm6000_tuner_callback (void *ptr, int component, int command, int arg); /* In tm6000-core.c */ int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req, @@ -209,7 +221,6 @@ int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req, int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index); int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index); int tm6000_init (struct tm6000_core *dev); -int tm6000_init_after_firmware (struct tm6000_core *dev); int tm6000_init_analog_mode (struct tm6000_core *dev);