svn commit: r187997 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/sound/pci

[Giorgos Keramidas]

Author: keramida (doc committer)
Date: Mon Feb  2 04:48:32 2009
New Revision: 187997
URL: http://svn.freebsd.org/changeset/base/187997

Log:
  MFC 187375 from /head
  
  Add support for CMedia CMI120.
  
  PR:           kern/123640
  Approved by:  ariff

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/sound/pci/cmi.c

Modified: stable/7/sys/dev/sound/pci/cmi.c
==============================================================================
--- stable/7/sys/dev/sound/pci/cmi.c	Mon Feb  2 03:34:40 2009	(r187996)
+++ stable/7/sys/dev/sound/pci/cmi.c	Mon Feb  2 04:48:32 2009	(r187997)
@@ -60,6 +60,7 @@ SND_DECLARE_FILE("$FreeBSD$");
 #define CMI8338B_PCI_ID   0x010113f6
 #define CMI8738_PCI_ID    0x011113f6
 #define CMI8738B_PCI_ID   0x011213f6
+#define CMI120_USB_ID     0x01030d8c
 
 /* Buffer size max is 64k for permitted DMA boundaries */
 #define CMI_DEFAULT_BUFSZ      16384
@@ -916,6 +917,9 @@ cmi_probe(device_t dev)
 	case CMI8738B_PCI_ID:
 		device_set_desc(dev, "CMedia CMI8738B");
 		return BUS_PROBE_DEFAULT;
+	case CMI120_USB_ID:
+	        device_set_desc(dev, "CMedia CMI120");
+	        return BUS_PROBE_DEFAULT;
 	default:
 		return ENXIO;
 	}