diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/bktr/bktr_card.c | 30 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_card.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 10 |
4 files changed, 46 insertions, 5 deletions
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c index 55d0573adaa..7b91757df6a 100644 --- a/sys/dev/pci/bktr/bktr_card.c +++ b/sys/dev/pci/bktr/bktr_card.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_card.c,v 1.11 2005/02/17 18:07:36 jfb Exp $ */ +/* $OpenBSD: bktr_card.c,v 1.12 2005/02/24 20:23:39 mickey Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */ /* @@ -379,6 +379,18 @@ static const struct CARDTYPE cards[] = { { 0x02, 0x00, 0x00, 0x00, 1 }, /* audio MUX values */ 0x18e0 }, /* GPIO mask */ + { CARD_ZOLTRIX_GENIE_FM, /* the card id */ + "Zoltrix Genie TV/FM", /* the 'name' */ + NULL, /* the tuner */ + 0, /* the tuner i2c address */ + 0, /* dbx is optional */ + 0, /* msp34xx is optional */ + 0, /* dpl3518a is optional */ + 0, /* EEProm type */ + 0, /* EEProm size */ + { 0xbc803f, 0xbcb03f, 0xbc903f, 0x0, 1 }, /* audio MUX values*/ + 0xbcf03f }, /* GPIO mask */ + }; struct bt848_card_sig bt848_card_signature[1]= { @@ -735,6 +747,17 @@ probeCard( bktr_ptr_t bktr, int verbose, int unit ) goto checkTuner; } + if (subsystem_vendor_id == PCI_VENDOR_ZOLTRIX) { + if (subsystem_id == PCI_PRODUCT_ZOLTRIX_GENIE_TV_FM) { + bktr->card = cards[ (card = CARD_ZOLTRIX_GENIE_FM) ]; + } else { + bktr->card = cards[ (card = CARD_ZOLTRIX) ]; + } + 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 */ printf("%s: Warning " @@ -1150,6 +1173,11 @@ checkTuner: goto checkDBX; break; + case CARD_ZOLTRIX_GENIE_FM: + select_tuner( bktr, PHILIPS_FR1236_NTSC ); + goto checkDBX; + break; + case CARD_IO_BCTV3: select_tuner( bktr, ALPS_TSCH5 ); /* ALPS_TSCH6, in fact. */ goto checkDBX; diff --git a/sys/dev/pci/bktr/bktr_card.h b/sys/dev/pci/bktr/bktr_card.h index 10b3b6897a0..f1cd405dec6 100644 --- a/sys/dev/pci/bktr/bktr_card.h +++ b/sys/dev/pci/bktr/bktr_card.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_card.h,v 1.5 2004/10/15 08:59:32 jsg Exp $ */ +/* $OpenBSD: bktr_card.h,v 1.6 2005/02/24 20:23:39 mickey Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.4 2000/06/26 09:41:31 roger Exp $ */ /* @@ -80,7 +80,8 @@ #define CARD_TVWONDER 17 #define CARD_IO_BCTV3 18 #define CARD_AOPEN_VA1000 19 -#define Bt848_MAX_CARD 20 +#define CARD_ZOLTRIX_GENIE_FM 20 +#define Bt848_MAX_CARD 21 int signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig ); diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 31e9e2fa808..c38e1097451 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.835 2005/02/21 19:55:50 grange Exp + * OpenBSD: pcidevs,v 1.836 2005/02/24 20:21:27 mickey Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -243,6 +243,7 @@ #define PCI_VENDOR_BLUESTEEL 0x15ab /* Bluesteel Networks */ #define PCI_VENDOR_VMWARE 0x15ad /* VMware */ #define PCI_VENDOR_NDC 0x15e8 /* National Datacomm Corp */ +#define PCI_VENDOR_ZOLTRIX 0x15b0 /* Zoltrix Intl Ltd. */ #define PCI_VENDOR_EUMITCOM 0x1638 /* Eumitcom */ #define PCI_VENDOR_NETSEC 0x1660 /* NetSec */ #define PCI_VENDOR_SAMSUNG 0x167d /* Samsung */ @@ -2825,6 +2826,9 @@ /* Ziatech products */ #define PCI_PRODUCT_ZIATECH_ZT8905 0x8905 /* PCI-ST32 */ +/* Zoltrix Intl Ltd. products */ +#define PCI_PRODUCT_ZOLTRIX_GENIE_TV_FM 0x400d /* Genie TV/FM */ + /* Zoran products */ #define PCI_PRODUCT_ZORAN_ZR36057 0x6057 /* TV */ #define PCI_PRODUCT_ZORAN_ZR36120 0x6120 /* DVD */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index e9805e9cca5..5b739793325 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.835 2005/02/21 19:55:50 grange Exp + * OpenBSD: pcidevs,v 1.836 2005/02/24 20:21:27 mickey Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -8399,6 +8399,10 @@ static const struct pci_known_product pci_known_products[] = { "PCI-ST32", }, { + PCI_VENDOR_ZOLTRIX, PCI_PRODUCT_ZOLTRIX_GENIE_TV_FM, + "Genie TV/FM", + }, + { PCI_VENDOR_ZORAN, PCI_PRODUCT_ZORAN_ZR36057, "TV", }, @@ -9179,6 +9183,10 @@ static const struct pci_known_vendor pci_known_vendors[] = { "National Datacomm Corp", }, { + PCI_VENDOR_ZOLTRIX, + "Zoltrix Intl Ltd.", + }, + { PCI_VENDOR_EUMITCOM, "Eumitcom", }, |