From owner-freebsd-current@FreeBSD.ORG Mon Nov 22 03:00:52 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7963216A4CE for ; Mon, 22 Nov 2004 03:00:52 +0000 (GMT) Received: from mirapoint2.tis.cwru.edu (mirapoint2.TIS.CWRU.Edu [129.22.104.47]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EBAA43D4C for ; Mon, 22 Nov 2004 03:00:48 +0000 (GMT) (envelope-from jrh29@po.cwru.edu) Received: from [192.168.1.100] (oh-clevelandheights-cdnt1-bg1b-147.clvdoh.adelphia.net [68.170.192.147]) by mirapoint2.tis.cwru.edu (MOS 3.5.4-GR) with ESMTP id CSU84753 (AUTH jrh29); Sun, 21 Nov 2004 22:00:46 -0500 (EST) Mime-Version: 1.0 (Apple Message framework v619) To: freebsd-current@freebsd.org Message-Id: Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-6-378674242" From: Justin Hibbits Date: Sun, 21 Nov 2004 22:00:41 -0500 Content-Transfer-Encoding: 7bit X-Pgp-Agent: GPGMail 1.0.2 X-Mailer: Apple Mail (2.619) X-Mailman-Approved-At: Mon, 22 Nov 2004 13:31:31 +0000 Subject: ATI TV Wonder support X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Nov 2004 03:00:52 -0000 --Apple-Mail-6-378674242 Content-Type: multipart/mixed; boundary=Apple-Mail-5-378674181 --Apple-Mail-5-378674181 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed This patch gives more or less full ATI TV Wonder support to the bktr driver. The sound doesn't mute at close, but that might be xawtv's fault, but I don't know which to accuse or look at. But, other than that, it seems pretty good. -Justin -- "And now, if you'll excuse me, I'm in the middle of 15 things, all annoying" -- Lt. Cmdr Susan Ivanova, Babylon 5 --Apple-Mail-5-378674181 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="bktr.patch" Content-Disposition: attachment; filename=bktr.patch --- bktr_card.c Thu Aug 12 11:17:06 2004 +++ /local/src/sys/dev/bktr/bktr_card.c Thu Aug 12 09:15:58 2004 @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/bktr/bktr_card.c,v 1.24 2004/08/08 01:23:39 sanpei Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.23 2003/12/08 07:59:18 obrien Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -368,6 +368,20 @@ { 0x02, 0x00, 0x00, 0x00, 1 }, /* audio MUX values */ 0x18e0 }, /* GPIO mask */ + { CARD_TVWONDER, /* the card id */ + "ATI TV Wonder", /* the 'name' */ + NULL, /* the tuner */ + 0, /* the tuner i2c address */ + 0, /* dbx is optional */ + 0, + 0, + 0, /* EEProm type */ + 0, /* EEProm size */ + /* Tuner, Extern, Intern, Mute, Enabled */ +// { 0x1002, 0x1002, 0x3003, 0x3003, 0x3003 }, /* audio MUX values */ +// 0x300f }, /* GPIO mask */ + { 0x1002, 0x1002, 0x3003, 0x3003, 0x3003 }, /* audio MUX values */ + 0x300f }, /* GPIO mask */ }; struct bt848_card_sig bt848_card_signature[1]= { @@ -569,6 +583,7 @@ #define PCI_VENDOR_FLYVIDEO_2 0x1852 #define PCI_VENDOR_PINNACLE_ALT 0xBD11 #define PCI_VENDOR_IODATA 0x10fc +#define PCI_VENDOR_ATI 0x1002 #define MODEL_IODATA_GV_BCTV3_PCI 0x4020 @@ -713,6 +728,12 @@ bktr->card.eepromSize = (u_char)(256 / EEPROMBLOCKSIZE); goto checkTuner; } + if (subsystem_vendor_id == PCI_VENDOR_ATI) { + bktr->card = cards[ (card = CARD_TVWONDER) ]; + bktr->card.eepromAddr = eeprom_i2c_address; + bktr->card.eepromSize = (u_char)(256 / EEPROMBLOCKSIZE); + goto checkTuner; + } /* Vendor is unknown. We will use the standard probe code */ /* which may not give best results */ @@ -1131,6 +1152,11 @@ goto checkDBX; break; + case CARD_TVWONDER: + select_tuner( bktr, PHILIPS_NTSC ); /* ALPS_TSCH6, in fact. */ + goto checkDBX; + break; + } /* end switch(card) */ @@ -1274,6 +1300,10 @@ /* Enable PLL mode for Video Highway Xtreme users */ if (card == CARD_VIDEO_HIGHWAY_XTREME) + bktr->xtal_pll_mode = BT848_USE_PLL; + + /* Enable PLL mode for Video Highway Xtreme users */ + if (card == CARD_TVWONDER) bktr->xtal_pll_mode = BT848_USE_PLL; --- bktr_card.h Thu Aug 12 11:17:06 2004 +++ /local/src/sys/dev/bktr/bktr_card.h Thu Aug 12 08:41:55 2004 @@ -1,4 +1,4 @@ -/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/bktr/bktr_card.h,v 1.7 2004/08/08 01:23:39 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.6 2003/02/02 17:46:00 orion Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -76,9 +76,10 @@ #define CARD_ASKEY_DYNALINK_MAGIC_TVIEW 14 #define CARD_LEADTEK 15 #define CARD_TERRATVPLUS 16 -#define CARD_IO_BCTV3 17 -#define CARD_AOPEN_VA1000 18 -#define Bt848_MAX_CARD 19 +#define CARD_IO_BCTV3 17 +#define CARD_AOPEN_VA1000 18 +#define CARD_TVWONDER 19 +#define Bt848_MAX_CARD 20 #define CARD_IO_GV CARD_IO_BCTV2 --Apple-Mail-5-378674181-- --Apple-Mail-6-378674242 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (Darwin) iD8DBQFBoVZlqt29EJDZlM4RAqorAKCc/wgQ/4a8dWq/0Ug6Tiv3F2pbCQCeOg0U fXk3VCrlREZY3lDOFwN/ML8= =Uod7 -----END PGP SIGNATURE----- --Apple-Mail-6-378674242--