From owner-freebsd-current@FreeBSD.ORG Thu Aug 12 12:49:00 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 28E1F16A4CE for ; Thu, 12 Aug 2004 12:49:00 +0000 (GMT) Received: from mirapoint1.tis.cwru.edu (mirapoint1.TIS.CWRU.Edu [129.22.104.46]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5C4F43D41 for ; Thu, 12 Aug 2004 12:48:59 +0000 (GMT) (envelope-from jrh29@po.cwru.edu) Received: from [192.168.1.108] (oh-clevelandheights-cdnt1-bg1b-147.clvdoh.adelphia.net [68.170.192.147]) by mirapoint1.tis.cwru.edu (MOS 3.4.3-CR) with ESMTP id CFX50104 (AUTH jrh29); Thu, 12 Aug 2004 08:48:58 -0400 (EDT) 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-3-191096317" From: Justin Hibbits Date: Thu, 12 Aug 2004 08:48:49 -0400 Content-Transfer-Encoding: 7bit X-Pgp-Agent: GPGMail 1.0.2 X-Mailer: Apple Mail (2.619) X-Mailman-Approved-At: Thu, 12 Aug 2004 18:48:35 +0000 Subject: Preliminary ATI TV Wonder bktr 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: Thu, 12 Aug 2004 12:49:00 -0000 --Apple-Mail-3-191096317 Content-Type: multipart/mixed; boundary=Apple-Mail-2-191096309 --Apple-Mail-2-191096309 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed It's not complete (no sound yet, and no idea where to begin), but the ATI TV Wonder is now auto configured. Source merged from OpenBSD. Since I'm not a regular FreeBSD hacker, I'm posting it here. I hope it's the right list. Anyway, maybe someone can figure out how to go from here, since I'm stuck now. I'll continue working on it though. -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-2-191096309 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="bktr_card_c.patch" Content-Disposition: attachment; filename=bktr_card_c.patch *** bktr_card.c Thu Aug 12 08:44:41 2004 --- /local/src/sys/dev/bktr/bktr_card.c Thu Aug 12 08:40:48 2004 *************** *** 368,373 **** --- 368,385 ---- { 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 */ }; struct bt848_card_sig bt848_card_signature[1]= { *************** *** 569,574 **** --- 581,587 ---- #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,718 **** --- 726,737 ---- 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,1136 **** --- 1150,1160 ---- goto checkDBX; break; + case CARD_TVWONDER: + select_tuner( bktr, PHILIPS_NTSC ); /* ALPS_TSCH6, in fact. */ + goto checkDBX; + break; + } /* end switch(card) */ *************** *** 1274,1279 **** --- 1298,1307 ---- /* 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; --Apple-Mail-2-191096309 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="bktr_card_h.patch" Content-Disposition: attachment; filename=bktr_card_h.patch *** bktr_card.h Thu Aug 12 08:44:41 2004 --- /local/src/sys/dev/bktr/bktr_card.h Thu Aug 12 08:41:55 2004 *************** *** 76,84 **** #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_GV CARD_IO_BCTV2 --- 76,85 ---- #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 CARD_TVWONDER 19 ! #define Bt848_MAX_CARD 20 #define CARD_IO_GV CARD_IO_BCTV2 --Apple-Mail-2-191096309-- --Apple-Mail-3-191096317 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) iD8DBQFBG2c3qt29EJDZlM4RAlSIAJ9RyKi31JQbbuuOrt9d/6JTbaW4kQCfaj3b VDt5nDXjDl3DhqebLx3s4Js= =w60H -----END PGP SIGNATURE----- --Apple-Mail-3-191096317--