[PATCH] asihpi driver, register as pci device and autoprobe support

["Delio Brignoli" <dbrignoli@audioscience.com>]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

Hello,

patch attached, please apply :)

CHANGELOG:
*register as pci device and add autoprobe support

signed-off-by: Delio Brignoli dbrignoli@audioscience.com

thanks
--
Delio Brignoli


[-- Attachment #2: patch.txt --]
[-- Type: application/octet-stream, Size: 6648 bytes --]

Thu Aug  4 16:39:08 NZST 2005  dbrignoli@audioscience.com
  * register_as_pci_device_and_hotplug_support
diff -rN -u old-alsa-driver-1.0.9b-register_pci/pci/asihpi.c new-alsa-driver-1.0.9b-register_pci/pci/asihpi.c
--- old-alsa-driver-1.0.9b-register_pci/pci/asihpi.c	2005-08-25 10:13:51.000000000 +1200
+++ new-alsa-driver-1.0.9b-register_pci/pci/asihpi.c	2005-08-25 10:13:52.000000000 +1200
@@ -27,6 +27,7 @@
 #define ASI_STYLE_NAMES 1
 #endif
 
+#include <linux/pci.h>
 #include <sound/driver.h>
 #include <linux/version.h>
 #include <linux/init.h>
@@ -110,7 +111,9 @@
 } snd_card_asihpi_pcm_t;
 
 static HPI_HSUBSYS *phSubSys;	/* handle to HPI audio subsystem */
-static snd_card_t *snd_asihpi_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+void HPI_AdapterIndex( const HPI_HSUBSYS *phSubSys, struct pci_dev *pci_dev,
+					const struct pci_device_id *pci_id, short * wAdapterIndex );
 
 static void _HandleError(HW16 err, int line, char *filename)
 {
@@ -2207,27 +2210,51 @@
 /*------------------------------------------------------------
    CARD
  ------------------------------------------------------------*/
-static int __init snd_card_asihpi_probe(int dev)
+static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
+				       const struct pci_device_id *pci_id)
 {
+	int idx, err;
+
+	short dev_idx;
+	HW32 dwVersion;
+
 	HW16 wVersion;
 	int pcm_substreams;
 
 	snd_card_t *card;
 	struct snd_card_asihpi *asihpi;
-	int idx, err;
 
 	HPI_HCONTROL hControl;
 
-	//  if (!enable[dev])
-	//return -ENODEV;
-	err = HPI_AdapterOpen(phSubSys, dev);
+	snd_printd(KERN_INFO "ASIHPI driver start\n");
+
+	phSubSys = HPI_SubSysCreate();
+	if (phSubSys == NULL) {
+		snd_printd(KERN_ERR
+			   "phSubSys==NULL, ASI HPI driver not loaded?\n");
+		return 0;
+	}
 
+	err = HPI_SubSysGetVersion(phSubSys, &dwVersion);
 	HPI_HandleError(err);
-	if (err)
+	snd_printd(KERN_INFO "HPI_SubSysGetVersion=%lx\n", dwVersion);
+
+	HPI_AdapterIndex( phSubSys, pci_dev, pci_id, &dev_idx );
+	snd_printd(KERN_INFO "PCI device (%04x:%04x,%04x:%04x,%04x) is HPI index # %d\n", 
+		pci_dev->vendor, pci_dev->device, pci_dev->subsystem_vendor, 
+		pci_dev->subsystem_device, pci_dev->devfn, dev_idx );
+
+	if ( dev_idx >= 0 ) {
+		err = HPI_AdapterOpen( phSubSys, (HW16)dev_idx );
+		HPI_HandleError( err );
+		if ( err )
+			return -ENODEV;
+	} else {
 		return -ENODEV;
+	}
 
 	// first try to give the card the same index as its hardware index
-	card = snd_card_new(dev, SNDRV_DEFAULT_STR1, THIS_MODULE,
+	card = snd_card_new(dev_idx, SNDRV_DEFAULT_STR1, THIS_MODULE,
 			    sizeof(struct snd_card_asihpi));
 	if (card == NULL) {
 		// if that fails, try the default index==next available
@@ -2239,12 +2266,12 @@
 			return -ENOMEM;
 		snd_printk(KERN_WARNING
 			   "**** WARNING **** Adapter index %d->ALSA index %d\n",
-			   dev, card->number);
+			   dev_idx, card->number);
 	}
 
 	asihpi = (struct snd_card_asihpi *) card->private_data;
 	asihpi->card = card;
-	asihpi->wAdapterIndex = dev;
+	asihpi->wAdapterIndex = dev_idx;
 	err = HPI_AdapterGetInfo(phSubSys,
 				 asihpi->wAdapterIndex,
 				 &asihpi->wNumOutStreams,
@@ -2272,80 +2299,58 @@
 				  HPI_CONTROL_SAMPLECLOCK, &hControl);
 
 	if (!err)
-			err = HPI_SampleClock_SetSampleRate(phSubSys, hControl, adapter_fs);
+		err = HPI_SampleClock_SetSampleRate(phSubSys, hControl, adapter_fs);
 
 	snd_asihpi_proc_init(asihpi);
 
 	strcpy(card->driver, "ASIHPI");
 	sprintf(card->shortname, "AudioScience ASI%4X", asihpi->wType);
-	sprintf(card->longname, "%s %i", card->shortname, dev + 1);
+	sprintf(card->longname, "%s %i", card->shortname, dev_idx + 1);
 	if ((err = snd_card_register(card)) == 0) {
-		snd_asihpi_cards[dev] = card;
+		pci_set_drvdata( pci_dev, card );
 		return 0;
 	}
       __nodev:
 	snd_card_free(card);
 	return err;
-}
 
+}
 
-static int __init alsa_card_asihpi_init(void)
+static void __devexit snd_asihpi_remove(struct pci_dev *pci_dev)
 {
-	int dev, cards;
-
-	HW16 err = 0;		// HPI error
-	HW16 wNumAdapters = 0;
-	HW16 awAdapterList[HPI_MAX_ADAPTERS];
-	HW16 wListLength = HPI_MAX_ADAPTERS;
-	HW32 dwVersion;
-
-	snd_printd(KERN_INFO "ASIHPI driver start\n");
+	snd_card_free( pci_get_drvdata( pci_dev ) );
+	pci_set_drvdata( pci_dev, NULL );
+}
 
-	phSubSys = HPI_SubSysCreate();
-	if (phSubSys == NULL) {
-		snd_printd(KERN_ERR
-			   "phSubSys==NULL, ASI HPI driver not loaded?\n");
-		return 0;
-	}
+static struct pci_device_id  asihpi_pci_tbl[] = {
+    {HPI_PCI_VENDOR_ID_TI, HPI_ADAPTER_DSP6205,HPI_PCI_VENDOR_ID_AUDIOSCIENCE,PCI_ANY_ID,0,0,0, },
+    {HPI_PCI_VENDOR_ID_TI, HPI_ADAPTER_PCI2040,HPI_PCI_VENDOR_ID_AUDIOSCIENCE,PCI_ANY_ID,0,0,0, },
+    {HPI_PCI_VENDOR_ID_MOTOROLA,HPI_ADAPTER_DSP56301,HPI_PCI_VENDOR_ID_AUDIOSCIENCE,PCI_ANY_ID,0,0,0, },
+    {HPI_PCI_VENDOR_ID_MOTOROLA,HPI_ADAPTER_DSP56301,HPI_PCI_VENDOR_ID_AUDIOSCIENCE,PCI_ANY_ID,0,0,0, },
+     // look for ASI cards that have 0x12cf sub-vendor ID, like the 4300 and 4601
+    {HPI_PCI_VENDOR_ID_MOTOROLA,HPI_ADAPTER_DSP56301,0x12CF                        ,PCI_ANY_ID,0,0,0, },
+    // look for ASI cards that have sub-vendor-ID = 0, like the 4501, 4113 and 4215 revC and below
+    {HPI_PCI_VENDOR_ID_MOTOROLA,HPI_ADAPTER_DSP56301,0                             ,PCI_ANY_ID,0,0,0, },
+    {0,}
+};
 
-	err = HPI_SubSysGetVersion(phSubSys, &dwVersion);
-	HPI_HandleError(err);
-	snd_printd(KERN_INFO "HPI_SubSysGetVersion=%lx\n", dwVersion);
+MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
 
-	err = HPI_SubSysFindAdapters(phSubSys,
-				     &wNumAdapters,
-				     awAdapterList, wListLength);
-	HPI_HandleError(err);
-	snd_printd(KERN_INFO "HPI_SubSysFindAdapters NumberAdapters=%d \n",
-		   wNumAdapters);
+static struct pci_driver asihpi_pci_driver = {
+        .name     = "asihpi",
+        .id_table = asihpi_pci_tbl,
+        .probe    = snd_asihpi_probe,
+        .remove   = __devexit_p(snd_asihpi_remove),
+};
 
-	for (dev = cards = 0; dev < HPI_MAX_ADAPTERS; dev++) {
-		if (awAdapterList[dev] && snd_card_asihpi_probe(dev) < 0) {
-#ifdef MODULE
-			snd_printk(KERN_ERR
-				   "Asihpi soundcard #%i not found or device busy\n",
-				   dev + 1);
-#endif
-			break;
-		}
-		cards++;
-	}
-	if (!cards) {
-#ifdef MODULE
-		snd_printk(KERN_ERR
-			   "Asihpi soundcard not found or device busy\n");
-#endif
-		return -ENODEV;
-	}
-	return 0;
+static int __init alsa_card_asihpi_init(void)
+{
+	return pci_register_driver(&asihpi_pci_driver);
 }
 
 static void __exit alsa_card_asihpi_exit(void)
 {
-	int idx;
-
-	for (idx = 0; idx < SNDRV_CARDS; idx++)
-		snd_card_free(snd_asihpi_cards[idx]);
+	pci_unregister_driver(&asihpi_pci_driver);
 }
 
 module_init(alsa_card_asihpi_init)