diff options
| author | Xavier Bachelot <xavier@bachelot.org> | 2007-05-10 16:00:03 +0000 |
|---|---|---|
| committer | Xavier Bachelot <xavier@bachelot.org> | 2007-05-10 16:00:03 +0000 |
| commit | 21b9aa3145b1a770efb5176d0021fc13a821045a (patch) | |
| tree | 0a166bcae141e963fd90b981cbcf69a0f3ff7fae | |
| parent | e016e40648d78d91fb4f905df7c6a4ab8ba97354 (diff) | |
port few fixes from trunk to experimental
| -rw-r--r-- | unichrome/via_id.c | 16 | ||||
| -rw-r--r-- | unichrome/via_vt162x.h | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/unichrome/via_id.c b/unichrome/via_id.c index 482c859..744514a 100644 --- a/unichrome/via_id.c +++ b/unichrome/via_id.c @@ -17,7 +17,7 @@ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ @@ -35,7 +35,7 @@ /* * Known missing devices: - * + * * CLE266: * Biostar M6VLQ Grand * Biostar M6VLQ Pro @@ -170,6 +170,8 @@ static struct ViaCardIdStruct ViaCardId[] = { {"Clevo/RoverBook Partner E419L", VIA_VM800, 0x1019, 0x0F75, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"ECS P4M800PRO-M", VIA_VM800, 0x1019, 0x2122, VIA_DEVICE_CRT}, {"ECS C7VCM", VIA_VM800, 0x1019, 0xAA2D, VIA_DEVICE_CRT}, + {"Asustek P5VDC-MX", VIA_VM800, 0x1043, 0x3344, VIA_DEVICE_CRT}, + {"Asustek P5VDC-TVM", VIA_VM800, 0x1043, 0x81CE, VIA_DEVICE_CRT}, {"Gateway MX3210", VIA_VM800, 0x107B, 0x0216, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, {"VIA VT3344 (VM800) - EPIA EN", VIA_VM800, 0x1106, 0x3344, VIA_DEVICE_CRT | VIA_DEVICE_TV}, {"Gigabyte GA-8VM800M-775", VIA_VM800, 0x1458, 0xD000, VIA_DEVICE_CRT}, @@ -243,9 +245,9 @@ ViaCheckCardId(ScrnInfoPtr pScrn) if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) && (pVia->PciInfo->subsysCard == pVia->PciInfo->chipType)) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Manufacturer plainly copied main PCI" - " ids to Subsystem/Card ids.\n"); - + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n"); + for (Id = ViaCardId; Id->String; Id++) { if ((Id->Chip == pVia->Chipset) && (Id->Vendor == pVia->PciInfo->subsysVendor) && @@ -257,8 +259,8 @@ ViaCheckCardId(ScrnInfoPtr pScrn) } xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unknown Card-Ids (%4X|%4X); please report to openchrome-users@openchrome.org\n" - , pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); + "Unknown Card-Ids (%4X|%4X); please report to openchrome-users@openchrome.org\n", + pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard); pVia->Id = NULL; } diff --git a/unichrome/via_vt162x.h b/unichrome/via_vt162x.h index 0acc21d..369ffc8 100644 --- a/unichrome/via_vt162x.h +++ b/unichrome/via_vt162x.h @@ -840,7 +840,7 @@ VT1625Table[] = { 0x21F07BD6, 0x21F087BE, }, - { "1280x720", 1270, 720, TVTYPE_720P, 0, 0, + { "1280x720", 1280, 720, TVTYPE_720P, 0, 0, /* 00 0F */ { 0x83, 0, 0x10, 0x40, 0x94, 0x00, 0, 0xFF, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x80, 0x89, 0x10, 0x63, 0x24, 0x00, 0x00, 0x00, 0x00, 0, 0x50, 0x40, 0x80, 0x00, 0x03, |