From owner-freebsd-multimedia Wed Aug 5 10:16:52 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id KAA19672 for freebsd-multimedia-outgoing; Wed, 5 Aug 1998 10:16:52 -0700 (PDT) (envelope-from owner-freebsd-multimedia@FreeBSD.ORG) Received: from fleming.cs.strath.ac.uk (bell.cs.strath.ac.uk [130.159.196.126]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA19652; Wed, 5 Aug 1998 10:16:47 -0700 (PDT) (envelope-from roger@cs.strath.ac.uk) Received: from cs.strath.ac.uk (posh.dmem.strath.ac.uk [130.159.202.3]) by fleming.cs.strath.ac.uk (8.8.8/8.8.8) with ESMTP id SAA00878 Wed, 5 Aug 1998 18:16:33 +0100 (BST) Message-ID: <35C89370.A1EB29F8@cs.strath.ac.uk> Date: Wed, 05 Aug 1998 18:16:32 +0100 From: Roger Hardiman Organization: Strathclyde Uni X-Mailer: Mozilla 4.05 [en] (X11; I; FreeBSD 3.0-980520-SNAP i386) MIME-Version: 1.0 To: current@FreeBSD.ORG, roger@cs.strath.ac.uk, multimedia@FreeBSD.ORG Subject: Patch for Bt848 driver to detect new Hauppauge 404 Cards Content-Type: multipart/mixed; boundary="------------30D9845A3F7ACB1405A3769F" Sender: owner-freebsd-multimedia@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multi-part message in MIME format. --------------30D9845A3F7ACB1405A3769F Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, Please can someone commit this patch for the bt848 driver. It allows the new Hauppauge WinCastTV 404 card with NTSC tuner to be detected. It also tidies up some of my earlier initialisation code Amancio commited for me. Thanks Roger Hardiman Strathclyde Uni Telepresence Group --------------30D9845A3F7ACB1405A3769F Content-Type: text/plain; charset=us-ascii; name="patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch" *** brooktree848.c Wed Aug 5 18:08:21 1998 --- new_brooktree848.c Wed Aug 5 18:11:04 1998 *************** *** 1,4 **** ! /* BT848 1.38 Driver for Brooktree's Bt848 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The Philips SAA 7116 and SAA 7196 are very different chipsets than --- 1,4 ---- ! /* BT848 1.39 Driver for Brooktree's Bt848 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The Philips SAA 7116 and SAA 7196 are very different chipsets than *************** *** 267,272 **** --- 267,279 ---- 1.38 Further improvements on Hauppauge's rely on eeprom[9] to determine the tuner type 8) + AVerMedia card type added + + 1.39 08/05/98 Roger Hardiman + Updated Hauppauge detection code for Tuner ID 0x0a + for newer NTSC WinCastTV 404 with Bt878 chipset. + Tidied up PAL default in video_open() + */ #define DDB(x) x *************** video_open( bktr_ptr_t bktr ) *** 1621,1639 **** BT848_IFORM_X_XT0 | BT848_IFORM_F_NTSCM; bktr->format_params = BT848_IFORM_F_NTSCM; - frame_rate = 30; } else { bt848->iform = BT848_IFORM_M_MUX1 | BT848_IFORM_X_XT1 | BT848_IFORM_F_PALBDGHI; - bt848->adelay = format_params[BT848_IFORM_F_PALBDGHI].adelay; - bt848->bdelay = format_params[BT848_IFORM_F_PALBDGHI].bdelay; bktr->format_params = BT848_IFORM_F_PALBDGHI; - frame_rate = 25; } bktr->flags = (bktr->flags & ~METEOR_DEV_MASK) | METEOR_DEV0; bktr->max_clip_node = 0; --- 1628,1646 ---- BT848_IFORM_X_XT0 | BT848_IFORM_F_NTSCM; bktr->format_params = BT848_IFORM_F_NTSCM; } else { bt848->iform = BT848_IFORM_M_MUX1 | BT848_IFORM_X_XT1 | BT848_IFORM_F_PALBDGHI; bktr->format_params = BT848_IFORM_F_PALBDGHI; } + bt848->adelay = format_params[bktr->format_params].adelay; + bt848->bdelay = format_params[bktr->format_params].bdelay; + frame_rate = format_params[bktr->format_params].frame_rate; + bktr->flags = (bktr->flags & ~METEOR_DEV_MASK) | METEOR_DEV0; bktr->max_clip_node = 0; *************** checkTuner: *** 4413,4418 **** --- 4420,4426 ---- bktr->card.tuner = &tuners[ PHILIPS_NTSC ]; goto checkDBX; + case 0x0a: case 0x12: case 0x17: bktr->card.tuner = &tuners[ PHILIPS_FR1236_NTSC ]; --------------30D9845A3F7ACB1405A3769F-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-multimedia" in the body of the message