Index: es137x.c =================================================================== RCS file: /home/xorpc/u2/freebsd/src/sys/dev/sound/pci/es137x.c,v retrieving revision 1.42 retrieving revision 1.48 diff -u -r1.42 -r1.48 --- es137x.c 28 Apr 2002 22:38:23 -0000 1.42 +++ es137x.c 7 Sep 2003 16:28:03 -0000 1.48 @@ -3,7 +3,7 @@ * boards based on the ES1370, ES1371 and ES1373 chips. * * Copyright (c) 1999 Russell Cattelan - * Copyright (c) 1999 Cameron Grant + * Copyright (c) 1999 Cameron Grant * Copyright (c) 1998 by Joachim Kuebart. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,6 +71,7 @@ #define ES1371_PCI_ID 0x13711274 #define ES1371_PCI_ID2 0x13713274 #define CT5880_PCI_ID 0x58801274 +#define CT4730_PCI_ID 0x89381102 #define ES1371REV_ES1371_A 0x02 #define ES1371REV_ES1371_B 0x09 @@ -85,6 +86,8 @@ #define CT5880REV_CT5880_D 0x03 #define CT5880REV_CT5880_E 0x04 +#define CT4730REV_CT4730_A 0x00 + #define ES_DEFAULT_BUFSZ 4096 /* device private data */ @@ -505,7 +508,8 @@ (devid == ES1371_PCI_ID && revid == ES1371REV_CT5880_A) || (devid == CT5880_PCI_ID && revid == CT5880REV_CT5880_C) || (devid == CT5880_PCI_ID && revid == CT5880REV_CT5880_D) || - (devid == CT5880_PCI_ID && revid == CT5880REV_CT5880_E)) { + (devid == CT5880_PCI_ID && revid == CT5880REV_CT5880_E) || + (devid == CT4730_PCI_ID)) { bus_space_write_4(es->st, es->sh, ES1370_REG_STATUS, 0x20000000); DELAY(20000); if (debug > 0) device_printf(dev, "ac97 2.1 enabled\n"); @@ -791,6 +795,17 @@ device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); return 0; + case CT4730_PCI_ID: + switch(pci_get_revid(dev)) { + case CT4730REV_CT4730_A: + device_set_desc(dev, "Creative SB AudioPCI CT4730"); + return 0; + default: + device_set_desc(dev, "Creative SB AudioPCI CT4730-?"); + device_printf(dev, "unknown revision %d -- please report to cg@freebsd.org\n", pci_get_revid(dev)); + return 0; + } + case CT5880_PCI_ID: switch(pci_get_revid(dev)) { case CT5880REV_CT5880_C: @@ -868,7 +883,8 @@ if (pci_get_devid(dev) == ES1371_PCI_ID || pci_get_devid(dev) == ES1371_PCI_ID2 || - pci_get_devid(dev) == CT5880_PCI_ID) { + pci_get_devid(dev) == CT5880_PCI_ID || + pci_get_devid(dev) == CT4730_PCI_ID) { if(-1 == es1371_init(es, dev)) { device_printf(dev, "unable to initialize the card\n"); goto bad;